X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2Ftapi%2Ftest02_full_topology.py;h=10ec7bf07bf3892ece459150e9fd220e54e0574e;hb=253651ee685c07d342c96adb18fee852b5e02b67;hp=910ba2899952b88360e6c4e48cf9cb8857731f07;hpb=77465d18ac9eff9c7d587bed9122143fc8357f16;p=transportpce.git diff --git a/tests/transportpce_tests/tapi/test02_full_topology.py b/tests/transportpce_tests/tapi/test02_full_topology.py index 910ba2899..10ec7bf07 100644 --- a/tests/transportpce_tests/tapi/test02_full_topology.py +++ b/tests/transportpce_tests/tapi/test02_full_topology.py @@ -40,58 +40,61 @@ class TransportPCEtesting(unittest.TestCase): NODE_VERSION = '2.2.1' uuid_services = UuidServices() - cr_serv_sample_data = { - "input": { - "end-point": [ - { - "layer-protocol-name": "PHOTONIC_MEDIA", - "service-interface-point": { - "service-interface-point-uuid": "b1a0d883-32b8-3b0b-93d6-7ed074f6f107" - }, - "administrative-state": "UNLOCKED", - "operational-state": "ENABLED", - "direction": "BIDIRECTIONAL", - "role": "SYMMETRIC", - "protection-role": "WORK", - "local-id": "SPDR-SA1-XPDR1", - "name": [ + cr_serv_input_data = { + "end-point": [ + { + "layer-protocol-name": "PHOTONIC_MEDIA", + "service-interface-point": { + "service-interface-point-uuid": "b1a0d883-32b8-3b0b-93d6-7ed074f6f107" + }, + "administrative-state": "UNLOCKED", + "operational-state": "ENABLED", + "direction": "BIDIRECTIONAL", + "role": "SYMMETRIC", + "protection-role": "WORK", + "local-id": "SPDR-SA1-XPDR1", + "name": [ { "value-name": "OpenROADM node id", "value": "SPDR-SA1-XPDR1" } - ] + ] + }, + { + "layer-protocol-name": "PHOTONIC_MEDIA", + "service-interface-point": { + "service-interface-point-uuid": "d1d6305e-179b-346f-b02d-8260aebe1ce8" }, - { - "layer-protocol-name": "PHOTONIC_MEDIA", - "service-interface-point": { - "service-interface-point-uuid": "d1d6305e-179b-346f-b02d-8260aebe1ce8" - }, - "administrative-state": "UNLOCKED", - "operational-state": "ENABLED", - "direction": "BIDIRECTIONAL", - "role": "SYMMETRIC", - "protection-role": "WORK", - "local-id": "SPDR-SC1-XPDR1", - "name": [ + "administrative-state": "UNLOCKED", + "operational-state": "ENABLED", + "direction": "BIDIRECTIONAL", + "role": "SYMMETRIC", + "protection-role": "WORK", + "local-id": "SPDR-SC1-XPDR1", + "name": [ { "value-name": "OpenROADM node id", "value": "SPDR-SC1-XPDR1" } - ] + ] + } + ], + "connectivity-constraint": { + "service-layer": "PHOTONIC_MEDIA", + "service-type": "POINT_TO_POINT_CONNECTIVITY", + "service-level": "Some service-level", + "requested-capacity": { + "total-size": { + "value": "100", + "unit": "GB" } - ], - "connectivity-constraint": { - "service-layer": "PHOTONIC_MEDIA", - "service-type": "POINT_TO_POINT_CONNECTIVITY", - "service-level": "Some service-level", - "requested-capacity": { - "total-size": { - "value": "100", - "unit": "GB" - } - } - }, - "state": "Some state"}} + } + }, + "state": "Some state"} + + del_serv_input_data = {"service-id-or-name": "TBD"} + + tapi_topo = {"topology-id-or-name": "TBD"} @classmethod def setUpClass(cls): @@ -101,7 +104,7 @@ class TransportPCEtesting(unittest.TestCase): os.environ['JAVA_MAX_MEM'] = '4096M' cls.processes = test_utils.start_tpce() # TAPI feature is not installed by default in Karaf - if "USE_LIGHTY" not in os.environ or os.environ['USE_LIGHTY'] != 'True': + if "NO_ODL_STARTUP" not in os.environ or "USE_LIGHTY" not in os.environ or os.environ['USE_LIGHTY'] != 'True': print("installing tapi feature...") result = test_utils.install_karaf_feature("odl-transportpce-tapi") if result.returncode != 0: @@ -133,63 +136,62 @@ class TransportPCEtesting(unittest.TestCase): def test_01_connect_spdrA(self): print("Connecting SPDRA") - response = test_utils.mount_tapi_device("SPDR-SA1", ('spdra', self.NODE_VERSION)) - self.assertEqual(response.status_code, - requests.codes.created, test_utils.CODE_SHOULD_BE_201) + response = test_utils.mount_device("SPDR-SA1", ('spdra', self.NODE_VERSION)) + self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) + time.sleep(2) def test_02_connect_spdrC(self): print("Connecting SPDRC") - response = test_utils.mount_tapi_device("SPDR-SC1", ('spdrc', self.NODE_VERSION)) - self.assertEqual(response.status_code, - requests.codes.created, test_utils.CODE_SHOULD_BE_201) + response = test_utils.mount_device("SPDR-SC1", ('spdrc', self.NODE_VERSION)) + self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) + time.sleep(2) def test_03_connect_rdmA(self): print("Connecting ROADMA") - response = test_utils.mount_tapi_device("ROADM-A1", ('roadma', self.NODE_VERSION)) - self.assertEqual(response.status_code, - requests.codes.created, test_utils.CODE_SHOULD_BE_201) + response = test_utils.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION)) + self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) time.sleep(2) def test_04_connect_rdmC(self): print("Connecting ROADMC") - response = test_utils.mount_tapi_device("ROADM-C1", ('roadmc', self.NODE_VERSION)) - self.assertEqual(response.status_code, - requests.codes.created, test_utils.CODE_SHOULD_BE_201) + response = test_utils.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION)) + self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) + time.sleep(2) def test_05_connect_sprdA_1_N1_to_roadmA_PP1(self): - response = test_utils.connect_xpdr_to_rdm_request("SPDR-SA1", "1", "1", - "ROADM-A1", "1", "SRG1-PP1-TXRX") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Xponder Roadm Link created successfully', - res["output"]["result"]) + response = test_utils.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-xpdr-rdm-links', + {'links-input': {'xpdr-node': 'SPDR-SA1', 'xpdr-num': '1', 'network-num': '1', + 'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}}) + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"]) time.sleep(2) def test_06_connect_roadmA_PP1_to_spdrA_1_N1(self): - response = test_utils.connect_rdm_to_xpdr_request("SPDR-SA1", "1", "1", - "ROADM-A1", "1", "SRG1-PP1-TXRX") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Roadm Xponder links created successfully', - res["output"]["result"]) + response = test_utils.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-rdm-xpdr-links', + {'links-input': {'xpdr-node': 'SPDR-SA1', 'xpdr-num': '1', 'network-num': '1', + 'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}}) + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertIn('Roadm Xponder links created successfully', response["output"]["result"]) time.sleep(2) def test_07_connect_sprdC_1_N1_to_roadmC_PP1(self): - response = test_utils.connect_xpdr_to_rdm_request("SPDR-SC1", "1", "1", - "ROADM-C1", "1", "SRG1-PP1-TXRX") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Xponder Roadm Link created successfully', - res["output"]["result"]) + response = test_utils.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-xpdr-rdm-links', + {'links-input': {'xpdr-node': 'SPDR-SC1', 'xpdr-num': '1', 'network-num': '1', + 'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}}) + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"]) time.sleep(2) def test_08_connect_roadmC_PP1_to_spdrC_1_N1(self): - response = test_utils.connect_rdm_to_xpdr_request("SPDR-SC1", "1", "1", - "ROADM-C1", "1", "SRG1-PP1-TXRX") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Roadm Xponder links created successfully', - res["output"]["result"]) + response = test_utils.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-rdm-xpdr-links', + {'links-input': {'xpdr-node': 'SPDR-SC1', 'xpdr-num': '1', 'network-num': '1', + 'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}}) + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertIn('Roadm Xponder links created successfully', response["output"]["result"]) time.sleep(2) def test_09_add_omsAttributes_ROADMA_ROADMC(self): @@ -207,7 +209,6 @@ class TransportPCEtesting(unittest.TestCase): response = test_utils.add_oms_attr_request( "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data) self.assertEqual(response.status_code, requests.codes.created) - time.sleep(2) def test_10_add_omsAttributes_ROADMC_ROADMA(self): # Config ROADMC-ROADMA oms-attributes @@ -224,54 +225,41 @@ class TransportPCEtesting(unittest.TestCase): response = test_utils.add_oms_attr_request( "ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data) self.assertEqual(response.status_code, requests.codes.created) - time.sleep(2) def test_11_check_otn_topology(self): - response = test_utils.get_otn_topo_request() - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - nbNode = len(res['network'][0]['node']) - self.assertEqual(nbNode, 6, 'There should be 6 otn nodes') - self.assertNotIn('ietf-network-topology:link', res['network'][0]) - time.sleep(2) + response = test_utils.get_ietf_network_request('otn-topology', 'config') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(len(response['network'][0]['node']), 6, 'There should be 6 otn nodes') + self.assertNotIn('ietf-network-topology:link', response['network'][0]) def test_12_check_openroadm_topology(self): - response = test_utils.get_ordm_topo_request("") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - nbNode = len(res['network'][0]['node']) - nbLink = len(res['network'][0]['ietf-network-topology:link']) - self.assertEqual(nbNode, 13, 'There should be 13 openroadm nodes') - self.assertEqual(nbLink, 22, 'There should be 22 openroadm links') - time.sleep(2) + response = test_utils.get_ietf_network_request('openroadm-topology', 'config') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(len(response['network'][0]['node']), 13, 'There should be 13 openroadm nodes') + self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 22, + 'There should be 22 openroadm links') def test_13_get_tapi_topology_details(self): - response = test_utils.tapi_get_topology_details_request( - "T0 - Full Multi-layer topology") - time.sleep(2) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - nbNode = len(res['output']['topology']['node']) - nbLink = len(res['output']['topology']['link']) - self.assertEqual(nbNode, 14, 'There should be 14 TAPI nodes') - self.assertEqual(nbLink, 15, 'There should be 15 TAPI links') + self.tapi_topo["topology-id-or-name"] = test_utils.T0_FULL_MULTILAYER_TOPO + response = test_utils.transportpce_api_rpc_request( + 'tapi-topology', 'get-topology-details', self.tapi_topo) time.sleep(2) + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(len(response['output']['topology']['node']), 14, 'There should be 14 TAPI nodes') + self.assertEqual(len(response['output']['topology']['link']), 15, 'There should be 15 TAPI links') def test_14_check_sip_details(self): - response = test_utils.tapi_get_sip_details_request() - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - nbSip = len(res['output']['sip']) - self.assertEqual(nbSip, 60, 'There should be 60 service interface point') - time.sleep(2) + response = test_utils.transportpce_api_rpc_request( + 'tapi-common', 'get-service-interface-point-list', None) + self.assertEqual(len(response['output']['sip']), 60, 'There should be 60 service interface point') # test create connectivity service from spdrA to spdrC for Photonic_media def test_15_create_connectivity_service_PhotonicMedia(self): - response = test_utils.tapi_create_connectivity_request(self.cr_serv_sample_data) + response = test_utils.transportpce_api_rpc_request( + 'tapi-connectivity', 'create-connectivity-service', self.cr_serv_input_data) time.sleep(self.WAITING) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.uuid_services.pm = res['output']['service']['uuid'] + self.assertEqual(response['status_code'], requests.codes.ok) + self.uuid_services.pm = response['output']['service']['uuid'] # pylint: disable=consider-using-f-string print("photonic media service uuid : {}".format(self.uuid_services.pm)) @@ -287,44 +275,39 @@ class TransportPCEtesting(unittest.TestCase): input_dict_3 = {'value-name': 'OpenROADM node id', 'value': 'SPDR-SA1-XPDR1'} - self.assertDictEqual(dict(input_dict_1, **res['output']['service']), - res['output']['service']) - self.assertDictEqual(dict(input_dict_2, **res['output']['service']['end-point'][0]['name'][0]), - res['output']['service']['end-point'][0]['name'][0]) - self.assertDictEqual(dict(input_dict_3, **res['output']['service']['end-point'][1]['name'][0]), - res['output']['service']['end-point'][1]['name'][0]) + self.assertDictEqual(dict(input_dict_1, **response['output']['service']), + response['output']['service']) + self.assertDictEqual(dict(input_dict_2, **response['output']['service']['end-point'][0]['name'][0]), + response['output']['service']['end-point'][0]['name'][0]) + self.assertDictEqual(dict(input_dict_3, **response['output']['service']['end-point'][1]['name'][0]), + response['output']['service']['end-point'][1]['name'][0]) # If the gate fails is because of the waiting time not being enough - time.sleep(self.WAITING) +# time.sleep(self.WAITING) def test_16_get_service_PhotonicMedia(self): - response = test_utils.get_service_list_request( - "services/" + str(self.uuid_services.pm)) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual( - res['services'][0]['administrative-state'], 'inService') - self.assertEqual( - res['services'][0]['service-name'], self.uuid_services.pm) - self.assertEqual( - res['services'][0]['connection-type'], 'infrastructure') - self.assertEqual( - res['services'][0]['lifecycle-state'], 'planned') - time.sleep(2) + response = test_utils.get_ordm_serv_list_attr_request("services", str(self.uuid_services.pm)) + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(response['services'][0]['administrative-state'], 'inService') + self.assertEqual(response['services'][0]['service-name'], str(self.uuid_services.pm)) + self.assertEqual(response['services'][0]['connection-type'], 'infrastructure') + self.assertEqual(response['services'][0]['lifecycle-state'], 'planned') + time.sleep(1) # test create connectivity service from spdrA to spdrC for odu def test_17_create_connectivity_service_ODU(self): # pylint: disable=line-too-long - self.cr_serv_sample_data["input"]["end-point"][0]["layer-protocol-name"] = "ODU" - self.cr_serv_sample_data["input"]["end-point"][0]["service-interface-point"]["service-interface-point-uuid"] = "5efda776-f8de-3e0b-9bbd-2c702e210946" - self.cr_serv_sample_data["input"]["end-point"][1]["layer-protocol-name"] = "ODU" - self.cr_serv_sample_data["input"]["end-point"][1]["service-interface-point"]["service-interface-point-uuid"] = "8116d0af-39fa-3df5-bed2-dd2cd5e8217d" - self.cr_serv_sample_data["input"]["connectivity-constraint"]["service-layer"] = "ODU" - - response = test_utils.tapi_create_connectivity_request(self.cr_serv_sample_data) + self.cr_serv_input_data["end-point"][0]["layer-protocol-name"] = "ODU" + self.cr_serv_input_data["end-point"][0]["service-interface-point"]["service-interface-point-uuid"] = "5efda776-f8de-3e0b-9bbd-2c702e210946" + self.cr_serv_input_data["end-point"][1]["layer-protocol-name"] = "ODU" + self.cr_serv_input_data["end-point"][1]["service-interface-point"]["service-interface-point-uuid"] = "8116d0af-39fa-3df5-bed2-dd2cd5e8217d" + self.cr_serv_input_data["connectivity-constraint"]["service-layer"] = "ODU" + self.cr_serv_input_data["connectivity-constraint"]["service-level"] = self.uuid_services.pm + + response = test_utils.transportpce_api_rpc_request( + 'tapi-connectivity', 'create-connectivity-service', self.cr_serv_input_data) time.sleep(self.WAITING) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.uuid_services.odu = res['output']['service']['uuid'] + self.assertEqual(response['status_code'], requests.codes.ok) + self.uuid_services.odu = response['output']['service']['uuid'] # pylint: disable=consider-using-f-string print("odu service uuid : {}".format(self.uuid_services.odu)) @@ -340,45 +323,40 @@ class TransportPCEtesting(unittest.TestCase): input_dict_3 = {'value-name': 'OpenROADM node id', 'value': 'SPDR-SA1-XPDR1'} - self.assertDictEqual(dict(input_dict_1, **res['output']['service']), - res['output']['service']) - self.assertDictEqual(dict(input_dict_2, **res['output']['service']['end-point'][0]['name'][0]), - res['output']['service']['end-point'][0]['name'][0]) - self.assertDictEqual(dict(input_dict_3, **res['output']['service']['end-point'][1]['name'][0]), - res['output']['service']['end-point'][1]['name'][0]) + self.assertDictEqual(dict(input_dict_1, **response['output']['service']), + response['output']['service']) + self.assertDictEqual(dict(input_dict_2, **response['output']['service']['end-point'][0]['name'][0]), + response['output']['service']['end-point'][0]['name'][0]) + self.assertDictEqual(dict(input_dict_3, **response['output']['service']['end-point'][1]['name'][0]), + response['output']['service']['end-point'][1]['name'][0]) # If the gate fails is because of the waiting time not being enough - time.sleep(self.WAITING) +# time.sleep(self.WAITING) def test_18_get_service_ODU(self): - response = test_utils.get_service_list_request( - "services/" + str(self.uuid_services.odu)) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual( - res['services'][0]['administrative-state'], 'inService') - self.assertEqual( - res['services'][0]['service-name'], self.uuid_services.odu) - self.assertEqual( - res['services'][0]['connection-type'], 'infrastructure') - self.assertEqual( - res['services'][0]['lifecycle-state'], 'planned') - time.sleep(2) + response = test_utils.get_ordm_serv_list_attr_request("services", str(self.uuid_services.odu)) + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(response['services'][0]['administrative-state'], 'inService') + self.assertEqual(response['services'][0]['service-name'], str(self.uuid_services.odu)) + self.assertEqual(response['services'][0]['connection-type'], 'infrastructure') + self.assertEqual(response['services'][0]['lifecycle-state'], 'planned') + time.sleep(1) # test create connectivity service from spdrA to spdrC for dsr def test_19_create_connectivity_service_DSR(self): # pylint: disable=line-too-long - self.cr_serv_sample_data["input"]["end-point"][0]["layer-protocol-name"] = "DSR" - self.cr_serv_sample_data["input"]["end-point"][0]["service-interface-point"]["service-interface-point-uuid"] = "c14797a0-adcc-3875-a1fe-df8949d1a2d7" - self.cr_serv_sample_data["input"]["end-point"][1]["layer-protocol-name"] = "DSR" - self.cr_serv_sample_data["input"]["end-point"][1]["service-interface-point"]["service-interface-point-uuid"] = "25812ef2-625d-3bf8-af55-5e93946d1c22" - self.cr_serv_sample_data["input"]["connectivity-constraint"]["service-layer"] = "DSR" - self.cr_serv_sample_data["input"]["connectivity-constraint"]["requested-capacity"]["total-size"]["value"] = "10" - - response = test_utils.tapi_create_connectivity_request(self.cr_serv_sample_data) + self.cr_serv_input_data["end-point"][0]["layer-protocol-name"] = "DSR" + self.cr_serv_input_data["end-point"][0]["service-interface-point"]["service-interface-point-uuid"] = "c14797a0-adcc-3875-a1fe-df8949d1a2d7" + self.cr_serv_input_data["end-point"][1]["layer-protocol-name"] = "DSR" + self.cr_serv_input_data["end-point"][1]["service-interface-point"]["service-interface-point-uuid"] = "25812ef2-625d-3bf8-af55-5e93946d1c22" + self.cr_serv_input_data["connectivity-constraint"]["service-layer"] = "DSR" + self.cr_serv_input_data["connectivity-constraint"]["requested-capacity"]["total-size"]["value"] = "10" + self.cr_serv_input_data["connectivity-constraint"]["service-level"] = self.uuid_services.odu + + response = test_utils.transportpce_api_rpc_request( + 'tapi-connectivity', 'create-connectivity-service', self.cr_serv_input_data) time.sleep(self.WAITING) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.uuid_services.dsr = res['output']['service']['uuid'] + self.assertEqual(response['status_code'], requests.codes.ok) + self.uuid_services.dsr = response['output']['service']['uuid'] # pylint: disable=consider-using-f-string print("dsr service uuid : {}".format(self.uuid_services.dsr)) @@ -395,37 +373,31 @@ class TransportPCEtesting(unittest.TestCase): 'value': 'SPDR-SA1-XPDR1'} self.assertDictEqual(dict(input_dict_1, - **res['output']['service']), - res['output']['service']) + **response['output']['service']), + response['output']['service']) self.assertDictEqual(dict(input_dict_2, - **res['output']['service']['end-point'][0]['name'][0]), - res['output']['service']['end-point'][0]['name'][0]) + **response['output']['service']['end-point'][0]['name'][0]), + response['output']['service']['end-point'][0]['name'][0]) self.assertDictEqual(dict(input_dict_3, - **res['output']['service']['end-point'][1]['name'][0]), - res['output']['service']['end-point'][1]['name'][0]) + **response['output']['service']['end-point'][1]['name'][0]), + response['output']['service']['end-point'][1]['name'][0]) # The sleep here is okey as the DSR service creation is very fast - time.sleep(self.WAITING) +# time.sleep(self.WAITING) def test_20_get_service_DSR(self): - response = test_utils.get_service_list_request( - "services/" + str(self.uuid_services.dsr)) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual( - res['services'][0]['administrative-state'], 'inService') - self.assertEqual( - res['services'][0]['service-name'], self.uuid_services.dsr) - self.assertEqual( - res['services'][0]['connection-type'], 'service') - self.assertEqual( - res['services'][0]['lifecycle-state'], 'planned') - time.sleep(2) + response = test_utils.get_ordm_serv_list_attr_request("services", str(self.uuid_services.dsr)) + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(response['services'][0]['administrative-state'], 'inService') + self.assertEqual(response['services'][0]['service-name'], str(self.uuid_services.dsr)) + self.assertEqual(response['services'][0]['connection-type'], 'service') + self.assertEqual(response['services'][0]['lifecycle-state'], 'planned') + time.sleep(1) def test_21_get_connectivity_service_list(self): - response = test_utils.tapi_get_service_list_request() - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - liste_service = res['output']['service'] + response = test_utils.transportpce_api_rpc_request( + 'tapi-connectivity', 'get-connectivity-service-list', None) + self.assertEqual(response['status_code'], requests.codes.ok) + liste_service = response['output']['service'] for ele in liste_service: if ele['uuid'] == self.uuid_services.pm: self.assertEqual(ele['operational-state'], 'ENABLED') @@ -447,59 +419,55 @@ class TransportPCEtesting(unittest.TestCase): time.sleep(2) def test_22_delete_connectivity_service_DSR(self): - response = test_utils.tapi_delete_connectivity_request(self.uuid_services.dsr) - self.assertEqual(response.status_code, requests.codes.no_content) + self.del_serv_input_data["service-id-or-name"] = str(self.uuid_services.dsr) + response = test_utils.transportpce_api_rpc_request( + 'tapi-connectivity', 'delete-connectivity-service', self.del_serv_input_data) + self.assertIn(response["status_code"], (requests.codes.ok, requests.codes.no_content)) time.sleep(self.WAITING) def test_23_delete_connectivity_service_ODU(self): - response = test_utils.tapi_delete_connectivity_request(self.uuid_services.odu) - self.assertEqual(response.status_code, requests.codes.no_content) + self.del_serv_input_data["service-id-or-name"] = str(self.uuid_services.odu) + response = test_utils.transportpce_api_rpc_request( + 'tapi-connectivity', 'delete-connectivity-service', self.del_serv_input_data) + self.assertIn(response["status_code"], (requests.codes.ok, requests.codes.no_content)) time.sleep(self.WAITING) def test_24_delete_connectivity_service_PhotonicMedia(self): - response = test_utils.tapi_delete_connectivity_request(self.uuid_services.pm) - self.assertEqual(response.status_code, requests.codes.no_content) + self.del_serv_input_data["service-id-or-name"] = str(self.uuid_services.pm) + response = test_utils.transportpce_api_rpc_request( + 'tapi-connectivity', 'delete-connectivity-service', self.del_serv_input_data) + self.assertIn(response["status_code"], (requests.codes.ok, requests.codes.no_content)) time.sleep(self.WAITING) def test_25_get_no_tapi_services(self): - response = test_utils.tapi_get_service_list_request() - res = response.json() + response = test_utils.transportpce_api_rpc_request( + 'tapi-connectivity', 'get-connectivity-service-list', None) + self.assertEqual(response['status_code'], requests.codes.internal_server_error) self.assertIn( {"error-type": "rpc", "error-tag": "operation-failed", "error-message": "No services exist in datastore", "error-info": "error"}, - res['errors']['error']) - time.sleep(2) + response['output']['errors']['error']) def test_26_get_no_openroadm_services(self): - response = test_utils.get_service_list_request("") - self.assertEqual(response.status_code, requests.codes.conflict) - res = response.json() - self.assertIn( - {"error-type": "application", "error-tag": "data-missing", - "error-message": "Request could not be completed because the relevant data model content does not exist"}, - res['errors']['error']) - time.sleep(2) + response = test_utils.get_ordm_serv_list_request() + self.assertEqual(response['status_code'], requests.codes.conflict) def test_27_disconnect_spdrA(self): response = test_utils.unmount_device("SPDR-SA1") - self.assertEqual(response.status_code, requests.codes.ok, - test_utils.CODE_SHOULD_BE_200) + self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) def test_28_disconnect_spdrC(self): response = test_utils.unmount_device("SPDR-SC1") - self.assertEqual(response.status_code, requests.codes.ok, - test_utils.CODE_SHOULD_BE_200) + self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) def test_29_disconnect_roadmA(self): response = test_utils.unmount_device("ROADM-A1") - self.assertEqual(response.status_code, requests.codes.ok, - test_utils.CODE_SHOULD_BE_200) + self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) def test_30_disconnect_roadmC(self): response = test_utils.unmount_device("ROADM-C1") - self.assertEqual(response.status_code, requests.codes.ok, - test_utils.CODE_SHOULD_BE_200) + self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) if __name__ == "__main__":