X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftransportpce_tests%2Fhybrid%2Ftest02_B100G_end2end.py;h=5b1ad0bd8cb805a727c778781bac107917838b4b;hb=3864192e72c83efcabc741d0cb84600dec58c357;hp=9ebcffcd914ba868decb767773f90087978ba971;hpb=6a0209f13ac0bb62053128e4a2281871caba91de;p=transportpce.git diff --git a/tests/transportpce_tests/hybrid/test02_B100G_end2end.py b/tests/transportpce_tests/hybrid/test02_B100G_end2end.py index 9ebcffcd9..5b1ad0bd8 100644 --- a/tests/transportpce_tests/hybrid/test02_B100G_end2end.py +++ b/tests/transportpce_tests/hybrid/test02_B100G_end2end.py @@ -33,7 +33,7 @@ class TransportPCEtesting(unittest.TestCase): NODE_VERSION_221 = '2.2.1' NODE_VERSION_71 = '7.1' - cr_serv_sample_data = {"input": { + cr_serv_input_data = { "sdnc-request-header": { "request-id": "request-1", "rpc-action": "service-create", @@ -48,13 +48,7 @@ class TransportPCEtesting(unittest.TestCase): "service-format": "OTU", "otu-service-rate": "org-openroadm-otn-common-types:OTUCn", "clli": "NodeSA", - "subrate-eth-sla": { - "subrate-eth-sla": { - "committed-info-rate": "100000", - "committed-burst-size": "64" - } - }, - "tx-direction": { + "tx-direction": [{ "port": { "port-device-name": "XPDR-A2-XPDR2", "port-type": "fixed", @@ -67,9 +61,10 @@ class TransportPCEtesting(unittest.TestCase): "lgx-port-name": "Some lgx-port-name", "lgx-port-rack": "000000.00", "lgx-port-shelf": "00" - } - }, - "rx-direction": { + }, + "index": 0 + }], + "rx-direction": [{ "port": { "port-device-name": "XPDR-A2-XPDR2", "port-type": "fixed", @@ -82,8 +77,9 @@ class TransportPCEtesting(unittest.TestCase): "lgx-port-name": "Some lgx-port-name", "lgx-port-rack": "000000.00", "lgx-port-shelf": "00" - } - }, + }, + "index": 0 + }], "optic-type": "gray" }, "service-z-end": { @@ -92,13 +88,7 @@ class TransportPCEtesting(unittest.TestCase): "service-format": "OTU", "otu-service-rate": "org-openroadm-otn-common-types:OTUCn", "clli": "NodeSC", - "subrate-eth-sla": { - "subrate-eth-sla": { - "committed-info-rate": "100000", - "committed-burst-size": "64" - } - }, - "tx-direction": { + "tx-direction": [{ "port": { "port-device-name": "XPDR-C2-XPDR2", "port-type": "fixed", @@ -111,9 +101,10 @@ class TransportPCEtesting(unittest.TestCase): "lgx-port-name": "Some lgx-port-name", "lgx-port-rack": "000000.00", "lgx-port-shelf": "00" - } - }, - "rx-direction": { + }, + "index": 0 + }], + "rx-direction": [{ "port": { "port-device-name": "XPDR-C2-XPDR2", "port-type": "fixed", @@ -126,13 +117,24 @@ class TransportPCEtesting(unittest.TestCase): "lgx-port-name": "Some lgx-port-name", "lgx-port-rack": "000000.00", "lgx-port-shelf": "00" - } - }, + }, + "index": 0 + }], "optic-type": "gray" }, "due-date": "2018-06-15T00:00:01Z", "operator-contact": "pw1234" } + + del_serv_input_data = { + "sdnc-request-header": { + "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", + "rpc-action": "service-delete", + "request-system-id": "appname", + "notification-url": "http://localhost:8585/NotificationServer/notify"}, + "service-delete-req-info": { + "service-name": "TBD", + "tail-retention": "no"} } @classmethod @@ -151,65 +153,61 @@ class TransportPCEtesting(unittest.TestCase): print("all processes killed") def setUp(self): - time.sleep(2) + time.sleep(1) - def test_01_connect_xpdra2(self): + def test_001_connect_xpdra2(self): response = test_utils.mount_device("XPDR-A2", ('xpdra2', self.NODE_VERSION_71)) self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) - def test_02_connect_xpdrc2(self): + def test_002_connect_xpdrc2(self): response = test_utils.mount_device("XPDR-C2", ('xpdrc2', self.NODE_VERSION_71)) self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) - def test_03_connect_rdma(self): + def test_003_connect_rdma(self): response = test_utils.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION_221)) self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) - def test_04_connect_rdmc(self): + def test_004_connect_rdmc(self): response = test_utils.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION_221)) self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) - def test_05_connect_xprda2_2_N1_to_roadma_PP2(self): - response = test_utils.connect_xpdr_to_rdm_request("XPDR-A2", "2", "1", - "ROADM-A1", "1", "SRG1-PP2-TXRX") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Xponder Roadm Link created successfully', - res["output"]["result"]) - time.sleep(2) - - def test_06_connect_roadma_PP2_to_xpdra2_2_N1(self): - response = test_utils.connect_rdm_to_xpdr_request("XPDR-A2", "2", "1", - "ROADM-A1", "1", "SRG1-PP2-TXRX") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Roadm Xponder links created successfully', - res["output"]["result"]) - time.sleep(2) - - def test_07_connect_xprdc2_2_N1_to_roadmc_PP2(self): - response = test_utils.connect_xpdr_to_rdm_request("XPDR-C2", "2", "1", - "ROADM-C1", "1", "SRG1-PP2-TXRX") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Xponder Roadm Link created successfully', - res["output"]["result"]) - time.sleep(2) - - def test_08_connect_roadmc_PP2_to_xpdrc2_2_N1(self): - response = test_utils.connect_rdm_to_xpdr_request("XPDR-C2", "2", "1", - "ROADM-C1", "1", "SRG1-PP2-TXRX") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Roadm Xponder links created successfully', - res["output"]["result"]) - time.sleep(2) - - def test_09_add_omsAttributes_roadma_roadmc(self): + def test_005_connect_xpdra2_2_N1_to_roadma_PP2(self): + response = test_utils.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-xpdr-rdm-links', + {'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '2', 'network-num': '1', + 'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}}) + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"]) + + def test_006_connect_roadma_PP2_to_xpdra2_2_N1(self): + response = test_utils.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-rdm-xpdr-links', + {'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '2', 'network-num': '1', + 'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}}) + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertIn('Roadm Xponder links created successfully', response["output"]["result"]) + + def test_007_connect_xpdrc2_2_N1_to_roadmc_PP2(self): + response = test_utils.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-xpdr-rdm-links', + {'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '2', 'network-num': '1', + 'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}}) + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"]) + + def test_008_connect_roadmc_PP2_to_xpdrc2_2_N1(self): + response = test_utils.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-rdm-xpdr-links', + {'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '2', 'network-num': '1', + 'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}}) + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertIn('Roadm Xponder links created successfully', response["output"]["result"]) + + def test_009_add_omsAttributes_roadma_roadmc(self): # Config ROADMA-ROADMC oms-attributes data = {"span": { "auto-spanloss": "true", @@ -225,7 +223,7 @@ class TransportPCEtesting(unittest.TestCase): "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data) self.assertEqual(response.status_code, requests.codes.created) - def test_10_add_omsAttributes_roadmc_roadma(self): + def test_010_add_omsAttributes_roadmc_roadma(self): # Config ROADMC-ROADMA oms-attributes data = {"span": { "auto-spanloss": "true", @@ -241,72 +239,59 @@ class TransportPCEtesting(unittest.TestCase): "ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data) self.assertEqual(response.status_code, requests.codes.created) -# test service-create for OCH-OTU4 service from xpdra2 to xpdrc2 - 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, 4, 'There should be 4 nodes') - self.assertNotIn('ietf-network-topology:link', res['network'][0]) - - def test_12_create_OTUC4_service(self): - response = test_utils.service_create_request(self.cr_serv_sample_data) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + # test service-create for OCH-OTU4 service from xpdra2 to xpdrc2 + def test_011_check_otn_topology(self): + 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']), 7, 'There should be 7 nodes') + self.assertNotIn('ietf-network-topology:link', response['network'][0]) + + def test_012_create_OTUC4_service(self): + response = test_utils.transportpce_api_rpc_request( + 'org-openroadm-service', 'service-create', + self.cr_serv_input_data) + self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('PCE calculation in progress', - res['output']['configuration-response-common']['response-message']) + response['output']['configuration-response-common']['response-message']) time.sleep(self.WAITING) - def test_13_get_OTUC4_service1(self): - response = test_utils.get_service_list_request( - "services/service1-OTUC4") - 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'], 'service1-OTUC4') - self.assertEqual( - res['services'][0]['connection-type'], 'infrastructure') - self.assertEqual( - res['services'][0]['lifecycle-state'], 'planned') - self.assertEqual( - res['services'][0]['service-layer'], 'wdm') - self.assertEqual( - res['services'][0]['service-a-end']['service-rate'], 400) - self.assertEqual( - res['services'][0]['service-a-end']['otu-service-rate'], 'org-openroadm-otn-common-types:OTUCn') - time.sleep(2) - self.assertEqual( - res['services'][0]['service-z-end']['otu-service-rate'], 'org-openroadm-otn-common-types:OTUCn') - time.sleep(2) + def test_013_get_OTUC4_service1(self): + response = test_utils.get_ordm_serv_list_attr_request( + "services", "service1-OTUC4") + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(response['services'][0]['administrative-state'], 'inService') + self.assertEqual(response['services'][0]['service-name'], 'service1-OTUC4') + self.assertEqual(response['services'][0]['connection-type'], 'infrastructure') + self.assertEqual(response['services'][0]['lifecycle-state'], 'planned') + self.assertEqual(response['services'][0]['service-layer'], 'wdm') + self.assertEqual(response['services'][0]['service-a-end']['service-rate'], 400) + self.assertEqual(response['services'][0]['service-a-end']['otu-service-rate'], + 'org-openroadm-otn-common-types:OTUCn') + self.assertEqual(response['services'][0]['service-z-end']['otu-service-rate'], + 'org-openroadm-otn-common-types:OTUCn') # Check correct configuration of devices - def test_14_check_interface_otsi_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR2-NETWORK1-755:768") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + def test_014_check_interface_otsi_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-755:768') + self.assertEqual(response['status_code'], requests.codes.ok) self.assertDictEqual(dict({'name': 'XPDR2-NETWORK1-755:768', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/2-PLUG-NET', 'type': 'org-openroadm-interfaces:otsi', 'supporting-port': 'L1' - }, **res['interface'][0]), - res['interface'][0]) - + }, **response['interface'][0]), + response['interface'][0]) self.assertDictEqual( dict({'frequency': 196.0812, 'otsi-rate': 'org-openroadm-common-optical-channel-types:R400G-otsi', 'transmit-power': -5, 'modulation-format': 'dp-qam16'}, - **res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']), - res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']) - - def test_15_check_interface_OTSI_GROUP_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR2-NETWORK1-OTSIGROUP-400G") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + **response['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']), + response['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']) + + def test_015_check_interface_OTSI_GROUP_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-OTSIGROUP-400G') + self.assertEqual(response['status_code'], requests.codes.ok) input_dict_1 = {'name': 'XPDR2-NETWORK1-OTSIGROUP-400G', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/2-PLUG-NET', @@ -317,18 +302,17 @@ class TransportPCEtesting(unittest.TestCase): input_dict_2 = {"group-id": 1, "group-rate": "org-openroadm-common-optical-channel-types:R400G-otsi" } - self.assertDictEqual(dict(input_dict_1, **res['interface'][0]), - res['interface'][0]) - self.assertDictEqual(dict(input_dict_2, **res['interface'][0] + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) + self.assertDictEqual(dict(input_dict_2, **response['interface'][0] ['org-openroadm-otsi-group-interfaces:otsi-group']), - res['interface'][0] + response['interface'][0] ['org-openroadm-otsi-group-interfaces:otsi-group']) - def test_16_check_interface_OTUC4_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR2-NETWORK1-OTUC4") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + def test_016_check_interface_OTUC4_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-OTUC4') + self.assertEqual(response['status_code'], requests.codes.ok) input_dict_1 = {'name': 'XPDR2-NETWORK1-OTUC4', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/2-PLUG-NET', @@ -345,36 +329,34 @@ class TransportPCEtesting(unittest.TestCase): 'degm-intervals': 2, 'otucn-n-rate': 4 } - self.assertDictEqual(dict(input_dict_1, **res['interface'][0]), - res['interface'][0]) - self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-otn-otu-interfaces:otu']), - res['interface'][0] + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) + self.assertDictEqual(dict(input_dict_2, **response['interface'][0]['org-openroadm-otn-otu-interfaces:otu']), + response['interface'][0] ['org-openroadm-otn-otu-interfaces:otu']) - def test_17_check_interface_otsi_xpdrc2(self): - response = test_utils.check_netconf_node_request( - "XPDR-C2", "interface/XPDR2-NETWORK1-755:768") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + def test_017_check_interface_otsi_xpdrc2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-C2', 'interface', 'XPDR2-NETWORK1-755:768') + self.assertEqual(response['status_code'], requests.codes.ok) self.assertDictEqual(dict({'name': 'XPDR2-NETWORK1-755:768', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/2-PLUG-NET', 'type': 'org-openroadm-interfaces:otsi', 'supporting-port': 'L1' - }, **res['interface'][0]), - res['interface'][0]) + }, **response['interface'][0]), + response['interface'][0]) self.assertDictEqual( dict({'frequency': 196.0812, 'otsi-rate': 'org-openroadm-common-optical-channel-types:R400G-otsi', 'transmit-power': -5, 'modulation-format': 'dp-qam16'}, - **res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']), - res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']) - - def test_18_check_interface_OTSI_GROUP_xpdrc2(self): - response = test_utils.check_netconf_node_request( - "XPDR-C2", "interface/XPDR2-NETWORK1-OTSIGROUP-400G") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + **response['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']), + response['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']) + + def test_018_check_interface_OTSI_GROUP_xpdrc2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-C2', 'interface', 'XPDR2-NETWORK1-OTSIGROUP-400G') + self.assertEqual(response['status_code'], requests.codes.ok) input_dict_1 = {'name': 'XPDR2-NETWORK1-OTSIGROUP-400G', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/2-PLUG-NET', @@ -385,18 +367,17 @@ class TransportPCEtesting(unittest.TestCase): input_dict_2 = {"group-id": 1, "group-rate": "org-openroadm-common-optical-channel-types:R400G-otsi" } - self.assertDictEqual(dict(input_dict_1, **res['interface'][0]), - res['interface'][0]) - self.assertDictEqual(dict(input_dict_2, **res['interface'][0] + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) + self.assertDictEqual(dict(input_dict_2, **response['interface'][0] ['org-openroadm-otsi-group-interfaces:otsi-group']), - res['interface'][0] + response['interface'][0] ['org-openroadm-otsi-group-interfaces:otsi-group']) - def test_19_check_interface_OTUC4_xpdrc2(self): - response = test_utils.check_netconf_node_request( - "XPDR-C2", "interface/XPDR2-NETWORK1-OTUC4") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + def test_019_check_interface_OTUC4_xpdrc2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-C2', 'interface', 'XPDR2-NETWORK1-OTUC4') + self.assertEqual(response['status_code'], requests.codes.ok) input_dict_1 = {'name': 'XPDR1-NETWORK1-OTUC4', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/2-PLUG-NET', @@ -414,100 +395,80 @@ class TransportPCEtesting(unittest.TestCase): 'otucn-n-rate': 4 } - self.assertDictEqual(dict(input_dict_1, **res['interface'][0]), - res['interface'][0]) + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) - self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-otn-otu-interfaces:otu']), - res['interface'][0] + self.assertDictEqual(dict(input_dict_2, **response['interface'][0]['org-openroadm-otn-otu-interfaces:otu']), + response['interface'][0] ['org-openroadm-otn-otu-interfaces:otu']) - def test_20_check_no_interface_ODUC4_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR2-NETWORK1-ODUC4") - 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']) - - def test_21_check_openroadm_topo_xpdra2(self): - response = test_utils.get_ordm_topo_request("node/XPDR-A2-XPDR2") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - ele = res['node'][0]['ietf-network-topology:termination-point'][0] + def test_020_check_no_interface_ODUC4_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-ODUC4') + self.assertEqual(response['status_code'], requests.codes.conflict) + + def test_021_check_openroadm_topo_xpdra2(self): + response = test_utils.get_ietf_network_node_request('openroadm-topology', 'XPDR-A2-XPDR2', 'config') + self.assertEqual(response['status_code'], requests.codes.ok) + ele = response['node']['ietf-network-topology:termination-point'][0] self.assertEqual('XPDR2-NETWORK1', ele['tp-id']) - self.assertEqual({'frequency': 196.08125, - 'width': 75}, - ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']) - time.sleep(3) - - def test_22_check_otn_topo_OTUC4_links(self): - response = test_utils.get_otn_topo_request() - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - nb_links = len(res['network'][0]['ietf-network-topology:link']) - self.assertEqual(nb_links, 2) + self.assertEqual( + 196.08125, + float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['frequency'])) + self.assertEqual( + 75.0, + float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['width'])) + + def test_022_check_otn_topo_OTUC4_links(self): + response = test_utils.get_ietf_network_request('otn-topology', 'config') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 2) listLinkId = ['OTUC4-XPDR-A2-XPDR2-XPDR2-NETWORK1toXPDR-C2-XPDR2-XPDR2-NETWORK1', 'OTUC4-XPDR-C2-XPDR2-XPDR2-NETWORK1toXPDR-A2-XPDR2-XPDR2-NETWORK1'] - for link in res['network'][0]['ietf-network-topology:link']: + for link in response['network'][0]['ietf-network-topology:link']: self.assertIn(link['link-id'], listLinkId) - self.assertEqual( - link['transportpce-topology:otn-link-type'], 'OTUC4') - self.assertEqual( - link['org-openroadm-common-network:link-type'], 'OTN-LINK') - self.assertEqual( - link['org-openroadm-otn-network-topology:available-bandwidth'], 400000) - self.assertEqual( - link['org-openroadm-otn-network-topology:used-bandwidth'], 0) - self.assertIn( - link['org-openroadm-common-network:opposite-link'], listLinkId) - -# test service-create for ODU4 service from xpdra2 to xpdrc2 - def test_23_create_ODUC4_service(self): - self.cr_serv_sample_data["input"]["service-name"] = "service1-ODUC4" - self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "ODU" - del self.cr_serv_sample_data["input"]["service-a-end"]["otu-service-rate"] - self.cr_serv_sample_data["input"]["service-a-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODUCn" - self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "ODU" - del self.cr_serv_sample_data["input"]["service-z-end"]["otu-service-rate"] - self.cr_serv_sample_data["input"]["service-z-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODUCn" - - response = test_utils.service_create_request(self.cr_serv_sample_data) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + self.assertEqual(link['transportpce-networkutils:otn-link-type'], 'OTUC4') + self.assertEqual(link['org-openroadm-common-network:link-type'], 'OTN-LINK') + self.assertEqual(link['org-openroadm-otn-network-topology:available-bandwidth'], 400000) + self.assertEqual(link['org-openroadm-otn-network-topology:used-bandwidth'], 0) + self.assertIn(link['org-openroadm-common-network:opposite-link'], listLinkId) + + # test service-create for ODU4 service from xpdra2 to xpdrc2 + def test_023_create_ODUC4_service(self): + self.cr_serv_input_data["service-name"] = "service1-ODUC4" + self.cr_serv_input_data["service-a-end"]["service-format"] = "ODU" + del self.cr_serv_input_data["service-a-end"]["otu-service-rate"] + self.cr_serv_input_data["service-a-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODUCn" + self.cr_serv_input_data["service-z-end"]["service-format"] = "ODU" + del self.cr_serv_input_data["service-z-end"]["otu-service-rate"] + self.cr_serv_input_data["service-z-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODUCn" + response = test_utils.transportpce_api_rpc_request( + 'org-openroadm-service', 'service-create', + self.cr_serv_input_data) + self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('PCE calculation in progress', - res['output']['configuration-response-common']['response-message']) + response['output']['configuration-response-common']['response-message']) time.sleep(self.WAITING) - def test_24_get_ODUC4_service1(self): - response = test_utils.get_service_list_request( - "services/service1-ODUC4") - 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'], 'service1-ODUC4') - self.assertEqual( - res['services'][0]['connection-type'], 'infrastructure') - self.assertEqual( - res['services'][0]['lifecycle-state'], 'planned') - self.assertEqual( - res['services'][0]['service-layer'], 'wdm') - self.assertEqual( - res['services'][0]['service-a-end']['service-rate'], 400) - self.assertEqual( - res['services'][0]['service-a-end']['odu-service-rate'], 'org-openroadm-otn-common-types:ODUCn') - self.assertEqual( - res['services'][0]['service-z-end']['odu-service-rate'], 'org-openroadm-otn-common-types:ODUCn') - time.sleep(2) - - def test_25_check_interface_ODUC4_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR2-NETWORK1-ODUC4") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + def test_024_get_ODUC4_service1(self): + response = test_utils.get_ordm_serv_list_attr_request( + "services", "service1-ODUC4") + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(response['services'][0]['service-name'], 'service1-ODUC4') + self.assertEqual(response['services'][0]['administrative-state'], 'inService') + self.assertEqual(response['services'][0]['connection-type'], 'infrastructure') + self.assertEqual(response['services'][0]['lifecycle-state'], 'planned') + self.assertEqual(response['services'][0]['service-layer'], 'wdm') + self.assertEqual(response['services'][0]['service-a-end']['service-rate'], 400) + self.assertEqual(response['services'][0]['service-a-end']['odu-service-rate'], + 'org-openroadm-otn-common-types:ODUCn') + self.assertEqual(response['services'][0]['service-z-end']['odu-service-rate'], + 'org-openroadm-otn-common-types:ODUCn') + + def test_025_check_interface_ODUC4_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-ODUC4') + self.assertEqual(response['status_code'], requests.codes.ok) input_dict_1 = {'name': 'XPDR2-NETWORK1-ODUC4', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/2-PLUG-NET', @@ -522,19 +483,18 @@ class TransportPCEtesting(unittest.TestCase): 'tx-dapi': 'Nmbu2MNHvc4=', 'tx-sapi': 'LY9PxYJqUbw='} - self.assertDictEqual(dict(input_dict_1, **res['interface'][0]), - res['interface'][0]) - self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), - res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) + self.assertDictEqual(dict(input_dict_2, **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) self.assertDictEqual( {'payload-type': '22', 'exp-payload-type': '22'}, - res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) - def test_26_check_interface_ODUC4_xpdrc2(self): - response = test_utils.check_netconf_node_request( - "XPDR-C2", "interface/XPDR2-NETWORK1-ODUC4") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + def test_026_check_interface_ODUC4_xpdrc2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-C2', 'interface', 'XPDR2-NETWORK1-ODUC4') + self.assertEqual(response['status_code'], requests.codes.ok) input_dict_1 = {'name': 'XPDR2-NETWORK1-ODUC4', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/2-PLUG-NET', @@ -549,21 +509,19 @@ class TransportPCEtesting(unittest.TestCase): 'expected-sapi': 'LY9PxYJqUbw=', 'expected-dapi': 'LY9PxYJqUbw=' } - self.assertDictEqual(dict(input_dict_1, **res['interface'][0]), - res['interface'][0]) - self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), - res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) + self.assertDictEqual(dict(input_dict_2, **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) self.assertDictEqual( {'payload-type': '22', 'exp-payload-type': '22'}, - res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) - - def test_27_check_otn_topo_links(self): - response = test_utils.get_otn_topo_request() - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - nb_links = len(res['network'][0]['ietf-network-topology:link']) - self.assertEqual(nb_links, 4) - for link in res['network'][0]['ietf-network-topology:link']: + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) + + def test_027_check_otn_topo_links(self): + response = test_utils.get_ietf_network_request('otn-topology', 'config') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 4) + for link in response['network'][0]['ietf-network-topology:link']: linkId = link['link-id'] if (linkId in ('OTUC4-XPDR-A2-XPDR2-XPDR2-NETWORK1toXPDR-C2-XPDR2-XPDR2-NETWORK1', 'OTUC4-XPDR-C2-XPDR2-XPDR2-NETWORK1toXPDR-A2-XPDR2-XPDR2-NETWORK1')): @@ -578,7 +536,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual( link['org-openroadm-otn-network-topology:used-bandwidth'], 0) self.assertEqual( - link['transportpce-topology:otn-link-type'], 'ODUC4') + link['transportpce-networkutils:otn-link-type'], 'ODUC4') self.assertEqual( link['org-openroadm-common-network:link-type'], 'OTN-LINK') self.assertIn(link['org-openroadm-common-network:opposite-link'], @@ -587,10 +545,10 @@ class TransportPCEtesting(unittest.TestCase): else: self.fail("this link should not exist") - def test_28_check_otn_topo_tp(self): - response = test_utils.get_otn_topo_request() - res = response.json() - for node in res['network'][0]['node']: + def test_028_check_otn_topo_tp(self): + response = test_utils.get_ietf_network_request('otn-topology', 'config') + self.assertEqual(response['status_code'], requests.codes.ok) + for node in response['network'][0]['node']: if node['node-id'] in ('XPDR-A2-XPDR2', 'XPDR-C2-XPDR2'): tpList = node['ietf-network-topology:termination-point'] for tp in tpList: @@ -602,47 +560,41 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(xpdrTpPortConAt['odtu-tpn-pool'][0]['odtu-type'], 'org-openroadm-otn-common-types:ODTU4.ts-Allocated') -# test service-create for 100GE service 1 from xpdra2 to xpdrc2 - def test_29_create_100GE_service_1(self): - self.cr_serv_sample_data["input"]["service-name"] = "service-100GE" - self.cr_serv_sample_data["input"]["connection-type"] = "service" - self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "100" - self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "Ethernet" - del self.cr_serv_sample_data["input"]["service-a-end"]["odu-service-rate"] - self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-name"] = "XPDR2-CLIENT1" - self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-name"] = "XPDR2-CLIENT1" - self.cr_serv_sample_data["input"]["service-z-end"]["service-rate"] = "100" - self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "Ethernet" - del self.cr_serv_sample_data["input"]["service-z-end"]["odu-service-rate"] - self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-name"] = "XPDR2-CLIENT1" - self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-name"] = "XPDR2-CLIENT1" - response = test_utils.service_create_request(self.cr_serv_sample_data) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + # test service-create for 100GE service 1 from xpdra2 to xpdrc2 + def test_029_create_100GE_service_1(self): + self.cr_serv_input_data["service-name"] = "service-100GE" + self.cr_serv_input_data["connection-type"] = "service" + self.cr_serv_input_data["service-a-end"]["service-rate"] = "100" + self.cr_serv_input_data["service-a-end"]["service-format"] = "Ethernet" + del self.cr_serv_input_data["service-a-end"]["odu-service-rate"] + self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1" + self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1" + self.cr_serv_input_data["service-z-end"]["service-rate"] = "100" + self.cr_serv_input_data["service-z-end"]["service-format"] = "Ethernet" + del self.cr_serv_input_data["service-z-end"]["odu-service-rate"] + self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1" + self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1" + response = test_utils.transportpce_api_rpc_request( + 'org-openroadm-service', 'service-create', + self.cr_serv_input_data) + self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('PCE calculation in progress', - res['output']['configuration-response-common']['response-message']) + response['output']['configuration-response-common']['response-message']) time.sleep(self.WAITING) - def test_30_get_100GE_service_1(self): - response = test_utils.get_service_list_request( - "services/service-100GE") - 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'], 'service-100GE') - self.assertEqual( - res['services'][0]['connection-type'], 'service') - self.assertEqual( - res['services'][0]['lifecycle-state'], 'planned') - time.sleep(2) - - def test_31_check_interface_100GE_CLIENT_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR2-CLIENT1-ETHERNET-100G") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + def test_030_get_100GE_service_1(self): + response = test_utils.get_ordm_serv_list_attr_request( + "services", "service-100GE") + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(response['services'][0]['administrative-state'], 'inService') + self.assertEqual(response['services'][0]['service-name'], 'service-100GE') + self.assertEqual(response['services'][0]['connection-type'], 'service') + self.assertEqual(response['services'][0]['lifecycle-state'], 'planned') + + def test_031_check_interface_100GE_CLIENT_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR2-CLIENT1-ETHERNET-100G') + self.assertEqual(response['status_code'], requests.codes.ok) input_dict_1 = {'name': 'XPDR2-CLIENT1-ETHERNET-100G', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT', @@ -650,17 +602,17 @@ class TransportPCEtesting(unittest.TestCase): 'supporting-port': 'C1' } input_dict_2 = {'speed': 100000} - self.assertDictEqual(dict(input_dict_1, **res['interface'][0]), - res['interface'][0]) - self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']), - res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']) - - def test_32_check_interface_ODU4_CLIENT_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR2-CLIENT1-ODU4-service-100GE") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4-service-100GE', + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) + self.assertDictEqual( + dict(input_dict_2, **response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']), + response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']) + + def test_032_check_interface_ODU4_CLIENT_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR2-CLIENT1-ODU4:service-100GE') + self.assertEqual(response['status_code'], requests.codes.ok) + input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4:service-100GE', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT', 'supporting-interface-list': 'XPDR2-CLIENT1-ETHERNET-100G', @@ -671,21 +623,20 @@ class TransportPCEtesting(unittest.TestCase): 'rate': 'org-openroadm-otn-common-types:ODU4', 'monitoring-mode': 'terminated'} - self.assertDictEqual(dict(input_dict_1, **res['interface'][0]), - res['interface'][0]) + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) self.assertDictEqual(dict(input_dict_2, - **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), - res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) + **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) self.assertDictEqual( {'payload-type': '07', 'exp-payload-type': '07'}, - res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) - - def test_33_check_interface_ODU4_NETWORK_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR2-NETWORK1-ODU4-service-100GE") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4-service-100GE', + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) + + def test_033_check_interface_ODU4_NETWORK_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-ODU4:service-100GE') + self.assertEqual(response['status_code'], requests.codes.ok) + input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4:service-100GE', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/2-PLUG-NET', 'supporting-interface-list': 'XPDR2-NETWORK1-ODUC4', @@ -697,44 +648,41 @@ class TransportPCEtesting(unittest.TestCase): 'monitoring-mode': 'not-terminated'} input_dict_3 = {'trib-port-number': 1} - self.assertDictEqual(dict(input_dict_1, **res['interface'][0]), - res['interface'][0]) + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) self.assertDictEqual(dict(input_dict_2, - **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), - res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) + **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) self.assertDictEqual(dict(input_dict_3, - **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][ + **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][ 'parent-odu-allocation']), - res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']) - self.assertIn('1.1', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'] + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']) + self.assertIn('1.1', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'] ['opucn-trib-slots']) - self.assertIn('1.20', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'] + self.assertIn('1.20', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'] ['opucn-trib-slots']) - def test_34_check_ODU4_connection_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", - "odu-connection/XPDR2-CLIENT1-ODU4-service-100GE-x-XPDR2-NETWORK1-ODU4-service-100GE") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + def test_034_check_ODU4_connection_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'odu-connection', 'XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4') + self.assertEqual(response['status_code'], requests.codes.ok) input_dict_1 = { 'connection-name': - 'XPDR2-CLIENT1-ODU4-service-100GE-x-XPDR2-NETWORK1-ODU4-service-100GE', + 'XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4', 'direction': 'bidirectional' } - self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]), - res['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4-service-100GE'}, - res['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4-service-100GE'}, - res['odu-connection'][0]['source']) - - def test_35_check_interface_100GE_CLIENT_xpdrc2(self): - response = test_utils.check_netconf_node_request( - "XPDR-C2", "interface/XPDR2-CLIENT1-ETHERNET-100G") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]), + response['odu-connection'][0]) + self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4:service-100GE'}, + response['odu-connection'][0]['destination']) + self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4:service-100GE'}, + response['odu-connection'][0]['source']) + + def test_035_check_interface_100GE_CLIENT_xpdrc2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-C2', 'interface', 'XPDR2-CLIENT1-ETHERNET-100G') + self.assertEqual(response['status_code'], requests.codes.ok) input_dict_1 = {'name': 'XPDR2-CLIENT1-ETHERNET-100G', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT', @@ -742,17 +690,17 @@ class TransportPCEtesting(unittest.TestCase): 'supporting-port': 'C1' } input_dict_2 = {'speed': 100000} - self.assertDictEqual(dict(input_dict_1, **res['interface'][0]), - res['interface'][0]) - self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']), - res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']) - - def test_36_check_interface_ODU4_CLIENT_xpdrc2(self): - response = test_utils.check_netconf_node_request( - "XPDR-C2", "interface/XPDR2-CLIENT1-ODU4-service-100GE") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4-service-100GE', + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) + self.assertDictEqual( + dict(input_dict_2, **response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']), + response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']) + + def test_036_check_interface_ODU4_CLIENT_xpdrc2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-C2', 'interface', 'XPDR2-CLIENT1-ODU4:service-100GE') + self.assertEqual(response['status_code'], requests.codes.ok) + input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4:service-100GE', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT', 'supporting-interface-list': 'XPDR2-CLIENT1-ETHERNET-100G', @@ -763,21 +711,20 @@ class TransportPCEtesting(unittest.TestCase): 'rate': 'org-openroadm-otn-common-types:ODU4', 'monitoring-mode': 'terminated'} - self.assertDictEqual(dict(input_dict_1, **res['interface'][0]), - res['interface'][0]) + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) self.assertDictEqual(dict(input_dict_2, - **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), - res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) + **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) self.assertDictEqual( {'payload-type': '07', 'exp-payload-type': '07'}, - res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) - - def test_37_check_interface_ODU4_NETWORK_xpdrc2(self): - response = test_utils.check_netconf_node_request( - "XPDR-C2", "interface/XPDR2-NETWORK1-ODU4-service-100GE") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4-service-100GE', + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) + + def test_037_check_interface_ODU4_NETWORK_xpdrc2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-C2', 'interface', 'XPDR2-NETWORK1-ODU4:service-100GE') + self.assertEqual(response['status_code'], requests.codes.ok) + input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4:service-100GE', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/2-PLUG-NET', 'supporting-interface-list': 'XPDR2-NETWORK1-ODUC4', @@ -790,51 +737,47 @@ class TransportPCEtesting(unittest.TestCase): input_dict_3 = {'trib-port-number': 1} - self.assertDictEqual(dict(input_dict_1, **res['interface'][0]), - res['interface'][0]) + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) self.assertDictEqual(dict(input_dict_2, - **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), - res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) + **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) self.assertDictEqual(dict(input_dict_3, - **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][ + **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][ 'parent-odu-allocation']), - res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][ + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][ 'parent-odu-allocation']) self.assertIn('1.1', - res['interface'][0][ + response['interface'][0][ 'org-openroadm-otn-odu-interfaces:odu'][ 'parent-odu-allocation']['opucn-trib-slots']) self.assertIn('1.20', - res['interface'][0][ + response['interface'][0][ 'org-openroadm-otn-odu-interfaces:odu'][ 'parent-odu-allocation']['opucn-trib-slots']) - def test_38_check_ODU4_connection_xpdrc2(self): - response = test_utils.check_netconf_node_request( - "XPDR-C2", - "odu-connection/XPDR2-CLIENT1-ODU4-service-100GE-x-XPDR2-NETWORK1-ODU4-service-100GE") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + def test_038_check_ODU4_connection_xpdrc2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-C2', 'odu-connection', 'XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4') + self.assertEqual(response['status_code'], requests.codes.ok) input_dict_1 = { 'connection-name': - 'XPDR2-CLIENT1-ODU4-service-100GE-x-XPDR2-NETWORK1-ODU4-service-100GE', + 'XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4', 'direction': 'bidirectional' } - self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]), - res['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4-service-100GE'}, - res['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4-service-100GE'}, - res['odu-connection'][0]['source']) - - def test_39_check_otn_topo_links(self): - response = test_utils.get_otn_topo_request() - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - nb_links = len(res['network'][0]['ietf-network-topology:link']) - self.assertEqual(nb_links, 4) - for link in res['network'][0]['ietf-network-topology:link']: + self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]), + response['odu-connection'][0]) + self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4:service-100GE'}, + response['odu-connection'][0]['destination']) + self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4:service-100GE'}, + response['odu-connection'][0]['source']) + + def test_039_check_otn_topo_links(self): + response = test_utils.get_ietf_network_request('otn-topology', 'config') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 4) + for link in response['network'][0]['ietf-network-topology:link']: linkId = link['link-id'] if (linkId in ('ODUC4-XPDR-A2-XPDR2-XPDR2-NETWORK1toXPDR-C2-XPDR2-XPDR2-NETWORK1', 'ODUC4-XPDR-C2-XPDR2-XPDR2-NETWORK1toXPDR-A2-XPDR2-XPDR2-NETWORK1')): @@ -843,10 +786,10 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual( link['org-openroadm-otn-network-topology:used-bandwidth'], 100000) - def test_40_check_otn_topo_tp(self): - response = test_utils.get_otn_topo_request() - res = response.json() - for node in res['network'][0]['node']: + def test_040_check_otn_topo_tp(self): + response = test_utils.get_ietf_network_request('otn-topology', 'config') + self.assertEqual(response['status_code'], requests.codes.ok) + for node in response['network'][0]['node']: if node['node-id'] in ('XPDR-A2-XPDR2', 'XPDR-C2-XPDR2'): tpList = node['ietf-network-topology:termination-point'] for tp in tpList: @@ -861,54 +804,45 @@ class TransportPCEtesting(unittest.TestCase): self.assertNotIn( 1, xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool']) -# test service-create for 100GE service 2 from xpdra2 to xpdrc2 - def test_41_create_100GE_service_2(self): - self.cr_serv_sample_data["input"]["service-name"] = "service-100GE2" - self.cr_serv_sample_data["input"]["connection-type"] = "service" - self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "100" - self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "Ethernet" - self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-name"] = "XPDR2-CLIENT2" - self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-name"] = "XPDR2-CLIENT2" - self.cr_serv_sample_data["input"]["service-z-end"]["service-rate"] = "100" - self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "Ethernet" - self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-name"] = "XPDR2-CLIENT2" - self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-name"] = "XPDR2-CLIENT2" - response = test_utils.service_create_request(self.cr_serv_sample_data) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + # test service-create for 100GE service 2 from xpdra2 to xpdrc2 + def test_041_create_100GE_service_2(self): + self.cr_serv_input_data["service-name"] = "service-100GE2" + self.cr_serv_input_data["connection-type"] = "service" + self.cr_serv_input_data["service-a-end"]["service-rate"] = "100" + self.cr_serv_input_data["service-a-end"]["service-format"] = "Ethernet" + self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT2" + self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT2" + self.cr_serv_input_data["service-z-end"]["service-rate"] = "100" + self.cr_serv_input_data["service-z-end"]["service-format"] = "Ethernet" + self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT2" + self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT2" + response = test_utils.transportpce_api_rpc_request( + 'org-openroadm-service', 'service-create', + self.cr_serv_input_data) + self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('PCE calculation in progress', - res['output']['configuration-response-common']['response-message']) + response['output']['configuration-response-common']['response-message']) time.sleep(self.WAITING) - def test_42_get_100GE_service_2(self): - response = test_utils.get_service_list_request( - "services/service-100GE2") - 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'], 'service-100GE2') - self.assertEqual( - res['services'][0]['connection-type'], 'service') - self.assertEqual( - res['services'][0]['lifecycle-state'], 'planned') - time.sleep(2) - - def test_43_check_service_list(self): - response = test_utils.get_service_list_request("") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual(len(res['service-list']['services']), 4) - time.sleep(2) - - def test_44_check_otn_topo_links(self): - response = test_utils.get_otn_topo_request() - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - nb_links = len(res['network'][0]['ietf-network-topology:link']) - self.assertEqual(nb_links, 4) - for link in res['network'][0]['ietf-network-topology:link']: + def test_042_get_100GE_service_2(self): + response = test_utils.get_ordm_serv_list_attr_request("services", "service-100GE2") + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(response['services'][0]['administrative-state'], 'inService') + self.assertEqual(response['services'][0]['service-name'], 'service-100GE2') + self.assertEqual(response['services'][0]['connection-type'], 'service') + self.assertEqual(response['services'][0]['lifecycle-state'], 'planned') + time.sleep(1) + + def test_043_check_service_list(self): + response = test_utils.get_ordm_serv_list_request() + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(len(response['service-list']['services']), 4) + + def test_044_check_otn_topo_links(self): + response = test_utils.get_ietf_network_request('otn-topology', 'config') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 4) + for link in response['network'][0]['ietf-network-topology:link']: linkId = link['link-id'] if (linkId in ('ODUC4-XPDR-A2-XPDR2-XPDR2-NETWORK1toXPDR-C2-XPDR2-XPDR2-NETWORK1', 'ODUC4-XPDR-C2-XPDR2-XPDR2-NETWORK1toXPDR-A2-XPDR2-XPDR2-NETWORK1')): @@ -917,10 +851,10 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual( link['org-openroadm-otn-network-topology:used-bandwidth'], 200000) - def test_45_check_otn_topo_tp(self): - response = test_utils.get_otn_topo_request() - res = response.json() - for node in res['network'][0]['node']: + def test_045_check_otn_topo_tp(self): + response = test_utils.get_ietf_network_request('otn-topology', 'config') + self.assertEqual(response['status_code'], requests.codes.ok) + for node in response['network'][0]['node']: if node['node-id'] in ('XPDR-A2-XPDR2', 'XPDR-C2-XPDR2'): tpList = node['ietf-network-topology:termination-point'] for tp in tpList: @@ -935,58 +869,56 @@ class TransportPCEtesting(unittest.TestCase): self.assertNotIn( 2, xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool']) - def test_46_delete_100GE_service_2(self): - response = test_utils.service_delete_request("service-100GE2") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + def test_046_delete_100GE_service_2(self): + self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service-100GE2" + response = test_utils.transportpce_api_rpc_request( + 'org-openroadm-service', 'service-delete', + self.del_serv_input_data) + self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Renderer service delete in progress', - res['output']['configuration-response-common']['response-message']) + response['output']['configuration-response-common']['response-message']) time.sleep(self.WAITING) - def test_47_delete_100GE_service_1(self): - response = test_utils.service_delete_request("service-100GE") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + def test_047_delete_100GE_service_1(self): + self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service-100GE" + response = test_utils.transportpce_api_rpc_request( + 'org-openroadm-service', 'service-delete', + self.del_serv_input_data) + self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Renderer service delete in progress', - res['output']['configuration-response-common']['response-message']) + response['output']['configuration-response-common']['response-message']) time.sleep(self.WAITING) - def test_48_check_service_list(self): - response = test_utils.get_service_list_request("") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual(len(res['service-list']['services']), 2) - time.sleep(2) - - def test_49_check_no_ODU4_connection_xpdra2(self): - response = test_utils.check_netconf_node_request("XPDR-A2", "") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertNotIn(['odu-connection'][0], res['org-openroadm-device']) - time.sleep(1) - - def test_50_check_no_interface_ODU4_NETWORK_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR2-NETWORK1-ODU4-service-100GE") - self.assertEqual(response.status_code, requests.codes.conflict) - - def test_51_check_no_interface_ODU4_CLIENT_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR2-CLIENT1-ODU4-service-100GE") - self.assertEqual(response.status_code, requests.codes.conflict) - - def test_52_check_no_interface_100GE_CLIENT_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR2-CLIENT1-ETHERNET-100G") - self.assertEqual(response.status_code, requests.codes.conflict) - - def test_53_check_otn_topo_links(self): - response = test_utils.get_otn_topo_request() - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - nb_links = len(res['network'][0]['ietf-network-topology:link']) - self.assertEqual(nb_links, 4) - for link in res['network'][0]['ietf-network-topology:link']: + def test_048_check_service_list(self): + response = test_utils.get_ordm_serv_list_request() + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(len(response['service-list']['services']), 2) + + def test_049_check_no_ODU4_connection_xpdra2(self): + response = test_utils.check_node_request("XPDR-A2") + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertNotIn(['odu-connection'][0], response['org-openroadm-device']) + + def test_050_check_no_interface_ODU4_NETWORK_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-ODU4:service-100GE') + self.assertEqual(response['status_code'], requests.codes.conflict) + + def test_051_check_no_interface_ODU4_CLIENT_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR2-CLIENT1-ODU4:service-100GE') + self.assertEqual(response['status_code'], requests.codes.conflict) + + def test_052_check_no_interface_100GE_CLIENT_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR2-CLIENT1-ETHERNET-100G') + self.assertEqual(response['status_code'], requests.codes.conflict) + + def test_053_check_otn_topo_links(self): + response = test_utils.get_ietf_network_request('otn-topology', 'config') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 4) + for link in response['network'][0]['ietf-network-topology:link']: linkId = link['link-id'] if (linkId in ('ODUC4-XPDR-A2-XPDR2-XPDR2-NETWORK1toXPDR-C2-XPDR2-XPDR2-NETWORK1', 'ODUC4-XPDR-C2-XPDR2-XPDR2-NETWORK1toXPDR-A2-XPDR2-XPDR2-NETWORK1')): @@ -995,10 +927,10 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual( link['org-openroadm-otn-network-topology:used-bandwidth'], 0) - def test_54_check_otn_topo_tp(self): - response = test_utils.get_otn_topo_request() - res = response.json() - for node in res['network'][0]['node']: + def test_054_check_otn_topo_tp(self): + response = test_utils.get_ietf_network_request('otn-topology', 'config') + self.assertEqual(response['status_code'], requests.codes.ok) + for node in response['network'][0]['node']: if node['node-id'] in ('XPDR-A2-XPDR2', 'XPDR-C2-XPDR2'): tpList = node['ietf-network-topology:termination-point'] for tp in tpList: @@ -1008,33 +940,287 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual( len(xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool']), 4) - def test_55_delete_ODUC4_service(self): - response = test_utils.service_delete_request("service1-ODUC4") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + # test service-create for 100GE service 3 from xpdra2 client1 to xpdrc2 client2 + def test_055_create_100GE_service_3(self): + self.cr_serv_input_data["service-name"] = "service-100GE3" + self.cr_serv_input_data["connection-type"] = "service" + self.cr_serv_input_data["service-a-end"]["service-rate"] = "100" + self.cr_serv_input_data["service-a-end"]["service-format"] = "Ethernet" + self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1" + self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1" + self.cr_serv_input_data["service-z-end"]["service-rate"] = "100" + self.cr_serv_input_data["service-z-end"]["service-format"] = "Ethernet" + self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT2" + self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT2" + response = test_utils.transportpce_api_rpc_request( + 'org-openroadm-service', 'service-create', + self.cr_serv_input_data) + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertIn('PCE calculation in progress', + response['output']['configuration-response-common']['response-message']) + time.sleep(self.WAITING) + + def test_056_get_100GE_service_3(self): + response = test_utils.get_ordm_serv_list_attr_request("services", "service-100GE3") + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(response['services'][0]['administrative-state'], 'inService') + self.assertEqual(response['services'][0]['service-name'], 'service-100GE3') + self.assertEqual(response['services'][0]['connection-type'], 'service') + self.assertEqual(response['services'][0]['lifecycle-state'], 'planned') + time.sleep(1) + + def test_057_check_service_list(self): + response = test_utils.get_ordm_serv_list_request() + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(len(response['service-list']['services']), 3) + + def test_058_check_interface_100GE_CLIENT_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR2-CLIENT1-ETHERNET-100G') + self.assertEqual(response['status_code'], requests.codes.ok) + input_dict_1 = {'name': 'XPDR2-CLIENT1-ETHERNET-100G', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT', + 'type': 'org-openroadm-interfaces:ethernetCsmacd', + 'supporting-port': 'C1' + } + input_dict_2 = {'speed': 100000} + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) + self.assertDictEqual( + dict(input_dict_2, **response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']), + response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']) + + def test_059_check_interface_ODU4_CLIENT_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR2-CLIENT1-ODU4:service-100GE3') + self.assertEqual(response['status_code'], requests.codes.ok) + input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4:service-100GE3', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT', + 'supporting-interface-list': 'XPDR2-CLIENT1-ETHERNET-100GE3', + 'type': 'org-openroadm-interfaces:otnOdu', + 'supporting-port': 'C1'} + input_dict_2 = { + 'odu-function': 'org-openroadm-otn-common-types:ODU-TTP-CTP', + 'rate': 'org-openroadm-otn-common-types:ODU4', + 'monitoring-mode': 'terminated'} + + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) + self.assertDictEqual(dict(input_dict_2, + **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) + self.assertDictEqual( + {'payload-type': '07', 'exp-payload-type': '07'}, + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) + + def test_060_check_interface_ODU4_NETWORK_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-ODU4:service-100GE3') + self.assertEqual(response['status_code'], requests.codes.ok) + input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4:service-100GE3', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '1/2/2-PLUG-NET', + 'supporting-interface-list': 'XPDR2-NETWORK1-ODUC4', + 'type': 'org-openroadm-interfaces:otnOdu', + 'supporting-port': 'L1'} + input_dict_2 = { + 'odu-function': 'org-openroadm-otn-common-types:ODU-CTP', + 'rate': 'org-openroadm-otn-common-types:ODU4', + 'monitoring-mode': 'not-terminated'} + input_dict_3 = {'trib-port-number': 1} + + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) + self.assertDictEqual(dict(input_dict_2, + **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) + self.assertDictEqual(dict(input_dict_3, + **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][ + 'parent-odu-allocation']), + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']) + self.assertIn('1.1', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'] + ['opucn-trib-slots']) + self.assertIn('1.20', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'] + ['opucn-trib-slots']) + + def test_061_check_ODU4_connection_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'odu-connection', 'XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4') + self.assertEqual(response['status_code'], requests.codes.ok) + input_dict_1 = { + 'connection-name': + 'XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4', + 'direction': 'bidirectional' + } + + self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]), + response['odu-connection'][0]) + self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4:service-100GE3'}, + response['odu-connection'][0]['destination']) + self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4:service-100GE3'}, + response['odu-connection'][0]['source']) + + def test_062_check_interface_100GE_CLIENT_xpdrc2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-C2', 'interface', 'XPDR2-CLIENT2-ETHERNET-100G') + self.assertEqual(response['status_code'], requests.codes.ok) + input_dict_1 = {'name': 'XPDR2-CLIENT2-ETHERNET-100G', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '1/2/1/2-PLUG-CLIENT', + 'type': 'org-openroadm-interfaces:ethernetCsmacd', + 'supporting-port': 'C1' + } + input_dict_2 = {'speed': 100000} + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) + self.assertDictEqual( + dict(input_dict_2, **response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']), + response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']) + + def test_063_check_interface_ODU4_CLIENT_xpdrc2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-C2', 'interface', 'XPDR2-CLIENT2-ODU4:service-100GE3') + self.assertEqual(response['status_code'], requests.codes.ok) + input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4:service-100GE3', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '1/2/1/2-PLUG-CLIENT', + 'supporting-interface-list': 'XPDR2-CLIENT2-ETHERNET-100GE3', + 'type': 'org-openroadm-interfaces:otnOdu', + 'supporting-port': 'C1'} + input_dict_2 = { + 'odu-function': 'org-openroadm-otn-common-types:ODU-TTP-CTP', + 'rate': 'org-openroadm-otn-common-types:ODU4', + 'monitoring-mode': 'terminated'} + + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) + self.assertDictEqual(dict(input_dict_2, + **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) + self.assertDictEqual( + {'payload-type': '07', 'exp-payload-type': '07'}, + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) + + def test_064_check_interface_ODU4_NETWORK_xpdrc2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-C2', 'interface', 'XPDR2-NETWORK1-ODU4:service-100GE3') + self.assertEqual(response['status_code'], requests.codes.ok) + input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4:service-100GE3', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '1/2/2-PLUG-NET', + 'supporting-interface-list': 'XPDR2-NETWORK1-ODUC4', + 'type': 'org-openroadm-interfaces:otnOdu', + 'supporting-port': 'C1'} + input_dict_2 = { + 'odu-function': 'org-openroadm-otn-common-types:ODU-CTP', + 'rate': 'org-openroadm-otn-common-types:ODU4', + 'monitoring-mode': 'not-terminated'} + + input_dict_3 = {'trib-port-number': 1} + + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) + self.assertDictEqual(dict(input_dict_2, + **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) + self.assertDictEqual(dict(input_dict_3, + **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][ + 'parent-odu-allocation']), + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][ + 'parent-odu-allocation']) + self.assertIn('1.1', + response['interface'][0][ + 'org-openroadm-otn-odu-interfaces:odu'][ + 'parent-odu-allocation']['opucn-trib-slots']) + self.assertIn('1.20', + response['interface'][0][ + 'org-openroadm-otn-odu-interfaces:odu'][ + 'parent-odu-allocation']['opucn-trib-slots']) + + def test_065_check_ODU4_connection_xpdrc2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-C2', 'odu-connection', 'XPDR2-CLIENT2-ODU4-x-XPDR2-NETWORK1-ODU4') + self.assertEqual(response['status_code'], requests.codes.ok) + input_dict_1 = { + 'connection-name': + 'XPDR2-CLIENT2-ODU4-x-XPDR2-NETWORK1-ODU4', + 'direction': 'bidirectional' + } + + self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]), + response['odu-connection'][0]) + self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4:service-100GE3'}, + response['odu-connection'][0]['destination']) + self.assertDictEqual({'src-if': 'XPDR2-CLIENT2-ODU4:service-100GE3'}, + response['odu-connection'][0]['source']) + + def test_066_check_otn_topo_links(self): + response = test_utils.get_ietf_network_request('otn-topology', 'config') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 4) + for link in response['network'][0]['ietf-network-topology:link']: + linkId = link['link-id'] + if (linkId in ('ODUC4-XPDR-A2-XPDR2-XPDR2-NETWORK1toXPDR-C2-XPDR2-XPDR2-NETWORK1', + 'ODUC4-XPDR-C2-XPDR2-XPDR2-NETWORK1toXPDR-A2-XPDR2-XPDR2-NETWORK1')): + self.assertEqual( + link['org-openroadm-otn-network-topology:available-bandwidth'], 300000) + self.assertEqual( + link['org-openroadm-otn-network-topology:used-bandwidth'], 100000) + + def test_067_check_otn_topo_tp(self): + response = test_utils.get_ietf_network_request('otn-topology', 'config') + self.assertEqual(response['status_code'], requests.codes.ok) + for node in response['network'][0]['node']: + if node['node-id'] in ('XPDR-A2-XPDR2', 'XPDR-C2-XPDR2'): + tpList = node['ietf-network-topology:termination-point'] + for tp in tpList: + if tp['tp-id'] == 'XPDR2-NETWORK1': + xpdrTpPortConAt = tp['org-openroadm-otn-network-topology:xpdr-tp-port-connection-attributes'] + self.assertEqual(len(xpdrTpPortConAt['ts-pool']), 60) + tsPoolList = list(range(1, 20)) + self.assertNotIn(tsPoolList, xpdrTpPortConAt['ts-pool']) + self.assertEqual(len(xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool']), 3) + self.assertNotIn(1, xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool']) + + def test_068_delete_100GE_service_3(self): + self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service-100GE3" + response = test_utils.transportpce_api_rpc_request( + 'org-openroadm-service', 'service-delete', + self.del_serv_input_data) + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertIn('Renderer service delete in progress', + response['output']['configuration-response-common']['response-message']) + time.sleep(self.WAITING) + + def test_069_delete_ODUC4_service(self): + self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1-ODUC4" + response = test_utils.transportpce_api_rpc_request( + 'org-openroadm-service', 'service-delete', + self.del_serv_input_data) + self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Renderer service delete in progress', - res['output']['configuration-response-common']['response-message']) + response['output']['configuration-response-common']['response-message']) time.sleep(self.WAITING) - def test_56_check_service_list(self): - response = test_utils.get_service_list_request("") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual(len(res['service-list']['services']), 1) - time.sleep(2) - - def test_57_check_no_interface_ODU4_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR2-NETWORK1-ODUC4") - self.assertEqual(response.status_code, requests.codes.conflict) - - def test_58_check_otn_topo_links(self): - self.test_22_check_otn_topo_OTUC4_links() - - def test_59_check_otn_topo_tp(self): - response = test_utils.get_otn_topo_request() - res = response.json() - for node in res['network'][0]['node']: + def test_070_check_service_list(self): + response = test_utils.get_ordm_serv_list_request() + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(len(response['service-list']['services']), 1) + + def test_071_check_no_interface_ODU4_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-ODUC4') + self.assertEqual(response['status_code'], requests.codes.conflict) + + def test_072_check_otn_topo_links(self): + self.test_022_check_otn_topo_OTUC4_links() + + def test_073_check_otn_topo_tp(self): + response = test_utils.get_ietf_network_request('otn-topology', 'config') + self.assertEqual(response['status_code'], requests.codes.ok) + for node in response['network'][0]['node']: if node['node-id'] in ('XPDR-A2-XPDR2', 'XPDR-C2-XPDR2'): tpList = node['ietf-network-topology:termination-point'] for tp in tpList: @@ -1042,173 +1228,171 @@ class TransportPCEtesting(unittest.TestCase): self.assertNotIn('org-openroadm-otn-network-topology:xpdr-tp-port-connection-attributes', dict.keys(tp)) - def test_60_delete_OTUC4_service(self): - response = test_utils.service_delete_request("service1-OTUC4") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + def test_074_delete_OTUC4_service(self): + self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1-OTUC4" + response = test_utils.transportpce_api_rpc_request( + 'org-openroadm-service', 'service-delete', + self.del_serv_input_data) + self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Renderer service delete in progress', - res['output']['configuration-response-common']['response-message']) + response['output']['configuration-response-common']['response-message']) time.sleep(self.WAITING) - def test_61_get_no_service(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(1) - - def test_62_check_no_interface_OTUC4_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR2-NETWORK1-OTUC4") - self.assertEqual(response.status_code, requests.codes.conflict) - - def test_63_check_no_interface_OTSI_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR2-NETWORK1-755:768") - self.assertEqual(response.status_code, requests.codes.conflict) - - def test_64_check_no_interface_OTSIG_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR2-NETWORK1-OTSIGROUP-400G") - self.assertEqual(response.status_code, requests.codes.conflict) - - def test_65_getLinks_OtnTopology(self): - response = test_utils.get_otn_topo_request() - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertNotIn('ietf-network-topology:link', res['network'][0]) - - def test_66_check_openroadm_topo_xpdra2(self): - response = test_utils.get_ordm_topo_request("node/XPDR-A2-XPDR2") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - tp = res['node'][0]['ietf-network-topology:termination-point'][0] + def test_075_get_no_service(self): + response = test_utils.get_ordm_serv_list_request() + self.assertEqual(response['status_code'], requests.codes.conflict) + self.assertIn(response['service-list'], ( + { + "error-type": "protocol", + "error-tag": "data-missing", + "error-message": + "Request could not be completed because the relevant data " + "model content does not exist" + }, { + "error-type": "application", + "error-tag": "data-missing", + "error-message": + "Request could not be completed because the relevant data " + "model content does not exist" + })) + + def test_076_check_no_interface_OTUC4_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-OTUC4') + self.assertEqual(response['status_code'], requests.codes.conflict) + + def test_077_check_no_interface_OTSI_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-755:768') + self.assertEqual(response['status_code'], requests.codes.conflict) + + def test_078_check_no_interface_OTSIG_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-OTSIGROUP-400G') + self.assertEqual(response['status_code'], requests.codes.conflict) + + def test_079_getLinks_OtnTopology(self): + response = test_utils.get_ietf_network_request('otn-topology', 'config') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertNotIn('ietf-network-topology:link', response['network'][0]) + + def test_080_check_openroadm_topo_xpdra2(self): + response = test_utils.get_ietf_network_node_request('openroadm-topology', 'XPDR-A2-XPDR2', 'config') + self.assertEqual(response['status_code'], requests.codes.ok) + tp = response['node']['ietf-network-topology:termination-point'][0] self.assertEqual('XPDR2-NETWORK1', tp['tp-id']) self.assertNotIn('wavelength', dict.keys( tp['org-openroadm-network-topology:xpdr-network-attributes'])) - time.sleep(3) - def test_67_check_openroadm_topology(self): - response = test_utils.get_ordm_topo_request("") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - links = res['network'][0]['ietf-network-topology:link'] + def test_081_check_openroadm_topology(self): + response = test_utils.get_ietf_network_request('openroadm-topology', 'config') + self.assertEqual(response['status_code'], requests.codes.ok) + links = response['network'][0]['ietf-network-topology:link'] self.assertEqual(22, len(links), 'Topology should contain 22 links') - def test_68_connect_xprda2_1_N1_to_roadma_PP2(self): - response = test_utils.connect_xpdr_to_rdm_request("XPDR-A2", "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"]) - time.sleep(2) - - def test_69_connect_roadma_PP2_to_xpdra2_1_N1(self): - response = test_utils.connect_rdm_to_xpdr_request("XPDR-A2", "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"]) - time.sleep(2) - - def test_70_connect_xprdc2_1_N1_to_roadmc_PP2(self): - response = test_utils.connect_xpdr_to_rdm_request("XPDR-C2", "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"]) - time.sleep(2) - - def test_71_connect_roadmc_PP2_to_xpdrc2_1_N1(self): - response = test_utils.connect_rdm_to_xpdr_request("XPDR-C2", "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"]) - time.sleep(2) - - -# test service-create for 400GE service from xpdra2 to xpdrc2 - - - def test_72_create_400GE_service(self): - self.cr_serv_sample_data["input"]["service-name"] = "service-400GE" - self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "400" - self.cr_serv_sample_data["input"]["service-z-end"]["service-rate"] = "400" - response = test_utils.service_create_request(self.cr_serv_sample_data) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + def test_082_connect_xpdra2_1_N1_to_roadma_PP2(self): + response = test_utils.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-xpdr-rdm-links', + {'links-input': {'xpdr-node': 'XPDR-A2', '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"]) + + def test_083_connect_roadma_PP2_to_xpdra2_1_N1(self): + response = test_utils.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-rdm-xpdr-links', + {'links-input': {'xpdr-node': 'XPDR-A2', '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"]) + + def test_084_connect_xpdrc2_1_N1_to_roadmc_PP2(self): + response = test_utils.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-xpdr-rdm-links', + {'links-input': {'xpdr-node': 'XPDR-C2', '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"]) + + def test_085_connect_roadmc_PP2_to_xpdrc2_1_N1(self): + response = test_utils.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-rdm-xpdr-links', + {'links-input': {'xpdr-node': 'XPDR-C2', '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"]) + + # test service-create for 400GE service from xpdra2 to xpdrc2 + def test_086_create_400GE_service(self): + self.cr_serv_input_data["service-name"] = "service-400GE" + self.cr_serv_input_data["service-a-end"]["service-rate"] = "400" + self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1" + self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1" + self.cr_serv_input_data["service-z-end"]["service-rate"] = "400" + del self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"] + del self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] + del self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"] + del self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] + del self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-name"] + del self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-device-name"] + del self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-name"] + del self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-device-name"] + response = test_utils.transportpce_api_rpc_request( + 'org-openroadm-service', 'service-create', + self.cr_serv_input_data) + self.assertEqual(response['status_code'], requests.codes.ok) + time.sleep(self.WAITING) self.assertIn('PCE calculation in progress', - res['output']['configuration-response-common']['response-message']) + response['output']['configuration-response-common']['response-message']) time.sleep(self.WAITING) - def test_73_get_400GE_service(self): - response = test_utils.get_service_list_request( - "services/service-400GE") - 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'], 'service-400GE') - self.assertEqual( - res['services'][0]['connection-type'], 'service') - self.assertEqual( - res['services'][0]['lifecycle-state'], 'planned') - time.sleep(2) - - def test_74_check_xc1_roadma(self): - response = test_utils.check_netconf_node_request( - "ROADM-A1", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-755:768") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + def test_087_get_400GE_service(self): + response = test_utils.get_ordm_serv_list_attr_request("services", "service-400GE") + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(response['services'][0]['administrative-state'], 'inService') + self.assertEqual(response['services'][0]['service-name'], 'service-400GE') + self.assertEqual(response['services'][0]['connection-type'], 'service') + self.assertEqual(response['services'][0]['lifecycle-state'], 'planned') + time.sleep(1) + + def test_088_check_xc1_roadma(self): + response = test_utils.check_node_attribute_request( + "ROADM-A1", "roadm-connections", "SRG1-PP1-TXRX-DEG2-TTP-TXRX-755:768") + self.assertEqual(response['status_code'], requests.codes.ok) self.assertDictEqual( dict({ 'connection-name': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768', 'opticalControlMode': 'gainLoss', 'target-output-power': -3.0 - }, **res['roadm-connections'][0]), - res['roadm-connections'][0] - ) - self.assertDictEqual( - {'src-if': 'SRG1-PP1-TXRX-nmc-755:768'}, - res['roadm-connections'][0]['source']) - self.assertDictEqual( - {'dst-if': 'DEG2-TTP-TXRX-nmc-755:768'}, - res['roadm-connections'][0]['destination']) - time.sleep(5) - - def test_75_check_topo_xpdra2(self): - response = test_utils.get_ordm_topo_request("node/XPDR-A2-XPDR1") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - liste_tp = res['node'][0]['ietf-network-topology:termination-point'] + }, **response['roadm-connections'][0]), response['roadm-connections'][0]) + self.assertDictEqual({'src-if': 'SRG1-PP1-TXRX-nmc-755:768'}, response['roadm-connections'][0]['source']) + self.assertDictEqual({'dst-if': 'DEG2-TTP-TXRX-nmc-755:768'}, response['roadm-connections'][0]['destination']) + time.sleep(1) + + def test_089_check_topo_xpdra2(self): + response = test_utils.get_ietf_network_node_request('openroadm-topology', 'XPDR-A2-XPDR1', 'config') + self.assertEqual(response['status_code'], requests.codes.ok) + liste_tp = response['node']['ietf-network-topology:termination-point'] for ele in liste_tp: if ele['tp-id'] == 'XPDR1-NETWORK1': - self.assertEqual({'frequency': 196.08125, - 'width': 75}, - ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']) + self.assertEqual( + 196.08125, + float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['frequency'])) + self.assertEqual( + 75.0, + float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['width'])) if ele['tp-id'] == 'XPDR1-CLIENT1': self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele)) - time.sleep(3) + time.sleep(1) - def test_76_check_topo_roadma_SRG1(self): - response = test_utils.get_ordm_topo_request("node/ROADM-A1-SRG1") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + def test_090_check_topo_roadma_SRG1(self): + response = test_utils.get_ietf_network_node_request('openroadm-topology', 'ROADM-A1-SRG1', 'config') + self.assertEqual(response['status_code'], requests.codes.ok) freq_map = base64.b64decode( - res['node'][0]['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map']) + response['node']['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map']) freq_map_array = [int(x) for x in freq_map] self.assertEqual(freq_map_array[95], 0, "Index 1 should not be available") - liste_tp = res['node'][0]['ietf-network-topology:termination-point'] + liste_tp = response['node']['ietf-network-topology:termination-point'] for ele in liste_tp: if ele['tp-id'] == 'SRG1-PP1-TXRX': freq_map = base64.b64decode( @@ -1217,17 +1401,16 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(freq_map_array[95], 0, "Index 1 should not be available") if ele['tp-id'] == 'SRG1-PP2-TXRX': self.assertNotIn('avail-freq-maps', dict.keys(ele)) - time.sleep(3) + time.sleep(1) - def test_77_check_topo_roadma_DEG1(self): - response = test_utils.get_ordm_topo_request("node/ROADM-A1-DEG2") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + def test_091_check_topo_roadma_DEG1(self): + response = test_utils.get_ietf_network_node_request('openroadm-topology', 'ROADM-A1-DEG2', 'config') + self.assertEqual(response['status_code'], requests.codes.ok) freq_map = base64.b64decode( - res['node'][0]['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map']) + response['node']['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map']) freq_map_array = [int(x) for x in freq_map] self.assertEqual(freq_map_array[95], 0, "Index 1 should not be available") - liste_tp = res['node'][0]['ietf-network-topology:termination-point'] + liste_tp = response['node']['ietf-network-topology:termination-point'] for ele in liste_tp: if ele['tp-id'] == 'DEG2-CTP-TXRX': freq_map = base64.b64decode( @@ -1239,13 +1422,12 @@ class TransportPCEtesting(unittest.TestCase): ele['org-openroadm-network-topology:tx-ttp-attributes']['avail-freq-maps'][0]['freq-map']) freq_map_array = [int(x) for x in freq_map] self.assertEqual(freq_map_array[95], 0, "Index 1 should not be available") - time.sleep(3) + time.sleep(1) - def test_78_check_interface_400GE_CLIENT_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR1-CLIENT1-ETHERNET") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + def test_092_check_interface_400GE_CLIENT_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR1-CLIENT1-ETHERNET') + self.assertEqual(response['status_code'], requests.codes.ok) input_dict_1 = {'name': 'XPDR1-CLIENT1-ETHERNET', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/1/1-PLUG-CLIENT', @@ -1253,16 +1435,16 @@ class TransportPCEtesting(unittest.TestCase): 'supporting-port': 'C1' } input_dict_2 = {'speed': 400000} - self.assertDictEqual(dict(input_dict_1, **res['interface'][0]), - res['interface'][0]) - self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']), - res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']) - - def test_79_check_interface_OTSI_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR1-NETWORK1-755:768") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) + self.assertDictEqual( + dict(input_dict_2, **response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']), + response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']) + + def test_093_check_interface_OTSI_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR1-NETWORK1-755:768') + self.assertEqual(response['status_code'], requests.codes.ok) input_dict_1 = {'name': 'XPDR1-NETWORK1-755:768', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/1/2-PLUG-NET', @@ -1276,19 +1458,19 @@ class TransportPCEtesting(unittest.TestCase): "provision-mode": "explicit", "modulation-format": "dp-qam16"} - self.assertDictEqual(dict(input_dict_1, **res['interface'][0]), - res['interface'][0]) - self.assertDictEqual(dict(input_dict_2, - **res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']), - res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']) - self.assertDictEqual({"foic-type": "org-openroadm-common-optical-channel-types:foic4.8", "iid": [1, 2, 3, 4]}, - res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']['flexo']) - - def test_80_check_interface_OTSI_GROUP_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR1-NETWORK1-OTSIGROUP-400G") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) + self.assertDictEqual( + dict(input_dict_2, **response['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']), + response['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']) + self.assertDictEqual( + {"foic-type": "org-openroadm-common-optical-channel-types:foic4.8", "iid": [1, 2, 3, 4]}, + response['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']['flexo']) + + def test_094_check_interface_OTSI_GROUP_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR1-NETWORK1-OTSIGROUP-400G') + self.assertEqual(response['status_code'], requests.codes.ok) input_dict_1 = {'name': 'XPDR1-NETWORK1-OTSIGROUP-400G', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/1/2-PLUG-NET', @@ -1298,17 +1480,16 @@ class TransportPCEtesting(unittest.TestCase): input_dict_2 = {"group-id": 1, "group-rate": "org-openroadm-common-optical-channel-types:R400G-otsi"} - self.assertDictEqual(dict(input_dict_1, **res['interface'][0]), - res['interface'][0]) + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) self.assertDictEqual(dict(input_dict_2, - **res['interface'][0]['org-openroadm-otsi-group-interfaces:otsi-group']), - res['interface'][0]['org-openroadm-otsi-group-interfaces:otsi-group']) - - def test_81_check_interface_OTUC4_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR1-NETWORK1-OTUC4") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + **response['interface'][0]['org-openroadm-otsi-group-interfaces:otsi-group']), + response['interface'][0]['org-openroadm-otsi-group-interfaces:otsi-group']) + + def test_095_check_interface_OTUC4_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR1-NETWORK1-OTUC4') + self.assertEqual(response['status_code'], requests.codes.ok) input_dict_1 = {'name': 'XPDR1-NETWORK1-OTUC4', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/1/2-PLUG-NET', @@ -1325,17 +1506,16 @@ class TransportPCEtesting(unittest.TestCase): "otucn-n-rate": 4, "degm-intervals": 2} - self.assertDictEqual(dict(input_dict_1, **res['interface'][0]), - res['interface'][0]) + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) self.assertDictEqual(dict(input_dict_2, - **res['interface'][0]['org-openroadm-otn-otu-interfaces:otu']), - res['interface'][0]['org-openroadm-otn-otu-interfaces:otu']) - - def test_82_check_interface_ODUC4_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR1-NETWORK1-ODUC4") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + **response['interface'][0]['org-openroadm-otn-otu-interfaces:otu']), + response['interface'][0]['org-openroadm-otn-otu-interfaces:otu']) + + def test_096_check_interface_ODUC4_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR1-NETWORK1-ODUC4') + self.assertEqual(response['status_code'], requests.codes.ok) input_dict_1 = {'name': 'XPDR1-NETWORK1-ODUC4', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/1/2-PLUG-NET', @@ -1353,21 +1533,20 @@ class TransportPCEtesting(unittest.TestCase): "oducn-n-rate": 4} input_dict_3 = {"exp-payload-type": "22", "payload-type": "22"} - self.assertDictEqual(dict(input_dict_1, **res['interface'][0]), - res['interface'][0]) + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) self.assertDictEqual(dict(input_dict_2, - **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), - res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) + **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) self.assertDictEqual(dict(input_dict_3, - **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']), - res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) - self.assertEqual('XPDR1-NETWORK1-OTUC4', res['interface'][0]['supporting-interface-list'][0]) - - def test_82a_check_interface_ODUFLEX_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR1-NETWORK1-ODUFLEX") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']), + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) + self.assertEqual('XPDR1-NETWORK1-OTUC4', response['interface'][0]['supporting-interface-list'][0]) + + def test_097_check_interface_ODUFLEX_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR1-NETWORK1-ODUFLEX') + self.assertEqual(response['status_code'], requests.codes.ok) input_dict_1 = {'name': 'XPDR1-NETWORK1-ODUFLEX', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/1/2-PLUG-NET', @@ -1387,110 +1566,115 @@ class TransportPCEtesting(unittest.TestCase): input_dict_3 = {"exp-payload-type": "32", "payload-type": "32"} input_dict_4 = {'trib-port-number': 1} - self.assertDictEqual(dict(input_dict_1, **res['interface'][0]), - res['interface'][0]) + self.assertDictEqual(dict(input_dict_1, **response['interface'][0]), + response['interface'][0]) self.assertDictEqual(dict(input_dict_2, - **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), - res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) + **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) self.assertDictEqual(dict(input_dict_3, - **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']), - res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) + **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']), + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) self.assertDictEqual(dict(input_dict_4, - **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][ + **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][ 'parent-odu-allocation']), - res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']) - self.assertIn('1.1', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'] + response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']) + self.assertIn('1.1', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'] ['opucn-trib-slots']) - self.assertIn('1.20', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'] + self.assertIn('1.20', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'] ['opucn-trib-slots']) - self.assertIn('2.1', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'] + self.assertIn('2.1', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'] ['opucn-trib-slots']) - self.assertIn('2.20', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'] + self.assertIn('2.20', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'] ['opucn-trib-slots']) - self.assertIn('3.1', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'] + self.assertIn('3.1', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'] ['opucn-trib-slots']) - self.assertIn('3.20', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'] + self.assertIn('3.20', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'] ['opucn-trib-slots']) - self.assertIn('4.1', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'] + self.assertIn('4.1', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'] ['opucn-trib-slots']) - self.assertIn('4.20', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'] + self.assertIn('4.20', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'] ['opucn-trib-slots']) - self.assertEqual('XPDR1-NETWORK1-ODUC4', res['interface'][0]['supporting-interface-list'][0]) - - def test_83_delete_400GE_service(self): - response = test_utils.service_delete_request("service-400GE") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + self.assertEqual('XPDR1-NETWORK1-ODUC4', response['interface'][0]['supporting-interface-list'][0]) + + def test_098_delete_400GE_service(self): + self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service-400GE" + response = test_utils.transportpce_api_rpc_request( + 'org-openroadm-service', 'service-delete', + self.del_serv_input_data) + self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Renderer service delete in progress', - res['output']['configuration-response-common']['response-message']) + response['output']['configuration-response-common']['response-message']) time.sleep(self.WAITING) - def test_84_get_no_service(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']) + def test_099_get_no_service(self): + response = test_utils.get_ordm_serv_list_request() + self.assertEqual(response['status_code'], requests.codes.conflict) + self.assertIn(response['service-list'], ( + { + "error-type": "protocol", + "error-tag": "data-missing", + "error-message": + "Request could not be completed because the relevant data " + "model content does not exist" + }, { + "error-type": "application", + "error-tag": "data-missing", + "error-message": + "Request could not be completed because the relevant data " + "model content does not exist" + })) time.sleep(1) - def test_85_check_no_interface_ODUC4_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR1-NETWORK1-ODUC4") - self.assertEqual(response.status_code, requests.codes.conflict) - - def test_86_check_no_interface_OTUC4_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR1-NETWORK1-OTUC4") - self.assertEqual(response.status_code, requests.codes.conflict) - - def test_87_check_no_interface_OTSI_GROUP_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR1-NETWORK1-OTSIGROUP-400G") - self.assertEqual(response.status_code, requests.codes.conflict) - - def test_88_check_no_interface_OTSI_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR1-NETWORK1-755:768") - self.assertEqual(response.status_code, requests.codes.conflict) - - def test_89_check_no_interface_400GE_CLIENT_xpdra2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR1-CLIENT1-ETHERNET") - self.assertEqual(response.status_code, requests.codes.conflict) - - def test_90_disconnect_xponders_from_roadm(self): - url = "{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:link/" - response = test_utils.get_ordm_topo_request("") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - links = res['network'][0]['ietf-network-topology:link'] + def test_100_check_no_interface_ODUC4_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR1-NETWORK1-ODUC4') + self.assertEqual(response['status_code'], requests.codes.conflict) + + def test_101_check_no_interface_OTUC4_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR1-NETWORK1-OTUC4') + self.assertEqual(response['status_code'], requests.codes.conflict) + + def test_102_check_no_interface_OTSI_GROUP_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR1-NETWORK1-OTSIGROUP-400G') + self.assertEqual(response['status_code'], requests.codes.conflict) + + def test_103_check_no_interface_OTSI_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR1-NETWORK1-755:768') + self.assertEqual(response['status_code'], requests.codes.conflict) + + def test_104_check_no_interface_400GE_CLIENT_xpdra2(self): + response = test_utils.check_node_attribute_request( + 'XPDR-A2', 'interface', 'XPDR1-CLIENT1-ETHERNET') + self.assertEqual(response['status_code'], requests.codes.conflict) + + def test_105_disconnect_xponders_from_roadm(self): + response = test_utils.get_ietf_network_request('openroadm-topology', 'config') + self.assertEqual(response['status_code'], requests.codes.ok) + links = response['network'][0]['ietf-network-topology:link'] for link in links: if link["org-openroadm-common-network:link-type"] in ('XPONDER-OUTPUT', 'XPONDER-INPUT'): - link_name = link["link-id"] - response = test_utils.delete_request(url+link_name) - self.assertEqual(response.status_code, requests.codes.ok) + response = test_utils.del_ietf_network_link_request( + 'openroadm-topology', link['link-id'], 'config') + self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) - def test_91_disconnect_xpdra2(self): + def test_106_disconnect_xpdra2(self): response = test_utils.unmount_device("XPDR-A2") - 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_92_disconnect_xpdrc2(self): + def test_107_disconnect_xpdrc2(self): response = test_utils.unmount_device("XPDR-C2") - 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_93_disconnect_roadmA(self): + def test_108_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_94_disconnect_roadmC(self): + def test_109_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__":