[Update]优化和解决公网IP获取不到取私网Ip

Author: 杨红飞

libs/aliyun/ecs.py

@@ -44,15 +44,31 @@ def get_response(self):
         获取返回值
         :return:
         """
+
+        response_data = {}
+        err = None
         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
+            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)
 
@@ -61,25 +77,24 @@ def get_server_count(self):
         获取机器总数
         :return:
         """
-
-        try:
-            response = self.get_response()
-            count = response['TotalCount']
-            return count
-        except TypeError as e:
-            print(e)
+        response_data, err = self.get_response()
+        if err != None:
+            ins_log.read_log('error', err)
             return False
+        count = response_data['TotalCount']
+        return count
 
     def get_server_info(self):
         """
         获取服务器信息
         :return:
         """
-        response = self.get_response()
-        if not response:
+        response_data, err = self.get_response()
+        if err != None:
+            ins_log.read_log('error', err)
             return False
         try:
-            ret = response['Instances']['Instance']
+            ret = response_data['Instances']['Instance']
         except (KeyError, TypeError):
             ins_log.read_log('error', '可能是因为SecretID/SecretKey配置错误，没法拿到配置，请检查下配置')
             # print('[Error]: 可能是因为SecretID/SecretKey配置错误，没法拿到配置，请检查下配置')
@@ -90,7 +105,7 @@ def get_server_info(self):
             try:
                 asset_data['hostname'] = i.get('InstanceName')
             except(KeyError, TypeError):
-                asset_data['hostname'] = i.get('InstanceId')  #取不到给instance_id
+                asset_data['hostname'] = i.get('InstanceId')  # 取不到给instance_id
             asset_data['region'] = i.get('ZoneId')
             asset_data['instance_id'] = i.get('InstanceId')
             asset_data['instance_type'] = i.get('InstanceType')
@@ -110,7 +125,7 @@ def get_server_info(self):
             except(KeyError, IndexError):
                 asset_data['public_ip'] = i['EipAddress']['IpAddress']
             except Exception:
-                asset_data['public_ip'] = 'Null'
+                asset_data['public_ip'] = asset_data['private_ip']
 
             asset_data['os_type'] = i.get('OSType')
             asset_data['os_name'] = i.get('OSName')
@@ -128,11 +143,9 @@ def sync_cmdb(self):
         if not server_list:
             ins_log.read_log('info', 'Not fount server info')
             return False
-        with DBContext('r') as session:
+        with DBContext('w') as session:
             for server in server_list:
-                private_ip = server.get('private_ip')
-                if server.get('public_ip') == 'Null':
-                    ip = private_ip
+                ip = server.get('public_ip')
                 instance_id = server.get('instance_id', 'Null')
                 hostname = server.get('hostname', instance_id)
                 if hostname == '' or not hostname:

libs/aws/ec2.py

@@ -80,12 +80,15 @@ def sync_cmdb(self):
             ins_log.read_log('info', 'Not fount server info...')
             # print('Not Fount Server Info')
             return False
-        with DBContext('r') as session:
+        with DBContext('w') as session:
             for server in server_list:
-                ip = server.get('public_ip', 'Null')
+                private_ip = server.get('private_ip')
+                if server.get('public_ip') == 'Null' or not server.get('public_ip'):
+                    ip = private_ip
+                #ip = server.get('public_ip', 'Null')
                 instance_id = server.get('instance_id', 'Null')
                 hostname = server.get('hostname', instance_id)
-                if hostname == '':
+                if hostname == '' or not hostname:
                     hostname = instance_id
                 region = server.get('region', 'Null')
                 instance_type = server.get('instance_type', 'Null')

libs/qcloud/cvm.py

@@ -3,7 +3,7 @@
 # @Time    : 2019/5/10 16:37
 # @Author  : Fred Yangxiaofei
 # @File    : ecs.py
-# @Role    : 说明脚本功能
+# @Role    : 获取腾讯云主机信息
 
 
 import time
@@ -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'):
-            print(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 = 'Null'
+                public_ip = private_ip  #不存在公网就给私网IP
             os_type = i.get('OsName')
             region = i['Placement'].get('Zone')
             asset_data['region'] = region
@@ -141,9 +141,7 @@ def sync_cmdb(self):
 
         with DBContext('w') as session:
             for server in server_list:
-                private_ip  = server.get('private_ip')
-                if server.get('public_ip') == 'Null':
-                    ip = private_ip
+                ip = server.get('public_ip')
                 instance_id = server.get('instance_id', 'Null')
                 hostname = server.get('hostname', instance_id)
                 if hostname == '' or not hostname: