diff options
| -rw-r--r-- | functest/ci/config_functest.yaml | 1 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/snaps/snaps_test_runner.py | 3 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/ims/clearwater_ims_base.py | 4 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/ims/cloudify_ims.py | 3 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/router/cloudify_vrouter.py | 3 | ||||
| -rw-r--r-- | functest/tests/unit/openstack/snaps/test_snaps.py | 27 | ||||
| -rw-r--r-- | upper-constraints.txt | 4 |
7 files changed, 26 insertions, 19 deletions
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index 3e49d612a..67ecc3424 100644 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -44,6 +44,7 @@ general: snaps: use_keystone: 'True' use_floating_ips: 'True' + flavor_extra_specs: {} images: glance_tests: disk_file: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.img diff --git a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py index 7b111ed1b..70327ff89 100644 --- a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py +++ b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py @@ -44,7 +44,8 @@ class SnapsTestRunner(unit.Suite): self.use_keystone = ( getattr(config.CONF, 'snaps_use_keystone') == 'True') - self.flavor_metadata = getattr(config.CONF, 'flavor_extra_specs', None) + self.flavor_metadata = getattr(config.CONF, 'snaps_flavor_extra_specs', + None) self.logger.info("Using flavor metadata '%s'", self.flavor_metadata) self.image_metadata = None diff --git a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py index ae01cfa3e..6b54d220a 100644 --- a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py +++ b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py @@ -154,8 +154,8 @@ class ClearwaterOnBoardingBase(vnf.VnfOnBoarding): vims_test_result = {} try: grp = re.search( - '(\d+) failures out of (\d+) tests run\n.*?' - '(\d+) tests skipped', result) + r'(\d+) failures out of (\d+) tests run.*' + r'(\d+) tests skipped', result, re.MULTILINE | re.DOTALL) assert grp vims_test_result["failures"] = int(grp.group(1)) vims_test_result["total"] = int(grp.group(2)) diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py index 711cd8237..bc4242235 100644 --- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py +++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py @@ -257,7 +257,8 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase): cfy_client = CloudifyClient( host=manager_creator.get_floating_ip().ip, - username='admin', password='admin', tenant='default_tenant') + username='admin', password='admin', tenant='default_tenant', + api_version='v3') self.orchestrator['object'] = cfy_client diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py index f23906b70..194549022 100644 --- a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py +++ b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py @@ -261,7 +261,8 @@ class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase): cfy_client = CloudifyClient( host=manager_creator.get_floating_ip().ip, - username='admin', password='admin', tenant='default_tenant') + username='admin', password='admin', tenant='default_tenant', + api_version='v3') self.orchestrator['object'] = cfy_client diff --git a/functest/tests/unit/openstack/snaps/test_snaps.py b/functest/tests/unit/openstack/snaps/test_snaps.py index 8bbf70f4a..9da4f2ac8 100644 --- a/functest/tests/unit/openstack/snaps/test_snaps.py +++ b/functest/tests/unit/openstack/snaps/test_snaps.py @@ -176,7 +176,7 @@ class HealthCheckTesting(unittest.TestCase): testcase.TestCase.EX_OK, self.health_check.is_successful()) args[0].assert_called_with(mock.ANY) args[1].assert_called_with( - mock.ANY, ext_net_name='foo', flavor_metadata=None, + mock.ANY, ext_net_name='foo', flavor_metadata=mock.ANY, image_metadata=mock.ANY, netconf_override=None, os_creds=self.os_creds, use_keystone=True) @@ -194,7 +194,7 @@ class HealthCheckTesting(unittest.TestCase): self.health_check.is_successful()) args[0].assert_called_with(mock.ANY) args[1].assert_called_with( - mock.ANY, ext_net_name='foo', flavor_metadata=None, + mock.ANY, ext_net_name='foo', flavor_metadata=mock.ANY, image_metadata=mock.ANY, netconf_override=None, os_creds=self.os_creds, use_keystone=True) @@ -212,7 +212,7 @@ class HealthCheckTesting(unittest.TestCase): testcase.TestCase.EX_OK, self.health_check.is_successful()) args[0].assert_called_with(mock.ANY) args[1].assert_called_with( - mock.ANY, ext_net_name='foo', flavor_metadata=None, + mock.ANY, ext_net_name='foo', flavor_metadata=mock.ANY, image_metadata=mock.ANY, netconf_override=None, os_creds=self.os_creds, use_keystone=True) @@ -243,9 +243,10 @@ class SmokeTesting(unittest.TestCase): self.assertEquals(testcase.TestCase.EX_OK, self.smoke.is_successful()) args[0].assert_called_with(mock.ANY) args[1].assert_called_with( - ext_net_name='foo', flavor_metadata=None, image_metadata=mock.ANY, - netconf_override=None, os_creds=self.os_creds, - suite=mock.ANY, use_floating_ips=True, use_keystone=True) + ext_net_name='foo', flavor_metadata=mock.ANY, + image_metadata=mock.ANY, netconf_override=None, + os_creds=self.os_creds, suite=mock.ANY, use_floating_ips=True, + use_keystone=True) @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_suite_builder.' 'add_openstack_integration_tests') @@ -260,9 +261,10 @@ class SmokeTesting(unittest.TestCase): testcase.TestCase.EX_TESTCASE_FAILED, self.smoke.is_successful()) args[0].assert_called_with(mock.ANY) args[1].assert_called_with( - ext_net_name='foo', flavor_metadata=None, image_metadata=mock.ANY, - netconf_override=mock.ANY, os_creds=self.os_creds, - suite=mock.ANY, use_floating_ips=True, use_keystone=True) + ext_net_name='foo', flavor_metadata=mock.ANY, + image_metadata=mock.ANY, netconf_override=mock.ANY, + os_creds=self.os_creds, suite=mock.ANY, use_floating_ips=True, + use_keystone=True) @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_suite_builder.' 'add_openstack_integration_tests') @@ -278,9 +280,10 @@ class SmokeTesting(unittest.TestCase): testcase.TestCase.EX_OK, self.smoke.is_successful()) args[0].assert_called_with(mock.ANY) args[1].assert_called_with( - ext_net_name='foo', flavor_metadata=None, image_metadata=mock.ANY, - netconf_override=None, os_creds=self.os_creds, - suite=mock.ANY, use_floating_ips=True, use_keystone=True) + ext_net_name='foo', flavor_metadata=mock.ANY, + image_metadata=mock.ANY, netconf_override=None, + os_creds=self.os_creds, suite=mock.ANY, use_floating_ips=True, + use_keystone=True) if __name__ == "__main__": diff --git a/upper-constraints.txt b/upper-constraints.txt index c0763dbb4..e0acb1845 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -1,5 +1,5 @@ git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv&subdirectory=modules -git+https://gerrit.opnfv.org/gerrit/snaps@d3be4ce4c62700ec6a84abb160d9f59e7a5c4b0d#egg=snaps +git+https://gerrit.opnfv.org/gerrit/snaps#egg=snaps git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests git+https://gerrit.opnfv.org/gerrit/sdnvpn#egg=sdnvpn git+https://gerrit.opnfv.org/gerrit/sfc#egg=sfc @@ -10,7 +10,7 @@ git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-heattranslator&subdirectory=t git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-toscaparser&subdirectory=tosca2heat/tosca-parser -e git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-parser git+https://github.com/openstack/refstack-client@a59189eaacda24b787ecb65e6634257beba361ec#egg=refstack-client -cloudify-rest-client===4.0 +cloudify-rest-client===4.3.2 openbaton-cli===2.2.1b7 robotframework===3.0.2 robotframework-httplibrary===0.4.2 |