R2.22.x

.gitreview

@@ -0,0 +1,16 @@
+#
+# Copyright (c) 2014 Juniper Networks, Inc. All rights reserved.
+#
+# OpenContrail Code Review System
+#
+# Please visit opencontrail.org additional information.
+#
+# e.g. After changes are complete and commited to a local branch, do
+# 'git review' to submit changeset to review.opencontrail.org Code Review
+# (gerrit) System.
+#
+[gerrit]
+host=review.opencontrail.org
+port=29418
+project=Juniper/contrail-test-ci.git
+defaultbranch=R3.0

common/connections.py

@@ -39,7 +39,7 @@ def __init__(self, inputs=None, logger=None, project_name=None,
         self.agent_inspect = custom_dict(self.get_vrouter_agent_inspect_handle,
                                          'agent_inspect')
         self.ops_inspects = custom_dict(self.get_opserver_inspect_handle,
-                                        'ops_inspect')
+                                        'ops_inspect:'+self.project_name+':'+self.username)
         self.cn_inspect = custom_dict(self.get_control_node_inspect_handle,
                                       'cn_inspect')
         self.ds_inspect = custom_dict(self.get_discovery_service_inspect_handle,
@@ -48,8 +48,8 @@ def __init__(self, inputs=None, logger=None, project_name=None,
         # ToDo: msenthil/sandipd rest of init needs to be better handled
         self.auth = self.get_auth_h()
         self.vnc_lib = self.get_vnc_lib_h()
+	self.project_id = self.get_project_id()
         if self.inputs.orchestrator == 'openstack':
-            self.project_id = self.get_project_id()
             if self.inputs.verify_thru_gui():
                 self.ui_login = UILogin(self, self.inputs, project_name, username, password)
                 self.browser = self.ui_login.browser
@@ -97,22 +97,27 @@ def get_auth_h(self, refresh=False, project_name=None,
         return env[attr]
 
     def get_vnc_lib_h(self, refresh=False):
-        attr = '_vnc_lib_' + self.project_name + '_' + self.username
+        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
         if not getattr(env, attr, None) or refresh:
-            self.vnc_lib_fixture = VncLibFixture(
+            env[attr] = VncLibFixture(
                 username=self.username, password=self.password,
                 domain=self.domain_name, project_name=self.project_name,
-                inputs = self.inputs,
+                inputs=self.inputs,
                 cfgm_ip=cfgm_ip,
                 api_server_port=self.inputs.api_server_port,
                 auth_server_ip=self.inputs.auth_ip,
                 orchestrator=self.inputs.orchestrator,
                 project_id=self.get_project_id(),
+                certfile = self.inputs.keystonecertfile,
+                keyfile = self.inputs.keystonekeyfile,
+                cacert = self.inputs.keycertbundle,
+                insecure = self.inputs.insecure,
                 logger=self.logger)
-            self.vnc_lib_fixture.setUp()
-            self.vnc_lib = self.vnc_lib_fixture.get_handle()
+            env[attr].setUp()
+        self.vnc_lib_fixture = env[attr]
+        self.vnc_lib = self.vnc_lib_fixture.get_handle()
         return self.vnc_lib
 
     def get_api_inspect_handle(self, host):
@@ -122,6 +127,7 @@ def get_api_inspect_handle(self, host):
         if host not in self.api_server_inspects:
             self.api_server_inspects[host] = VNCApiInspect(host,
                                                            inputs=self.inputs,
+                                                           protocol=self.inputs.api_protocol,
                                                            logger=self.logger)
         return self.api_server_inspects[host]
 
@@ -156,7 +162,8 @@ def get_opserver_inspect_handle(self, host):
         if ip not in self.ops_inspects:
             self.ops_inspects[ip] = VerificationOpsSrv(ip,
                                         port=self.inputs.analytics_api_port,
-                                        logger=self.logger)
+                                        logger=self.logger,
+                                        inputs=self.inputs)
         return self.ops_inspects[ip]
 
     def get_discovery_service_inspect_handle(self, host):
@@ -215,7 +222,7 @@ def ds_verification_obj(self):
         if not getattr(self, '_ds_verification_obj', None):
             self._ds_verification_obj = DiscoveryVerification(self.inputs,
                                         self.cn_inspect, self.agent_inspect,
-                                        self.ops_inspects, self.ds_inspect,
+                                        self.ops_inspects, self.ds_inspect, self.vnc_lib,
                                         logger=self.logger)
         return self._ds_verification_obj
     @ds_verification_obj.setter
@@ -229,9 +236,6 @@ def update_inspect_handles(self):
         self.agent_inspect.clear()
         self.ops_inspects.clear()
         self.ds_inspect.clear()
-        self.api_server_inspect = None
-        self.ops_inspect = None
-        self.ds_verification_obj = None
         self._svc_mon_inspect = None
         self._api_server_inspect = None
         self._ops_inspect = None

common/contrail_test_init.py

@@ -10,7 +10,7 @@
 from netaddr import *
 
 import fixtures
-from fabric.api import env, run, local
+from fabric.api import env, run, local, sudo
 from fabric.operations import get, put, reboot
 from fabric.context_managers import settings, hide
 from fabric.exceptions import NetworkError
@@ -28,6 +28,7 @@
 import subprocess
 import ast
 from collections import namedtuple
+from cfgm_common import utils
 
 # monkey patch subprocess.check_output cos its not supported in 2.6
 if "check_output" not in dir(subprocess):  # duck punch it in!
@@ -61,6 +62,7 @@ def __init__(self, ini_file=None):
         self.jenkins_trigger = self.get_os_env('JENKINS_TRIGGERED')
         self.os_type = custom_dict(self.get_os_version, 'os_type')
         self.config = None
+        self.ini_file = ini_file
         if ini_file:
             self.config = ConfigParser.ConfigParser()
             self.config.read(ini_file)
@@ -85,15 +87,15 @@ def __init__(self, ini_file=None):
         self.admin_username = read_config_option(self.config,
             'Basic',
             'adminUser',
-            os.getenv('OS_USERNAME', None))
+            os.getenv('OS_USERNAME', 'admin'))
         self.admin_password = read_config_option(self.config,
             'Basic',
             'adminPassword',
-            os.getenv('OS_PASSWORD', None))
+            os.getenv('OS_PASSWORD', 'contrail123'))
         self.admin_tenant = read_config_option(self.config,
             'Basic',
             'adminTenant',
-            os.getenv('OS_TENANT_NAME', None))
+            os.getenv('OS_TENANT_NAME', 'admin'))
 
         self.stack_user = read_config_option(
             self.config,
@@ -120,7 +122,16 @@ def __init__(self, ini_file=None):
             'Basic',
             'stackRegion',
             os.getenv('OS_REGION_NAME', 'RegionOne'))
