X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Ftests%2Ftest.py;h=2d7eff396f7aabf5a2d68ed22ab47f73b11e62d7;hp=74242d8a29229679c524d20996dd2f4a215b2367;hb=ace34903be528e8e10e096d3d059b81df30ddaa9;hpb=09e6542ceae8ee08ee7cc372f7344a77bc1f5304 diff --git a/osm_nbi/tests/test.py b/osm_nbi/tests/test.py index 74242d8..2d7eff3 100755 --- a/osm_nbi/tests/test.py +++ b/osm_nbi/tests/test.py @@ -131,7 +131,7 @@ class TestRest: self.test_name = test_name self.step = 0 self.last_id = "" - + def set_header(self, header): self.s.headers.update(header) @@ -460,7 +460,7 @@ class TestUsersProjects: engine.test("Create project admin", "POST", "/admin/v1/projects", headers_json, {"name": "Padmin", "admin": True}, (201, 204), {"Location": "/admin/v1/projects/", "Content-Type": "application/json"}, "json") - engine.test("Create project bad format", "POST", "/admin/v1/projects", headers_json, {"name": 1}, 422, + engine.test("Create project bad format", "POST", "/admin/v1/projects", headers_json, {"name": 1}, (400, 422), r_header_json, "json") engine.test("Create user with bad project", "POST", "/admin/v1/users", headers_json, {"username": "U1", "projects": ["P1", "P2", "Padmin"], "password": "pw1"}, 409, @@ -544,11 +544,185 @@ class TestUsersProjects: # change to admin engine.remove_authorization() # To force get authorization engine.get_autorization() - engine.test("Delete user U1", "DELETE", "/admin/v1/users/U1", headers_json, None, 204, None, None) - engine.test("Delete project P1", "DELETE", "/admin/v1/projects/P1", headers_json, None, 204, None, None) - engine.test("Delete project Padmin", "DELETE", "/admin/v1/projects/Padmin", headers_json, None, 204, + engine.test("Delete user U1 by Name", "DELETE", "/admin/v1/users/U1", headers_json, None, 204, None, None) + engine.test("Delete project P1 by Name", "DELETE", "/admin/v1/projects/P1", headers_json, None, 204, None, None) + engine.test("Delete project Padmin by Name", "DELETE", "/admin/v1/projects/Padmin", headers_json, None, 204, None, None) + # BEGIN New Tests - Addressing Projects/Users by Name/ID + res = engine.test("Create new project P1", "POST", "/admin/v1/projects", headers_json, {"name": "P1"}, + 201, {"Location": "/admin/v1/projects/", "Content-Type": "application/json"}, "json") + if res: + pid1 = res.json()["id"] + # print("# pid =", pid1) + res = engine.test("Create new project P2", "POST", "/admin/v1/projects", headers_json, {"name": "P2"}, + 201, {"Location": "/admin/v1/projects/", "Content-Type": "application/json"}, "json") + if res: + pid2 = res.json()["id"] + # print("# pid =", pid2) + res = engine.test("Create new user U1", "POST", "/admin/v1/users", headers_json, + {"username": "U1", "projects": ["P1"], "password": "pw1"}, 201, + {"Location": "/admin/v1/users/", "Content-Type": "application/json"}, "json") + if res: + uid1 = res.json()["id"] + # print("# uid =", uid1) + res = engine.test("Create new user U2", "POST", "/admin/v1/users", headers_json, + {"username": "U2", "projects": ["P2"], "password": "pw2"}, 201, + {"Location": "/admin/v1/users/", "Content-Type": "application/json"}, "json") + if res: + uid2 = res.json()["id"] + # print("# uid =", uid2) + engine.test("Get Project P1 by Name", "GET", "/admin/v1/projects/P1", headers_json, None, 200, None, "json") + engine.test("Get Project P1 by ID", "GET", "/admin/v1/projects/"+pid1, headers_json, None, 200, None, "json") + engine.test("Get User U1 by Name", "GET", "/admin/v1/users/U1", headers_json, None, 200, None, "json") + engine.test("Get User U1 by ID", "GET", "/admin/v1/users/"+uid1, headers_json, None, 200, None, "json") + engine.test("Rename Project P1 by Name", "PUT", "/admin/v1/projects/P1", headers_json, + {"name": "P3"}, 204, None, None) + engine.test("Rename Project P2 by ID", "PUT", "/admin/v1/projects/"+pid2, headers_json, + {"name": "P4"}, 204, None, None) + engine.test("Rename User U1 by Name", "PUT", "/admin/v1/users/U1", headers_json, + {"username": "U3"}, 204, None, None) + engine.test("Rename User U2 by ID", "PUT", "/admin/v1/users/"+uid2, headers_json, + {"username": "U4"}, 204, None, None) + engine.test("Get Project P1 by new Name", "GET", "/admin/v1/projects/P3", headers_json, None, 200, None, "json") + engine.test("Get User U1 by new Name", "GET", "/admin/v1/users/U3", headers_json, None, 200, None, "json") + engine.test("Delete User U1 by Name", "DELETE", "/admin/v1/users/U3", headers_json, None, 204, None, None) + engine.test("Delete User U2 by ID", "DELETE", "/admin/v1/users/"+uid2, headers_json, None, 204, None, None) + engine.test("Delete Project P1 by Name", "DELETE", "/admin/v1/projects/P3", headers_json, None, 204, None, + None) + engine.test("Delete Project P2 by ID", "DELETE", "/admin/v1/projects/"+pid2, headers_json, None, 204, None, + None) + # END New Tests - Addressing Projects/Users by Name + engine.remove_authorization() # To finish + + +class TestProjectsDescriptors: + description = "test descriptors visibility among projects" + + @staticmethod + def run(engine, test_osm, manual_check, test_params=None): + vnfd_ids = [] + engine.set_test_name("ProjectDescriptors") + engine.get_autorization() + engine.test("Create project Padmin", "POST", "/admin/v1/projects", headers_json, + {"name": "Padmin", "admin": True}, (201, 204), + {"Location": "/admin/v1/projects/", "Content-Type": "application/json"}, "json") + engine.test("Create project P2", "POST", "/admin/v1/projects", headers_json, {"name": "P2"}, + (201, 204), {"Location": "/admin/v1/projects/", "Content-Type": "application/json"}, "json") + engine.test("Create project P3", "POST", "/admin/v1/projects", headers_json, {"name": "P3"}, + (201, 204), {"Location": "/admin/v1/projects/", "Content-Type": "application/json"}, "json") + + engine.test("Create user U1", "POST", "/admin/v1/users", headers_json, + {"username": "U1", "projects": ["Padmin", "P2", "P3"], "password": "pw1"}, 201, + {"Location": "/admin/v1/users/", "Content-Type": "application/json"}, "json") + + engine.test("Onboard VNFD id1", "POST", "/vnfpkgm/v1/vnf_packages_content?id=id1", headers_yaml, + TestDescriptors.vnfd_empty, 201, r_headers_yaml_location_vnfd, "yaml") + vnfd_ids.append(engine.last_id) + engine.test("Onboard VNFD id2 PUBLIC", "POST", "/vnfpkgm/v1/vnf_packages_content?id=id2&PUBLIC=TRUE", + headers_yaml, TestDescriptors.vnfd_empty, 201, r_headers_yaml_location_vnfd, "yaml") + vnfd_ids.append(engine.last_id) + engine.test("Onboard VNFD id3", "POST", "/vnfpkgm/v1/vnf_packages_content?id=id3&PUBLIC=FALSE", headers_yaml, + TestDescriptors.vnfd_empty, 201, r_headers_yaml_location_vnfd, "yaml") + vnfd_ids.append(engine.last_id) + + res = engine.test("Get VNFD descriptors", "GET", "/vnfpkgm/v1/vnf_packages?id=id1,id2,id3", + headers_json, None, 200, r_header_json, "json") + response = res.json() + if len(response) != 3: + logger.error("Only 3 vnfds should be present for project admin. {} listed".format(len(response))) + engine.failed_tests += 1 + + # Change to other project Padmin + res = engine.test("Change to user U1 project Padmin", "POST", "/admin/v1/tokens", headers_json, + {"username": "U1", "password": "pw1", "project_id": "Padmin"}, (200, 201), + r_header_json, "json") + if res: + response = res.json() + engine.set_header({"Authorization": "Bearer {}".format(response["id"])}) + + # list vnfds + res = engine.test("List VNFD descriptors for Padmin", "GET", "/vnfpkgm/v1/vnf_packages", + headers_json, None, 200, r_header_json, "json") + response = res.json() + if len(response) != 0: + logger.error("Only 0 vnfds should be present for project Padmin. {} listed".format(len(response))) + engine.failed_tests += 1 + + # list Public vnfds + res = engine.test("List VNFD public descriptors", "GET", "/vnfpkgm/v1/vnf_packages?PUBLIC=True", + headers_json, None, 200, r_header_json, "json") + response = res.json() + if len(response) != 1: + logger.error("Only 1 vnfds should be present for project Padmin. {} listed".format(len(response))) + engine.failed_tests += 1 + + # list vnfds belonging to project "admin" + res = engine.test("List VNFD of admin project", "GET", "/vnfpkgm/v1/vnf_packages?ADMIN=admin", + headers_json, None, 200, r_header_json, "json") + response = res.json() + if len(response) != 3: + logger.error("Only 3 vnfds should be present for project Padmin. {} listed".format(len(response))) + engine.failed_tests += 1 + + # Get Public vnfds + engine.test("Get VNFD public descriptors", "GET", "/vnfpkgm/v1/vnf_packages/{}".format(vnfd_ids[1]), + headers_json, None, 200, r_header_json, "json") + # Edit not owned vnfd + engine.test("Edit VNFD ", "PATCH", "/vnfpkgm/v1/vnf_packages/{}".format(vnfd_ids[0]), + headers_yaml, '{name: pepe}', 404, r_header_yaml, "yaml") + + # Add to my catalog + engine.test("Add VNFD id2 to my catalog", "PATCH", "/vnfpkgm/v1/vnf_packages/{}?SET_PROJECT". + format(vnfd_ids[1]), headers_json, None, 204, None, 0) + + # Add a new vnfd + engine.test("Onboard VNFD id4", "POST", "/vnfpkgm/v1/vnf_packages_content?id=id4", headers_yaml, + TestDescriptors.vnfd_empty, 201, r_headers_yaml_location_vnfd, "yaml") + vnfd_ids.append(engine.last_id) + + # list vnfds + res = engine.test("List VNFD public descriptors", "GET", "/vnfpkgm/v1/vnf_packages", + headers_json, None, 200, r_header_json, "json") + response = res.json() + if len(response) != 2: + logger.error("Only 2 vnfds should be present for project Padmin. {} listed".format(len(response))) + engine.failed_tests += 1 + + if manual_check: + input('VNFDs have been omboarded. Perform manual check and press enter to resume') + + test_rest.test("Delete VNFD id2", "DELETE", "/vnfpkgm/v1/vnf_packages/{}".format(vnfd_ids[1]), + headers_yaml, None, 204, None, 0) + + # change to admin project + engine.remove_authorization() # To force get authorization + engine.get_autorization() + test_rest.test("Delete VNFD id1", "DELETE", "/vnfpkgm/v1/vnf_packages/{}".format(vnfd_ids[0]), + headers_yaml, None, 204, None, 0) + test_rest.test("Delete VNFD id2", "DELETE", "/vnfpkgm/v1/vnf_packages/{}".format(vnfd_ids[1]), + headers_yaml, None, 204, None, 0) + test_rest.test("Delete VNFD id3", "DELETE", "/vnfpkgm/v1/vnf_packages/{}".format(vnfd_ids[2]), + headers_yaml, None, 204, None, 0) + test_rest.test("Delete VNFD id4", "DELETE", "/vnfpkgm/v1/vnf_packages/{}".format(vnfd_ids[3]), + headers_yaml, None, 404, r_header_yaml, "yaml") + test_rest.test("Delete VNFD id4", "DELETE", "/vnfpkgm/v1/vnf_packages/{}?ADMIN".format(vnfd_ids[3]), + headers_yaml, None, 204, None, 0) + # Get Public vnfds + engine.test("Get VNFD deleted id1", "GET", "/vnfpkgm/v1/vnf_packages/{}?ADMIN".format(vnfd_ids[0]), + headers_json, None, 404, r_header_json, "json") + engine.test("Get VNFD deleted id2", "GET", "/vnfpkgm/v1/vnf_packages/{}?ADMIN".format(vnfd_ids[1]), + headers_json, None, 404, r_header_json, "json") + engine.test("Get VNFD deleted id3", "GET", "/vnfpkgm/v1/vnf_packages/{}?ADMIN".format(vnfd_ids[2]), + headers_json, None, 404, r_header_json, "json") + engine.test("Get VNFD deleted id4", "GET", "/vnfpkgm/v1/vnf_packages/{}?ADMIN".format(vnfd_ids[3]), + headers_json, None, 404, r_header_json, "json") + + engine.test("Delete user U1", "DELETE", "/admin/v1/users/U1", headers_json, None, 204, None, None) + engine.test("Delete project Padmin", "DELETE", "/admin/v1/projects/Padmin", headers_json, None, 204, None, None) + engine.test("Delete project P2", "DELETE", "/admin/v1/projects/P2", headers_json, None, 204, None, None) + engine.test("Delete project P3", "DELETE", "/admin/v1/projects/P3", headers_json, None, 204, None, None) + class TestFakeVim: description = "Creates/edit/delete fake VIMs and SDN controllers" @@ -716,6 +890,7 @@ class TestDeploy: self.timeout = 120 self.qforce = "" self.ns_params = None + self.vnfr_ip_list = {} def create_descriptors(self, engine): temp_dir = os.path.dirname(os.path.abspath(__file__)) + "/temp/" @@ -875,6 +1050,7 @@ class TestDeploy: _keys = keys if keys is not None else self.keys _timeout = timeout if timeout != 0 else self.timeout + # vnfr_list=[d8272263-6bd3-4680-84ca-6a4be23b3f2d, 88b22e2f-994a-4b61-94fd-4a3c90de3dc4] for vnfr_id in vnfr_list: r = engine.test("Get VNFR to get IP_ADDRESS", "GET", "/nslcm/v1/vnfrs/{}".format(vnfr_id), headers_json, None, @@ -884,37 +1060,36 @@ class TestDeploy: vnfr_data = r.json() vnf_index = str(vnfr_data["member-vnf-index-ref"]) - if not _commands.get(vnf_index): - continue - if vnfr_data.get("ip-address"): - description = "Exec command='{}' at VNFR={} IP={}".format(_commands.get(vnf_index)[0], vnf_index, - vnfr_data['ip-address']) - engine.step += 1 - test_description = "{}{} {}".format(engine.test_name, engine.step, description) - logger.warning(test_description) - while _timeout >= time: - result, message = self.do_checks([vnfr_data["ip-address"]], - vnf_index=vnfr_data["member-vnf-index-ref"], - commands=_commands.get(vnf_index), user=_users.get(vnf_index), - passwd=_passwds.get(vnf_index), key=_keys.get(vnf_index)) - if result == 1: - engine.passed_tests += 1 - logger.debug(message) - break - elif result == 0: - time += 20 - sleep(20) - elif result == -1: - engine.failed_tests += 1 - logger.error(message) - break + + ip_address = self.get_vnfr_ip(engine, vnf_index) + description = "Exec command='{}' at VNFR={} IP={}".format(_commands.get(vnf_index)[0], vnf_index, + ip_address) + engine.step += 1 + test_description = "{}{} {}".format(engine.test_name, engine.step, description) + logger.warning(test_description) + while _timeout >= time: + result, message = self.do_checks([ip_address], + vnf_index=vnfr_data["member-vnf-index-ref"], + commands=_commands.get(vnf_index), user=_users.get(vnf_index), + passwd=_passwds.get(vnf_index), key=_keys.get(vnf_index)) + if result == 1: + engine.passed_tests += 1 + logger.debug(message) + break + elif result == 0: + time += 20 + sleep(20) + elif result == -1: + engine.failed_tests += 1 + logger.error(message) + break else: time -= 20 engine.failed_tests += 1 logger.error(message) else: engine.failed_tests += 1 - logger.error("VNFR {} has not mgmt address. Check failed".format(vnfr_id)) + logger.error("VNFR {} has not mgmt address. Check failed".format(vnf_index)) def do_checks(self, ip, vnf_index, commands=[], user=None, passwd=None, key=None): try: @@ -990,6 +1165,32 @@ class TestDeploy: self.terminate(engine) self.delete_descriptors(engine) + def get_first_ip(self, ip_string): + # When using a floating IP, the vnfr_data['ip-address'] contains a semicolon-separated list of IP:s. + first_ip = ip_string.split(";")[0] if ip_string else "" + return first_ip + + def get_vnfr_ip(self, engine, vnfr_index_wanted): + # If the IP address list has been obtained before, it has been stored in 'vnfr_ip_list' + ip = self.vnfr_ip_list.get(vnfr_index_wanted, "") + if (ip): + return self.get_first_ip(ip) + r = engine.test("Get VNFR to get IP_ADDRESS", "GET", + "/nslcm/v1/vnfrs?member-vnf-index-ref={}&nsr-id-ref={}".format( + vnfr_index_wanted, self.ns_id), headers_json, None, + 200, r_header_json, "json") + if not r: + return "" + vnfr_data = r.json() + if not (vnfr_data and vnfr_data[0]): + return "" + # Store the IP (or list of IPs) in 'vnfr_ip_list' + ip_list = vnfr_data[0].get("ip-address", "") + if ip_list: + self.vnfr_ip_list[vnfr_index_wanted] = ip_list + ip = self.get_first_ip(ip_list) + return ip + class TestDeployHackfestCirros(TestDeploy): description = "Load and deploy Hackfest cirros_2vnf_ns example" @@ -1048,9 +1249,6 @@ class TestDeployHackfestCirrosScaling(TestDeploy): self.test_name = "CIRROS-SCALE" self.vnfd_filenames = ("cirros_vnf.tar.gz",) self.nsd_filename = "cirros_2vnf_ns.tar.gz" - - def create_descriptors(self, engine): - super().create_descriptors(engine) # Modify VNFD to add scaling and count=2 self.descriptor_edit = { "vnfd0": { @@ -1249,11 +1447,34 @@ class TestDeployHackfest3Charmed(TestDeploy): self.commands = {'1': ['ls -lrt /home/ubuntu/first-touch'], '2': ['ls -lrt /home/ubuntu/first-touch']} self.users = {'1': "ubuntu", '2': "ubuntu"} self.passwords = {'1': "osm4u", '2': "osm4u"} + self.descriptor_edit = { + "vnfd0": yaml.safe_load( + """ + vnf-configuration: + terminate-config-primitive: + - seq: '1' + name: touch + parameter: + - name: filename + value: '/home/ubuntu/last-touch1' + - seq: '3' + name: touch + parameter: + - name: filename + value: '/home/ubuntu/last-touch3' + - seq: '2' + name: touch + parameter: + - name: filename + value: '/home/ubuntu/last-touch2' + """) + } def additional_operations(self, engine, test_osm, manual_check): if not test_osm: return # 1 perform action + vnfr_index_selected = "2" payload = '{member_vnf_index: "2", primitive: touch, primitive_params: { filename: /home/ubuntu/OSMTESTNBI }}' engine.test("Exec service primitive over NS", "POST", "/nslcm/v1/ns_instances/{}/action".format(self.ns_id), headers_yaml, payload, @@ -1261,9 +1482,12 @@ class TestDeployHackfest3Charmed(TestDeploy): nslcmop2_action = engine.last_id # Wait until status is Ok engine.wait_operation_ready("ns", nslcmop2_action, timeout_deploy) + vnfr_ip = self.get_vnfr_ip(engine, vnfr_index_selected) if manual_check: - input('NS service primitive has been executed. Check that file /home/ubuntu/OSMTESTNBI is present at ' - 'TODO_PUT_IP') + input( + "NS service primitive has been executed." + "Check that file /home/ubuntu/OSMTESTNBI is present at {}". + format(vnfr_ip)) if test_osm: commands = {'1': [''], '2': ['ls -lrt /home/ubuntu/OSMTESTNBI', ]} self.test_ns(engine, test_osm, commands=commands) @@ -1413,20 +1637,20 @@ class TestDeployHackfest3Charmed3(TestDeployHackfest3Charmed): "$[1]": parameter: "$[0]": - value: "" # default-value: /home/ubuntu/first-touch + value: "" # default-value: /home/ubuntu/first-touch config-primitive: "$[0]": parameter: "$[0]": - default-value: "" + default-value: "" """) } self.ns_params = { "additionalParamsForVnf": [ - {"member-vnf-index": "1", "additionalParams": {"touch-filename": "/home/ubuntu/first-touch-1", - "touch-filename2": "/home/ubuntu/second-touch-1"}}, - {"member-vnf-index": "2", "additionalParams": {"touch-filename": "/home/ubuntu/first-touch-2", - "touch-filename2": "/home/ubuntu/second-touch-2"}}, + {"member-vnf-index": "1", "additionalParams": {"touch_filename": "/home/ubuntu/first-touch-1", + "touch_filename2": "/home/ubuntu/second-touch-1"}}, + {"member-vnf-index": "2", "additionalParams": {"touch_filename": "/home/ubuntu/first-touch-2", + "touch_filename2": "/home/ubuntu/second-touch-2"}}, ] } @@ -1746,6 +1970,31 @@ class TestDeployHnfd(TestDeployHackfest3Charmed): class TestDescriptors: description = "Test VNFD, NSD, PDU descriptors CRUD and dependencies" + vnfd_empty = """vnfd:vnfd-catalog: + vnfd: + - name: prova + short-name: prova + id: prova + """ + vnfd_prova = """vnfd:vnfd-catalog: + vnfd: + - connection-point: + - name: cp_0h8m + type: VPORT + id: prova + name: prova + short-name: prova + vdu: + - id: vdu_z4bm + image: ubuntu + interface: + - external-connection-point-ref: cp_0h8m + name: eth0 + virtual-interface: + type: VIRTIO + name: vdu_z4bm + version: '1.0' + """ def __init__(self): self.vnfd_filename = "hackfest_3charmed_vnfd.tar.gz" @@ -1753,31 +2002,6 @@ class TestDescriptors: self.descriptor_url = "https://osm-download.etsi.org/ftp/osm-3.0-three/2nd-hackfest/packages/" self.vnfd_id = None self.nsd_id = None - self.vnfd_empty = """vnfd:vnfd-catalog: - vnfd: - - name: prova - short-name: prova - id: prova - """ - self.vnfd_prova = """vnfd:vnfd-catalog: - vnfd: - - connection-point: - - name: cp_0h8m - type: VPORT - id: prova - name: prova - short-name: prova - vdu: - - id: vdu_z4bm - image: ubuntu - interface: - - external-connection-point-ref: cp_0h8m - name: eth0 - virtual-interface: - type: VIRTIO - name: vdu_z4bm - version: '1.0' - """ def run(self, engine, test_osm, manual_check, test_params=None): engine.set_test_name("Descriptors") @@ -2074,7 +2298,8 @@ class TestNetSliceInstances: nsilcmop_id1 = engine.last_id # Waiting for NSI-1 - engine.wait_operation_ready("nsi", nsilcmop_id1, timeout_deploy) + if test_osm: + engine.wait_operation_ready("nsi", nsilcmop_id1, timeout_deploy) # CREATE NSI-2 ns_data = {'nsiName': 'Deploy-NSI-2', 'vimAccountId': self.vim_id, 'nstId': nst_id, 'nsiDescription': 'default'} @@ -2088,17 +2313,19 @@ class TestNetSliceInstances: nsilcmop_id2 = engine.last_id # Waiting for NSI-2 - engine.wait_operation_ready("nsi", nsilcmop_id2, timeout_deploy) + if test_osm: + engine.wait_operation_ready("nsi", nsilcmop_id2, timeout_deploy) if manual_check: input('NSI-1 AND NSI-2 has been deployed. Perform manual check and press enter to resume') # TERMINATE NSI-1 - self.terminate_slice(engine, self.nsi_id1, "Terminate NSI-1") - nsilcmop1_id = engine.last_id + if test_osm: + self.terminate_slice(engine, self.nsi_id1, "Terminate NSI-1") + nsilcmop1_id = engine.last_id - # Wait terminate NSI-1 - engine.wait_operation_ready("nsi", nsilcmop1_id, timeout_deploy) + # Wait terminate NSI-1 + engine.wait_operation_ready("nsi", nsilcmop1_id, timeout_deploy) # DELETE NSI-1 self.delete_slice(engine, self.nsi_id1, "Delete NS") @@ -2119,27 +2346,30 @@ class TestNetSliceInstances: nsilcmop_id3 = engine.last_id # Wait Instantiate NSI-3 - engine.wait_operation_ready("nsi", nsilcmop_id3, timeout_deploy) + if test_osm: + engine.wait_operation_ready("nsi", nsilcmop_id3, timeout_deploy) if manual_check: input('NSI-3 has been deployed. Perform manual check and press enter to resume') # TERMINATE NSI-2 - self.terminate_slice(engine, self.nsi_id2, "Terminate NSI-2") - nsilcmop2_id = engine.last_id + if test_osm: + self.terminate_slice(engine, self.nsi_id2, "Terminate NSI-2") + nsilcmop2_id = engine.last_id - # Wait terminate NSI-2 - engine.wait_operation_ready("nsi", nsilcmop2_id, timeout_deploy) + # Wait terminate NSI-2 + engine.wait_operation_ready("nsi", nsilcmop2_id, timeout_deploy) # DELETE NSI-2 self.delete_slice(engine, self.nsi_id2, "DELETE NSI-2") # TERMINATE NSI-3 - self. terminate_slice(engine, self.nsi_id3, "Terminate NSI-3") - nsilcmop3_id = engine.last_id - - # Wait terminate NSI-3 - engine.wait_operation_ready("nsi", nsilcmop3_id, timeout_deploy) + if test_osm: + self. terminate_slice(engine, self.nsi_id3, "Terminate NSI-3") + nsilcmop3_id = engine.last_id + + # Wait terminate NSI-3 + engine.wait_operation_ready("nsi", nsilcmop3_id, timeout_deploy) # DELETE NSI-3 self.delete_slice(engine, self.nsi_id3, "DELETE NSI-3") @@ -2190,7 +2420,8 @@ if __name__ == "__main__": test_classes = { "NonAuthorized": TestNonAuthorized, "FakeVIM": TestFakeVim, - "TestUsersProjects": TestUsersProjects, + "Users-Projects": TestUsersProjects, + "Projects-Descriptors": TestProjectsDescriptors, "VIM-SDN": TestVIMSDN, "Deploy-Custom": TestDeploy, "Deploy-Hackfest-Cirros": TestDeployHackfestCirros, @@ -2200,15 +2431,15 @@ if __name__ == "__main__": "Deploy-Hackfest-3Charmed3": TestDeployHackfest3Charmed3, "Deploy-Hackfest-4": TestDeployHackfest4, "Deploy-CirrosMacIp": TestDeployIpMac, - "TestDescriptors": TestDescriptors, - "TestDeployHackfest1": TestDeployHackfest1, + "Descriptors": TestDescriptors, + "Deploy-Hackfest1": TestDeployHackfest1, # "Deploy-MultiVIM": TestDeployMultiVIM, - "DeploySingleVdu": TestDeploySingleVdu, - "DeployHnfd": TestDeployHnfd, + "Deploy-SingleVdu": TestDeploySingleVdu, + "Deploy-Hnfd": TestDeployHnfd, "Upload-Slice-Template": TestNetSliceTemplates, "Deploy-Slice-Instance": TestNetSliceInstances, - "TestDeploySimpleCharm": TestDeploySimpleCharm, - "TestDeploySimpleCharm2": TestDeploySimpleCharm2, + "Deploy-SimpleCharm": TestDeploySimpleCharm, + "Deploy-SimpleCharm2": TestDeploySimpleCharm2, } test_to_do = [] test_params = {} @@ -2285,7 +2516,7 @@ if __name__ == "__main__": test_class = test_classes[test] test_class().run(test_rest, test_osm, manual_check, test_params.get(text_index)) else: - for test, test_class in test_classes.items(): + for test, test_class in sorted(test_classes.items()): if fail_fast and test_rest.failed_tests: break test_class().run(test_rest, test_osm, manual_check, test_params.get(0))