fixes for vdns to use mgmt ip and use cfgm db for connectivity check

Change-Id: I4e5e73a78de7b4f4540a415f9e54a4a4985c5c43 Closes-Bug: 1736580
Juniper · Dec 21, 2017 · db5d241 · db5d241
1 parent a1d3659
commit db5d241
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/common/vdns/base.py b/common/vdns/base.py
@@ -418,6 +418,7 @@ def verify_ns_lookup_data(self, vm_fix, cmd, expectd_data,
     def verify_vm_dns_data(self, vm_dns_exp_data, dns_server_ip):
         result = True
         dns_data_list = []
+        dns_server_ip = self.inputs.host_data[dns_server_ip]['host_ip']
         for bgp_ip in self.inputs.bgp_ips:
             dnsinspect_h = self.dnsagent_inspect[dns_server_ip]
             dns_data_list.append(dnsinspect_h.get_dnsa_config())

diff --git a/scripts/analytics/test_analytics_basic.py b/scripts/analytics/test_analytics_basic.py
@@ -60,7 +60,7 @@ def test_verify_object_logs(self):
             st=self.analytics_obj.ops_inspect[self.inputs.collector_ips[0]
                                   ].send_trace_to_database(
                                   node=self.inputs.collector_names[0],
-                                  module='QueryEngine',
+                                  module='contrail-query-engine',
                                   trace_buffer_name='QeTraceBuf')
             self.logger.debug("Status: %s"%(st))
         assert res2, "Verification of %s failed"%msg
@@ -81,7 +81,7 @@ def test_verify_object_logs(self):
             st=self.analytics_obj.ops_inspect[self.inputs.collector_ips[0]
                                   ].send_trace_to_database(
                                   node=self.inputs.collector_names[0],
-                                  module='QueryEngine',
+                                  module='contrail-query-engine',
                                   trace_buffer_name='QeTraceBuf')
             self.logger.debug("status: %s"%(st))
         assert res1, "Verification of %s failed"%msg
@@ -106,7 +106,7 @@ def test_verify_object_logs(self):
             st=self.analytics_obj.ops_inspect[self.inputs.collector_ips[0]
                                   ].send_trace_to_database(
                                   node=self.inputs.collector_names[0],
-                                  module='QueryEngine',
+                                  module='contrail-query-engine',
                                   trace_buffer_name='QeTraceBuf')
             self.logger.debug("Status: %s"%(st))
         assert res1, "Verification of %s failed"%msg

diff --git a/tcutils/collector/analytics_tests.py b/tcutils/collector/analytics_tests.py
@@ -4225,7 +4225,7 @@ def verify_process_and_connection_infos_config(self):
            #                 [server])
            # assert result   
             result = False    
-            for ip in self.inputs.database_control_ips:
+            for ip in self.inputs.cfgm_control_ips:
                 server = "%s:%s"%(ip,port_dict['cassandra'])
                 result = result or self.verify_connection_infos(ops_inspect,\
                             'contrail-api',\
@@ -4298,7 +4298,7 @@ def verify_process_and_connection_infos_config(self):
                    break
 
             result = False    
-            for ip in self.inputs.database_control_ips:
+            for ip in self.inputs.cfgm_control_ips:
                 server = "%s:%s"%(ip,port_dict['cassandra'])
                 result_cass = result_cass or self.verify_connection_infos(ops_inspect,\
                             'contrail-device-manager',\
@@ -4366,7 +4366,7 @@ def verify_process_and_connection_infos_config(self):
                    break
 
             result = False    
-            for ip in self.inputs.database_control_ips:
+            for ip in self.inputs.cfgm_control_ips:
                 server = "%s:%s"%(ip,port_dict['cassandra'])
                 result_cass = result_cass or self.verify_connection_infos(ops_inspect,\
                             'contrail-schema',\
@@ -4426,7 +4426,7 @@ def verify_process_and_connection_infos_config(self):
                    break
 
             result = False    
-            for ip in self.inputs.database_control_ips:
+            for ip in self.inputs.cfgm_control_ips:
                 server = "%s:%s"%(ip,port_dict['cassandra'])
                 result_cass = result_cass or self.verify_connection_infos(ops_inspect,\
                             'contrail-svc-monitor',\