[Update]更新阿里云和腾讯云分页获取机器Bug

Author: 杨红飞

libs/aliyun/ecs.py

@@ -97,7 +97,7 @@ def get_server_info(self):
             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 +110,7 @@ def get_server_info(self):
             except(KeyError, IndexError):
                 asset_data['public_ip'] = i['EipAddress']['IpAddress']
             except Exception:
-                asset_data['public_ip'] = None
+                asset_data['public_ip'] = 'Null'
 
             asset_data['os_type'] = i.get('OSType')
             asset_data['os_name'] = i.get('OSName')
@@ -131,7 +131,7 @@ def sync_cmdb(self):
         with DBContext('r') as session:
             for server in server_list:
                 private_ip = server.get('private_ip')
-                if not server.get('public_ip'):
+                if server.get('public_ip') == 'Null':
                     ip = private_ip
                 instance_id = server.get('instance_id', 'Null')
                 hostname = server.get('hostname', instance_id)
@@ -215,8 +215,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()
 
 

libs/qcloud/cvm.py

@@ -109,7 +109,7 @@ def get_server_info(self):
             try:
                 public_ip = i['PublicIpAddresses'][0]
             except (KeyError, TypeError):
-                public_ip = None
+                public_ip = 'Null'
             os_type = i.get('OsName')
             region = i['Placement'].get('Zone')
             asset_data['region'] = region
@@ -139,10 +139,10 @@ 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:
                 private_ip  = server.get('private_ip')
-                if not server.get('public_ip'):
+                if server.get('public_ip') == 'Null':
                     ip = private_ip
                 instance_id = server.get('instance_id', 'Null')
                 hostname = server.get('hostname', instance_id)
@@ -220,7 +220,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()