X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F2.2.1%2Ftest_renderer_service_path_nominal.py;h=da93789ef90b13781fabb1e2b9f4309d75ed6142;hb=f14d37954ffcf069743b1c1b8f52811606667ed8;hp=c8211fa3886155f2ccb00bd2c0f648652881c501;hpb=53375cfd7601ff17bf225f78d4e01dc649960e65;p=transportpce.git diff --git a/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py b/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py index c8211fa38..da93789ef 100644 --- a/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py +++ b/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py @@ -19,53 +19,24 @@ import os import psutil import shutil from unittest.result import failfast +import test_utils class TransportPCERendererTesting(unittest.TestCase): - honeynode_process1 = None - honeynode_process2 = None + sim_process1 = None + sim_process2 = None odl_process = None restconf_baseurl = "http://localhost:8181/restconf" -#START_IGNORE_XTESTING - - @classmethod - def __start_honeynode1(cls): - executable = ("./honeynode/2.2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" - "/honeynode-distribution-1.18.01/honeycomb-tpce") - if os.path.isfile(executable): - with open('honeynode1.log', 'w') as outfile: - cls.honeynode_process1 = subprocess.Popen( - [executable, "17841", "sample_configs/openroadm/2.2.1/oper-ROADMA.xml"], - stdout=outfile) - - @classmethod - def __start_honeynode2(cls): - executable = ("./honeynode/2.2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" - "/honeynode-distribution-1.18.01/honeycomb-tpce") - if os.path.isfile(executable): - with open('honeynode2.log', 'w') as outfile: - cls.honeynode_process2 = subprocess.Popen( - [executable, "17840", "sample_configs/openroadm/2.2.1/oper-XPDRA.xml"], - stdout=outfile) - - @classmethod - def __start_odl(cls): - executable = "../karaf/target/assembly/bin/karaf" - with open('odl.log', 'w') as outfile: - cls.odl_process = subprocess.Popen( - ["bash", executable, "server"], stdout=outfile, - stdin=open(os.devnull)) +# START_IGNORE_XTESTING @classmethod def setUpClass(cls): - cls.__start_honeynode1() - time.sleep(20) - cls.__start_honeynode2() - time.sleep(20) - cls.__start_odl() - time.sleep(60) + cls.odl_process = test_utils.start_tpce() + + cls.sim_process1 = test_utils.start_sim('xpdra') + cls.sim_process2 = test_utils.start_sim('roadma') @classmethod def tearDownClass(cls): @@ -74,59 +45,63 @@ class TransportPCERendererTesting(unittest.TestCase): child.wait() cls.odl_process.send_signal(signal.SIGINT) cls.odl_process.wait() - for child in psutil.Process(cls.honeynode_process1.pid).children(): + for child in psutil.Process(cls.sim_process1.pid).children(): child.send_signal(signal.SIGINT) child.wait() - cls.honeynode_process1.send_signal(signal.SIGINT) - cls.honeynode_process1.wait() - for child in psutil.Process(cls.honeynode_process2.pid).children(): + cls.sim_process1.send_signal(signal.SIGINT) + cls.sim_process1.wait() + for child in psutil.Process(cls.sim_process2.pid).children(): child.send_signal(signal.SIGINT) child.wait() - cls.honeynode_process2.send_signal(signal.SIGINT) - cls.honeynode_process2.wait() + cls.sim_process2.send_signal(signal.SIGINT) + cls.sim_process2.wait() def setUp(self): - print ("execution of {}".format(self.id().split(".")[-1])) + print("execution of {}".format(self.id().split(".")[-1])) time.sleep(10) -#END_IGNORE_XTESTING +# END_IGNORE_XTESTING def test_01_rdm_device_connected(self): url = ("{}/config/network-topology:" "network-topology/topology/topology-netconf/node/ROADM-A1" .format(self.restconf_baseurl)) data = {"node": [{ - "node-id": "ROADM-A1", - "netconf-node-topology:username": "admin", - "netconf-node-topology:password": "admin", - "netconf-node-topology:host": "127.0.0.1", - "netconf-node-topology:port": "17841", - "netconf-node-topology:tcp-only": "false", - "netconf-node-topology:pass-through": {}}]} + "node-id": "ROADM-A1", + "netconf-node-topology:username": "admin", + "netconf-node-topology:password": "admin", + "netconf-node-topology:host": "127.0.0.1", + "netconf-node-topology:port": test_utils.sims['roadma']['port'], + "netconf-node-topology:tcp-only": "false", + "netconf-node-topology:pass-through": {}}]} headers = {'content-type': 'application/json'} response = requests.request( - "PUT", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.created) + "PUT", url, data=json.dumps(data), headers=headers, + auth=('admin', 'admin')) + self.assertIn(response.status_code, [requests.codes.created, + requests.codes.ok]) + # self.assertEqual(response.status_code, requests.codes.created) time.sleep(20) def test_02_xpdr_device_connected(self): url = ("{}/config/network-topology:" "network-topology/topology/topology-netconf/node/XPDR-A1" - .format(self.restconf_baseurl)) + .format(self.restconf_baseurl)) data = {"node": [{ "node-id": "XPDR-A1", "netconf-node-topology:username": "admin", "netconf-node-topology:password": "admin", "netconf-node-topology:host": "127.0.0.1", - "netconf-node-topology:port": "17840", + "netconf-node-topology:port": test_utils.sims['xpdra']['port'], "netconf-node-topology:tcp-only": "false", "netconf-node-topology:pass-through": {}}]} headers = {'content-type': 'application/json'} response = requests.request( "PUT", url, data=json.dumps(data), headers=headers, auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.created) + # self.assertEqual(response.status_code, requests.codes.created) + self.assertIn(response.status_code, [requests.codes.created, + requests.codes.ok]) time.sleep(20) def test_03_rdm_portmapping(self): @@ -135,17 +110,17 @@ class TransportPCERendererTesting(unittest.TestCase): .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( - {'supporting-port': 'L1', 'supporting-circuit-pack-name': '1/0', - 'logical-connection-point': 'DEG1-TTP-TXRX'}, - res['nodes'][0]['mapping']) + {'supporting-port': 'L1', 'supporting-circuit-pack-name': '1/0', + 'logical-connection-point': 'DEG1-TTP-TXRX', 'port-direction': 'bidirectional'}, + res['nodes'][0]['mapping']) self.assertIn( - {'supporting-port': 'C3', 'supporting-circuit-pack-name': '3/0', - 'logical-connection-point': 'SRG1-PP3-TXRX'}, - res['nodes'][0]['mapping']) + {'supporting-port': 'C3', 'supporting-circuit-pack-name': '3/0', + 'logical-connection-point': 'SRG1-PP3-TXRX', 'port-direction': 'bidirectional'}, + res['nodes'][0]['mapping']) def test_04_xpdr_portmapping(self): url = ("{}/config/transportpce-portmapping:network/" @@ -153,111 +128,137 @@ class TransportPCERendererTesting(unittest.TestCase): .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn( - {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', - 'logical-connection-point': 'XPDR1-NETWORK1'}, - res['nodes'][0]['mapping']) + {'supported-interface-capability': ['org-openroadm-port-types:if-OCH'], + 'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', + 'logical-connection-point': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-network', + 'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-CLIENT1', + 'lcp-hash-val': '8e128ba57560403cfd4ffafae38cd941'}, + res['nodes'][0]['mapping']) self.assertIn( - {'supporting-port': 'C1', - 'supporting-circuit-pack-name': '1/0/1-PLUG-CLIENT', - 'logical-connection-point': 'XPDR1-CLIENT1'}, - res['nodes'][0]['mapping']) + {'supported-interface-capability': ['org-openroadm-port-types:if-100GE'], + 'supporting-port': 'C1', + 'supporting-circuit-pack-name': '1/0/1-PLUG-CLIENT', + 'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional', + 'connection-map-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client', + 'lcp-hash-val': '3ed8ed1336784ac7c2f66c22f2f03d8'}, + res['nodes'][0]['mapping']) def test_05_service_path_create(self): url = "{}/operations/transportpce-device-renderer:service-path".format(self.restconf_baseurl) data = {"renderer:input": { - "renderer:service-name": "service_test", - "renderer:wave-number": "7", - "renderer:modulation-format": "qpsk", - "renderer:operation": "create", - "renderer:nodes": [ - {"renderer:node-id": "ROADM-A1", - "renderer:src-tp": "SRG1-PP3-TXRX", - "renderer:dest-tp": "DEG1-TTP-TXRX"}, - {"renderer:node-id": "XPDR-A1", - "renderer:src-tp": "XPDR1-CLIENT1", - "renderer:dest-tp": "XPDR1-NETWORK1"}]}} + "renderer:service-name": "service_test", + "renderer:wave-number": "7", + "renderer:modulation-format": "qpsk", + "renderer:operation": "create", + "renderer:nodes": [ + {"renderer:node-id": "ROADM-A1", + "renderer:src-tp": "SRG1-PP3-TXRX", + "renderer:dest-tp": "DEG1-TTP-TXRX"}, + {"renderer:node-id": "XPDR-A1", + "renderer:src-tp": "XPDR1-CLIENT1", + "renderer:dest-tp": "XPDR1-NETWORK1"}]}} headers = {'content-type': 'application/json'} response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=('admin', 'admin')) + "POST", url, data=json.dumps(data), + headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes: ROADM-A1', res["output"]["result"]) def test_06_service_path_create_rdm_check(self): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/DEG1-TTP-TXRX-nmc-7" - .format(self.restconf_baseurl)) + "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" + "interface/DEG1-TTP-TXRX-nmc-7" + .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset({'name': 'DEG1-TTP-TXRX-nmc-7', 'administrative-state': 'inService', - 'supporting-circuit-pack-name': '1/0', - 'type': 'org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint', - 'supporting-port': 'L1'}, res['interface'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'name': 'DEG1-TTP-TXRX-nmc-7', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '1/0', + 'type': 'org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint', + 'supporting-port': 'L1' + }, **res['interface'][0]), + res['interface'][0] + ) self.assertDictEqual( - {u'frequency': 191.65, u'width': 40}, - res['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp']) + {u'frequency': 195.8, u'width': 40}, + res['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp']) def test_07_service_path_create_rdm_check(self): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/DEG1-TTP-TXRX-mc-7" - .format(self.restconf_baseurl)) + "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" + "interface/DEG1-TTP-TXRX-mc-7" + .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset({'name': 'DEG1-TTP-TXRX-mc-7', 'administrative-state': 'inService', - 'supporting-circuit-pack-name': '1/0', - 'type': 'org-openroadm-interfaces:mediaChannelTrailTerminationPoint', - 'supporting-port': 'L1'}, res['interface'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( - {u'min-freq': 191.625, u'max-freq': 191.67499999999998}, - res['interface'][0]['org-openroadm-media-channel-interfaces:mc-ttp']) - + dict({ + 'name': 'DEG1-TTP-TXRX-mc-7', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '1/0', + 'type': 'org-openroadm-interfaces:mediaChannelTrailTerminationPoint', + 'supporting-port': 'L1' + }, **res['interface'][0]), + res['interface'][0] + ) + self.assertDictEqual( + {u'min-freq': 195.775, u'max-freq': 195.825}, + res['interface'][0]['org-openroadm-media-channel-interfaces:mc-ttp']) def test_08_service_path_create_rdm_check(self): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/SRG1-PP3-TXRX-nmc-7" - .format(self.restconf_baseurl)) + "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" + "interface/SRG1-PP3-TXRX-nmc-7" + .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset({'name': 'SRG1-PP3-TXRX-nmc-7', 'administrative-state': 'inService', - 'supporting-circuit-pack-name': '3/0', - 'type': 'org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint', - 'supporting-port': 'C3'}, res['interface'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'name': 'SRG1-PP3-TXRX-nmc-7', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '3/0', + 'type': 'org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint', + 'supporting-port': 'C3' + }, **res['interface'][0]), + res['interface'][0] + ) self.assertDictEqual( - {u'frequency': 191.65, u'width': 40}, - res['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp']) + {u'frequency': 195.8, u'width': 40}, + res['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp']) # -mc supporting interfaces must not be created for SRG, only degrees def test_09_service_path_create_rdm_check(self): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/SRG1-PP3-TXRX-mc-7" - .format(self.restconf_baseurl)) + "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" + "interface/SRG1-PP3-TXRX-mc-7" + .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.not_found) 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']) + {"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_10_service_path_create_rdm_check(self): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" @@ -266,86 +267,108 @@ class TransportPCERendererTesting(unittest.TestCase): .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'connection-name': 'SRG1-PP3-TXRX-DEG1-TTP-TXRX-7', - 'opticalControlMode': 'off'}, - res['roadm-connections'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'connection-name': 'SRG1-PP3-TXRX-DEG1-TTP-TXRX-7', + 'opticalControlMode': 'off' + }, **res['roadm-connections'][0]), + res['roadm-connections'][0] + ) self.assertDictEqual( - {'src-if': 'SRG1-PP3-TXRX-nmc-7'}, - res['roadm-connections'][0]['source']) + {'src-if': 'SRG1-PP3-TXRX-nmc-7'}, + res['roadm-connections'][0]['source']) self.assertDictEqual( - {'dst-if': 'DEG1-TTP-TXRX-nmc-7'}, - res['roadm-connections'][0]['destination']) + {'dst-if': 'DEG1-TTP-TXRX-nmc-7'}, + res['roadm-connections'][0]['destination']) def test_11_service_path_create_xpdr_check(self): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-7" - .format(self.restconf_baseurl)) + "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" + "interface/XPDR1-NETWORK1-7" + .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'name': 'XPDR1-NETWORK1-7', 'administrative-state': 'inService', - 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', - 'type': 'org-openroadm-interfaces:opticalChannel', - 'supporting-port': '1'}, - res['interface'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'name': 'XPDR1-NETWORK1-7', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', + 'type': 'org-openroadm-interfaces:opticalChannel', + 'supporting-port': '1' + }, **res['interface'][0]), + res['interface'][0] + ) self.assertDictEqual( - {u'rate': u'org-openroadm-common-types:R100G', - u'transmit-power':-5, - u'frequency': 191.65}, - res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) + {u'rate': u'org-openroadm-common-types:R100G', + u'transmit-power': -5, + u'frequency': 195.8}, + res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) def test_12_service_path_create_xpdr_check(self): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-OTU" - .format(self.restconf_baseurl)) + "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" + "interface/XPDR1-NETWORK1-OTU" + .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'name': 'XPDR1-NETWORK1-OTU', 'administrative-state': 'inService', - 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', - 'type': 'org-openroadm-interfaces:otnOtu', - 'supporting-port': '1', - 'supporting-interface': 'XPDR1-NETWORK1-7'}, - res['interface'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'name': 'XPDR1-NETWORK1-OTU', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', + 'type': 'org-openroadm-interfaces:otnOtu', + 'supporting-port': '1', + 'supporting-interface': 'XPDR1-NETWORK1-7' + }, **res['interface'][0]), + res['interface'][0] + ) self.assertDictEqual( - {u'rate': u'org-openroadm-otn-common-types:OTU4', - u'fec': u'scfec'}, - res['interface'][0]['org-openroadm-otn-otu-interfaces:otu']) + {u'rate': u'org-openroadm-otn-common-types:OTU4', + u'fec': u'scfec'}, + res['interface'][0]['org-openroadm-otn-otu-interfaces:otu']) def test_13_service_path_create_xpdr_check(self): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/XPDR1-NETWORK1-ODU" - .format(self.restconf_baseurl)) + "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" + "interface/XPDR1-NETWORK1-ODU" + .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'name': 'XPDR1-NETWORK1-ODU', 'administrative-state': 'inService', - 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', - 'type': 'org-openroadm-interfaces:otnOdu', - 'supporting-port': '1', - 'supporting-interface': 'XPDR1-NETWORK1-OTU'}, - res['interface'][0]) - self.assertDictContainsSubset( - {'rate': 'org-openroadm-otn-common-types:ODU4', - u'monitoring-mode': u'terminated'}, - res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']) - self.assertDictEqual({u'exp-payload-type': u'07', u'payload-type': u'07'}, + # the 2 following statements replace self.assertDictContainsSubset deprecated in python 3.2 + self.assertDictEqual( + dict({ + 'name': 'XPDR1-NETWORK1-ODU', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', + 'type': 'org-openroadm-interfaces:otnOdu', + 'supporting-port': '1', + 'supporting-interface': 'XPDR1-NETWORK1-OTU' + }, **res['interface'][0]), + res['interface'][0] + ) + self.assertDictEqual( + dict({ + 'rate': 'org-openroadm-otn-common-types:ODU4', + u'monitoring-mode': u'terminated' + }, **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']), + res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'] + ) + self.assertDictEqual({u'exp-payload-type': u'07', u'payload-type': u'07'}, res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) def test_14_service_path_create_xpdr_check(self): @@ -355,39 +378,44 @@ class TransportPCERendererTesting(unittest.TestCase): .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictContainsSubset( - {'name': 'XPDR1-CLIENT1-ETHERNET', 'administrative-state': 'inService', - 'supporting-circuit-pack-name': '1/0/1-PLUG-CLIENT', - 'type': 'org-openroadm-interfaces:ethernetCsmacd', - 'supporting-port': 'C1'}, - res['interface'][0]) + # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( - {u'fec': u'off', u'speed': 100000}, - res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']) + dict({ + 'name': 'XPDR1-CLIENT1-ETHERNET', + 'administrative-state': 'inService', + 'supporting-circuit-pack-name': '1/0/1-PLUG-CLIENT', + 'type': 'org-openroadm-interfaces:ethernetCsmacd', + 'supporting-port': 'C1' + }, **res['interface'][0]), + res['interface'][0] + ) + self.assertDictEqual( + {u'fec': u'off', u'speed': 100000}, + res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']) def test_15_service_path_create_xpdr_check(self): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "circuit-packs/1%2F0%2F1-PLUG-NET" - .format(self.restconf_baseurl)) + "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" + "circuit-packs/1%2F0%2F1-PLUG-NET" + .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('not-reserved-inuse', res['circuit-packs'][0]["equipment-state"]) def test_16_service_path_create_xpdr_check(self): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "circuit-packs/1%2F0%2F1-PLUG-CLIENT" - .format(self.restconf_baseurl)) + "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" + "circuit-packs/1%2F0%2F1-PLUG-CLIENT" + .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('not-reserved-inuse', res['circuit-packs'][0]["equipment-state"]) @@ -395,53 +423,53 @@ class TransportPCERendererTesting(unittest.TestCase): def test_17_service_path_delete(self): url = "{}/operations/transportpce-device-renderer:service-path".format(self.restconf_baseurl) data = {"renderer:input": { - "renderer:service-name": "service_test", - "renderer:wave-number": "7", - "renderer:operation": "delete", - "renderer:nodes": [ - {"renderer:node-id": "ROADM-A1", - "renderer:src-tp": "SRG1-PP3-TXRX", - "renderer:dest-tp": "DEG1-TTP-TXRX"}, - {"renderer:node-id": "XPDR-A1", - "renderer:src-tp": "XPDR1-CLIENT1", - "renderer:dest-tp": "XPDR1-NETWORK1"}]}} + "renderer:service-name": "service_test", + "renderer:wave-number": "7", + "renderer:operation": "delete", + "renderer:nodes": [ + {"renderer:node-id": "ROADM-A1", + "renderer:src-tp": "SRG1-PP3-TXRX", + "renderer:dest-tp": "DEG1-TTP-TXRX"}, + {"renderer:node-id": "XPDR-A1", + "renderer:src-tp": "XPDR1-CLIENT1", + "renderer:dest-tp": "XPDR1-NETWORK1"}]}} headers = {'content-type': 'application/json'} response = requests.request( - "POST", url, data=json.dumps(data), - headers=headers, auth=('admin', 'admin')) + "POST", url, data=json.dumps(data), + headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) self.assertEqual(response.json(), { - 'output': {'result': 'Request processed', 'success': True}}) + 'output': {'result': 'Request processed', 'success': True}}) def test_18_service_path_delete_rdm_check(self): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/DEG1-TTP-TXRX-mc-7" - .format(self.restconf_baseurl)) + "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" + "interface/DEG1-TTP-TXRX-mc-7" + .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.not_found) 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']) + {"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_19_service_path_delete_rdm_check(self): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" - "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" - "interface/DEG1-TTP-TXRX-nmc-7" - .format(self.restconf_baseurl)) + "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/" + "interface/DEG1-TTP-TXRX-nmc-7" + .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.not_found) 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']) + {"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_20_service_path_delete_rdm_check(self): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" @@ -450,12 +478,13 @@ class TransportPCERendererTesting(unittest.TestCase): .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.not_found) 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']) + {"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_service_path_delete_rdm_check(self): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" @@ -464,12 +493,13 @@ class TransportPCERendererTesting(unittest.TestCase): .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.not_found) 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']) + {"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_22_service_path_delete_rdm_check(self): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" @@ -478,12 +508,13 @@ class TransportPCERendererTesting(unittest.TestCase): .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.not_found) 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']) + {"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_23_service_path_delete_xpdr_check(self): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" @@ -492,12 +523,13 @@ class TransportPCERendererTesting(unittest.TestCase): .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.not_found) 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']) + {"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_24_service_path_delete_xpdr_check(self): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" @@ -506,12 +538,13 @@ class TransportPCERendererTesting(unittest.TestCase): .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.not_found) 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']) + {"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_25_service_path_delete_xpdr_check(self): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" @@ -520,12 +553,13 @@ class TransportPCERendererTesting(unittest.TestCase): .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.not_found) 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']) + {"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_26_service_path_delete_xpdr_check(self): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" @@ -534,12 +568,13 @@ class TransportPCERendererTesting(unittest.TestCase): .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + "GET", url, headers=headers, auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.not_found) 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']) + {"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_27_service_path_delete_xpdr_check(self): url = ("{}/config/network-topology:network-topology/topology/topology-netconf/" @@ -571,19 +606,19 @@ class TransportPCERendererTesting(unittest.TestCase): .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "DELETE", url, headers=headers, - auth=('admin', 'admin')) + "DELETE", url, headers=headers, + auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) time.sleep(20) def test_30_xpdr_device_disconnected(self): url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/XPDR-A1" + "network-topology/topology/topology-netconf/node/XPDR-A1" .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} response = requests.request( - "DELETE", url, headers=headers, - auth=('admin', 'admin')) + "DELETE", url, headers=headers, + auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) time.sleep(20)