X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F1.2.1%2Ftest_end2end.py;h=3f7ca3b52aff45306c1664bf6eba47d95da1c572;hb=c834356f10cb8bc04c8b0a9eb2a438b2e9c50632;hp=759fdbaa0f2161ac30dbf795281586adcb787904;hpb=f4addc552d711cd1a6fb52fe2d27a92f86f95410;p=transportpce.git diff --git a/tests/transportpce_tests/1.2.1/test_end2end.py b/tests/transportpce_tests/1.2.1/test_end2end.py index 759fdbaa0..3f7ca3b52 100644 --- a/tests/transportpce_tests/1.2.1/test_end2end.py +++ b/tests/transportpce_tests/1.2.1/test_end2end.py @@ -14,11 +14,10 @@ import base64 import time import unittest - import requests -from common import test_utils -from common.flexgrid_utils import INDEX_1_USED_FREQ_MAP, INDEX_1_2_USED_FREQ_MAP, AVAILABLE_FREQ_MAP, check_freq_map - +import sys +sys.path.append('transportpce_tests/common/') +import test_utils class TransportPCEFulltesting(unittest.TestCase): cr_serv_sample_data = {"input": { @@ -120,11 +119,15 @@ class TransportPCEFulltesting(unittest.TestCase): } processes = None WAITING = 20 + NODE_VERSION = '1.2.1' @classmethod def setUpClass(cls): cls.processes = test_utils.start_tpce() - cls.processes = test_utils.start_sims(['xpdra', 'roadma-full', 'roadmc-full', 'xpdrc']) + cls.processes = test_utils.start_sims([('xpdra', cls.NODE_VERSION), + ('roadma-full', cls.NODE_VERSION), + ('roadmc-full', cls.NODE_VERSION), + ('xpdrc', cls.NODE_VERSION)]) @classmethod def tearDownClass(cls): @@ -138,19 +141,19 @@ class TransportPCEFulltesting(unittest.TestCase): # connect netconf devices def test_01_connect_xpdrA(self): - response = test_utils.mount_device("XPDRA01", 'xpdra') + response = test_utils.mount_device("XPDRA01", ('xpdra', self.NODE_VERSION)) self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_02_connect_xpdrC(self): - response = test_utils.mount_device("XPDRC01", 'xpdrc') + response = test_utils.mount_device("XPDRC01", ('xpdrc', self.NODE_VERSION)) self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_03_connect_rdmA(self): - response = test_utils.mount_device("ROADMA01", 'roadma-full') + 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) def test_04_connect_rdmC(self): - response = test_utils.mount_device("ROADMC01", 'roadmc-full') + 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) def test_05_connect_xprdA_N1_to_roadmA_PP1(self): @@ -246,13 +249,13 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(2) def test_13_check_xc1_ROADMA(self): - response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") + 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() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( dict({ - 'connection-number': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-1', + 'connection-number': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768', 'wavelength-number': 1, 'opticalControlMode': 'gainLoss', 'target-output-power': -3.0 @@ -260,21 +263,21 @@ class TransportPCEFulltesting(unittest.TestCase): res['roadm-connections'][0] ) self.assertDictEqual( - {'src-if': 'SRG1-PP1-TXRX-1'}, + {'src-if': 'SRG1-PP1-TXRX-761:768'}, res['roadm-connections'][0]['source']) self.assertDictEqual( - {'dst-if': 'DEG1-TTP-TXRX-1'}, + {'dst-if': 'DEG1-TTP-TXRX-761:768'}, res['roadm-connections'][0]['destination']) time.sleep(5) def test_14_check_xc1_ROADMC(self): - response = test_utils.check_netconf_node_request("ROADMC01", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1") + 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() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( dict({ - 'connection-number': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-1', + 'connection-number': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768', 'wavelength-number': 1, 'opticalControlMode': 'gainLoss', 'target-output-power': 2.0 @@ -282,10 +285,10 @@ class TransportPCEFulltesting(unittest.TestCase): res['roadm-connections'][0] ) self.assertDictEqual( - {'src-if': 'SRG1-PP1-TXRX-1'}, + {'src-if': 'SRG1-PP1-TXRX-761:768'}, res['roadm-connections'][0]['source']) self.assertDictEqual( - {'dst-if': 'DEG2-TTP-TXRX-1'}, + {'dst-if': 'DEG2-TTP-TXRX-761:768'}, res['roadm-connections'][0]['destination']) time.sleep(5) @@ -296,16 +299,13 @@ class TransportPCEFulltesting(unittest.TestCase): liste_tp = res['node'][0]['ietf-network-topology:termination-point'] for ele in liste_tp: if ele['tp-id'] == 'XPDR1-NETWORK1': - self.assertEqual({u'frequency': 196.1, u'width': 40}, + self.assertEqual({u'frequency': 196.1, + u'width': 40}, ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']) - if ele['tp-id'] == 'XPDR1-CLIENT1' or ele['tp-id'] == 'XPDR1-CLIENT3': - self.assertNotIn( - 'org-openroadm-network-topology:xpdr-client-attributes', - dict.keys(ele)) + if ele['tp-id'] == 'XPDR1-CLIENT2' or ele['tp-id'] == 'XPDR1-CLIENT1': + self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele)) if ele['tp-id'] == 'XPDR1-NETWORK2': - self.assertNotIn( - 'org-openroadm-network-topology:xpdr-network-attributes', - dict.keys(ele)) + self.assertNotIn('org-openroadm-network-topology:xpdr-network-attributes', dict.keys(ele)) time.sleep(3) def test_16_check_topo_ROADMA_SRG1(self): @@ -315,16 +315,16 @@ class TransportPCEFulltesting(unittest.TestCase): freq_map = base64.b64decode( res['node'][0]['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[0], 0, "Index 1 should not be available") + self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available") liste_tp = res['node'][0]['ietf-network-topology:termination-point'] for ele in liste_tp: if ele['tp-id'] == 'SRG1-PP1-TXRX': - self.assertIn({u'index': 1, u'frequency': 196.1, u'width': 40}, - ele['org-openroadm-network-topology:' - 'pp-attributes']['used-wavelength'] - ) + freq_map = base64.b64decode( + ele['org-openroadm-network-topology:pp-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") if ele['tp-id'] == 'SRG1-PP2-TXRX': - self.assertNotIn('used-wavelength', dict.keys(ele)) + self.assertNotIn('avail-freq-maps', dict.keys(ele)) time.sleep(3) def test_17_check_topo_ROADMA_DEG1(self): @@ -334,20 +334,19 @@ class TransportPCEFulltesting(unittest.TestCase): freq_map = base64.b64decode( res['node'][0]['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[0], 0, "Index 1 should not be available") + self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available") liste_tp = res['node'][0]['ietf-network-topology:termination-point'] for ele in liste_tp: - if ele['tp-id'] == 'DEG1-CTP-TXRX': - self.assertIn({u'map-name': 'cband', u'freq-map-granularity': 6.25, u'start-edge-freq': 191.325, - u'effective-bits': 8, u'freq-map': INDEX_1_USED_FREQ_MAP}, - ele['org-openroadm-network-topology:' - 'ctp-attributes'][ - 'avail-freq-maps']) - if ele['tp-id'] == 'DEG1-TTP-TXRX': - self.assertIn({u'index': 1, u'frequency': 196.1, u'width': 40}, - ele['org-openroadm-network-topology:' - 'tx-ttp-attributes'][ - 'used-wavelengths']) + if ele['tp-id'] == 'DEG2-CTP-TXRX': + freq_map = base64.b64decode( + ele['org-openroadm-network-topology:ctp-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") + if ele['tp-id'] == 'DEG2-TTP-TXRX': + freq_map = base64.b64decode( + 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) def test_18_connect_xprdA_N2_to_roadmA_PP2(self): @@ -412,23 +411,23 @@ class TransportPCEFulltesting(unittest.TestCase): 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-2") + 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() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( dict({ - 'connection-number': 'DEG1-TTP-TXRX-SRG1-PP2-TXRX-2', + '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-2'}, + {'src-if': 'DEG1-TTP-TXRX-753:760'}, res['roadm-connections'][0]['source']) self.assertDictEqual( - {'dst-if': 'SRG1-PP2-TXRX-2'}, + {'dst-if': 'SRG1-PP2-TXRX-753:760'}, res['roadm-connections'][0]['destination']) def test_25_check_topo_XPDRA(self): @@ -438,20 +437,15 @@ class TransportPCEFulltesting(unittest.TestCase): liste_tp = res['node'][0]['ietf-network-topology:termination-point'] for ele in liste_tp: if ele['tp-id'] == 'XPDR1-NETWORK1': - self.assertEqual({u'frequency': 196.1, u'width': 40}, - ele['org-openroadm-network-topology:' - 'xpdr-network-attributes'][ - 'wavelength']) + self.assertEqual({u'frequency': 196.1, + u'width': 40}, + ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']) if ele['tp-id'] == 'XPDR1-NETWORK2': - self.assertEqual({u'frequency': 196.05, u'width': 40}, - ele['org-openroadm-network-topology:' - 'xpdr-network-attributes'][ - 'wavelength']) - if ele['tp-id'] == 'XPDR1-CLIENT1' or \ - ele['tp-id'] == 'XPDR1-CLIENT3': - self.assertNotIn( - 'org-openroadm-network-topology:xpdr-client-attributes', - dict.keys(ele)) + self.assertEqual({u'frequency': 196.05, + u'width': 40}, + ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']) + if ele['tp-id'] == 'XPDR1-CLIENT1' or ele['tp-id'] == 'XPDR1-CLIENT2': + self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele)) time.sleep(10) def test_26_check_topo_ROADMA_SRG1(self): @@ -461,29 +455,24 @@ class TransportPCEFulltesting(unittest.TestCase): freq_map = base64.b64decode( res['node'][0]['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[0], 0, "Index 1 should not be available") - self.assertEqual(freq_map_array[1], 0, "Index 2 should not be available") + 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'] for ele in liste_tp: if ele['tp-id'] == 'SRG1-PP1-TXRX': - self.assertIn({u'index': 1, u'frequency': 196.1, u'width': 40}, - ele['org-openroadm-network-topology:' - 'pp-attributes']['used-wavelength']) - self.assertNotIn({u'index': 2, u'frequency': 196.05, - u'width': 40}, - ele['org-openroadm-network-topology:' - 'pp-attributes']['used-wavelength']) + freq_map = base64.b64decode( + ele['org-openroadm-network-topology:pp-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], 255, "Lambda 2 should be available") if ele['tp-id'] == 'SRG1-PP2-TXRX': - self.assertIn({u'index': 2, u'frequency': 196.05, u'width': 40}, - ele['org-openroadm-network-topology:' - 'pp-attributes']['used-wavelength']) - self.assertNotIn({u'index': 1, u'frequency': 196.1, - u'width': 40}, - ele['org-openroadm-network-topology:' - 'pp-attributes']['used-wavelength']) + freq_map = base64.b64decode( + ele['org-openroadm-network-topology:pp-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], 0, "Lambda 2 should not be available") if ele['tp-id'] == 'SRG1-PP3-TXRX': - self.assertNotIn('org-openroadm-network-topology:pp-attributes', - dict.keys(ele)) + self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele)) time.sleep(10) def test_27_check_topo_ROADMA_DEG1(self): @@ -493,23 +482,22 @@ class TransportPCEFulltesting(unittest.TestCase): freq_map = base64.b64decode( res['node'][0]['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[0], 0, "Index 1 should not be available") - self.assertEqual(freq_map_array[1], 0, "Index 2 should not be available") + 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'] for ele in liste_tp: - if ele['tp-id'] == 'DEG1-CTP-TXRX': - self.assertIn({u'map-name': 'cband', u'freq-map-granularity': 6.25, u'start-edge-freq': 191.325, - u'effective-bits': 8, u'freq-map': INDEX_1_2_USED_FREQ_MAP}, - ele['org-openroadm-network-topology:' - 'ctp-attributes'][ - 'avail-freq-maps']) - if ele['tp-id'] == 'DEG1-TTP-TXRX': - self.assertIn({u'index': 1, u'frequency': 196.1, u'width': 40}, - ele['org-openroadm-network-topology:' - 'tx-ttp-attributes']['used-wavelengths']) - self.assertIn({u'index': 2, u'frequency': 196.05, u'width': 40}, - ele['org-openroadm-network-topology:' - 'tx-ttp-attributes']['used-wavelengths']) + if ele['tp-id'] == 'DEG2-CTP-TXRX': + freq_map = base64.b64decode( + ele['org-openroadm-network-topology:ctp-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") + if ele['tp-id'] == 'DEG2-TTP-TXRX': + freq_map = base64.b64decode( + 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") + self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available") time.sleep(10) # creation service test on a non-available resource @@ -594,10 +582,25 @@ class TransportPCEFulltesting(unittest.TestCase): res = response.json() freq_map = base64.b64decode( res['node'][0]['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map']) - self.assertTrue(check_freq_map(freq_map), "Index 1 and 2 should be available") + 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'] for ele in liste_tp: - self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele)) + if ele['tp-id'] == 'SRG1-PP1-TXRX' or ele['tp-id'] == 'SRG1-PP2-TXRX': + freq_map = base64.b64decode( + ele['org-openroadm-network-topology:pp-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") + elif ele['tp-id'] == 'SRG1-CP-TXRX': + freq_map = base64.b64decode( + ele['org-openroadm-network-topology:cp-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") + else: + self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele)) time.sleep(10) def test_35_check_topo_ROADMA_DEG1(self): @@ -606,15 +609,23 @@ class TransportPCEFulltesting(unittest.TestCase): res = response.json() freq_map = base64.b64decode( res['node'][0]['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map']) - self.assertTrue(check_freq_map(freq_map), "Index 1 and 2 should be available") + 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'] for ele in liste_tp: - if ele['tp-id'] == 'DEG1-CTP-TXRX': - self.assertEqual(ele['org-openroadm-network-topology:ctp-attributes']['avail-freq-maps'][0]['freq-map'], - AVAILABLE_FREQ_MAP) - if ele['tp-id'] == 'DEG1-TTP-TXRX': - self.assertNotIn('org-openroadm-network-topology:' - 'tx-ttp-attributes', dict.keys(ele)) + if ele['tp-id'] == 'DEG2-CTP-TXRX': + freq_map = base64.b64decode( + ele['org-openroadm-network-topology:ctp-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") + if ele['tp-id'] == 'DEG2-TTP-TXRX': + freq_map = base64.b64decode( + 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], 255, "Lambda 1 should be available") + self.assertEqual(freq_map_array[94], 255, "Lambda 2 should be available") time.sleep(10) # test service-create for Optical Channel (OC) service from srg-pp to srg-pp @@ -649,13 +660,13 @@ class TransportPCEFulltesting(unittest.TestCase): 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-1") + 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() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( dict({ - 'connection-number': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-1', + 'connection-number': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768', 'wavelength-number': 1, 'opticalControlMode': 'gainLoss', 'target-output-power': -3.0 @@ -663,21 +674,21 @@ class TransportPCEFulltesting(unittest.TestCase): res['roadm-connections'][0] ) self.assertDictEqual( - {'src-if': 'SRG1-PP1-TXRX-1'}, + {'src-if': 'SRG1-PP1-TXRX-761:768'}, res['roadm-connections'][0]['source']) self.assertDictEqual( - {'dst-if': 'DEG1-TTP-TXRX-1'}, + {'dst-if': 'DEG1-TTP-TXRX-761:768'}, res['roadm-connections'][0]['destination']) time.sleep(7) def test_39_check_xc1_ROADMC(self): - response = test_utils.check_netconf_node_request("ROADMC01", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1") + 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() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( dict({ - 'connection-number': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-1', + 'connection-number': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768', 'wavelength-number': 1, 'opticalControlMode': 'gainLoss', 'target-output-power': 2.0 @@ -685,10 +696,10 @@ class TransportPCEFulltesting(unittest.TestCase): res['roadm-connections'][0] ) self.assertDictEqual( - {'src-if': 'SRG1-PP1-TXRX-1'}, + {'src-if': 'SRG1-PP1-TXRX-761:768'}, res['roadm-connections'][0]['source']) self.assertDictEqual( - {'dst-if': 'DEG2-TTP-TXRX-1'}, + {'dst-if': 'DEG2-TTP-TXRX-761:768'}, res['roadm-connections'][0]['destination']) time.sleep(7) @@ -723,13 +734,13 @@ class TransportPCEFulltesting(unittest.TestCase): 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-2") + 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() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( dict({ - 'connection-number': 'SRG1-PP2-TXRX-DEG1-TTP-TXRX-2', + 'connection-number': 'SRG1-PP2-TXRX-DEG1-TTP-TXRX-753:760', 'wavelength-number': 2, 'opticalControlMode': 'gainLoss', 'target-output-power': -3.0 @@ -737,10 +748,10 @@ class TransportPCEFulltesting(unittest.TestCase): res['roadm-connections'][0] ) self.assertDictEqual( - {'src-if': 'SRG1-PP2-TXRX-2'}, + {'src-if': 'SRG1-PP2-TXRX-753:760'}, res['roadm-connections'][0]['source']) self.assertDictEqual( - {'dst-if': 'DEG1-TTP-TXRX-2'}, + {'dst-if': 'DEG1-TTP-TXRX-753:760'}, res['roadm-connections'][0]['destination']) time.sleep(2)