-
+        self.neutron_username = read_config_option(
+            self.config,
+            'Basic',
+            'neutron_username',
+            None)
+        self.availability_zone = read_config_option(
+            self.config,
+            'Basic',
+            'availability_zone',
+            None)
         self.endpoint_type = read_config_option(
             self.config,
             'Basic',
@@ -132,6 +143,10 @@ def __init__(self, ini_file=None):
                                             'Basic', 'auth_port', 5000)
         self.auth_protocol = read_config_option(self.config,
                                             'Basic', 'auth_protocol', 'http')
+        self.api_protocol = read_config_option(self.config,
+                                          'cfgm', 'api_protocol', 'http')
+        self.api_insecure = read_config_option(self.config,
+                                          'cfgm', 'api_insecure_flag', True)
         self.ds_port = read_config_option(self.config, 'services',
                                           'discovery_port', '5998')
         self.api_server_port = read_config_option(self.config, 'services',
@@ -163,6 +178,8 @@ def __init__(self, ini_file=None):
                                                 'Basic', 'multiTenancy', False)
         self.enable_ceilometer = read_config_option(self.config,
                                                     'Basic', 'enable_ceilometer', False)
+        self.ci_flavor = read_config_option(self.config,
+                                            'Basic', 'ci_flavor', None)
         self.fixture_cleanup = read_config_option(
             self.config,
             'Basic',
@@ -250,6 +267,7 @@ def __init__(self, ini_file=None):
         self.ha_tmp_list = []
         self.tor_agent_data = {}
         self.sriov_data = {}
+        self.dpdk_data = {}
         self.mysql_token = None
 
         self.public_host = read_config_option(self.config, 'Basic',
@@ -311,6 +329,34 @@ def __init__(self, ini_file=None):
             'supervisor-analytics',
             'contrail-snmp-collector', 'contrail-topology']
         self.correct_states = ['active', 'backup']
+        self.apicertfile = read_config_option(self.config,
+                                             'cfgm', 'api_certfile', None)
+        self.apikeyfile = read_config_option(self.config,
+                                            'cfgm', 'api_keyfile', None)
+        self.apicafile = read_config_option(self.config,
+                                           'cfgm', 'api_cafile', None)
+        self.keystonecertfile = read_config_option(self.config,
+                                                  'Basic', 'keystone_certfile', None)
+        self.keystonekeyfile = read_config_option(self.config,
+                                                 'Basic', 'keystone_keyfile', None)
+        self.keystonecafile = read_config_option(self.config,
+                                                'Basic', 'keystone_cafile', None)
+        self.insecure = os.getenv('OS_INSECURE')
+        if self.insecure:
+            self.insecure = bool(self.insecure)
+        else:
+            self.insecure = read_config_option(self.config,
+                                              'Basic', 'keystone_insecure_flag', True)
+        if self.auth_url.startswith('https') and not self.insecure:
+           self.keystone_bundle = '/tmp/' + get_random_string() + '.pem'
+           if self.keystonecertfile and self.keystonekeyfile and \
+                  self.keystonecafile:
+               self.certs = [self.keystonecertfile, self.keystonekeyfile,
+                            self.keystonecafile]
+               self.keycertbundle = utils.getCertKeyCaBundle(self.keystone_bundle,
+                                        self.certs)
+        else:
+            self.keycertbundle = None
 
     def get_os_env(self, var, default=''):
         if var in os.environ:
@@ -374,6 +420,7 @@ def read_prov_file(self):
         self.ds_server_name = []
         self.host_ips = []
         self.webui_ips = []
+        self.webui_control_ips = []
         self.host_data = {}
         self.tor = {}
         self.tor_hosts_data = {}
@@ -421,6 +468,7 @@ def read_prov_file(self):
                 if role['type'] == 'webui':
                     self.webui_ip = host_ip
                     self.webui_ips.append(host_ip)
+                    self.webui_control_ips.append(host_control_ip)
                 if role['type'] == 'collector':
                     self.collector_ip = host_ip
                     self.collector_ips.append(host_ip)
@@ -437,11 +485,17 @@ def read_prov_file(self):
         if 'vgw' in json_data:
             self.vgw_data = json_data['vgw']
 
+        if 'xmpp_auth_enable' in json_data:
+            self.xmpp_auth_enable = json_data['xmpp_auth_enable']
+        if 'xmpp_dns_auth_enable' in json_data:
+            self.xmpp_dns_auth_enable = json_data['xmpp_dns_auth_enable']
+
         if 'tor_agent' in json_data:
             self.tor_agent_data = json_data['tor_agent']
         if 'sriov' in json_data:
             self.sriov_data = json_data['sriov']
-
+        if 'dpdk' in json_data:
+            self.dpdk_data = json_data['dpdk']
         if 'tor_hosts' in json_data:
             self.tor_hosts_data = json_data['tor_hosts']
 
@@ -506,6 +560,7 @@ def get_computes(self, cfgm_ip):
                   'project_name': self.stack_tenant,
                   'auth_ip': self.auth_ip,
                   'auth_port': self.auth_port,
+                  'auth_protocol': self.auth_protocol,
                   'api_server_port': self.api_server_port,
                  }
         api_h = VNCApiInspect(cfgm_ip, inputs=type('', (), kwargs))
