X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F1.2.1%2Ftest_topology.py;h=e87f078bb5f618b5ebe50b4f721b26f852b3e5b3;hb=66ccddbe00692f230350a19e1a222f09d6abd9a7;hp=ac1a5f7e50f37b894f139b2af3110ea0104e73e0;hpb=e547f6844b7abb6ea16aa5d9cbceaab1e10e7cbe;p=transportpce.git diff --git a/tests/transportpce_tests/1.2.1/test_topology.py b/tests/transportpce_tests/1.2.1/test_topology.py index ac1a5f7e5..e87f078bb 100644 --- a/tests/transportpce_tests/1.2.1/test_topology.py +++ b/tests/transportpce_tests/1.2.1/test_topology.py @@ -133,7 +133,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(res['network'][0]['node'][0]['node-id'],'ROADMA01') self.assertEqual(res['network'][0]['node'][0]['supporting-node'][0]['network-ref'],'clli-network') self.assertEqual(res['network'][0]['node'][0]['supporting-node'][0]['node-ref'],'NodeA') - self.assertEqual(res['network'][0]['node'][0]['org-openroadm-network:node-type'],'ROADM') + self.assertEqual(res['network'][0]['node'][0]['org-openroadm-common-network:node-type'],'ROADM') self.assertEqual(res['network'][0]['node'][0]['org-openroadm-network:model'],'2') def test_04_getLinks_OpenroadmTopology(self): @@ -154,15 +154,15 @@ class TransportPCETopologyTesting(unittest.TestCase): 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX','ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX'] for i in range(0,nbLink): linkId = res['network'][0]['ietf-network-topology:link'][i]['link-id'] - if (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']=='EXPRESS-LINK'): + if (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type']=='EXPRESS-LINK'): find= linkId in expressLink self.assertEqual(find, True) expressLink.remove(linkId) - elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']=='ADD-LINK'): + elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type']=='ADD-LINK'): find= linkId in addLink self.assertEqual(find, True) addLink.remove(linkId) - elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']=='DROP-LINK'): + elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type']=='DROP-LINK'): find= linkId in dropLink self.assertEqual(find, True) dropLink.remove(linkId) @@ -187,40 +187,40 @@ class TransportPCETopologyTesting(unittest.TestCase): for i in range(0,nbNode): self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) - nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'] + nodeType=res['network'][0]['node'][i]['org-openroadm-common-network:node-type'] nodeId=res['network'][0]['node'][i]['node-id'] if(nodeId=='ROADMA01-SRG1'): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17) - self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) elif(nodeId=='ROADMA01-SRG3'): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17) - self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) elif(nodeId=='ROADMA01-DEG1'): #Test related to DEG1 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) elif(nodeId=='ROADMA01-DEG2'): #Test related to DEG2 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) else: @@ -272,10 +272,10 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'],'NodeA') nodeId=res['network'][0]['node'][i]['node-id'] if(nodeId=='XPDRA01'): - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'XPONDER') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'XPONDER') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'1') elif(nodeId=='ROADMA01'): - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'ROADM') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'ROADM') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'2') else: self.assertFalse(True) @@ -293,7 +293,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(nbNode,5) listNode=['XPDRA01-XPDR1','ROADMA01-SRG1','ROADMA01-SRG3','ROADMA01-DEG1','ROADMA01-DEG2'] for i in range(0,nbNode): - nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'] + nodeType=res['network'][0]['node'][i]['org-openroadm-common-network:node-type'] nodeId=res['network'][0]['node'][i]['node-id'] #Tests related to XPDRA nodes if(nodeId=='XPDRA01-XPDR1'): @@ -304,7 +304,7 @@ class TransportPCETopologyTesting(unittest.TestCase): client = 0 network = 0 for j in range(0,nbTps): - tpType=res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['org-openroadm-network-topology:tp-type'] + tpType=res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['org-openroadm-common-network:tp-type'] tpId=res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['tp-id'] if (tpType=='XPONDER-CLIENT'): client += 1 @@ -321,9 +321,9 @@ class TransportPCETopologyTesting(unittest.TestCase): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17) - self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) @@ -332,9 +332,9 @@ class TransportPCETopologyTesting(unittest.TestCase): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17) - self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) @@ -342,9 +342,9 @@ class TransportPCETopologyTesting(unittest.TestCase): elif(nodeId=='ROADMA01-DEG1'): #Test related to DEG1 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) @@ -352,9 +352,9 @@ class TransportPCETopologyTesting(unittest.TestCase): elif(nodeId=='ROADMA01-DEG2'): #Test related to DEG2 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) @@ -427,7 +427,7 @@ class TransportPCETopologyTesting(unittest.TestCase): XPDR_IN=['ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1'] XPDR_OUT=['XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX'] for i in range(0,nbLink): - nodeType=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'] + nodeType=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] linkId=res['network'][0]['ietf-network-topology:link'][i]['link-id'] if(nodeType=='EXPRESS-LINK'): find= linkId in expressLink @@ -557,17 +557,17 @@ class TransportPCETopologyTesting(unittest.TestCase): nodeId=res['network'][0]['node'][i]['node-id'] if(nodeId=='XPDRA01'): self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'],'NodeA') - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'XPONDER') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'XPONDER') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'1') listNode.remove(nodeId) elif(nodeId=='ROADMA01'): self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'],'NodeA') - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'ROADM') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'ROADM') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'2') listNode.remove(nodeId) elif(nodeId=='ROADMC01'): self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'],'NodeC') - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'ROADM') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'ROADM') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'2') listNode.remove(nodeId) else: @@ -597,7 +597,7 @@ class TransportPCETopologyTesting(unittest.TestCase): XPDR_IN=['ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1'] XPDR_OUT=['XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX'] for i in range(0,nbLink): - nodeType=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'] + nodeType=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] linkId=res['network'][0]['ietf-network-topology:link'][i]['link-id'] if(nodeType=='EXPRESS-LINK'): find= linkId in expressLink @@ -646,7 +646,7 @@ class TransportPCETopologyTesting(unittest.TestCase): R2RLink=['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX', 'ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX'] for i in range(0,nbLink): - nodeType = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'] + nodeType = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] link_id=res['network'][0]['ietf-network-topology:link'][i]['link-id'] if(link_id in R2RLink): find = False @@ -676,7 +676,7 @@ class TransportPCETopologyTesting(unittest.TestCase): 'ROADMC01-SRG1','ROADMC01-DEG1','ROADMC01-DEG2'] #************************Tests related to XPDRA nodes for i in range(0,nbNode): - nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'] + nodeType=res['network'][0]['node'][i]['org-openroadm-common-network:node-type'] nodeId=res['network'][0]['node'][i]['node-id'] if(nodeId=='XPDRA01-XPDR1'): self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA01'}, @@ -687,7 +687,7 @@ class TransportPCETopologyTesting(unittest.TestCase): client = 0 network = 0 for j in range(0,nbTps): - tpType=res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['org-openroadm-network-topology:tp-type'] + tpType=res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['org-openroadm-common-network:tp-type'] if (tpType=='XPONDER-CLIENT'): client += 1 elif (tpType=='XPONDER-NETWORK'): @@ -698,75 +698,75 @@ class TransportPCETopologyTesting(unittest.TestCase): elif(nodeId=='ROADMA01-SRG1'): #Test related to SRG1 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17) - self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'SRG') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'SRG') listNode.remove(nodeId) elif(nodeId=='ROADMA01-SRG3'): #Test related to SRG1 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17) - self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'SRG') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'SRG') listNode.remove(nodeId) elif(nodeId=='ROADMA01-DEG1'): #Test related to DEG1 - self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'DEGREE') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'DEGREE') listNode.remove(nodeId) elif(nodeId=='ROADMA01-DEG2'): #Test related to DEG2 - self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'DEGREE') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'DEGREE') listNode.remove(nodeId) elif(nodeId=='ROADMC01-SRG1'): #Test related to SRG1 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17) - self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMC01'}, res['network'][0]['node'][i]['supporting-node']) - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'SRG') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'SRG') listNode.remove(nodeId) elif(nodeId=='ROADMC01-DEG1'): #Test related to DEG1 - self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMC01'}, res['network'][0]['node'][i]['supporting-node']) - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'DEGREE') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'DEGREE') listNode.remove(nodeId) elif(nodeId=='ROADMC01-DEG2'): #Test related to DEG2 - self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMC01'}, res['network'][0]['node'][i]['supporting-node']) - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'DEGREE') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'DEGREE') listNode.remove(nodeId) else: self.assertFalse(True) @@ -913,7 +913,7 @@ class TransportPCETopologyTesting(unittest.TestCase): 'ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB-DEG1-DEG1-TTP-TXRX','ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB-DEG2-DEG2-TTP-TXRX', 'ROADMB-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX','ROADMB-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX'] for i in range(0,nbLink): - if res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'] == 'ROADM-TO-ROADM': + if res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'ROADM-TO-ROADM': link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] find= link_id in listR2RLink self.assertEqual(find, True) @@ -933,7 +933,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(nbLink,34) for i in range(0,nbLink): link_id=res['network'][0]['ietf-network-topology:link'][i]['link-id'] - link_type=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'] + link_type=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] link_src=res['network'][0]['ietf-network-topology:link'][i]['source']['source-node'] link_dest=res['network'][0]['ietf-network-topology:link'][i]['destination']['dest-node'] oppLink_id=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:opposite-link'] @@ -947,7 +947,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(res_oppLink['ietf-network-topology:link'][0]['org-openroadm-common-network:opposite-link'],link_id) self.assertEqual(res_oppLink['ietf-network-topology:link'][0]['source']['source-node'],link_dest) self.assertEqual(res_oppLink['ietf-network-topology:link'][0]['destination']['dest-node'],link_src) - oppLink_type=res_oppLink['ietf-network-topology:link'][0]['org-openroadm-network-topology:link-type'] + oppLink_type=res_oppLink['ietf-network-topology:link'][0]['org-openroadm-common-network:link-type'] if link_type=='ADD-LINK': self.assertEqual(oppLink_type, 'DROP-LINK') elif link_type=='DROP-LINK': @@ -978,7 +978,7 @@ class TransportPCETopologyTesting(unittest.TestCase): 'ROADMB-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX', 'ROADMB-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX'] for i in range(0,nbLink): - nodeType = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'] + nodeType = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] link_id=res['network'][0]['ietf-network-topology:link'][i]['link-id'] if(link_id in R2RLink): find = False @@ -1047,7 +1047,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(nbNode,5) listNode=['XPDRA01-XPDR1','ROADMA01-SRG1', 'ROADMA01-SRG3','ROADMA01-DEG1','ROADMA01-DEG2'] for i in range(0,nbNode): - nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'] + nodeType=res['network'][0]['node'][i]['org-openroadm-common-network:node-type'] nodeId=res['network'][0]['node'][i]['node-id'] #Tests related to XPDRA nodes if(nodeId=='XPDRA01-XPDR1'): @@ -1056,7 +1056,7 @@ class TransportPCETopologyTesting(unittest.TestCase): tpid = res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['tp-id'] if (tpid == 'XPDR1-CLIENT1'): self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] - ['org-openroadm-network-topology:tp-type'], 'XPONDER-CLIENT') + ['org-openroadm-common-network:tp-type'], 'XPONDER-CLIENT') self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] ['org-openroadm-network-topology:xpdr-client-attributes']['tail-equipment-id'], 'XPDR1-NETWORK1') @@ -1067,9 +1067,9 @@ class TransportPCETopologyTesting(unittest.TestCase): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17) - self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) @@ -1078,9 +1078,9 @@ class TransportPCETopologyTesting(unittest.TestCase): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17) - self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) @@ -1088,9 +1088,9 @@ class TransportPCETopologyTesting(unittest.TestCase): elif(nodeId=='ROADMA01-DEG1'): #Test related to DEG1 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) @@ -1098,9 +1098,9 @@ class TransportPCETopologyTesting(unittest.TestCase): elif(nodeId=='ROADMA01-DEG2'): #Test related to DEG2 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) @@ -1192,40 +1192,40 @@ class TransportPCETopologyTesting(unittest.TestCase): for i in range(0,nbNode): self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) - nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'] + nodeType=res['network'][0]['node'][i]['org-openroadm-common-network:node-type'] nodeId=res['network'][0]['node'][i]['node-id'] if(nodeId=='ROADMA01-SRG1'): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17) - self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) elif(nodeId=='ROADMA01-SRG3'): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17) - self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) elif(nodeId=='ROADMA01-DEG1'): #Test related to DEG1 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) elif(nodeId=='ROADMA01-DEG2'): #Test related to DEG2 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) else: @@ -1271,17 +1271,17 @@ class TransportPCETopologyTesting(unittest.TestCase): 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX','ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX'] roadmtoroadmLink = 0 for i in range(0,nbLink): - if (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']=='EXPRESS-LINK'): + if (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type']=='EXPRESS-LINK'): link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] find= link_id in expressLink self.assertEqual(find, True) expressLink.remove(link_id) - elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']=='ADD-LINK'): + elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type']=='ADD-LINK'): link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] find= link_id in addLink self.assertEqual(find, True) addLink.remove(link_id) - elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']=='DROP-LINK'): + elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type']=='DROP-LINK'): link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] find= link_id in dropLink self.assertEqual(find, True) @@ -1293,8 +1293,8 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(len(dropLink),0) self.assertEqual(roadmtoroadmLink, 6) for i in range(0,nbLink): - self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'],'XPONDER-OUTPUT') - self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'],'XPONDER-INPUT') + self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'],'XPONDER-OUTPUT') + self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'],'XPONDER-INPUT') def test_41_disconnect_ROADMA(self): url = ("{}/config/network-topology:"