Merge pull request #3 from yanghongfei/master

修复自动获取资产分页调用Bug

Author: yanghongfei

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,14 +105,14 @@ 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')
             asset_data['instance_state'] = i.get('Status')
             asset_data['cpu_cores'] = i.get('Cpu')
             asset_data['memory'] = M2human(i.get('Memory'))
-            # 私钥IP
+            # 内网IP
             try:
 
                 asset_data['private_ip'] = i['VpcAttributes']['PrivateIpAddress']['IpAddress'][0]
@@ -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,20 +143,20 @@ 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:
-                ip = server.get('public_ip', server.get('private_ip'))
+                ip = server.get('public_ip')
                 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')
                 instance_state = server.get('instance_state', 'Null')
                 cpu = server.get('cpu', 'Null')
                 cpu_cores = server.get('cpu_cores', 'Null')
                 memory = server.get('memory', 'Null')
-                disk = server.get('disk', 'Null')  # 阿里云接口里面没有disk信息
+                disk = server.get('disk', 'Null')  # 阿里云接口里面好像没有disk信息
                 os_type = server.get('os_type', 'Null')
                 os_name = server.get('os_name', 'Null')
                 os_kernel = server.get('os_kernel', 'Null')
@@ -213,8 +228,7 @@ def index(self):
                 self.page_size = count
             else:
                 self.page_size = c + 100
-
-            # print('开始同步第{}--第{}台机器'.format(self.page_number, self.page_size))
+            ins_log.read_log('info', '开始同步第{}--第{}台机器'.format(self.page_number, self.page_size))
             self.sync_cmdb()
 
 
@@ -254,7 +268,7 @@ def main():
         default_admin_user = config.get('default_admin_user')
 
         obj = EcsAPi(access_id, access_key, region, default_admin_user)
-        obj.sync_cmdb()
+        obj.index()
 
 
 if __name__ == '__main__':

libs/aws/ec2.py

@@ -61,7 +61,7 @@ def get_server_info(self):
                     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', i.get('PrivateIpAddress','Null'))
+                    asset_data['public_ip'] = i.get('PublicIpAddress', asset_data['private_ip']) #没有公网就给私网IP
                     print(asset_data)
                     server_list.append(asset_data)
 
@@ -80,12 +80,14 @@ 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')
+                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 == '':
+                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
@@ -139,12 +139,12 @@ def sync_cmdb(self):
             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', server.get('private_ip'))
+                ip = server.get('public_ip')
                 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')
@@ -218,7 +218,7 @@ def index(self):
                 self.limit = str(count)
             else:
                 self.limit = str(c + 100)
-
+            ins_log.read_log('info', '开始同步第{}--{}台机器'.format(self.offset, self.limit))
             self.sync_cmdb()
 
 
@@ -258,7 +258,7 @@ def main():
         default_admin_user = config.get('default_admin_user')
 
         obj = CVMApi(access_id, access_key, region, default_admin_user)
-        obj.sync_cmdb()
+        obj.index()
 
 
 

settings.py

@@ -15,17 +15,17 @@
 cookie_secret = '61oETzKXQAGaYdkL5gEmGeJJFuYh7EQnp2X6TP1o/Vo='
 
 #这是写库，
-DEFAULT_DB_DBHOST = os.getenv('DEFAULT_DB_DBHOST', '172.16.0.223') #修改
+DEFAULT_DB_DBHOST = os.getenv('DEFAULT_DB_DBHOST', '172.16.0.101') #修改
 DEFAULT_DB_DBPORT = os.getenv('DEFAULT_DB_DBPORT', '3306')   #修改
 DEFAULT_DB_DBUSER = os.getenv('DEFAULT_DB_DBUSER', 'root')   #修改
-DEFAULT_DB_DBPWD = os.getenv('DEFAULT_DB_DBPWD', 'ljXrcyn7chaBU4F') #修改
+DEFAULT_DB_DBPWD = os.getenv('DEFAULT_DB_DBPWD', 'shinezone2015') #修改
 DEFAULT_DB_DBNAME = os.getenv('DEFAULT_DB_DBNAME', 'codo_cmdb') #默认
 
 #这是从库，读， 一般情况下是一个数据库即可，需要主从读写分离的，请自行建立好服务
-READONLY_DB_DBHOST = os.getenv('READONLY_DB_DBHOST', '172.16.0.223') #修改
+READONLY_DB_DBHOST = os.getenv('READONLY_DB_DBHOST', '172.16.0.101') #修改
 READONLY_DB_DBPORT = os.getenv('READONLY_DB_DBPORT', '3306') #修改
 READONLY_DB_DBUSER = os.getenv('READONLY_DB_DBUSER', 'root') #修改
-READONLY_DB_DBPWD = os.getenv('READONLY_DB_DBPWD', 'ljXrcyn7chaBU4F') #修改
+READONLY_DB_DBPWD = os.getenv('READONLY_DB_DBPWD', 'shinezone2015') #修改
 READONLY_DB_DBNAME = os.getenv('READONLY_DB_DBNAME', 'codo_cmdb')  #默认
 
 #这是Redis配置信息，默认情况下和codo-admin里面的配置一致