@@ -534,13 +589,15 @@ def _create_prov_file(self):
         if self.orchestrator.lower() == 'openstack':
             auth_url = os.getenv('OS_AUTH_URL', None) or \
                        'http://127.0.0.1:5000/v2.0'
-            insecure = bool(os.getenv('OS_INSECURE', True))
             keystone = KeystoneCommands(self.stack_user,
                                         self.stack_password,
                                         self.stack_tenant,
                                         auth_url,
                                         region_name=self.region_name,
-                                        insecure=insecure)
+                                        insecure=self.insecure,
+                                        cert=self.keystone_certfile,
+                                        key=self.keystone_keyfile,
+                                        cacert=self.keycertbundle)
             match = re.match(pattern, keystone.get_endpoint('identity')[0])
             self.auth_ip = match.group('ip')
             self.auth_port = match.group('port')
@@ -631,7 +688,7 @@ def run_cmd_on_server(self, server_ip, issue_cmd, username=None,
             with settings(
                 host_string='%s@%s' % (username, server_ip), password=password,
                     warn_only=True, abort_on_prompts=False):
-                output = run('%s' % (issue_cmd), pty=pty)
+                output = sudo('%s' % (issue_cmd), pty=pty)
                 return output
     # end run_cmd_on_server
 
@@ -660,6 +717,7 @@ def __init__(
         # address_family = read_config_option(self.config,
         #                      'Basic', 'AddressFamily', 'dual')
         self.address_family = 'v4'
+        self.use_admin_auth = False
     # end __init__
 
     def set_af(self, af):
@@ -767,7 +825,7 @@ def verify_service_state(self, host, service, username, password):
 
     def verify_control_connection(self, connections):
         discovery = connections.ds_verification_obj
-        return discovery.verify_bgp_connection()
+        return discovery._verify_bgp_connection()
     # end verify_control_connection
 
     def build_compute_to_control_xmpp_connection_dict(self, connections):

common/device_connection.py

@@ -102,7 +102,7 @@ def disconnect(self):
     def show_version(self):
         return self.handle.show_version()
 
-    def config(self, stmts=[], commit=True, ignore_errors=False):
+    def config(self, stmts=[], commit=True, ignore_errors=False, timeout = 30):
         for stmt in stmts:
             try:
                 self.config_handle.load(stmt, format='set', merge=True)
@@ -114,7 +114,7 @@ def config(self, stmts=[], commit=True, ignore_errors=False):
                     raise e
         if commit:
             try:
-                self.config_handle.commit()
+                self.config_handle.commit(timeout = timeout)
             except CommitError,e:
                 self.logger.exception(e)
                 return (False,e)

common/ecmp/ecmp_test_resource.py

@@ -118,7 +118,7 @@ def setup_common_objects(self):
 
         # Get the project_fixture
         self.project_fixture = self.useFixture(ProjectFixture(
-            vnc_lib_h=self.vnc_lib, project_name=self.inputs.project_name, connections=self.connections))
+            project_name=self.inputs.project_name, connections=self.connections))
         # Read the project obj and set to the floating ip object.
         self.fip_obj.set_project(self.project_fixture.project_obj)