Merge pull request #5 from yanghongfei/master

[Update]阿里云不能获取到内网IP问题

Author: yanghongfei

libs/aliyun/ecs.py

@@ -55,23 +55,6 @@ def get_response(self):
             err = e
         return response_data, err
 
-    # def get_response(self):
-    #     """
-    #     获取返回值
-    #     :return:
-    #     """
-    #     request = self.set_request()
-    #     try:
-    #
-    #         response = self.client.do_action_with_exception(request)
-    #         response_data = json.loads(str(response, encoding="utf8"))
-    #         return response_data
-    #     except Exception as e:
-    #         # print(e)
-    #         return e
-
-    # print(response_data)
-
     def get_server_count(self):
         """
         获取机器总数
@@ -97,7 +80,6 @@ def get_server_info(self):
             ret = response_data['Instances']['Instance']
         except (KeyError, TypeError):
             ins_log.read_log('error', '可能是因为SecretID/SecretKey配置错误，没法拿到配置，请检查下配置')
-            # print('[Error]: 可能是因为SecretID/SecretKey配置错误，没法拿到配置，请检查下配置')
             return False
         server_list = []
         for i in ret:
@@ -114,7 +96,6 @@ def get_server_info(self):
             asset_data['memory'] = M2human(i.get('Memory'))
             # 内网IP
             try:
-
                 asset_data['private_ip'] = i['VpcAttributes']['PrivateIpAddress']['IpAddress'][0]
             except KeyError:
                 asset_data['private_ip'] = 'Null'
@@ -126,11 +107,13 @@ def get_server_info(self):
                 asset_data['public_ip'] = i['EipAddress']['IpAddress']
             except Exception:
                 asset_data['public_ip'] = asset_data['private_ip']
-
+            if 'public_ip' not in asset_data or not asset_data['public_ip'].strip():
+                asset_data['public_ip'] = asset_data['private_ip']
             asset_data['os_type'] = i.get('OSType')
             asset_data['os_name'] = i.get('OSName')
             server_list.append(asset_data)
-            print(asset_data)
+            # print(asset_data)
+            ins_log.read_log('info', asset_data)
         return server_list
 
     def sync_cmdb(self):
@@ -228,7 +211,7 @@ def index(self):
                 self.page_size = count
             else:
                 self.page_size = c + 100
-            ins_log.read_log('info', '开始同步第{}--第{}台机器'.format(self.page_number, self.page_size))
+            ins_log.read_log('info', '开始同步阿里云的第{}--第{}台机器'.format(self.page_number, self.page_size))
             self.sync_cmdb()
 
 
@@ -271,5 +254,10 @@ def main():
         obj.index()
 
 
+# def test():
+#     obj = EcsAPi('', '', 'cn-shanghai', '')
+#     obj.index()
+
+
 if __name__ == '__main__':
     fire.Fire(main)

libs/aws/ec2.py

@@ -51,24 +51,23 @@ def get_server_info(self):
         if ret:
             for r in ret:
                 for i in r['Instances']:
+                    print(i)
                     asset_data = dict()
                     try:
                         asset_data['hostname'] = i.get('Tags')[0].get('Value')
                     except (KeyError, TypeError):
-                        asset_data['hostname'] = i.get('InstanceId', 'Null')   #拿不到hostnameg给instance_id
-                    asset_data['region'] = i['Placement'].get('AvailabilityZone','Null')
+                        asset_data['hostname'] = i.get('InstanceId', 'Null')  # 拿不到hostnameg给instance_id
+                    asset_data['region'] = i['Placement'].get('AvailabilityZone', 'Null')
                     asset_data['instance_id'] = i.get('InstanceId', 'Null')
-                    asset_data['instance_type'] = i.get('InstanceType','Null')
+                    asset_data['instance_type'] = i.get('InstanceType', 'Null')
                     asset_data['instance_state'] = i['State'].get('Name', '')
-                    asset_data['private_ip'] = i.get('PrivateIpAddress','Null')
-                    asset_data['public_ip'] = i.get('PublicIpAddress', asset_data['private_ip']) #没有公网就给私网IP
-                    print(asset_data)
+                    asset_data['private_ip'] = i.get('PrivateIpAddress', 'Null')
+                    asset_data['public_ip'] = i.get('PublicIpAddress', asset_data['private_ip'])  # 没有公网就给私网IP
+                    # print(asset_data)
                     server_list.append(asset_data)
 
         return server_list
 
-
-
     def sync_cmdb(self):
         """
         写入CMDB
@@ -82,12 +81,11 @@ def sync_cmdb(self):
             return False
         with DBContext('w') as session:
             for server in server_list:
+                print(server)
                 ip = server.get('public_ip')
-
-                #ip = server.get('public_ip', 'Null')
                 instance_id = server.get('instance_id', 'Null')
                 hostname = server.get('hostname', instance_id)
-                if hostname == '' or not hostname:
+                if not hostname.strip():
                     hostname = instance_id
                 region = server.get('region', 'Null')
                 instance_type = server.get('instance_type', 'Null')
@@ -103,7 +101,7 @@ def sync_cmdb(self):
 
                 exist_hostname = session.query(Server).filter(Server.hostname == hostname).first()
                 # exist_ip = session.query(Server).filter(Server.ip == ip).first()
-                if exist_hostname :
+                if exist_hostname:
                     session.query(Server).filter(Server.hostname == hostname).update(
                         {Server.ip: ip, Server.public_ip: ip, Server.idc: 'AWS', Server.region: region})
 
@@ -126,11 +124,6 @@ def sync_cmdb(self):
                     session.add(new_serve_detail)
             session.commit()
 
-
-
-
-
-
     def test_auth(self):
         """
         测试接口权限等信息是否异常
@@ -179,9 +172,8 @@ def main():
         obj.sync_cmdb()
 
 
-#
-# def main(access_id, access_key, region):
-#     obj = Ec2Api(access_id, access_key, region)
+# def test():
+#     obj = Ec2Api('','','us-east-1', '')
 #     obj.sync_cmdb()
 
 

libs/qcloud/cvm.py

@@ -21,7 +21,7 @@
 class CVMApi():
     def __init__(self, access_id, access_key, region, default_admin_user):
         self.offset = '0'  # 偏移量,这里拼接的时候必须是字符串
-        self.limit = '100'  # 官方默认是20，我们直接拿最大，小于100可以获取所有，大于100需要设置偏移量再次请求：offset=100,offset={机器总数}
+        self.limit = '100'  # 官方默认是20，大于100需要设置偏移量再次请求：offset=100,offset={机器总数}
         self.access_id = access_id
         self.access_key = access_key
         self.region = region
@@ -60,7 +60,7 @@ def get_result_data(self):
         response = requests.get(result_url)
         result_data = json.loads(response.text)
         if result_data['Response'].get('Error'):
-            ins_log.read_log('error','{}'.format(result_data['Response']))
+            ins_log.read_log('error', '{}'.format(result_data['Response']))
             return False
         else:
             ret = result_data['Response']
@@ -109,7 +109,7 @@ def get_server_info(self):
             try:
                 public_ip = i['PublicIpAddresses'][0]
             except (KeyError, TypeError):
-                public_ip = private_ip  #不存在公网就给私网IP
+                public_ip = private_ip  # 不存在公网就给私网IP
             os_type = i.get('OsName')
             region = i['Placement'].get('Zone')
             asset_data['region'] = region
@@ -125,7 +125,7 @@ def get_server_info(self):
             asset_data['os_type'] = os_type
             # print(asset_data)
             server_list.append(asset_data)
-
+            ins_log.read_log('info', asset_data)
         return server_list
 
     def sync_cmdb(self):
@@ -144,7 +144,7 @@ def sync_cmdb(self):
                 ip = server.get('public_ip')
                 instance_id = server.get('instance_id', 'Null')
                 hostname = server.get('hostname', instance_id)
-                if hostname == '' or not hostname:
+                if not hostname.strip():
                     hostname = instance_id
                 region = server.get('region', 'Null')
                 instance_type = server.get('instance_type', 'Null')
@@ -180,19 +180,6 @@ def sync_cmdb(self):
 
             session.commit()
 
-    # def test(self):
-    #     count = int(450)
-    #     # count = self.get_server_count()
-    #     print('Tocal：{}'.format(count))
-    #     for c in range(0, count, 100):
-    #         self.offset = str(c)
-    #         if (c + 100) > count:
-    #             self.limit = str(count)
-    #         else:
-    #             self.limit = str(c + 100)
-    #
-    #         print('开始同步第{}--第{}台机器'.format(self.offset, self.limit))
-    #         print(f"offset:{self.offset},limit:{self.limit}")
     def test_auth(self):
         """
         测试下用户给的信息是否正确
@@ -218,7 +205,7 @@ def index(self):
                 self.limit = str(count)
             else:
                 self.limit = str(c + 100)
-            ins_log.read_log('info', '开始同步第{}--{}台机器'.format(self.offset, self.limit))
+            ins_log.read_log('info', '开始同步腾讯云的第{}--{}台机器'.format(self.offset, self.limit))
             self.sync_cmdb()
 
 
@@ -261,6 +248,10 @@ def main():
         obj.index()
 
 
+# def test():
+#     obj = CVMApi('','','ap-shanghai','')
+#     obj.index()
+
 
 if __name__ == '__main__':
     fire.Fire(main)