contrail internal and external vip are no longer supported and needed.

Closes-Bug: 1777039

Change-Id: I64dfd652887fca5841e3d1566c90a07496ffde5d

common/connections.py

@@ -135,7 +135,7 @@ def get_auth_h(self, refresh=False, project_name=None,
     def get_vnc_lib_h(self, refresh=False):
         attr = '_vnc_lib_fixture_' + self.project_name + '_' + self.username
         cfgm_ip = self.inputs.api_server_ip or \
-                  self.inputs.contrail_external_vip or self.inputs.cfgm_ip
+                  self.inputs.cfgm_ip
         if not getattr(env, attr, None) or refresh:
             if self.inputs.orchestrator == 'openstack' :
                 domain = self.orch_domain_name     
@@ -160,7 +160,7 @@ def get_vnc_lib_h(self, refresh=False):
         return self.vnc_lib
 
     def get_api_inspect_handle(self, host):
-        cfgm_ip = self.inputs.api_server_ip or self.inputs.contrail_external_vip
+        cfgm_ip = self.inputs.api_server_ip
         if cfgm_ip:
             host = cfgm_ip
         if host not in self.api_server_inspects:
@@ -194,8 +194,7 @@ def get_vrouter_agent_inspect_handle(self, host):
     def get_opserver_inspect_handle(self, host):
         #ToDo: WA till scripts are modified to use ip rather than hostname
         ip = host if is_v4(host) else self.inputs.get_host_ip(host)
-        collector_ip = self.inputs.analytics_api_ip or \
-                       self.inputs.contrail_external_vip
+        collector_ip = self.inputs.analytics_api_ip
         if collector_ip:
             ip = collector_ip
         if ip not in self.ops_inspects:

common/contrail_test_init.py

@@ -90,7 +90,6 @@ def __init__(self, input_file, logger=None):
         self.input_file = input_file
         self.logger = logger or contrail_logging.getLogger(__name__)
 
-        self.ha_tmp_list = []
         self.tor_agent_data = {}
         self.sriov_data = {}
         self.dpdk_data = {}
@@ -818,7 +817,6 @@ def parse_yml_file(self):
         self.analytics_api_ip = contrail_configs.get('ANALYTICS_API_VIP')
         self.config_amqp_ips = contrail_configs.get('RABBITMQ_NODES')
         self.config_amqp_port = contrail_configs.get('RABBITMQ_NODE_PORT', 5673)
-        self.contrail_internal_vip = self.contrail_external_vip = self.api_server_ip
         self.xmpp_auth_enable = contrail_configs.get('XMPP_SSL_ENABLE')
         self.xmpp_dns_auth_enable = contrail_configs.get('XMPP_SSL_ENABLE')
 
@@ -1375,14 +1373,10 @@ def get_host_ip(self, name):
         except KeyError:
             short_name = name.split('.')[0]
             ip = self.host_data[short_name]['host_ip']
-        if ip in self.ha_tmp_list:
-            ip = self.contrail_external_vip
         return ip
 
     def get_host_data_ip(self, name):
         ip = self.host_data[name]['host_data_ip']
-        if ip in self.ha_tmp_list:
-            ip = self.contrail_internal_vip
         return ip
 
     def get_node_name(self, ip):

scripts/vm_regression/test_vm_basic.py

@@ -344,8 +344,7 @@ def test_generic_link_local_service(self):
         compute_user = self.inputs.host_data[vm1_fixture.vm_node_ip]['username']
         compute_password = self.inputs.host_data[vm1_fixture.vm_node_ip]['password']
         cfgm_host_new_name = cfgm_hostname + '-test'
-        cfgm_ip = self.inputs.api_server_ip or \
-                  self.inputs.contrail_external_vip or self.inputs.cfgm_ip
+        cfgm_ip = self.inputs.api_server_ip or self.inputs.cfgm_ip
         cfgm_intro_port = '8084'
         service_name = 'cfgmintrospect'
 

tcutils/collector/analytics_tests.py

@@ -122,7 +122,6 @@ def __init__(self, inputs, cn_inspect, agent_inspect, ops_inspect, logger=LOG):
         self.logger = logger
         self.get_all_generators()
         self.uve_verification_flags = []
-        self.contrail_internal_vip = self.inputs.contrail_internal_vip
 
     def get_all_generators(self):
         self.generator_hosts = []
@@ -131,16 +130,12 @@ def get_all_generators(self):
         self.collector_hosts = []
 
         for collector_ip in self.inputs.collector_ips:
-            if collector_ip == self.inputs.contrail_internal_vip:
-                continue
             c_host = self.inputs.host_data[collector_ip]['name']
             self.collector_hosts.append(c_host)
             if (c_host not in self.generator_hosts):
                 self.generator_hosts.append(c_host)
 
         for ip in self.inputs.bgp_ips:
-            if ip == self.inputs.contrail_internal_vip:
-                continue
             bgp_host = self.inputs.host_data[ip]['name']
             self.bgp_hosts.append(bgp_host)
             if (bgp_host not in self.generator_hosts):