X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F2.2.1%2Ftest15_otn_end2end_with_intermediate_switch.py;h=11de7104007c392eb7860173434f4484c1a07631;hb=56d1795b647693ec1d620d6aca2c4003e3b302ca;hp=3cc1e32bfb0fd63c38ac444ddaeb59cbfce1a0e7;hpb=a449646bc5220e89df903a4cac85287d07702b77;p=transportpce.git diff --git a/tests/transportpce_tests/2.2.1/test15_otn_end2end_with_intermediate_switch.py b/tests/transportpce_tests/2.2.1/test15_otn_end2end_with_intermediate_switch.py index 3cc1e32bf..11de71040 100644 --- a/tests/transportpce_tests/2.2.1/test15_otn_end2end_with_intermediate_switch.py +++ b/tests/transportpce_tests/2.2.1/test15_otn_end2end_with_intermediate_switch.py @@ -45,13 +45,7 @@ class TransportPCEtesting(unittest.TestCase): "service-format": "OTU", "otu-service-rate": "org-openroadm-otn-common-types:OTU4", "clli": "NodeSA", - "subrate-eth-sla": { - "subrate-eth-sla": { - "committed-info-rate": "100000", - "committed-burst-size": "64" - } - }, - "tx-direction": { + "tx-direction": [{ "port": { "port-device-name": "SPDR-SA1-XPDR1", "port-type": "fixed", @@ -64,9 +58,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": "SPDR-SA1-XPDR1", "port-type": "fixed", @@ -79,8 +74,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": { @@ -89,13 +85,7 @@ class TransportPCEtesting(unittest.TestCase): "service-format": "OTU", "otu-service-rate": "org-openroadm-otn-common-types:OTU4", "clli": "NodeSB", - "subrate-eth-sla": { - "subrate-eth-sla": { - "committed-info-rate": "100000", - "committed-burst-size": "64" - } - }, - "tx-direction": { + "tx-direction": [{ "port": { "port-device-name": "SPDR-SB1-XPDR2", "port-type": "fixed", @@ -108,9 +98,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": "SPDR-SB1-XPDR2", "port-type": "fixed", @@ -123,8 +114,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" }, "due-date": "2018-06-15T00:00:01Z", @@ -432,7 +424,7 @@ class TransportPCEtesting(unittest.TestCase): for link in res['network'][0]['ietf-network-topology:link']: self.assertIn(link['link-id'], listLinkId) self.assertEqual( - link['transportpce-topology:otn-link-type'], 'OTU4') + link['transportpce-networkutils:otn-link-type'], 'OTU4') self.assertEqual( link['org-openroadm-common-network:link-type'], 'OTN-LINK') self.assertEqual( @@ -448,16 +440,16 @@ class TransportPCEtesting(unittest.TestCase): self.cr_serv_sample_data["input"]["service-name"] = "service-OCH-OTU4-BC" self.cr_serv_sample_data["input"]["service-a-end"]["node-id"] = "SPDR-SB1" self.cr_serv_sample_data["input"]["service-a-end"]["clli"] = "NodeSB" - self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-device-name"] = "SPDR-SB1-XPDR2" - self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-name"] = "XPDR2-NETWORK2" - self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-device-name"] = "SPDR-SB1-XPDR2" - self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-name"] = "XPDR2-NETWORK2" + self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SB1-XPDR2" + self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK2" + self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SB1-XPDR2" + self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK2" self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "SPDR-SC1" self.cr_serv_sample_data["input"]["service-z-end"]["clli"] = "NodeSC" - self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-device-name"] = "SPDR-SC1-XPDR1" - self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-name"] = "XPDR1-NETWORK1" - self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-device-name"] = "SPDR-SC1-XPDR1" - self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-name"] = "XPDR1-NETWORK1" + self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR1" + self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1" + self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR1" + self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1" response = test_utils.service_create_request(self.cr_serv_sample_data) self.assertEqual(response.status_code, requests.codes.ok) @@ -494,7 +486,7 @@ class TransportPCEtesting(unittest.TestCase): for link in res['network'][0]['ietf-network-topology:link']: self.assertIn(link['link-id'], listLinkId) self.assertEqual( - link['transportpce-topology:otn-link-type'], 'OTU4') + link['transportpce-networkutils:otn-link-type'], 'OTU4') self.assertEqual( link['org-openroadm-common-network:link-type'], 'OTN-LINK') self.assertEqual( @@ -513,19 +505,19 @@ class TransportPCEtesting(unittest.TestCase): 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:ODU4" - self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-device-name"] = "SPDR-SA1-XPDR1" - self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-name"] = "XPDR1-NETWORK1" - self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-device-name"] = "SPDR-SA1-XPDR1" - self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-name"] = "XPDR1-NETWORK1" + self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR1" + self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1" + self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR1" + self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1" self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "SPDR-SC1" self.cr_serv_sample_data["input"]["service-z-end"]["clli"] = "NodeSC" 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:ODU4" - self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-device-name"] = "SPDR-SC1-XPDR1" - self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-name"] = "XPDR1-NETWORK1" - self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-device-name"] = "SPDR-SC1-XPDR1" - self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-name"] = "XPDR1-NETWORK1" + self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR1" + self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1" + self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR1" + self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1" response = test_utils.service_create_request(self.cr_serv_sample_data) self.assertEqual(response.status_code, requests.codes.ok) @@ -703,7 +695,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual( link['org-openroadm-otn-network-topology:used-bandwidth'], 0) self.assertEqual( - link['transportpce-topology:otn-link-type'], 'ODTU4') + link['transportpce-networkutils:otn-link-type'], 'ODTU4') self.assertEqual( link['org-openroadm-common-network:link-type'], 'OTN-LINK') self.assertIn(link['org-openroadm-common-network:opposite-link'], @@ -734,13 +726,13 @@ class TransportPCEtesting(unittest.TestCase): self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "10" 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"] = "XPDR1-CLIENT1" - self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-name"] = "XPDR1-CLIENT1" + self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1" + self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1" self.cr_serv_sample_data["input"]["service-z-end"]["service-rate"] = "10" 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"] = "XPDR1-NETWORK1" - self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-name"] = "XPDR1-NETWORK1" + self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1" + self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1" response = test_utils.service_create_request(self.cr_serv_sample_data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -782,10 +774,10 @@ class TransportPCEtesting(unittest.TestCase): def test_043_check_interface_ODU2E_CLIENT_spdra(self): response = test_utils.check_netconf_node_request( - "SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e-service1-10GE") + "SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e-service1-10GE', + input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-SFP4', 'supporting-interface': 'XPDR1-CLIENT1-ETHERNET10G', @@ -809,7 +801,7 @@ class TransportPCEtesting(unittest.TestCase): {'payload-type': '03', 'exp-payload-type': '03'}, res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) response2 = test_utils.check_netconf_node_request( - "SPDR-SC1", "interface/XPDR1-CLIENT1-ODU2e-service1-10GE") + "SPDR-SC1", "interface/XPDR1-CLIENT1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res2 = response2.json()['interface'][0]['org-openroadm-otn-odu-interfaces:odu'] self.assertEqual(input_dict_2['tx-sapi'], res2['tx-dapi']) @@ -819,10 +811,10 @@ class TransportPCEtesting(unittest.TestCase): def test_044_check_interface_ODU2E_NETWORK_spdra(self): response = test_utils.check_netconf_node_request( - "SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e-service1-10GE") + "SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e-service1-10GE', + input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR1-NETWORK1-ODU4', @@ -849,20 +841,20 @@ class TransportPCEtesting(unittest.TestCase): def test_045_check_ODU2E_connection_spdra(self): response = test_utils.check_netconf_node_request( "SPDR-SA1", - "odu-connection/XPDR1-CLIENT1-ODU2e-service1-10GE-x-XPDR1-NETWORK1-ODU2e-service1-10GE") + "odu-connection/XPDR1-CLIENT1-ODU2e-x-XPDR1-NETWORK1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = { 'connection-name': - 'XPDR1-CLIENT1-ODU2e-service1-10GE-x-XPDR1-NETWORK1-ODU2e-service1-10GE', + 'XPDR1-CLIENT1-ODU2e-x-XPDR1-NETWORK1-ODU2e', 'direction': 'bidirectional' } self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]), res['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e-service1-10GE'}, + self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e'}, res['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e-service1-10GE'}, + self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e'}, res['odu-connection'][0]['source']) def test_046_check_interface_10GE_CLIENT_spdrc(self): @@ -884,10 +876,10 @@ class TransportPCEtesting(unittest.TestCase): def test_047_check_interface_ODU2E_CLIENT_spdrc(self): response = test_utils.check_netconf_node_request( - "SPDR-SC1", "interface/XPDR1-CLIENT1-ODU2e-service1-10GE") + "SPDR-SC1", "interface/XPDR1-CLIENT1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e-service1-10GE', + input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-SFP4', 'supporting-interface': 'XPDR1-CLIENT1-ETHERNET10G', @@ -911,7 +903,7 @@ class TransportPCEtesting(unittest.TestCase): {'payload-type': '03', 'exp-payload-type': '03'}, res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) response2 = test_utils.check_netconf_node_request( - "SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e-service1-10GE") + "SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res2 = response2.json()['interface'][0]['org-openroadm-otn-odu-interfaces:odu'] self.assertEqual(input_dict_2['tx-sapi'], res2['tx-dapi']) @@ -921,10 +913,10 @@ class TransportPCEtesting(unittest.TestCase): def test_048_check_interface_ODU2E_NETWORK_spdrc(self): response = test_utils.check_netconf_node_request( - "SPDR-SC1", "interface/XPDR1-NETWORK1-ODU2e-service1-10GE") + "SPDR-SC1", "interface/XPDR1-NETWORK1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e-service1-10GE', + input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR1-NETWORK1-ODU4', @@ -954,20 +946,20 @@ class TransportPCEtesting(unittest.TestCase): def test_049_check_ODU2E_connection_spdrc(self): response = test_utils.check_netconf_node_request( "SPDR-SC1", - "odu-connection/XPDR1-CLIENT1-ODU2e-service1-10GE-x-XPDR1-NETWORK1-ODU2e-service1-10GE") + "odu-connection/XPDR1-CLIENT1-ODU2e-x-XPDR1-NETWORK1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = { 'connection-name': - 'XPDR1-CLIENT1-ODU2e-service1-10GE-x-XPDR1-NETWORK1-ODU2e-service1-10GE', + 'XPDR1-CLIENT1-ODU2e-x-XPDR1-NETWORK1-ODU2e', 'direction': 'bidirectional' } self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]), res['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e-service1-10GE'}, + self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e'}, res['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e-service1-10GE'}, + self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e'}, res['odu-connection'][0]['source']) def test_050_check_otn_topo_links(self): @@ -1027,12 +1019,12 @@ class TransportPCEtesting(unittest.TestCase): def test_055_check_no_interface_ODU2E_NETWORK_spdra(self): response = test_utils.check_netconf_node_request( - "SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e-service1") + "SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e") self.assertEqual(response.status_code, requests.codes.conflict) def test_056_check_no_interface_ODU2E_CLIENT_spdra(self): response = test_utils.check_netconf_node_request( - "SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e-service1") + "SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e") self.assertEqual(response.status_code, requests.codes.conflict) def test_057_check_no_interface_10GE_CLIENT_spdra(self): @@ -1132,19 +1124,19 @@ class TransportPCEtesting(unittest.TestCase): self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "100" self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "ODU" self.cr_serv_sample_data["input"]["service-a-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODU4" - self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-device-name"] = "SPDR-SA1-XPDR1" - self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-name"] = "XPDR1-NETWORK1" - self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-device-name"] = "SPDR-SA1-XPDR1" - self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-name"] = "XPDR1-NETWORK1" + self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR1" + self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1" + self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR1" + self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1" self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "SPDR-SB1" self.cr_serv_sample_data["input"]["service-z-end"]["clli"] = "NodeSB" self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "100" self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "ODU" self.cr_serv_sample_data["input"]["service-z-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODU4" - self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-device-name"] = "SPDR-SB1-XPDR2" - self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-name"] = "XPDR2-NETWORK1" - self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-device-name"] = "SPDR-SB1-XPDR2" - self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-name"] = "XPDR2-NETWORK1" + self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SB1-XPDR2" + self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK1" + self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SB1-XPDR2" + self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK1" response = test_utils.service_create_request(self.cr_serv_sample_data) self.assertEqual(response.status_code, requests.codes.ok) @@ -1244,16 +1236,16 @@ class TransportPCEtesting(unittest.TestCase): def test_072_create_ODU4_service_BC(self): # pylint: disable=line-too-long self.cr_serv_sample_data["input"]["service-name"] = "service-ODU4-BC" - self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-device-name"] = "SPDR-SB1-XPDR2" - self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-name"] = "XPDR2-NETWORK2" - self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-device-name"] = "SPDR-SB1-XPDR2" - self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-name"] = "XPDR2-NETWORK2" + self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SB1-XPDR2" + self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK2" + self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SB1-XPDR2" + self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK2" self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "SPDR-SC1" self.cr_serv_sample_data["input"]["service-z-end"]["clli"] = "NodeSC" - self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-device-name"] = "SPDR-SC1-XPDR1" - self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-name"] = "XPDR1-NETWORK1" - self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-device-name"] = "SPDR-SC1-XPDR1" - self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-name"] = "XPDR1-NETWORK1" + self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR1" + self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1" + self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR1" + self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1" response = test_utils.service_create_request(self.cr_serv_sample_data) self.assertEqual(response.status_code, requests.codes.ok) @@ -1358,15 +1350,15 @@ class TransportPCEtesting(unittest.TestCase): self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "10" 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-device-name"] = "SPDR-SA1-XPDR1" - self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-name"] = "XPDR1-CLIENT1" - self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-device-name"] = "SPDR-SA1-XPDR1" - self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-name"] = "XPDR1-CLIENT1" + self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR1" + self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1" + self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR1" + self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1" self.cr_serv_sample_data["input"]["service-z-end"]["service-rate"] = "10" 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"] = "XPDR1-CLIENT1" - self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-name"] = "XPDR1-CLIENT1" + self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1" + self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1" response = test_utils.service_create_request(self.cr_serv_sample_data) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -1386,10 +1378,10 @@ class TransportPCEtesting(unittest.TestCase): def test_078_check_interface_ODU2E_NETWORK1_spdrb(self): response = test_utils.check_netconf_node_request( - "SPDR-SB1", "interface/XPDR2-NETWORK1-ODU2e-service1-10GE") + "SPDR-SB1", "interface/XPDR2-NETWORK1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU2e-service1-10GE', + input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU2e', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR2-NETWORK1-ODU4', @@ -1415,10 +1407,10 @@ class TransportPCEtesting(unittest.TestCase): def test_079_check_interface_ODU2E_NETWORK2_spdrb(self): response = test_utils.check_netconf_node_request( - "SPDR-SB1", "interface/XPDR2-NETWORK2-ODU2e-service1-10GE") + "SPDR-SB1", "interface/XPDR2-NETWORK2-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR2-NETWORK2-ODU2e-service1-10GE', + input_dict_1 = {'name': 'XPDR2-NETWORK2-ODU2e', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR2-NETWORK2-ODU4', @@ -1445,20 +1437,20 @@ class TransportPCEtesting(unittest.TestCase): def test_080_check_ODU2E_connection_spdrb(self): response = test_utils.check_netconf_node_request( "SPDR-SB1", - "odu-connection/XPDR2-NETWORK1-ODU2e-service1-10GE-x-XPDR2-NETWORK2-ODU2e-service1-10GE") + "odu-connection/XPDR2-NETWORK1-ODU2e-x-XPDR2-NETWORK2-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = { 'connection-name': - 'XPDR2-NETWORK1-ODU2e-service1-10GE-x-XPDR2-NETWORK2-ODU2e-service1-10GE', + 'XPDR2-NETWORK1-ODU2e-x-XPDR2-NETWORK2-ODU2e', 'direction': 'bidirectional' } self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]), res['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR2-NETWORK2-ODU2e-service1-10GE'}, + self.assertDictEqual({'dst-if': 'XPDR2-NETWORK2-ODU2e'}, res['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR2-NETWORK1-ODU2e-service1-10GE'}, + self.assertDictEqual({'src-if': 'XPDR2-NETWORK1-ODU2e'}, res['odu-connection'][0]['source']) def test_081_check_otn_topo_links(self): @@ -1511,12 +1503,12 @@ class TransportPCEtesting(unittest.TestCase): def test_087_check_no_interface_ODU2E_NETWORK1_spdrb(self): response = test_utils.check_netconf_node_request( - "SPDR-SB1", "interface/XPDR2-NETWORK1-ODU2e-service1") + "SPDR-SB1", "interface/XPDR2-NETWORK1-ODU2e") self.assertEqual(response.status_code, requests.codes.conflict) def test_088_check_no_interface_ODU2E_NETWORK2_spdrb(self): response = test_utils.check_netconf_node_request( - "SPDR-SB1", "interface/XPDR2-NETWORK2-ODU2e-service1") + "SPDR-SB1", "interface/XPDR2-NETWORK2-ODU2e") self.assertEqual(response.status_code, requests.codes.conflict) def test_089_check_otn_topo_links(self):