-# def test_24_getLinks_OpenRoadmTopology(self):
-# url = ("{}/config/ietf-network:networks/network/openroadm-topology"
-# .format(self.restconf_baseurl))
-# headers = {'content-type': 'application/json'}
-# response = requests.request(
-# "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,8)
-# expressLink=['ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX','ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX']
-# addLink=['ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX','ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX',]
-# dropLink=['ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX','ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX']
-# 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']
-# linkId=res['network'][0]['ietf-network-topology:link'][i]['link-id']
-# if(nodeType=='EXPRESS-LINK'):
-# find= linkId in expressLink
-# self.assertEqual(find, True)
-# expressLink.remove(linkId)
-# elif(nodeType=='ADD-LINK'):
-# find= linkId in addLink
-# self.assertEqual(find, True)
-# addLink.remove(linkId)
-# elif(nodeType=='DROP-LINK'):
-# find= linkId in dropLink
-# self.assertEqual(find, True)
-# dropLink.remove(linkId)
-# elif(nodeType=='XPONDER-INPUT'):
-# find= linkId in XPDR_IN
-# self.assertEqual(find, True)
-# XPDR_IN.remove(linkId)
-# elif(nodeType=='XPONDER-OUTPUT'):
-# find= linkId in XPDR_OUT
-# self.assertEqual(find, True)
-# XPDR_OUT.remove(linkId)
-# else:
-# self.assertFalse(True)
-# self.assertEqual(len(expressLink),0)
-# self.assertEqual(len(addLink),0)
-# self.assertEqual(len(dropLink),0)
-# self.assertEqual(len(XPDR_IN),0)
-# 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]['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')
-# self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['link-id'],'ROADMC-DEG1-DEG2-CTP-TXRXtoROADMC-SRG1-SRG1-CP-TXRX')
-# self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['link-id'],'ROADMC-DEG1-DEG1-CTP-TXRXtoROADMC-DEG2-DEG2-CTP-TXRX')
-# self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['link-id'],'ROADMC-DEG2-DEG2-CTP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX')
-#
-# def test_25_getNodes_OpenRoadmTopology(self):
-# url = ("{}/config/ietf-network:networks/network/openroadm-topology"
-# .format(self.restconf_baseurl))
-# headers = {'content-type': 'application/json'}
-# response = requests.request(
-# "GET", url, headers=headers, auth=('admin', 'admin'))
-# 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=['XPDRA-XPDR1','ROADMA-SRG1','ROADMA-DEG1','ROADMA-DEG2']
-# for i in range(0,nbNode):
-# nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type']
-# nodeId=res['network'][0]['node'][i]['node-id']
-# #Tests related to XPDRA nodes
-# if(nodeId=='XPDRA-XPDR1'):
-# self.assertEqual(nodeType,'XPONDER')
-# self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),2)
-# self.assertEqual({'tp-id': 'XPDR1-CLIENT1', 'org-openroadm-network-topology:tp-type': 'XPONDER-CLIENT',
-# 'org-openroadm-network-topology:xpdr-network-attributes': {
-# 'tail-equipment-id': 'XPDR1-NETWORK1'}},
-# res['network'][0]['node'][i]['ietf-network-topology:termination-point'][0])
-# self.assertEqual({'tp-id': 'XPDR1-NETWORK1', 'org-openroadm-network-topology:tp-type': 'XPONDER-NETWORK',
-# 'org-openroadm-network-topology:xpdr-client-attributes': {'tail-equipment-id': 'XPDR1-CLIENT1'}},
-# res['network'][0]['node'][i]['ietf-network-topology:termination-point'][1])
-# self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA'},
-# res['network'][0]['node'][i]['supporting-node'])
-# listNode.remove(nodeId)
-# elif(nodeId=='ROADMA-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'},
-# 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'},
-# res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
-# self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA'},
-# res['network'][0]['node'][i]['supporting-node'])
-# listNode.remove(nodeId)
-# elif(nodeId=='ROADMA-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'},
-# 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'},
-# res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
-# self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA'},
-# res['network'][0]['node'][i]['supporting-node'])
-# listNode.remove(nodeId)
-# elif(nodeId=='ROADMA-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'},
-# 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'},
-# res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
-# self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA'},
-# res['network'][0]['node'][i]['supporting-node'])
-# listNode.remove(nodeId)
-# else:
-# self.assertFalse(True)
-# self.assertEqual(len(listNode),0)
-# #Test related to SRG1 of ROADMC
-# for i in range(0,nbNode):
-# self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADMC-SRG1')
-# self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADMC-DEG1')
-# self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADMC-DEG2')
+ def test_32_getNodes_OpenRoadmTopology(self):
+ url = ("{}/config/ietf-network:networks/network/openroadm-topology"
+ .format(self.restconf_baseurl))
+ headers = {'content-type': 'application/json'}
+ response = requests.request(
+ "GET", url, headers=headers, auth=('admin', 'admin'))
+ res = response.json()
+ #Tests related to nodes
+ self.assertEqual(response.status_code, requests.codes.ok)
+ nbNode=len(res['network'][0]['node'])
+ 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-common-network:node-type']
+ nodeId=res['network'][0]['node'][i]['node-id']
+ #Tests related to XPDRA nodes
+ if(nodeId=='XPDRA01-XPDR1'):
+ nbTp = len(res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
+ for j in range(0, nbTp):
+ 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-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')
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA01'},
+ res['network'][0]['node'][i]['supporting-node'])
+ listNode.remove(nodeId)
+ elif(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-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': 'ROADMA01'},
+ res['network'][0]['node'][i]['supporting-node'])
+ 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-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': 'ROADMA01'},
+ res['network'][0]['node'][i]['supporting-node'])
+ listNode.remove(nodeId)
+ elif(nodeId=='ROADMA01-DEG1'):
+ #Test related to DEG1
+ self.assertEqual(nodeType,'DEGREE')
+ 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-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'])
+ listNode.remove(nodeId)
+ elif(nodeId=='ROADMA01-DEG2'):
+ #Test related to DEG2
+ self.assertEqual(nodeType,'DEGREE')
+ 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-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'])
+ listNode.remove(nodeId)
+ else:
+ self.assertFalse(True)
+ self.assertEqual(len(listNode),0)
+ #Test related to SRG1 of ROADMC
+ for i in range(0,nbNode):
+ self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADMC01-SRG1')
+ self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADMC01-DEG1')
+ self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADMC01-DEG2')