X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_nbi%2Ftests%2Frun_test.py;h=02141f5de641a7f9406afec025e87a0ba799c20e;hb=a04d59bd184959b9ea88baccea05274b8851d3f5;hp=f33935478b79f58c9de1bf145449feca26c16b75;hpb=4568a372eb5a204e04d917213de03ec51f9110c1;p=osm%2FNBI.git diff --git a/osm_nbi/tests/run_test.py b/osm_nbi/tests/run_test.py index f339354..02141f5 100755 --- a/osm_nbi/tests/run_test.py +++ b/osm_nbi/tests/run_test.py @@ -479,7 +479,11 @@ class TestRest: "Env OSMNBITEST_VIM_URL and OSMNBITEST_VIM_TENANT are needed for create a real VIM" " to deploy on whit the --test-osm option" ) - vim_data = "{{schema_version: '1.0', name: '{}', vim_type: {}, vim_url: '{}', vim_tenant_name: '{}', " "vim_user: {}, vim_password: {}".format( + vim_data = ( + "{{schema_version: '1.0', name: '{}', vim_type: {}, vim_url: '{}'," + "vim_tenant_name: '{}', " + "vim_user: {}, vim_password: {}" + ).format( vim_name, os.environ.get("OSMNBITEST_VIM_TYPE", "openstack"), os.environ.get("OSMNBITEST_VIM_URL"), @@ -1999,7 +2003,6 @@ class TestFakeVim: ] def run(self, engine, test_osm, manual_check, test_params=None): - vim_bad = self.vim.copy() vim_bad.pop("name") @@ -2618,7 +2621,6 @@ class TestDeploy: keys=None, timeout=0, ): - r = engine.test( "GET VNFR IDs", "GET", @@ -5041,7 +5043,6 @@ class TestNbiQuotas: test_user_id = engine.last_id if res else None if test_project_id and test_user_id: - # Get user access engine.token = None engine.user = test_username @@ -5109,7 +5110,6 @@ class TestNbiQuotas: test_vim_ids += [engine.last_id if res else None] if test_vim_ids[0]: - # Download descriptor files (if required) test_dir = "/tmp/" + test_username + "/" test_url = "https://osm-download.etsi.org/ftp/osm-6.0-six/7th-hackfest/packages/" @@ -5136,7 +5136,6 @@ class TestNbiQuotas: file.write(res.content) if all([os.path.exists(test_dir + p) for p in desc_filenames]): - # Test VNFD Quotas res = engine.test( "Create test VNFD #1", @@ -5202,7 +5201,6 @@ class TestNbiQuotas: test_vnfd_ids[i] = None if test_vnfd_ids[0] and test_vnfd_ids[1]: - # Test NSD Quotas res = engine.test( "Create test NSD #1", @@ -5268,7 +5266,6 @@ class TestNbiQuotas: test_nsd_ids[i] = None if test_nsd_ids[0] and test_nsd_ids[1]: - # Test NSR Quotas res = engine.test( "Create test NSR #1",