import time
import unittest
import logging
+import test_utils
class TransportPCEtesting(unittest.TestCase):
#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, "17840", "sample_configs/openroadm/2.2.1/oper-XPDRA.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, "17841", "sample_configs/openroadm/2.2.1/oper-ROADMA.xml"],
- stdout=outfile)
-
- @classmethod
- def __start_honeynode3(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_process3 = subprocess.Popen(
- [executable, "17842", "sample_configs/openroadm/2.2.1/oper-ROADMB.xml"],
- stdout=outfile)
-
- @classmethod
- def __start_honeynode4(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_process4 = subprocess.Popen(
- [executable, "17843", "sample_configs/openroadm/2.2.1/oper-ROADMC.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))
-
@classmethod
def setUpClass(cls):
- cls.__start_honeynode1()
+ print ("starting honeynode1...")
+ cls.honeynode_process1 = test_utils.start_xpdra_honeynode()
time.sleep(20)
- cls.__start_honeynode2()
+
+ print ("starting honeynode2...")
+ cls.honeynode_process2 = test_utils.start_roadma_honeynode()
time.sleep(20)
- cls.__start_honeynode3()
+
+ print ("starting honeynode3...")
+ cls.honeynode_process3 = test_utils.start_roadmb_honeynode()
time.sleep(20)
- cls.__start_honeynode4()
+
+ print ("starting honeynode4...")
+ cls.honeynode_process4 = test_utils.start_roadmc_honeynode()
time.sleep(20)
- cls.__start_odl()
+ print ("all honeynodes started")
+
+ print ("starting opendaylight...")
+ cls.odl_process = test_utils.start_tpce()
time.sleep(60)
+ print ("opendaylight started")
@classmethod
def tearDownClass(cls):
self.assertEqual(res['network'][0]['node'][0]['node-id'],'ROADM-A1')
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-network:model'],'')
+ 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'],'model2')
def test_04_getLinks_OpenroadmTopology(self):
url = ("{}/config/ietf-network:networks/network/openroadm-topology"
res = response.json()
#Tests related to links
nbLink=len(res['network'][0]['ietf-network-topology:link'])
- self.assertEqual(nbLink,6)
+ self.assertEqual(nbLink,10)
expressLink=['ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX',
'ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX']
addLink=['ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX',
- 'ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX']
+ 'ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX',
+ 'ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX',
+ 'ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX']
dropLink=['ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX',
- 'ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX']
+ 'ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX',
+ 'ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX',
+ 'ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-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)
res = response.json()
#Tests related to nodes
self.assertEqual(response.status_code, requests.codes.ok)
- with open('./transportpce_tests/log/response.log', 'a') as outfile1:
- outfile1.write(str(len(res['network'][0]['node'])))
nbNode=len(res['network'][0]['node'])
- self.assertEqual(nbNode,3)
- listNode=['ROADM-A1-SRG1','ROADM-A1-DEG1','ROADM-A1-DEG2']
+ self.assertEqual(nbNode,4)
+ listNode=['ROADM-A1-SRG1', 'ROADM-A1-SRG3','ROADM-A1-DEG1','ROADM-A1-DEG2']
for i in range(0,nbNode):
self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'},
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=='ROADM-A1-SRG1'):
#Test related to SRG1
self.assertEqual(nodeType,'SRG')
self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),5)
- 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-common-network:tp-type': 'SRG-TXRX-PP'},
+ res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
+ listNode.remove(nodeId)
+ elif(nodeId=='ROADM-A1-SRG3'):
+ #Test related to SRG1
+ self.assertEqual(nodeType,'SRG')
+ self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),5)
+ 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': 'SRG1-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=='ROADM-A1-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=='ROADM-A1-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:
self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'],'NodeA')
nodeId=res['network'][0]['node'][i]['node-id']
if(nodeId=='XPDR-A1'):
- self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'XPONDER')
- self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'')
+ 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'],'model2')
elif(nodeId=='ROADM-A1'):
- self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'ROADM')
- self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'')
+ 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'],'model2')
else:
self.assertFalse(True)
res = response.json()
#Tests related to nodes
self.assertEqual(response.status_code, requests.codes.ok)
- with open('./transportpce_tests/log/response.log', 'a') as outfile1:
- outfile1.write(str(len(res['network'][0]['node'])))
nbNode=len(res['network'][0]['node'])
- self.assertEqual(nbNode,4)
- listNode=['XPDR-A1-XPDR1','ROADM-A1-SRG1','ROADM-A1-DEG1','ROADM-A1-DEG2']
+ self.assertEqual(nbNode,5)
+ listNode=['XPDR-A1-XPDR1','ROADM-A1-SRG1','ROADM-A1-SRG3','ROADM-A1-DEG1','ROADM-A1-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=='XPDR-A1-XPDR1'):
res['network'][0]['node'][i]['supporting-node'])
self.assertEqual(nodeType,'XPONDER')
nbTps=len(res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
- self.assertTrue(nbTps >= 4)
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
elif (tpType=='XPONDER-NETWORK'):
network += 1
- self.assertTrue(client >= 2)
- self.assertTrue(network >= 2)
+ if (tpId == 'XPDR1-NETWORK2'):
+ self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]
+ ['transportpce-topology:associated-connection-map-port'],'XPDR1-CLIENT2')
+ if (tpId == 'XPDR1-CLIENT2'):
+ self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]
+ ['transportpce-topology:associated-connection-map-port'],'XPDR1-NETWORK2')
+
+ self.assertTrue(client == 2)
+ self.assertTrue(network == 2)
listNode.remove(nodeId)
elif(nodeId=='ROADM-A1-SRG1'):
#Test related to SRG1
self.assertEqual(nodeType,'SRG')
self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),5)
- 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-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': 'ROADM-A1'},
+ res['network'][0]['node'][i]['supporting-node'])
+ listNode.remove(nodeId)
+ elif(nodeId=='ROADM-A1-SRG3'):
+ #Test related to SRG1
+ self.assertEqual(nodeType,'SRG')
+ self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),5)
+ 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': 'SRG1-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': 'ROADM-A1'},
res['network'][0]['node'][i]['supporting-node'])
elif(nodeId=='ROADM-A1-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': 'ROADM-A1'},
res['network'][0]['node'][i]['supporting-node'])
elif(nodeId=='ROADM-A1-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': 'ROADM-A1'},
res['network'][0]['node'][i]['supporting-node'])
res = response.json()
#Tests related to links
nbLink=len(res['network'][0]['ietf-network-topology:link'])
- self.assertEqual(nbLink,8)
+ self.assertEqual(nbLink,12)
expressLink=['ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX','ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX']
- addLink=['ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX','ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX',]
- dropLink=['ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX','ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX']
+ addLink=['ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX','ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX',
+ 'ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX','ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX']
+ dropLink=['ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX','ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX',
+ 'ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX','ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX']
XPDR_IN=['ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1']
XPDR_OUT=['XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-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
nodeId=res['network'][0]['node'][i]['node-id']
if(nodeId=='XPDR-A1'):
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-network:model'],'')
+ 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'],'model2')
listNode.remove(nodeId)
elif(nodeId=='ROADM-A1'):
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-network:model'],'')
+ 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'],'model2')
listNode.remove(nodeId)
elif(nodeId=='ROADM-C1'):
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-network:model'],'')
+ 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'],'model2')
listNode.remove(nodeId)
else:
self.assertFalse(True)
res = response.json()
#Tests related to links
nbLink=len(res['network'][0]['ietf-network-topology:link'])
- self.assertEqual(nbLink,16)
+ self.assertEqual(nbLink,20)
expressLink=['ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX','ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX',
'ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX','ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX']
addLink=['ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX','ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX',
+ 'ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX','ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX',
'ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX','ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX']
dropLink=['ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX','ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX',
+ 'ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX','ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX',
'ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX','ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX']
R2RLink=['ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX','ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX']
XPDR_IN=['ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1']
XPDR_OUT=['XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-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
#Tests related to nodes
self.assertEqual(response.status_code, requests.codes.ok)
nbNode=len(res['network'][0]['node'])
- self.assertEqual(nbNode,7)
+ self.assertEqual(nbNode,8)
listNode=['XPDR-A1-XPDR1',
- 'ROADM-A1-SRG1','ROADM-A1-DEG1','ROADM-A1-DEG2',
+ 'ROADM-A1-SRG1','ROADM-A1-SRG3','ROADM-A1-DEG1','ROADM-A1-DEG2',
'ROADM-C1-SRG1','ROADM-C1-DEG1', 'ROADM-C1-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=='XPDR-A1-XPDR1'):
self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDR-A1'},
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'):
network += 1
- self.assertTrue(client > 2)
- self.assertTrue(network > 2)
+ self.assertTrue(client == 2)
+ self.assertTrue(network == 2)
listNode.remove(nodeId)
elif(nodeId=='ROADM-A1-SRG1'):
#Test related to SRG1
self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),5)
- 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': 'ROADM-A1'},
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=='ROADM-A1-SRG3'):
+ #Test related to SRG1
+ self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),5)
+ 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-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': 'ROADM-A1'},
+ res['network'][0]['node'][i]['supporting-node'])
+ self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'SRG')
listNode.remove(nodeId)
elif(nodeId=='ROADM-A1-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': 'ROADM-A1'},
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=='ROADM-A1-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': 'ROADM-A1'},
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=='ROADM-C1-SRG1'):
#Test related to SRG1
self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),5)
- 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': 'ROADM-C1'},
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=='ROADM-C1-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': 'ROADM-C1'},
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=='ROADM-C1-DEG2'):
#Test related to DEG1
- 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': 'ROADM-C1'},
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)
'ROADM-A1-DEG1-DEG1-TTP-TXRXtoROADM-B1-DEG1-DEG1-TTP-TXRX','ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX',
'ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX','ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-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)
"GET", url, headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
- #Write the response in the log
- with open('./transportpce_tests/log/response.log', 'a') as outfile1:
- outfile1.write(str(res))
#Tests related to links
nbLink=len(res['network'][0]['ietf-network-topology:link'])
- self.assertEqual(nbLink,22)
+ self.assertEqual(nbLink,26)
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']
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':
# XPDR_IN=['ROADMA-SRG1-SRG1-PP1-TXRXtoXPDRA-XPDR1-XPDR1-NETWORK1']
# XPDR_OUT=['XPDRA-XPDR1-XPDR1-NETWORK1toROADMA-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
# self.assertEqual(len(XPDR_OUT),0)
#
# for i in range(0,nbLink):
-# self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'],'ROADM-TO-ROADM')
+# self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'],'ROADM-TO-ROADM')
# self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['link-id'],'ROADMC-SRG1-SRG1-CP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX')
# self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['link-id'],'ROADMC-DEG1-DEG1-CTP-TXRXtoROADMC-SRG1-SRG1-CP-TXRX')
# self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['link-id'],'ROADMC-SRG1-SRG1-CP-TXRXtoROADMC-DEG2-DEG1-CTP-TXRX')
res = response.json()
#Tests related to nodes
self.assertEqual(response.status_code, requests.codes.ok)
- with open('./transportpce_tests/log/response.log', 'a') as outfile1:
- outfile1.write(str(len(res['network'][0]['node'])))
nbNode=len(res['network'][0]['node'])
- self.assertEqual(nbNode,4)
- listNode=['XPDR-A1-XPDR1','ROADM-A1-SRG1','ROADM-A1-DEG1','ROADM-A1-DEG2']
+ self.assertEqual(nbNode,5)
+ listNode=['XPDR-A1-XPDR1','ROADM-A1-SRG1', 'ROADM-A1-SRG3','ROADM-A1-DEG1','ROADM-A1-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=='XPDR-A1-XPDR1'):
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')
#Test related to SRG1
self.assertEqual(nodeType,'SRG')
self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),5)
- 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-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': 'ROADM-A1'},
+ res['network'][0]['node'][i]['supporting-node'])
+ listNode.remove(nodeId)
+ elif(nodeId=='ROADM-A1-SRG3'):
+ #Test related to SRG1
+ self.assertEqual(nodeType,'SRG')
+ self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),5)
+ 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': 'SRG1-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': 'ROADM-A1'},
res['network'][0]['node'][i]['supporting-node'])
elif(nodeId=='ROADM-A1-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': 'ROADM-A1'},
res['network'][0]['node'][i]['supporting-node'])
elif(nodeId=='ROADM-A1-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': 'ROADM-A1'},
res['network'][0]['node'][i]['supporting-node'])
self.assertEqual(nbNode,2)
for i in range(0,nbNode-1):
self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADM-C1')
+ self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADM-B1')
def test_27_getClliNetwork(self):
url = ("{}/config/ietf-network:networks/network/clli-network"
#Tests related to nodes
self.assertEqual(response.status_code, requests.codes.ok)
nbNode=len(res['network'][0]['node'])
- self.assertEqual(nbNode,3)
- listNode=['ROADM-A1-SRG1','ROADM-A1-DEG1','ROADM-A1-DEG2']
+ self.assertEqual(nbNode,4)
+ listNode=['ROADM-A1-SRG1','ROADM-A1-SRG3','ROADM-A1-DEG1','ROADM-A1-DEG2']
for i in range(0,nbNode):
self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'},
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=='ROADM-A1-SRG1'):
#Test related to SRG1
self.assertEqual(nodeType,'SRG')
self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),5)
- 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=='ROADM-A1-SRG3'):
+ #Test related to SRG1
+ self.assertEqual(nodeType,'SRG')
+ self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),5)
+ 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-common-network:tp-type': 'SRG-TXRX-PP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
listNode.remove(nodeId)
elif(nodeId=='ROADM-A1-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=='ROADM-A1-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:
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
nbLink=len(res['network'][0]['ietf-network-topology:link'])
- self.assertEqual(nbLink, 12)
+ self.assertEqual(nbLink, 16)
expressLink=['ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX','ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX']
- addLink=['ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX','ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX']
- dropLink=['ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX','ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX']
+ addLink=['ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX','ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX',
+ 'ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX','ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX']
+ dropLink=['ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX','ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX',
+ 'ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX','ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-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)
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_34_disconnect_ROADMA(self):
url = ("{}/config/network-topology:"
self.assertEqual(nbLink, 6)
if __name__ == "__main__":
- #logging.basicConfig(filename='./transportpce_tests/log/response.log',filemode='w',level=logging.DEBUG)
- #logging.debug('I am there')
unittest.main(verbosity=2)
Code Review / transportpce.git / blobdiff