X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftransportpce_tests%2F2.2.1%2Ftest_topology.py;h=936ccfc5d4761b5bed7fc2004211f32ff7facd5d;hb=6fe500a1bf557eb44d22584ac6bf7c924f12c47f;hp=c531cb25fc4f523247660b55777e1de6218440e0;hpb=f4d7679be9ffcc5ef14241cbfe9040c1c177b260;p=transportpce.git diff --git a/tests/transportpce_tests/2.2.1/test_topology.py b/tests/transportpce_tests/2.2.1/test_topology.py index c531cb25f..936ccfc5d 100644 --- a/tests/transportpce_tests/2.2.1/test_topology.py +++ b/tests/transportpce_tests/2.2.1/test_topology.py @@ -9,23 +9,20 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -import json -import os -import psutil -import requests -import signal -import shutil -import subprocess -import time +# pylint: disable=no-member +# pylint: disable=too-many-public-methods +# pylint: disable=too-many-lines + import unittest +import time import logging +import requests from common import test_utils class TransportPCEtesting(unittest.TestCase): processes = None - restconf_baseurl = "http://localhost:8181/restconf" @classmethod def setUpClass(cls): @@ -34,6 +31,7 @@ class TransportPCEtesting(unittest.TestCase): @classmethod def tearDownClass(cls): + # pylint: disable=not-an-iterable for process in cls.processes: test_utils.shutdown_process(process) print("all processes killed") @@ -42,31 +40,11 @@ class TransportPCEtesting(unittest.TestCase): time.sleep(5) def test_01_connect_ROADM_A1(self): - # Config ROADMA - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/ROADM-A1" - .format(self.restconf_baseurl)) - data = {"node": [{ - "node-id": "ROADM-A1", - "netconf-node-topology:username": "admin", - "netconf-node-topology:password": "admin", - "netconf-node-topology:host": "127.0.0.1", - "netconf-node-topology:port": test_utils.sims['roadma']['port'], - "netconf-node-topology:tcp-only": "false", - "netconf-node-topology:pass-through": {}}]} - headers = {'content-type': 'application/json'} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.created) - time.sleep(20) + response = test_utils.mount_device("ROADM-A1", 'roadma') + self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_02_getClliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.get_clli_net_request() self.assertEqual(response.status_code, requests.codes.ok) res = response.json() logging.info(res) @@ -74,11 +52,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(res['network'][0]['node'][0]['org-openroadm-clli-network:clli'], 'NodeA') def test_03_getOpenRoadmNetwork(self): - url = ("{}/config/ietf-network:networks/network/openroadm-network" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.get_ordm_net_request() self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(res['network'][0]['node'][0]['node-id'], 'ROADM-A1') @@ -88,11 +62,8 @@ class TransportPCEtesting(unittest.TestCase): 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" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + # pylint: disable=redundant-unittest-assert + response = test_utils.get_ordm_topo_request("") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # Tests related to links @@ -110,15 +81,18 @@ class TransportPCEtesting(unittest.TestCase): '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-common-network: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-common-network: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-common-network: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) @@ -129,11 +103,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(len(dropLink), 0) def test_05_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')) + # pylint: disable=redundant-unittest-assert + response = test_utils.get_ordm_topo_request("") res = response.json() # Tests related to nodes self.assertEqual(response.status_code, requests.codes.ok) @@ -145,7 +116,7 @@ class TransportPCEtesting(unittest.TestCase): res['network'][0]['node'][i]['supporting-node']) 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'): + 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) @@ -158,7 +129,7 @@ class TransportPCEtesting(unittest.TestCase): 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'): + 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) @@ -171,7 +142,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'}, res['network'][0]['node'][i]['supporting-node']) listNode.remove(nodeId) - elif(nodeId == 'ROADM-A1-DEG1'): + elif nodeId == 'ROADM-A1-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'}, @@ -183,7 +154,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'}, res['network'][0]['node'][i]['supporting-node']) listNode.remove(nodeId) - elif(nodeId == 'ROADM-A1-DEG2'): + elif nodeId == 'ROADM-A1-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'}, @@ -200,41 +171,19 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(len(listNode), 0) def test_06_connect_XPDRA(self): - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/XPDR-A1" - .format(self.restconf_baseurl)) - data = {"node": [{ - "node-id": "XPDR-A1", - "netconf-node-topology:username": "admin", - "netconf-node-topology:password": "admin", - "netconf-node-topology:host": "127.0.0.1", - "netconf-node-topology:port": test_utils.sims['xpdra']['port'], - "netconf-node-topology:tcp-only": "false", - "netconf-node-topology:pass-through": {}}]} - headers = {'content-type': 'application/json'} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.created) - time.sleep(30) + response = test_utils.mount_device("XPDR-A1", 'xpdra') + self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_07_getClliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.get_clli_net_request() self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(res['network'][0]['node'][0]['node-id'], 'NodeA') self.assertEqual(res['network'][0]['node'][0]['org-openroadm-clli-network:clli'], 'NodeA') def test_08_getOpenRoadmNetwork(self): - url = ("{}/config/ietf-network:networks/network/openroadm-network" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + # pylint: disable=redundant-unittest-assert + response = test_utils.get_ordm_net_request() self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -243,21 +192,18 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['network-ref'], 'clli-network') 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'): + if nodeId == 'XPDR-A1': 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'): + elif nodeId == 'ROADM-A1': 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) def test_09_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')) + # pylint: disable=redundant-unittest-assert + response = test_utils.get_ordm_topo_request("") res = response.json() # Tests related to nodes self.assertEqual(response.status_code, requests.codes.ok) @@ -268,7 +214,7 @@ class TransportPCEtesting(unittest.TestCase): 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'): + if nodeId == 'XPDR-A1-XPDR1': self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDR-A1'}, res['network'][0]['node'][i]['supporting-node']) self.assertIn({'network-ref': 'clli-network', 'node-ref': 'NodeA'}, @@ -278,23 +224,24 @@ class TransportPCEtesting(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-common-network: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'): + if tpType == 'XPONDER-CLIENT': client += 1 - elif (tpType == 'XPONDER-NETWORK'): + elif tpType == 'XPONDER-NETWORK': network += 1 - if (tpId == 'XPDR1-NETWORK2'): + 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'): + 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'): + 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) @@ -305,7 +252,7 @@ class TransportPCEtesting(unittest.TestCase): 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'): + 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) @@ -316,7 +263,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'}, res['network'][0]['node'][i]['supporting-node']) listNode.remove(nodeId) - elif(nodeId == 'ROADM-A1-DEG1'): + elif nodeId == 'ROADM-A1-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'}, @@ -326,7 +273,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'}, res['network'][0]['node'][i]['supporting-node']) listNode.remove(nodeId) - elif(nodeId == 'ROADM-A1-DEG2'): + elif nodeId == 'ROADM-A1-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'}, @@ -343,52 +290,18 @@ class TransportPCEtesting(unittest.TestCase): # Connect the tail XPDRA to ROADMA and vice versa def test_10_connect_tail_xpdr_rdm(self): # Connect the tail: XPDRA to ROADMA - url = ("{}/operations/transportpce-networkutils:init-xpdr-rdm-links" - .format(self.restconf_baseurl)) - data = {"networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDR-A1", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "1", - "networkutils:rdm-node": "ROADM-A1", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP1-TXRX" - } - } - } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + response = test_utils.connect_xpdr_to_rdm_request("XPDR-A1", "1", "1", + "ROADM-A1", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) def test_11_connect_tail_rdm_xpdr(self): - # Connect the tail: ROADMA to XPDRA - url = ("{}/operations/transportpce-networkutils:init-rdm-xpdr-links" - .format(self.restconf_baseurl)) - data = {"networkutils:input": { - "networkutils:links-input": { - "networkutils:xpdr-node": "XPDR-A1", - "networkutils:xpdr-num": "1", - "networkutils:network-num": "1", - "networkutils:rdm-node": "ROADM-A1", - "networkutils:srg-num": "1", - "networkutils:termination-point-num": "SRG1-PP1-TXRX" - } - } - } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + response = test_utils.connect_rdm_to_xpdr_request("XPDR-A1", "1", "1", + "ROADM-A1", "1", "SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) def test_12_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')) + # pylint: disable=redundant-unittest-assert + response = test_utils.get_ordm_topo_request("") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # Tests related to links @@ -396,32 +309,36 @@ class TransportPCEtesting(unittest.TestCase): 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', - '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'] + 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-common-network:link-type'] linkId = res['network'][0]['ietf-network-topology:link'][i]['link-id'] - if(nodeType == 'EXPRESS-LINK'): + if nodeType == 'EXPRESS-LINK': find = linkId in expressLink self.assertEqual(find, True) expressLink.remove(linkId) - elif(nodeType == 'ADD-LINK'): + elif nodeType == 'ADD-LINK': find = linkId in addLink self.assertEqual(find, True) addLink.remove(linkId) - elif(nodeType == 'DROP-LINK'): + elif nodeType == 'DROP-LINK': find = linkId in dropLink self.assertEqual(find, True) dropLink.remove(linkId) - elif(nodeType == 'XPONDER-INPUT'): + elif nodeType == 'XPONDER-INPUT': find = linkId in XPDR_IN self.assertEqual(find, True) XPDR_IN.remove(linkId) - elif(nodeType == 'XPONDER-OUTPUT'): + elif nodeType == 'XPONDER-OUTPUT': find = linkId in XPDR_OUT self.assertEqual(find, True) XPDR_OUT.remove(linkId) @@ -434,31 +351,11 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(len(XPDR_OUT), 0) def test_13_connect_ROADMC(self): - # Config ROADMC - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/ROADM-C1" - .format(self.restconf_baseurl)) - data = {"node": [{ - "node-id": "ROADM-C1", - "netconf-node-topology:username": "admin", - "netconf-node-topology:password": "admin", - "netconf-node-topology:host": "127.0.0.1", - "netconf-node-topology:port": test_utils.sims['roadmc']['port'], - "netconf-node-topology:tcp-only": "false", - "netconf-node-topology:pass-through": {}}]} - headers = {'content-type': 'application/json'} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.created) - time.sleep(20) + response = test_utils.mount_device("ROADM-C1", 'roadmc') + self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_14_omsAttributes_ROADMA_ROADMC(self): # Config ROADMA-ROADMC oms-attributes - url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" - "link/ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:" - "OMS-attributes/span" - .format(self.restconf_baseurl)) data = {"span": { "auto-spanloss": "true", "engineered-spanloss": 12.2, @@ -467,18 +364,11 @@ class TransportPCEtesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - headers = {'content-type': 'application/json'} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + response = test_utils.add_oms_attr_request("ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data) self.assertEqual(response.status_code, requests.codes.created) def test_15_omsAttributes_ROADMC_ROADMA(self): # Config ROADM-C1-ROADM-A1 oms-attributes - url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" - "link/ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:" - "OMS-attributes/span" - .format(self.restconf_baseurl)) data = {"span": { "auto-spanloss": "true", "engineered-spanloss": 12.2, @@ -488,18 +378,11 @@ class TransportPCEtesting(unittest.TestCase): "SRLG-length": 100000, "pmd": 0.5}]}} - headers = {'content-type': 'application/json'} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + response = test_utils.add_oms_attr_request("ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data) self.assertEqual(response.status_code, requests.codes.created) def test_16_getClliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.get_clli_net_request() self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -508,7 +391,7 @@ class TransportPCEtesting(unittest.TestCase): nodeId = res['network'][0]['node'][i]['node-id'] find = nodeId in listNode self.assertEqual(find, True) - if(nodeId == 'NodeA'): + if nodeId == 'NodeA': self.assertEqual(res['network'][0]['node'][i]['org-openroadm-clli-network:clli'], 'NodeA') else: self.assertEqual(res['network'][0]['node'][i]['org-openroadm-clli-network:clli'], 'NodeC') @@ -516,11 +399,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(len(listNode), 0) def test_17_getOpenRoadmNetwork(self): - url = ("{}/config/ietf-network:networks/network/openroadm-network" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + # pylint: disable=redundant-unittest-assert + response = test_utils.get_ordm_net_request() self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -529,17 +409,17 @@ class TransportPCEtesting(unittest.TestCase): for i in range(0, nbNode): self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['network-ref'], 'clli-network') nodeId = res['network'][0]['node'][i]['node-id'] - if(nodeId == 'XPDR-A1'): + 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-common-network:node-type'], 'XPONDER') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'], 'model2') listNode.remove(nodeId) - elif(nodeId == 'ROADM-A1'): + 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-common-network:node-type'], 'ROADM') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'], 'model2') listNode.remove(nodeId) - elif(nodeId == 'ROADM-C1'): + 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-common-network:node-type'], 'ROADM') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'], 'model2') @@ -549,24 +429,29 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(len(listNode), 0) def test_18_getROADMLinkOpenRoadmTopology(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')) + # pylint: disable=redundant-unittest-assert + response = test_utils.get_ordm_topo_request("") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # Tests related to links nbLink = len(res['network'][0]['ietf-network-topology:link']) 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'] + 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'] @@ -574,27 +459,27 @@ class TransportPCEtesting(unittest.TestCase): for i in range(0, nbLink): 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'): + if nodeType == 'EXPRESS-LINK': find = linkId in expressLink self.assertEqual(find, True) expressLink.remove(linkId) - elif(nodeType == 'ADD-LINK'): + elif nodeType == 'ADD-LINK': find = linkId in addLink self.assertEqual(find, True) addLink.remove(linkId) - elif(nodeType == 'DROP-LINK'): + elif nodeType == 'DROP-LINK': find = linkId in dropLink self.assertEqual(find, True) dropLink.remove(linkId) - elif(nodeType == 'ROADM-TO-ROADM'): + elif nodeType == 'ROADM-TO-ROADM': find = linkId in R2RLink self.assertEqual(find, True) R2RLink.remove(linkId) - elif(nodeType == 'XPONDER-INPUT'): + elif nodeType == 'XPONDER-INPUT': find = linkId in XPDR_IN self.assertEqual(find, True) XPDR_IN.remove(linkId) - elif(nodeType == 'XPONDER-OUTPUT'): + elif nodeType == 'XPONDER-OUTPUT': find = linkId in XPDR_OUT self.assertEqual(find, True) XPDR_OUT.remove(linkId) @@ -608,11 +493,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(len(XPDR_OUT), 0) def test_19_getLinkOmsAttributesOpenRoadmTopology(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')) + response = test_utils.get_ordm_topo_request("") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # Tests related to links @@ -621,26 +502,22 @@ class TransportPCEtesting(unittest.TestCase): R2RLink = ['ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX', 'ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX'] for i in range(0, nbLink): - 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): + if link_id in R2RLink: find = False spanLoss = res['network'][0]['ietf-network-topology:link'][i][ 'org-openroadm-network-topology:OMS-attributes']['span']["engineered-spanloss"] length = res['network'][0]['ietf-network-topology:link'][i][ 'org-openroadm-network-topology:OMS-attributes']['span']['link-concatenation'][0]['SRLG-length'] - if((spanLoss != None) & (length != None)): + if (spanLoss is not None) & (length is not None): find = True self.assertTrue(find) R2RLink.remove(link_id) self.assertEqual(len(R2RLink), 0) def test_20_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')) + # pylint: disable=redundant-unittest-assert + response = test_utils.get_ordm_topo_request("") res = response.json() # Tests related to nodes self.assertEqual(response.status_code, requests.codes.ok) @@ -653,7 +530,7 @@ class TransportPCEtesting(unittest.TestCase): 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'] - if(nodeId == 'XPDR-A1-XPDR1'): + if nodeId == 'XPDR-A1-XPDR1': self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDR-A1'}, res['network'][0]['node'][i]['supporting-node']) self.assertEqual(nodeType, 'XPONDER') @@ -662,15 +539,16 @@ class TransportPCEtesting(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-common-network:tp-type'] - if (tpType == 'XPONDER-CLIENT'): + 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'): + elif tpType == 'XPONDER-NETWORK': network += 1 self.assertTrue(client == 2) self.assertTrue(network == 2) listNode.remove(nodeId) - elif(nodeId == 'ROADM-A1-SRG1'): + 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-common-network:tp-type': 'SRG-TXRX-CP'}, @@ -681,7 +559,7 @@ class TransportPCEtesting(unittest.TestCase): 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-SRG3'): + 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'}, @@ -692,7 +570,7 @@ class TransportPCEtesting(unittest.TestCase): 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'): + elif nodeId == 'ROADM-A1-DEG1': # Test related to DEG1 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']) @@ -702,7 +580,7 @@ class TransportPCEtesting(unittest.TestCase): res['network'][0]['node'][i]['supporting-node']) self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'DEGREE') listNode.remove(nodeId) - elif(nodeId == 'ROADM-A1-DEG2'): + elif nodeId == 'ROADM-A1-DEG2': # Test related to DEG2 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']) @@ -712,7 +590,7 @@ class TransportPCEtesting(unittest.TestCase): res['network'][0]['node'][i]['supporting-node']) self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'DEGREE') listNode.remove(nodeId) - elif(nodeId == 'ROADM-C1-SRG1'): + 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-common-network:tp-type': 'SRG-TXRX-CP'}, @@ -723,7 +601,7 @@ class TransportPCEtesting(unittest.TestCase): 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-C1-DEG1'): + elif nodeId == 'ROADM-C1-DEG1': # Test related to DEG1 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']) @@ -733,7 +611,7 @@ class TransportPCEtesting(unittest.TestCase): res['network'][0]['node'][i]['supporting-node']) self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'DEGREE') listNode.remove(nodeId) - elif(nodeId == 'ROADM-C1-DEG2'): + elif nodeId == 'ROADM-C1-DEG2': # Test related to DEG1 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']) @@ -748,30 +626,11 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(len(listNode), 0) def test_21_connect_ROADMB(self): - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/ROADM-B1" - .format(self.restconf_baseurl)) - data = {"node": [{ - "node-id": "ROADM-B1", - "netconf-node-topology:username": "admin", - "netconf-node-topology:password": "admin", - "netconf-node-topology:host": "127.0.0.1", - "netconf-node-topology:port": test_utils.sims['roadmb']['port'], - "netconf-node-topology:tcp-only": "false", - "netconf-node-topology:pass-through": {}}]} - headers = {'content-type': 'application/json'} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.created) - time.sleep(20) + response = test_utils.mount_device("ROADM-B1", 'roadmb') + self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_22_omsAttributes_ROADMA_ROADMB(self): # Config ROADM-A1-ROADM-B1 oms-attributes - url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" - "link/ROADM-A1-DEG1-DEG1-TTP-TXRXtoROADM-B1-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:" - "OMS-attributes/span" - .format(self.restconf_baseurl)) data = {"span": { "auto-spanloss": "true", "engineered-spanloss": 12.2, @@ -782,18 +641,11 @@ class TransportPCEtesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - headers = {'content-type': 'application/json'} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + response = test_utils.add_oms_attr_request("ROADM-A1-DEG1-DEG1-TTP-TXRXtoROADM-B1-DEG1-DEG1-TTP-TXRX", data) self.assertEqual(response.status_code, requests.codes.created) def test_23_omsAttributes_ROADMB_ROADMA(self): # Config ROADM-B1-ROADM-A1 oms-attributes - url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" - "link/ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:" - "OMS-attributes/span" - .format(self.restconf_baseurl)) data = {"span": { "auto-spanloss": "true", "engineered-spanloss": 12.2, @@ -804,18 +656,11 @@ class TransportPCEtesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - headers = {'content-type': 'application/json'} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + response = test_utils.add_oms_attr_request("ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX", data) self.assertEqual(response.status_code, requests.codes.created) def test_24_omsAttributes_ROADMB_ROADMC(self): # Config ROADM-B1-ROADM-C1 oms-attributes - url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" - "link/ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:" - "OMS-attributes/span" - .format(self.restconf_baseurl)) data = {"span": { "auto-spanloss": "true", "engineered-spanloss": 12.2, @@ -826,18 +671,11 @@ class TransportPCEtesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - headers = {'content-type': 'application/json'} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + response = test_utils.add_oms_attr_request("ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-TTP-TXRX", data) self.assertEqual(response.status_code, requests.codes.created) def test_25_omsAttributes_ROADMC_ROADMB(self): # Config ROADM-C1-ROADM-B1 oms-attributes - url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" - "link/ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:" - "OMS-attributes/span" - .format(self.restconf_baseurl)) data = {"span": { "auto-spanloss": "true", "engineered-spanloss": 12.2, @@ -846,18 +684,11 @@ class TransportPCEtesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - headers = {'content-type': 'application/json'} - response = requests.request( - "PUT", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + response = test_utils.add_oms_attr_request("ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX", data) self.assertEqual(response.status_code, requests.codes.created) def test_26_getClliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.get_clli_net_request() self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -866,9 +697,9 @@ class TransportPCEtesting(unittest.TestCase): nodeId = res['network'][0]['node'][i]['node-id'] find = nodeId in listNode self.assertEqual(find, True) - if(nodeId == 'NodeA'): + if nodeId == 'NodeA': self.assertEqual(res['network'][0]['node'][i]['org-openroadm-clli-network:clli'], 'NodeA') - elif(nodeId == 'NodeB'): + elif nodeId == 'NodeB': self.assertEqual(res['network'][0]['node'][i]['org-openroadm-clli-network:clli'], 'NodeB') else: self.assertEqual(res['network'][0]['node'][i]['org-openroadm-clli-network:clli'], 'NodeC') @@ -876,20 +707,20 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(len(listNode), 0) def test_27_verifyDegree(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')) + response = test_utils.get_ordm_topo_request("") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # Tests related to links nbLink = len(res['network'][0]['ietf-network-topology:link']) - listR2RLink = ['ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX', 'ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX', - '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'] + listR2RLink = ['ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX', + 'ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX', + '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-common-network: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) @@ -897,11 +728,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(len(listR2RLink), 0) def test_28_verifyOppositeLinkTopology(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')) + response = test_utils.get_ordm_topo_request("") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # Tests related to links @@ -912,12 +739,10 @@ class TransportPCEtesting(unittest.TestCase): 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'] + oppLink_id = (res['network'][0]['ietf-network-topology:link'][i] + ['org-openroadm-common-network:opposite-link']) # Find the opposite link - url_oppLink = "{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:link/"+oppLink_id - url = (url_oppLink.format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response_oppLink = requests.request("GET", url, headers=headers, auth=('admin', 'admin')) + response_oppLink = test_utils.get_ordm_topo_request("ietf-network-topology:link/"+oppLink_id) self.assertEqual(response_oppLink.status_code, requests.codes.ok) res_oppLink = response_oppLink.json() self.assertEqual(res_oppLink['ietf-network-topology:link'][0] @@ -939,11 +764,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(oppLink_type, 'XPONDER-INPUT') def test_29_getLinkOmsAttributesOpenRoadmTopology(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')) + response = test_utils.get_ordm_topo_request("") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbLink = len(res['network'][0]['ietf-network-topology:link']) @@ -954,15 +775,14 @@ class TransportPCEtesting(unittest.TestCase): '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): - 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): + if link_id in R2RLink: find = False spanLoss = res['network'][0]['ietf-network-topology:link'][i][ 'org-openroadm-network-topology:OMS-attributes']['span']["engineered-spanloss"] length = res['network'][0]['ietf-network-topology:link'][i][ 'org-openroadm-network-topology:OMS-attributes']['span']['link-concatenation'][0]['SRLG-length'] - if((spanLoss != None) & (length != None)): + if (spanLoss is not None) & (length is not None): find = True self.assertTrue(find) R2RLink.remove(link_id) @@ -970,52 +790,21 @@ class TransportPCEtesting(unittest.TestCase): def test_30_disconnect_ROADMB(self): # Delete in the topology-netconf - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/ROADM-B1" - .format(self.restconf_baseurl)) - data = {} - headers = {'content-type': 'application/json'} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) + response = test_utils.unmount_device("ROADM-B1") # Delete in the clli-network - url = ("{}/config/ietf-network:networks/network/clli-network/node/NodeB" - .format(self.restconf_baseurl)) - data = {} - headers = {'content-type': 'application/json'} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + response = test_utils.del_node_request("NodeB") self.assertEqual(response.status_code, requests.codes.ok) def test_31_disconnect_ROADMC(self): # Delete in the topology-netconf - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/ROADM-C1" - .format(self.restconf_baseurl)) - data = {} - headers = {'content-type': 'application/json'} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) + response = test_utils.unmount_device("ROADM-C1") + self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) # Delete in the clli-network - url = ("{}/config/ietf-network:networks/network/clli-network/node/NodeC" - .format(self.restconf_baseurl)) - data = {} - headers = {'content-type': 'application/json'} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + response = test_utils.del_node_request("NodeC") self.assertEqual(response.status_code, requests.codes.ok) # def test_24_check_roadm2roadm_links_deletion(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')) +# response = test_utils.get_ordm_topo_request("") # self.assertEqual(response.status_code, requests.codes.ok) # res = response.json() # #Write the response in the log @@ -1024,9 +813,12 @@ class TransportPCEtesting(unittest.TestCase): # #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'] +# 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): @@ -1061,20 +853,24 @@ class TransportPCEtesting(unittest.TestCase): # self.assertEqual(len(XPDR_OUT),0) # # for i in range(0,nbLink): -# 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') -# 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') +# 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') +# 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_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')) + # pylint: disable=redundant-unittest-assert + response = test_utils.get_ordm_topo_request("") res = response.json() # Tests related to nodes self.assertEqual(response.status_code, requests.codes.ok) @@ -1085,23 +881,24 @@ class TransportPCEtesting(unittest.TestCase): 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'): + if nodeId == 'XPDR-A1-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') - if (tpid == 'XPDR1-NETWORK1'): - self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] - ['org-openroadm-common-network:tp-type'], 'XPONDER-NETWORK') - self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] - ['org-openroadm-network-topology:xpdr-network-attributes']['tail-equipment-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') + if tpid == 'XPDR1-NETWORK1': + self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] + ['org-openroadm-common-network:tp-type']), 'XPONDER-NETWORK') + self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] + ['org-openroadm-network-topology:xpdr-network-attributes'] + ['tail-equipment-id']), 'ROADM-A1-SRG1--SRG1-PP1-TXRX') self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDR-A1'}, res['network'][0]['node'][i]['supporting-node']) listNode.remove(nodeId) - elif(nodeId == 'ROADM-A1-SRG1'): + 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) @@ -1112,7 +909,7 @@ class TransportPCEtesting(unittest.TestCase): 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'): + 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) @@ -1123,7 +920,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'}, res['network'][0]['node'][i]['supporting-node']) listNode.remove(nodeId) - elif(nodeId == 'ROADM-A1-DEG1'): + elif nodeId == 'ROADM-A1-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'}, @@ -1133,7 +930,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'}, res['network'][0]['node'][i]['supporting-node']) listNode.remove(nodeId) - elif(nodeId == 'ROADM-A1-DEG2'): + elif nodeId == 'ROADM-A1-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'}, @@ -1153,11 +950,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertNotEqual(res['network'][0]['node'][i]['node-id'], 'ROADM-C1-DEG2') def test_33_getOpenRoadmNetwork(self): - url = ("{}/config/ietf-network:networks/network/openroadm-network" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.get_ordm_net_request() self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -1167,35 +960,20 @@ class TransportPCEtesting(unittest.TestCase): self.assertNotEqual(res['network'][0]['node'][i]['node-id'], 'ROADM-B1') def test_34_getClliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.get_clli_net_request() self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) self.assertEqual(nbNode, 1) for i in range(0, nbNode-1): - self.assertNotEqual(res['network'][0]['node'][1]['org-openroadm-clli-network:clli'], 'NodeC') + self.assertNotEqual(res['network'][0]['node'][i]['org-openroadm-clli-network:clli'], 'NodeC') def test_35_disconnect_XPDRA(self): - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/XPDR-A1" - .format(self.restconf_baseurl)) - data = {} - headers = {'content-type': 'application/json'} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) + response = test_utils.unmount_device("XPDR-A1") + self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) def test_36_getClliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.get_clli_net_request() self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -1203,11 +981,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(res['network'][0]['node'][0]['org-openroadm-clli-network:clli'], 'NodeA') def test_37_getOpenRoadmNetwork(self): - url = ("{}/config/ietf-network:networks/network/openroadm-network" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.get_ordm_net_request() self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbNode = len(res['network'][0]['node']) @@ -1216,11 +990,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertNotEqual(res['network'][0]['node'][i]['node-id'], 'XPDR-A1') def test_38_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')) + # pylint: disable=redundant-unittest-assert + response = test_utils.get_ordm_topo_request("") res = response.json() # Tests related to nodes self.assertEqual(response.status_code, requests.codes.ok) @@ -1232,7 +1003,7 @@ class TransportPCEtesting(unittest.TestCase): res['network'][0]['node'][i]['supporting-node']) 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'): + 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) @@ -1241,7 +1012,7 @@ class TransportPCEtesting(unittest.TestCase): 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'): + 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) @@ -1250,7 +1021,7 @@ class TransportPCEtesting(unittest.TestCase): 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'): + elif nodeId == 'ROADM-A1-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'}, @@ -1258,7 +1029,7 @@ class TransportPCEtesting(unittest.TestCase): 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'): + elif nodeId == 'ROADM-A1-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'}, @@ -1272,55 +1043,44 @@ class TransportPCEtesting(unittest.TestCase): def test_39_disconnect_ROADM_XPDRA_link(self): # Link-1 - url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" - "link/XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX" - .format(self.restconf_baseurl)) - data = {} - headers = {'content-type': 'application/json'} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + response = test_utils.del_link_request("XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX") self.assertEqual(response.status_code, requests.codes.ok) # Link-2 - url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" - "link/ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1" - .format(self.restconf_baseurl)) - data = {} - headers = {'content-type': 'application/json'} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + response = test_utils.del_link_request("ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1") self.assertEqual(response.status_code, requests.codes.ok) def test_40_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')) + response = test_utils.get_ordm_topo_request("") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbLink = len(res['network'][0]['ietf-network-topology:link']) 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', - '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'] + 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-common-network: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-common-network: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-common-network: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) @@ -1338,51 +1098,26 @@ class TransportPCEtesting(unittest.TestCase): ['org-openroadm-common-network:link-type'], 'XPONDER-INPUT') def test_41_disconnect_ROADMA(self): - url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/ROADM-A1" - .format(self.restconf_baseurl)) - data = {} - headers = {'content-type': 'application/json'} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) + response = test_utils.unmount_device("ROADM-A1") + self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) # Delete in the clli-network - url = ("{}/config/ietf-network:networks/network/clli-network/node/NodeA" - .format(self.restconf_baseurl)) - data = {} - headers = {'content-type': 'application/json'} - response = requests.request( - "DELETE", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) + response = test_utils.del_node_request("NodeA") self.assertEqual(response.status_code, requests.codes.ok) def test_42_getClliNetwork(self): - url = ("{}/config/ietf-network:networks/network/clli-network" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.get_clli_net_request() self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn('node', res['network'][0]) def test_43_getOpenRoadmNetwork(self): - url = ("{}/config/ietf-network:networks/network/openroadm-network" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) + response = test_utils.get_ordm_net_request() self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertNotIn('node', res['network'][0]) def test_44_check_roadm2roadm_link_persistence(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')) + response = test_utils.get_ordm_topo_request("") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() nbLink = len(res['network'][0]['ietf-network-topology:link'])