X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F1.2.1%2Ftest06_end2end.py;h=058f6d3be3f51a953d28c65cd29368ad8dd0388c;hb=refs%2Fchanges%2F18%2F102218%2F5;hp=4397151129ef5f6dcd318c12f41aeab832f4dfdd;hpb=0a27df8c4c1c62cc0de952d96304ffd09d6bef51;p=transportpce.git diff --git a/tests/transportpce_tests/1.2.1/test06_end2end.py b/tests/transportpce_tests/1.2.1/test06_end2end.py index 439715112..058f6d3be 100644 --- a/tests/transportpce_tests/1.2.1/test06_end2end.py +++ b/tests/transportpce_tests/1.2.1/test06_end2end.py @@ -20,11 +20,11 @@ import sys sys.path.append('transportpce_tests/common/') # pylint: disable=wrong-import-position # pylint: disable=import-error -import test_utils # nopep8 +import test_utils_rfc8040 # nopep8 class TransportPCEFulltesting(unittest.TestCase): - cr_serv_sample_data = {"input": { + cr_serv_input_data = { "sdnc-request-header": { "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", "rpc-action": "service-create", @@ -56,6 +56,15 @@ class TransportPCEFulltesting(unittest.TestCase): "due-date": "2016-11-28T00: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"} } processes = None WAITING = 20 @@ -63,74 +72,74 @@ class TransportPCEFulltesting(unittest.TestCase): @classmethod def setUpClass(cls): - cls.processes = test_utils.start_tpce() - cls.processes = test_utils.start_sims([('xpdra', cls.NODE_VERSION), - ('roadma-full', cls.NODE_VERSION), - ('roadmc-full', cls.NODE_VERSION), - ('xpdrc', cls.NODE_VERSION)]) + cls.processes = test_utils_rfc8040.start_tpce() + cls.processes = test_utils_rfc8040.start_sims([('xpdra', cls.NODE_VERSION), + ('roadma-full', cls.NODE_VERSION), + ('roadmc-full', cls.NODE_VERSION), + ('xpdrc', cls.NODE_VERSION)]) @classmethod def tearDownClass(cls): # pylint: disable=not-an-iterable for process in cls.processes: - test_utils.shutdown_process(process) + test_utils_rfc8040.shutdown_process(process) print("all processes killed") def setUp(self): # instruction executed before each test method # pylint: disable=consider-using-f-string print("execution of {}".format(self.id().split(".")[-1])) - # connect netconf devices + # connect netconf devices def test_01_connect_xpdrA(self): - response = test_utils.mount_device("XPDRA01", ('xpdra', self.NODE_VERSION)) - self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) + response = test_utils_rfc8040.mount_device("XPDRA01", ('xpdra', self.NODE_VERSION)) + self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201) def test_02_connect_xpdrC(self): - response = test_utils.mount_device("XPDRC01", ('xpdrc', self.NODE_VERSION)) - self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) + response = test_utils_rfc8040.mount_device("XPDRC01", ('xpdrc', self.NODE_VERSION)) + self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201) def test_03_connect_rdmA(self): - response = test_utils.mount_device("ROADMA01", ('roadma-full', self.NODE_VERSION)) - self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) + response = test_utils_rfc8040.mount_device("ROADMA01", ('roadma-full', self.NODE_VERSION)) + self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201) def test_04_connect_rdmC(self): - response = test_utils.mount_device("ROADMC01", ('roadmc-full', self.NODE_VERSION)) - self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) + response = test_utils_rfc8040.mount_device("ROADMC01", ('roadmc-full', self.NODE_VERSION)) + self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201) def test_05_connect_xprdA_N1_to_roadmA_PP1(self): - response = test_utils.connect_xpdr_to_rdm_request("XPDRA01", "1", "1", - "ROADMA01", "1", "SRG1-PP1-TXRX") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Xponder Roadm Link created successfully', - res["output"]["result"]) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-xpdr-rdm-links', + {'links-input': {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '1', + 'rdm-node': 'ROADMA01', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}}) + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"]) time.sleep(2) def test_06_connect_roadmA_PP1_to_xpdrA_N1(self): - response = test_utils.connect_rdm_to_xpdr_request("XPDRA01", "1", "1", - "ROADMA01", "1", "SRG1-PP1-TXRX") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Roadm Xponder links created successfully', - res["output"]["result"]) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-rdm-xpdr-links', + {'links-input': {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '1', + 'rdm-node': 'ROADMA01', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}}) + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertIn('Roadm Xponder links created successfully', response["output"]["result"]) time.sleep(2) def test_07_connect_xprdC_N1_to_roadmC_PP1(self): - response = test_utils.connect_xpdr_to_rdm_request("XPDRC01", "1", "1", - "ROADMC01", "1", "SRG1-PP1-TXRX") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Xponder Roadm Link created successfully', - res["output"]["result"]) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-xpdr-rdm-links', + {'links-input': {'xpdr-node': 'XPDRC01', 'xpdr-num': '1', 'network-num': '1', + 'rdm-node': 'ROADMC01', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}}) + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"]) time.sleep(2) def test_08_connect_roadmC_PP1_to_xpdrC_N1(self): - response = test_utils.connect_rdm_to_xpdr_request("XPDRC01", "1", "1", - "ROADMC01", "1", "SRG1-PP1-TXRX") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Roadm Xponder links created successfully', - res["output"]["result"]) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-rdm-xpdr-links', + {'links-input': {'xpdr-node': 'XPDRC01', 'xpdr-num': '1', 'network-num': '1', + 'rdm-node': 'ROADMC01', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}}) + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertIn('Roadm Xponder links created successfully', response["output"]["result"]) time.sleep(2) def test_09_add_omsAttributes_ROADMA_ROADMC(self): @@ -145,7 +154,8 @@ class TransportPCEFulltesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = test_utils.add_oms_attr_request("ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX", data) + response = test_utils_rfc8040.add_oms_attr_request("ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX", + data) self.assertEqual(response.status_code, requests.codes.created) def test_10_add_omsAttributes_ROADMC_ROADMA(self): @@ -160,106 +170,87 @@ class TransportPCEFulltesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = test_utils.add_oms_attr_request("ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX", data) + response = test_utils_rfc8040.add_oms_attr_request("ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX", + data) self.assertEqual(response.status_code, requests.codes.created) # test service-create for Eth service from xpdr to xpdr + def test_11_create_eth_service1(self): - self.cr_serv_sample_data["input"]["service-name"] = "service1" - response = test_utils.service_create_request(self.cr_serv_sample_data) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + self.cr_serv_input_data["service-name"] = "service1" + response = test_utils_rfc8040.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_12_get_eth_service1(self): - response = test_utils.get_service_list_request("services/service1") - 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') - self.assertEqual( - res['services'][0]['connection-type'], 'service') - self.assertEqual( - res['services'][0]['lifecycle-state'], 'planned') - time.sleep(2) + response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service1") + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(response['services'][0]['administrative-state'], 'inService') + self.assertEqual(response['services'][0]['service-name'], 'service1') + self.assertEqual(response['services'][0]['connection-type'], 'service') + self.assertEqual(response['services'][0]['lifecycle-state'], 'planned') + time.sleep(1) def test_13_check_xc1_ROADMA(self): - response = test_utils.check_netconf_node_request( - "ROADMA01", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + response = test_utils_rfc8040.check_node_attribute_request( + "ROADMA01", "roadm-connections", "SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768") + self.assertEqual(response['status_code'], requests.codes.ok) # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( dict({ 'connection-number': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768', 'wavelength-number': 1, - 'opticalControlMode': 'gainLoss', - 'target-output-power': -3.0 - }, **res['roadm-connections'][0]), - res['roadm-connections'][0] - ) - self.assertDictEqual( - {'src-if': 'SRG1-PP1-TXRX-761:768'}, - res['roadm-connections'][0]['source']) - self.assertDictEqual( - {'dst-if': 'DEG1-TTP-TXRX-761:768'}, - res['roadm-connections'][0]['destination']) - time.sleep(5) + 'opticalControlMode': 'gainLoss' + }, **response['roadm-connections'][0]), response['roadm-connections'][0]) + self.assertDictEqual({'src-if': 'SRG1-PP1-TXRX-761:768'}, response['roadm-connections'][0]['source']) + self.assertDictEqual({'dst-if': 'DEG1-TTP-TXRX-761:768'}, response['roadm-connections'][0]['destination']) + time.sleep(1) def test_14_check_xc1_ROADMC(self): - response = test_utils.check_netconf_node_request( - "ROADMC01", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + response = test_utils_rfc8040.check_node_attribute_request( + "ROADMC01", "roadm-connections", "SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768") + self.assertEqual(response['status_code'], requests.codes.ok) # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( dict({ 'connection-number': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768', 'wavelength-number': 1, - 'opticalControlMode': 'gainLoss', - 'target-output-power': 2.0 - }, **res['roadm-connections'][0]), - res['roadm-connections'][0] - ) - self.assertDictEqual( - {'src-if': 'SRG1-PP1-TXRX-761:768'}, - res['roadm-connections'][0]['source']) - self.assertDictEqual( - {'dst-if': 'DEG2-TTP-TXRX-761:768'}, - res['roadm-connections'][0]['destination']) - time.sleep(5) + 'opticalControlMode': 'gainLoss' + }, **response['roadm-connections'][0]), response['roadm-connections'][0]) + self.assertDictEqual({'src-if': 'SRG1-PP1-TXRX-761:768'}, response['roadm-connections'][0]['source']) + self.assertDictEqual({'dst-if': 'DEG2-TTP-TXRX-761:768'}, response['roadm-connections'][0]['destination']) + time.sleep(1) def test_15_check_topo_XPDRA(self): - response = test_utils.get_ordm_topo_request("node/XPDRA01-XPDR1") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - liste_tp = res['node'][0]['ietf-network-topology:termination-point'] + response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'XPDRA01-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.1, - 'width': 40}, - ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']) + self.assertEqual( + 196.1, + float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['frequency'])) + self.assertEqual( + 40.0, + float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['width'])) elif ele['tp-id'] in ('XPDR1-CLIENT2', 'XPDR1-CLIENT1'): self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele)) elif ele['tp-id'] == 'XPDR1-NETWORK2': self.assertNotIn('org-openroadm-network-topology:xpdr-network-attributes', dict.keys(ele)) - time.sleep(3) + time.sleep(1) def test_16_check_topo_ROADMA_SRG1(self): - response = test_utils.get_ordm_topo_request("node/ROADMA01-SRG1") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADMA01-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, "Lambda 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( @@ -268,17 +259,16 @@ class TransportPCEFulltesting(unittest.TestCase): self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available") elif ele['tp-id'] == 'SRG1-PP2-TXRX': self.assertNotIn('avail-freq-maps', dict.keys(ele)) - time.sleep(3) + time.sleep(1) def test_17_check_topo_ROADMA_DEG1(self): - response = test_utils.get_ordm_topo_request("node/ROADMA01-DEG1") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADMA01-DEG1', '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, "Lambda 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( @@ -290,118 +280,110 @@ class TransportPCEFulltesting(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, "Lambda 1 should not be available") - time.sleep(3) + time.sleep(1) def test_18_connect_xprdA_N2_to_roadmA_PP2(self): - response = test_utils.connect_xpdr_to_rdm_request("XPDRA01", "1", "2", - "ROADMA01", "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"]) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-xpdr-rdm-links', + {'links-input': {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '2', + 'rdm-node': 'ROADMA01', '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"]) time.sleep(2) def test_19_connect_roadmA_PP2_to_xpdrA_N2(self): - response = test_utils.connect_rdm_to_xpdr_request("XPDRA01", "1", "2", - "ROADMA01", "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"]) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-rdm-xpdr-links', + {'links-input': {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '2', + 'rdm-node': 'ROADMA01', '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"]) time.sleep(2) def test_20_connect_xprdC_N2_to_roadmC_PP2(self): - response = test_utils.connect_xpdr_to_rdm_request("XPDRC01", "1", "2", - "ROADMC01", "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"]) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-xpdr-rdm-links', + {'links-input': {'xpdr-node': 'XPDRC01', 'xpdr-num': '1', 'network-num': '2', + 'rdm-node': 'ROADMC01', '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"]) time.sleep(2) def test_21_connect_roadmC_PP2_to_xpdrC_N2(self): - response = test_utils.connect_rdm_to_xpdr_request("XPDRC01", "1", "2", - "ROADMC01", "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"]) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-rdm-xpdr-links', + {'links-input': {'xpdr-node': 'XPDRC01', 'xpdr-num': '1', 'network-num': '2', + 'rdm-node': 'ROADMC01', '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"]) time.sleep(2) def test_22_create_eth_service2(self): - self.cr_serv_sample_data["input"]["service-name"] = "service2" - response = test_utils.service_create_request(self.cr_serv_sample_data) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + self.cr_serv_input_data["service-name"] = "service2" + response = test_utils_rfc8040.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_23_get_eth_service2(self): - response = test_utils.get_service_list_request("services/service2") - 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'], 'service2') - self.assertEqual( - res['services'][0]['connection-type'], 'service') - self.assertEqual( - res['services'][0]['lifecycle-state'], 'planned') + response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service2") + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(response['services'][0]['administrative-state'], 'inService') + self.assertEqual(response['services'][0]['service-name'], 'service2') + self.assertEqual(response['services'][0]['connection-type'], 'service') + self.assertEqual(response['services'][0]['lifecycle-state'], 'planned') time.sleep(1) def test_24_check_xc2_ROADMA(self): - response = test_utils.check_netconf_node_request( - "ROADMA01", "roadm-connections/DEG1-TTP-TXRX-SRG1-PP2-TXRX-753:760") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + response = test_utils_rfc8040.check_node_attribute_request( + "ROADMA01", "roadm-connections", "DEG1-TTP-TXRX-SRG1-PP2-TXRX-753:760") + self.assertEqual(response['status_code'], requests.codes.ok) # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( dict({ 'connection-number': 'DEG1-TTP-TXRX-SRG1-PP2-TXRX-753:760', 'wavelength-number': 2, 'opticalControlMode': 'power' - }, **res['roadm-connections'][0]), - res['roadm-connections'][0] - ) - self.assertDictEqual( - {'src-if': 'DEG1-TTP-TXRX-753:760'}, - res['roadm-connections'][0]['source']) - self.assertDictEqual( - {'dst-if': 'SRG1-PP2-TXRX-753:760'}, - res['roadm-connections'][0]['destination']) + }, **response['roadm-connections'][0]), response['roadm-connections'][0]) + self.assertDictEqual({'src-if': 'DEG1-TTP-TXRX-753:760'}, response['roadm-connections'][0]['source']) + self.assertDictEqual({'dst-if': 'SRG1-PP2-TXRX-753:760'}, response['roadm-connections'][0]['destination']) + time.sleep(1) def test_25_check_topo_XPDRA(self): - response = test_utils.get_ordm_topo_request("node/XPDRA01-XPDR1") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - liste_tp = res['node'][0]['ietf-network-topology:termination-point'] + response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'XPDRA01-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.1, - 'width': 40}, - ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']) + self.assertEqual( + 196.1, + float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['frequency'])) + self.assertEqual( + 40.0, + float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['width'])) elif ele['tp-id'] == 'XPDR1-NETWORK2': - self.assertEqual({'frequency': 196.05, - 'width': 40}, - ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']) + self.assertEqual( + 196.05, + float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['frequency'])) + self.assertEqual( + 40.0, + float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['width'])) elif ele['tp-id'] in ('XPDR1-CLIENT1', 'XPDR1-CLIENT2'): self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele)) - time.sleep(10) + time.sleep(1) def test_26_check_topo_ROADMA_SRG1(self): - response = test_utils.get_ordm_topo_request("node/ROADMA01-SRG1") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADMA01-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, "Lambda 1 should not be available") self.assertEqual(freq_map_array[94], 0, "Lambda 2 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( @@ -417,18 +399,17 @@ class TransportPCEFulltesting(unittest.TestCase): self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available") elif ele['tp-id'] == 'SRG1-PP3-TXRX': self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele)) - time.sleep(10) + time.sleep(1) def test_27_check_topo_ROADMA_DEG1(self): - response = test_utils.get_ordm_topo_request("node/ROADMA01-DEG1") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADMA01-DEG1', '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, "Lambda 1 should not be available") self.assertEqual(freq_map_array[94], 0, "Lambda 2 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( @@ -442,66 +423,65 @@ class TransportPCEFulltesting(unittest.TestCase): freq_map_array = [int(x) for x in freq_map] self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available") self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available") - time.sleep(10) + time.sleep(1) # creation service test on a non-available resource def test_28_create_eth_service3(self): - self.cr_serv_sample_data["input"]["service-name"] = "service3" - response = test_utils.service_create_request(self.cr_serv_sample_data) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + self.cr_serv_input_data["service-name"] = "service3" + response = test_utils_rfc8040.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']) - self.assertIn('200', res['output']['configuration-response-common'][ - 'response-code']) + response['output']['configuration-response-common']['response-message']) + self.assertIn('200', response['output']['configuration-response-common']['response-code']) time.sleep(self.WAITING) # add a test that check the openroadm-service-list still only # contains 2 elements def test_29_delete_eth_service3(self): - response = test_utils.service_delete_request("service3") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service3" + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'org-openroadm-service', 'service-delete', + self.del_serv_input_data) + self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Service \'service3\' does not exist in datastore', - res['output']['configuration-response-common'][ - 'response-message']) - self.assertIn('500', res['output']['configuration-response-common'][ - 'response-code']) - time.sleep(20) + response['output']['configuration-response-common']['response-message']) + self.assertIn('500', response['output']['configuration-response-common']['response-code']) + time.sleep(3) def test_30_delete_eth_service1(self): - response = test_utils.service_delete_request("service1") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1" + response = test_utils_rfc8040.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']) - time.sleep(20) + response['output']['configuration-response-common']['response-message']) + time.sleep(self.WAITING) def test_31_delete_eth_service2(self): - response = test_utils.service_delete_request("service2") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service2" + response = test_utils_rfc8040.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']) - time.sleep(20) + response['output']['configuration-response-common']['response-message']) + time.sleep(self.WAITING) def test_32_check_no_xc_ROADMA(self): - response = test_utils.check_netconf_node_request("ROADMA01", "") - res = response.json() - self.assertEqual(response.status_code, requests.codes.ok) + response = test_utils_rfc8040.check_node_request("ROADMA01") + self.assertEqual(response['status_code'], requests.codes.ok) self.assertNotIn('roadm-connections', - dict.keys(res['org-openroadm-device'])) + dict.keys(response['org-openroadm-device'])) time.sleep(2) def test_33_check_topo_XPDRA(self): - response = test_utils.get_ordm_topo_request("node/XPDRA01-XPDR1") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - liste_tp = res['node'][0]['ietf-network-topology:termination-point'] + response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'XPDRA01-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['org-openroadm-common-network:tp-type'] == 'XPONDER-CLIENT' and ele['tp-id'] in ('XPDR1-CLIENT1', 'XPDR1-CLIENT3')): @@ -515,18 +495,17 @@ class TransportPCEFulltesting(unittest.TestCase): self.assertNotIn('wavelength', dict.keys( ele['org-openroadm-network-topology:' 'xpdr-network-attributes'])) - time.sleep(10) + time.sleep(1) def test_34_check_topo_ROADMA_SRG1(self): - response = test_utils.get_ordm_topo_request("node/ROADMA01-SRG1") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADMA01-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], 255, "Lambda 1 should be available") self.assertEqual(freq_map_array[94], 255, "Lambda 2 should 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' or ele['tp-id'] == 'SRG1-PP2-TXRX': freq_map = base64.b64decode( @@ -542,18 +521,17 @@ class TransportPCEFulltesting(unittest.TestCase): self.assertEqual(freq_map_array[94], 255, "Lambda 2 should be available") else: self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele)) - time.sleep(10) + time.sleep(1) def test_35_check_topo_ROADMA_DEG1(self): - response = test_utils.get_ordm_topo_request("node/ROADMA01-DEG1") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADMA01-DEG1', '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], 255, "Lambda 1 should be available") self.assertEqual(freq_map_array[94], 255, "Lambda 2 should 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( @@ -567,44 +545,38 @@ class TransportPCEFulltesting(unittest.TestCase): freq_map_array = [int(x) for x in freq_map] self.assertEqual(freq_map_array[95], 255, "Lambda 1 should be available") self.assertEqual(freq_map_array[94], 255, "Lambda 2 should be available") - time.sleep(10) + time.sleep(1) # test service-create for Optical Channel (OC) service from srg-pp to srg-pp + def test_36_create_oc_service1(self): - self.cr_serv_sample_data["input"]["service-name"] = "service1" - self.cr_serv_sample_data["input"]["connection-type"] = "roadm-line" - self.cr_serv_sample_data["input"]["service-a-end"]["node-id"] = "ROADMA01" - self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "OC" - self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "ROADMC01" - self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "OC" - response = test_utils.service_create_request(self.cr_serv_sample_data) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + self.cr_serv_input_data["service-name"] = "service1" + self.cr_serv_input_data["connection-type"] = "roadm-line" + self.cr_serv_input_data["service-a-end"]["node-id"] = "ROADMA01" + self.cr_serv_input_data["service-a-end"]["service-format"] = "OC" + self.cr_serv_input_data["service-z-end"]["node-id"] = "ROADMC01" + self.cr_serv_input_data["service-z-end"]["service-format"] = "OC" + response = test_utils_rfc8040.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_37_get_oc_service1(self): - response = test_utils.get_service_list_request("services/service1") - 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') - self.assertEqual( - res['services'][0]['connection-type'], 'roadm-line') - self.assertEqual( - res['services'][0]['lifecycle-state'], 'planned') + response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service1") + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(response['services'][0]['administrative-state'], 'inService') + self.assertEqual(response['services'][0]['service-name'], 'service1') + self.assertEqual(response['services'][0]['connection-type'], 'roadm-line') + self.assertEqual(response['services'][0]['lifecycle-state'], 'planned') time.sleep(1) def test_38_check_xc1_ROADMA(self): - response = test_utils.check_netconf_node_request( - "ROADMA01", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + response = test_utils_rfc8040.check_node_attribute_request( + "ROADMA01", "roadm-connections", "SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768") + self.assertEqual(response['status_code'], requests.codes.ok) # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( dict({ @@ -612,22 +584,15 @@ class TransportPCEFulltesting(unittest.TestCase): 'wavelength-number': 1, 'opticalControlMode': 'gainLoss', 'target-output-power': -3.0 - }, **res['roadm-connections'][0]), - res['roadm-connections'][0] - ) - self.assertDictEqual( - {'src-if': 'SRG1-PP1-TXRX-761:768'}, - res['roadm-connections'][0]['source']) - self.assertDictEqual( - {'dst-if': 'DEG1-TTP-TXRX-761:768'}, - res['roadm-connections'][0]['destination']) - time.sleep(7) + }, **response['roadm-connections'][0]), response['roadm-connections'][0]) + self.assertDictEqual({'src-if': 'SRG1-PP1-TXRX-761:768'}, response['roadm-connections'][0]['source']) + self.assertDictEqual({'dst-if': 'DEG1-TTP-TXRX-761:768'}, response['roadm-connections'][0]['destination']) + time.sleep(1) def test_39_check_xc1_ROADMC(self): - response = test_utils.check_netconf_node_request( - "ROADMC01", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + response = test_utils_rfc8040.check_node_attribute_request( + "ROADMC01", "roadm-connections", "SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768") + self.assertEqual(response['status_code'], requests.codes.ok) # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( dict({ @@ -635,52 +600,39 @@ class TransportPCEFulltesting(unittest.TestCase): 'wavelength-number': 1, 'opticalControlMode': 'gainLoss', 'target-output-power': 2.0 - }, **res['roadm-connections'][0]), - res['roadm-connections'][0] - ) - self.assertDictEqual( - {'src-if': 'SRG1-PP1-TXRX-761:768'}, - res['roadm-connections'][0]['source']) - self.assertDictEqual( - {'dst-if': 'DEG2-TTP-TXRX-761:768'}, - res['roadm-connections'][0]['destination']) - time.sleep(7) + }, **response['roadm-connections'][0]), response['roadm-connections'][0]) + self.assertDictEqual({'src-if': 'SRG1-PP1-TXRX-761:768'}, response['roadm-connections'][0]['source']) + self.assertDictEqual({'dst-if': 'DEG2-TTP-TXRX-761:768'}, response['roadm-connections'][0]['destination']) + time.sleep(1) def test_40_create_oc_service2(self): - self.cr_serv_sample_data["input"]["service-name"] = "service2" - self.cr_serv_sample_data["input"]["connection-type"] = "roadm-line" - self.cr_serv_sample_data["input"]["service-a-end"]["node-id"] = "ROADMA01" - self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "OC" - self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "ROADMC01" - self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "OC" - response = test_utils.service_create_request(self.cr_serv_sample_data) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + self.cr_serv_input_data["service-name"] = "service2" + self.cr_serv_input_data["connection-type"] = "roadm-line" + self.cr_serv_input_data["service-a-end"]["node-id"] = "ROADMA01" + self.cr_serv_input_data["service-a-end"]["service-format"] = "OC" + self.cr_serv_input_data["service-z-end"]["node-id"] = "ROADMC01" + self.cr_serv_input_data["service-z-end"]["service-format"] = "OC" + response = test_utils_rfc8040.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_41_get_oc_service2(self): - response = test_utils.get_service_list_request("services/service2") - 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'], 'service2') - self.assertEqual( - res['services'][0]['connection-type'], 'roadm-line') - self.assertEqual( - res['services'][0]['lifecycle-state'], 'planned') + response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service2") + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(response['services'][0]['administrative-state'], 'inService') + self.assertEqual(response['services'][0]['service-name'], 'service2') + self.assertEqual(response['services'][0]['connection-type'], 'roadm-line') + self.assertEqual(response['services'][0]['lifecycle-state'], 'planned') time.sleep(2) def test_42_check_xc2_ROADMA(self): - response = test_utils.check_netconf_node_request( - "ROADMA01", "roadm-connections/SRG1-PP2-TXRX-DEG1-TTP-TXRX-753:760") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + response = test_utils_rfc8040.check_node_attribute_request( + "ROADMA01", "roadm-connections", "SRG1-PP2-TXRX-DEG1-TTP-TXRX-753:760") + self.assertEqual(response['status_code'], requests.codes.ok) # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( dict({ @@ -688,61 +640,59 @@ class TransportPCEFulltesting(unittest.TestCase): 'wavelength-number': 2, 'opticalControlMode': 'gainLoss', 'target-output-power': -3.0 - }, **res['roadm-connections'][0]), - res['roadm-connections'][0] - ) - self.assertDictEqual( - {'src-if': 'SRG1-PP2-TXRX-753:760'}, - res['roadm-connections'][0]['source']) - self.assertDictEqual( - {'dst-if': 'DEG1-TTP-TXRX-753:760'}, - res['roadm-connections'][0]['destination']) - time.sleep(2) + }, **response['roadm-connections'][0]), response['roadm-connections'][0]) + self.assertDictEqual({'src-if': 'SRG1-PP2-TXRX-753:760'}, response['roadm-connections'][0]['source']) + self.assertDictEqual({'dst-if': 'DEG1-TTP-TXRX-753:760'}, response['roadm-connections'][0]['destination']) + time.sleep(1) def test_43_check_topo_ROADMA(self): self.test_26_check_topo_ROADMA_SRG1() self.test_27_check_topo_ROADMA_DEG1() - time.sleep(3) + time.sleep(1) def test_44_delete_oc_service1(self): - response = test_utils.service_delete_request("service1") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1" + response = test_utils_rfc8040.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']) - time.sleep(20) + response['output']['configuration-response-common']['response-message']) + time.sleep(self.WAITING) def test_45_delete_oc_service2(self): - response = test_utils.service_delete_request("service2") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() + self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service2" + response = test_utils_rfc8040.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']) - time.sleep(20) + response['output']['configuration-response-common']['response-message']) + time.sleep(self.WAITING) def test_46_get_no_oc_services(self): - print("start test") - response = test_utils.get_service_list_request("") - self.assertEqual(response.status_code, requests.codes.conflict) - res = response.json() - self.assertIn( + response = test_utils_rfc8040.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" - }, - res['errors']['error']) + })) time.sleep(1) def test_47_get_no_xc_ROADMA(self): - response = test_utils.check_netconf_node_request("ROADMA01", "") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertNotIn(['roadm-connections'][0], res['org-openroadm-device']) + response = test_utils_rfc8040.check_node_request("ROADMA01") + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertNotIn('roadm-connections', dict.keys(response['org-openroadm-device'])) time.sleep(1) def test_48_check_topo_ROADMA(self): @@ -751,7 +701,7 @@ class TransportPCEFulltesting(unittest.TestCase): def test_49_loop_create_eth_service(self): # pylint: disable=consider-using-f-string - for i in range(1, 6): + for i in range(1, 4): print("iteration number {}".format(i)) print("eth service creation") self.test_11_create_eth_service1() @@ -763,13 +713,16 @@ class TransportPCEFulltesting(unittest.TestCase): self.test_30_delete_eth_service1() def test_50_loop_create_oc_service(self): - response = test_utils.get_service_list_request("services/service1") - if response.status_code != 404: - response = test_utils.service_delete_request("service1") + response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service1") + if response['status_code'] != 404: + self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1" + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'org-openroadm-service', 'service-delete', + self.del_serv_input_data) time.sleep(5) # pylint: disable=consider-using-f-string - for i in range(1, 6): + for i in range(1, 4): print("iteration number {}".format(i)) print("oc service creation") self.test_36_create_oc_service1() @@ -781,20 +734,20 @@ class TransportPCEFulltesting(unittest.TestCase): self.test_44_delete_oc_service1() def test_51_disconnect_XPDRA(self): - response = test_utils.unmount_device("XPDRA01") - self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) + response = test_utils_rfc8040.unmount_device("XPDRA01") + self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) def test_52_disconnect_XPDRC(self): - response = test_utils.unmount_device("XPDRC01") - self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) + response = test_utils_rfc8040.unmount_device("XPDRC01") + self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) def test_53_disconnect_ROADMA(self): - response = test_utils.unmount_device("ROADMA01") - self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) + response = test_utils_rfc8040.unmount_device("ROADMA01") + self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) def test_54_disconnect_ROADMC(self): - response = test_utils.unmount_device("ROADMC01") - self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) + response = test_utils_rfc8040.unmount_device("ROADMC01") + self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) if __name__ == "__main__":