fix some pylint issues
[transportpce.git] / tests / transportpce_tests / 1.2.1 / test_topology.py
index 3eabea7febe0eeed66f8e4dbd6b7df6e44abcb6c..e088b6d7f7e80ec1f97c64f45bc0a2fbfa3a6ebe 100644 (file)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 ##############################################################################
-#Copyright (c) 2017 Orange, Inc. and others.  All rights reserved.
+# Copyright (c) 2017 Orange, Inc. and others.  All rights reserved.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-import json
-import os
-import psutil
-import requests
-import signal
-import shutil
-import subprocess
+# pylint: disable=no-member
+# pylint: disable=too-many-public-methods
+# pylint: disable=too-many-lines
+
 import time
 import unittest
-import logging
-
-class TransportPCETopologyTesting(unittest.TestCase):
-
-    honeynode_process1 = None
-    honeynode_process2 = None
-    honeynode_process3 = None
-    honeynode_process4 = None
-    odl_process = None
-    restconf_baseurl = "http://localhost:8181/restconf"
-
-#START_IGNORE_XTESTING
-
-    @classmethod
-    def __start_honeynode1(cls):
-        executable = ("./honeynode/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, "17830", "sample_configs/openroadm/2.1/oper-XPDRA.xml"],
-                    stdout=outfile)
+import requests
+from common import test_utils
 
-    @classmethod
-    def __start_honeynode2(cls):
-        executable = ("./honeynode/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, "17831", "sample_configs/openroadm/2.1/oper-ROADMA.xml"],
-                    stdout=outfile)
 
-    @classmethod
-    def __start_honeynode3(cls):
-        executable = ("./honeynode/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('honeynode3.log', 'w') as outfile:
-                cls.honeynode_process3 = subprocess.Popen(
-                    [executable, "17832", "sample_configs/openroadm/2.1/oper-ROADMB.xml"],
-                    stdout=outfile)
+class TransportPCETopologyTesting(unittest.TestCase):
 
-    @classmethod
-    def __start_honeynode4(cls):
-        executable = ("./honeynode/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('honeynode4.log', 'w') as outfile:
-                cls.honeynode_process4 = subprocess.Popen(
-                    [executable, "17833", "sample_configs/openroadm/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))
+    processes = None
 
     @classmethod
     def setUpClass(cls):
-        cls.__start_honeynode1()
-        time.sleep(20)
-        cls.__start_honeynode2()
-        time.sleep(20)
-        cls.__start_honeynode3()
-        time.sleep(20)
-        cls.__start_honeynode4()
-        time.sleep(20)
-        cls.__start_odl()
-        time.sleep(60)
+        cls.processes = test_utils.start_tpce()
+        cls.processes = test_utils.start_sims(['xpdra', 'roadma', 'roadmb', 'roadmc'])
 
     @classmethod
     def tearDownClass(cls):
-        for child in psutil.Process(cls.odl_process.pid).children():
-            child.send_signal(signal.SIGINT)
-            child.wait()
-        cls.odl_process.send_signal(signal.SIGINT)
-        cls.odl_process.wait()
-        for child in psutil.Process(cls.honeynode_process1.pid).children():
-            child.send_signal(signal.SIGINT)
-            child.wait()
-        cls.honeynode_process1.send_signal(signal.SIGINT)
-        cls.honeynode_process1.wait()
-        for child in psutil.Process(cls.honeynode_process2.pid).children():
-            child.send_signal(signal.SIGINT)
-            child.wait()
-        cls.honeynode_process2.send_signal(signal.SIGINT)
-        cls.honeynode_process2.wait()
-
-        for child in psutil.Process(cls.honeynode_process3.pid).children():
-            child.send_signal(signal.SIGINT)
-            child.wait()
-        cls.honeynode_process3.send_signal(signal.SIGINT)
-        cls.honeynode_process3.wait()
-
-        for child in psutil.Process(cls.honeynode_process4.pid).children():
-            child.send_signal(signal.SIGINT)
-            child.wait()
-        cls.honeynode_process4.send_signal(signal.SIGINT)
-        cls.honeynode_process4.wait()
+        # pylint: disable=not-an-iterable
+        for process in cls.processes:
+            test_utils.shutdown_process(process)
+        print("all processes killed")
 
     def setUp(self):
-        time.sleep(30)
-
-#END_IGNORE_XTESTING
+        time.sleep(5)
 
     def test_01_connect_ROADMA(self):
-        #Config ROADMA
-        url = ("{}/config/network-topology:"
-                "network-topology/topology/topology-netconf/node/ROADMA"
-               .format(self.restconf_baseurl))
-        data = {"node": [{
-             "node-id": "ROADMA",
-             "netconf-node-topology:username": "admin",
-             "netconf-node-topology:password": "admin",
-             "netconf-node-topology:host": "127.0.0.1",
-             "netconf-node-topology:port": "17831",
-             "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("ROADMA01", '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()
-        self.assertEqual(res['network'][0]['node'][0]['node-id'],'NodeA')
-        self.assertEqual(res['network'][0]['node'][0]['org-openroadm-clli-network:clli'],'NodeA')
+        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_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'],'ROADMA')
-        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'],'2')
+        self.assertEqual(res['network'][0]['node'][0]['node-id'], 'ROADMA01')
+        self.assertEqual(res['network'][0]['node'][0]['supporting-node'][0]['network-ref'], 'clli-network')
+        self.assertEqual(res['network'][0]['node'][0]['supporting-node'][0]['node-ref'], 'NodeA')
+        self.assertEqual(res['network'][0]['node'][0]['org-openroadm-common-network:node-type'], 'ROADM')
+        self.assertEqual(res['network'][0]['node'][0]['org-openroadm-network:model'], '2')
 
     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
-        nbLink=len(res['network'][0]['ietf-network-topology:link'])
-        self.assertEqual(nbLink,10)
-        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',
-                 'ROADMA-SRG3-SRG3-CP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX','ROADMA-SRG3-SRG3-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',
-                  'ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-SRG3-SRG3-CP-TXRX','ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-SRG3-SRG3-CP-TXRX']
-        for i in range(0,nbLink):
+        # Tests related to links
+        nbLink = len(res['network'][0]['ietf-network-topology:link'])
+        self.assertEqual(nbLink, 10)
+        expressLink = ['ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX',
+                       'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX']
+        addLink = ['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX',
+                   'ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX',
+                   'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX',
+                   'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX']
+        dropLink = ['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX',
+                    'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX',
+                    'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX',
+                    'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX']
+        for i in range(0, nbLink):
             linkId = res['network'][0]['ietf-network-topology:link'][i]['link-id']
-            if (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']=='EXPRESS-LINK'):
-                find= linkId in expressLink
+            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'):
-                find= linkId in addLink
+            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'):
-                find= linkId in dropLink
+            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)
             else:
                 self.assertFalse(True)
-        self.assertEqual(len(expressLink),0)
-        self.assertEqual(len(addLink),0)
-        self.assertEqual(len(dropLink),0)
+        self.assertEqual(len(expressLink), 0)
+        self.assertEqual(len(addLink), 0)
+        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
+        # Tests related to nodes
         self.assertEqual(response.status_code, requests.codes.ok)
-        nbNode=len(res['network'][0]['node'])
-        self.assertEqual(nbNode,4)
-        listNode=['ROADMA-SRG1','ROADMA-SRG3','ROADMA-DEG1','ROADMA-DEG2']
-        for i in range(0,nbNode):
-            self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA'},
+        nbNode = len(res['network'][0]['node'])
+        self.assertEqual(nbNode, 4)
+        listNode = ['ROADMA01-SRG1', 'ROADMA01-SRG3', 'ROADMA01-DEG1', 'ROADMA01-DEG2']
+        for i in range(0, nbNode):
+            self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
                           res['network'][0]['node'][i]['supporting-node'])
-            nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type']
-            nodeId=res['network'][0]['node'][i]['node-id']
-            if(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'},
+            nodeType = res['network'][0]['node'][i]['org-openroadm-common-network:node-type']
+            nodeId = res['network'][0]['node'][i]['node-id']
+            if nodeId == 'ROADMA01-SRG1':
+                # Test related to SRG1
+                self.assertEqual(nodeType, 'SRG')
+                self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 17)
+                self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-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': 'clli-network', 'node-ref': 'NodeA'},
+                              res['network'][0]['node'][i]['supporting-node'])
+                self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
+                              res['network'][0]['node'][i]['supporting-node'])
                 listNode.remove(nodeId)
-            elif(nodeId=='ROADMA-SRG3'):
-                #Test related to SRG1
-                self.assertEqual(nodeType,'SRG')
-                self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17)
-                self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'},
+            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-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': 'clli-network', 'node-ref': 'NodeA'},
+                              res['network'][0]['node'][i]['supporting-node'])
+                self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
+                              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'},
+            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-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=='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'},
+                self.assertIn({'network-ref': 'clli-network', 'node-ref': 'NodeA'},
+                              res['network'][0]['node'][i]['supporting-node'])
+                self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
+                              res['network'][0]['node'][i]['supporting-node'])
+            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-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': 'clli-network', 'node-ref': 'NodeA'},
+                              res['network'][0]['node'][i]['supporting-node'])
+                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)
+        self.assertEqual(len(listNode), 0)
 
     def test_06_connect_XPDRA(self):
-         url = ("{}/config/network-topology:"
-                 "network-topology/topology/topology-netconf/node/XPDRA"
-                .format(self.restconf_baseurl))
-         data = {"node": [{
-              "node-id": "XPDRA",
-              "netconf-node-topology:username": "admin",
-              "netconf-node-topology:password": "admin",
-              "netconf-node-topology:host": "127.0.0.1",
-              "netconf-node-topology:port": "17830",
-              "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("XPDRA01", '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'))
-         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')
+        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'))
-         self.assertEqual(response.status_code, requests.codes.ok)
-         res = response.json()
-         nbNode=len(res['network'][0]['node'])
-         self.assertEqual(nbNode,2)
-         for i in range(0,nbNode):
-             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=='XPDRA'):
-                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'XPONDER')
-                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'1')
-             elif(nodeId=='ROADMA'):
-                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'ROADM')
-                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'2')
-             else:
+        # 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'])
+        self.assertEqual(nbNode, 2)
+        for i in range(0, nbNode):
+            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 == 'XPDRA01':
+                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'XPONDER')
+                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'], '1')
+            elif nodeId == 'ROADMA01':
+                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'ROADM')
+                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'], '2')
+            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'))
-         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=['XPDRA-XPDR1','ROADMA-SRG1','ROADMA-SRG3','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.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA'},
-                               res['network'][0]['node'][i]['supporting-node'])
-                 self.assertEqual(nodeType,'XPONDER')
-                 nbTps=len(res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
-                 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']
-                     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
-                     if (tpId == 'XPDR1-NETWORK2'):
-                         self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['transportpce-topology:associated-connection-map-port'],'XPDR1-CLIENT3')
-                     if (tpId == 'XPDR1-CLIENT3'):
-                         self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['transportpce-topology:associated-connection-map-port'],'XPDR1-NETWORK2')
-                 self.assertTrue(client == 4)
-                 self.assertTrue(network == 2)
-                 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-SRG3'):
-                 #Test related to SRG1
-                 self.assertEqual(nodeType,'SRG')
-                 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17)
-                 self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'},
-                               res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
-                 self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'},
-                               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'},
+        # 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)
+        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':
+                self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA01'},
+                              res['network'][0]['node'][i]['supporting-node'])
+                self.assertIn({'network-ref': 'clli-network', 'node-ref': 'NodeA'},
+                              res['network'][0]['node'][i]['supporting-node'])
+                self.assertEqual(nodeType, 'XPONDER')
+                nbTps = len(res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
+                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']
+                    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
+                    if tpId == 'XPDR1-NETWORK2':
+                        self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point']
+                                         [j]['transportpce-topology:associated-connection-map-port'], 'XPDR1-CLIENT3')
+                    if tpId == 'XPDR1-CLIENT3':
+                        self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point']
+                                         [j]['transportpce-topology:associated-connection-map-port'], 'XPDR1-NETWORK2')
+                self.assertTrue(client == 4)
+                self.assertTrue(network == 2)
+                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': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'},
+                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': 'ROADMA'},
+                self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
                               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'},
+            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': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'},
+                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': 'ROADMA'},
+                self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
                               res['network'][0]['node'][i]['supporting-node'])
                 listNode.remove(nodeId)
-             else:
+            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)
+        self.assertEqual(len(listNode), 0)
 
-    #Connect the tail XPDRA to ROADMA and vice versa
+    # 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": "XPDRA",
-               "networkutils:xpdr-num": "1",
-               "networkutils:network-num": "1",
-               "networkutils:rdm-node": "ROADMA",
-               "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'))
+        # Connect the tail: XPDRA to ROADMA
+        response = test_utils.connect_xpdr_to_rdm_request("XPDRA01", "1", "1",
+                                                          "ROADMA01", "1", "SRG1-PP1-TXRX")
         self.assertEqual(response.status_code, requests.codes.ok)
-        time.sleep(10)
 
     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": "XPDRA",
-                "networkutils:xpdr-num": "1",
-                "networkutils:network-num": "1",
-                "networkutils:rdm-node": "ROADMA",
-                "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'))
-         self.assertEqual(response.status_code, requests.codes.ok)
-         time.sleep(10)
+        # Connect the tail: ROADMA to XPDRA
+        response = test_utils.connect_rdm_to_xpdr_request("XPDRA01", "1", "1",
+                                                          "ROADMA01", "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
-        nbLink=len(res['network'][0]['ietf-network-topology:link'])
-        self.assertEqual(nbLink,12)
-        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',
-                 'ROADMA-SRG3-SRG3-CP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX','ROADMA-SRG3-SRG3-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',
-                  'ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-SRG3-SRG3-CP-TXRX','ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-SRG3-SRG3-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
+        # Tests related to links
+        nbLink = len(res['network'][0]['ietf-network-topology:link'])
+        self.assertEqual(nbLink, 12)
+        expressLink = ['ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX',
+                       'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX']
+        addLink = ['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX',
+                   'ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX',
+                   'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX',
+                   'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX']
+        dropLink = ['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX',
+                    'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX',
+                    'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX',
+                    'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX']
+        XPDR_IN = ['ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1']
+        XPDR_OUT = ['XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX']
+        for i in range(0, nbLink):
+            nodeType = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-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(find, True)
                 expressLink.remove(linkId)
-            elif(nodeType=='ADD-LINK'):
-                find= linkId in addLink
+            elif nodeType == 'ADD-LINK':
+                find = linkId in addLink
                 self.assertEqual(find, True)
                 addLink.remove(linkId)
-            elif(nodeType=='DROP-LINK'):
-                find= linkId in dropLink
+            elif nodeType == 'DROP-LINK':
+                find = linkId in dropLink
                 self.assertEqual(find, True)
                 dropLink.remove(linkId)
-            elif(nodeType=='XPONDER-INPUT'):
-                find= linkId in XPDR_IN
+            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
+            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)
+        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)
 
     def test_13_connect_ROADMC(self):
-        #Config ROADMC
-        url = ("{}/config/network-topology:"
-                "network-topology/topology/topology-netconf/node/ROADMC"
-                .format(self.restconf_baseurl))
-        data = {"node": [{
-             "node-id": "ROADMC",
-             "netconf-node-topology:username": "admin",
-             "netconf-node-topology:password": "admin",
-             "netconf-node-topology:host": "127.0.0.1",
-             "netconf-node-topology:port": "17833",
-             "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("ROADMC01", '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/ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:"
-               "OMS-attributes/span"
-               .format(self.restconf_baseurl))
+        # Config ROADMA01-ROADMC01 oms-attributes
         data = {"span": {
-            "clfi": "fiber1",
             "auto-spanloss": "true",
             "engineered-spanloss": 12.2,
             "link-concatenation": [{
@@ -528,20 +362,12 @@ class TransportPCETopologyTesting(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("ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX", data)
         self.assertEqual(response.status_code, requests.codes.created)
 
     def test_15_omsAttributes_ROADMC_ROADMA(self):
-        # Config ROADMC-ROADMA oms-attributes
-        url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:"
-               "link/ROADMC-DEG2-DEG2-TTP-TXRXtoROADMA-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:"
-               "OMS-attributes/span"
-               .format(self.restconf_baseurl))
+        # Config ROADMC01-ROADMA oms-attributes
         data = {"span": {
-            "clfi": "fiber1",
             "auto-spanloss": "true",
             "engineered-spanloss": 12.2,
             "link-concatenation": [{
@@ -549,292 +375,262 @@ class TransportPCETopologyTesting(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("ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-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'])
-        listNode=['NodeA','NodeC']
-        for i in range(0,nbNode):
+        nbNode = len(res['network'][0]['node'])
+        listNode = ['NodeA', 'NodeC']
+        for i in range(0, nbNode):
             nodeId = res['network'][0]['node'][i]['node-id']
-            find= nodeId in listNode
+            find = nodeId in listNode
             self.assertEqual(find, True)
-            if(nodeId=='NodeA'):
-                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-clli-network:clli'],'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')
+                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-clli-network:clli'], 'NodeC')
             listNode.remove(nodeId)
 
-        self.assertEqual(len(listNode),0)
+        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'])
-        self.assertEqual(nbNode,3)
-        listNode=['XPDRA','ROADMA','ROADMC']
-        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=='XPDRA'):
-                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'],'1')
+        nbNode = len(res['network'][0]['node'])
+        self.assertEqual(nbNode, 3)
+        listNode = ['XPDRA01', 'ROADMA01', 'ROADMC01']
+        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 == 'XPDRA01':
+                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'], '1')
                 listNode.remove(nodeId)
-            elif(nodeId=='ROADMA'):
-                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'],'2')
+            elif nodeId == 'ROADMA01':
+                self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'], 'NodeA')
+                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'ROADM')
+                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'], '2')
                 listNode.remove(nodeId)
-            elif(nodeId=='ROADMC'):
-                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'],'2')
+            elif nodeId == 'ROADMC01':
+                self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'], 'NodeC')
+                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'ROADM')
+                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'], '2')
                 listNode.remove(nodeId)
             else:
                 self.assertFalse(True)
-        self.assertEqual(len(listNode),0)
+        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=['ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX','ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX',
-                     'ROADMC-DEG2-DEG2-CTP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX','ROADMC-DEG1-DEG1-CTP-TXRXtoROADMC-DEG2-DEG2-CTP-TXRX']
-        addLink=['ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX','ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX',
-                 'ROADMA-SRG3-SRG3-CP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX','ROADMA-SRG3-SRG3-CP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX',
-                 'ROADMC-SRG1-SRG1-CP-TXRXtoROADMC-DEG2-DEG2-CTP-TXRX','ROADMC-SRG1-SRG1-CP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX']
-        dropLink=['ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX','ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX',
-                  'ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-SRG3-SRG3-CP-TXRX','ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-SRG3-SRG3-CP-TXRX',
-                  'ROADMC-DEG1-DEG1-CTP-TXRXtoROADMC-SRG1-SRG1-CP-TXRX','ROADMC-DEG2-DEG2-CTP-TXRXtoROADMC-SRG1-SRG1-CP-TXRX']
-        R2RLink=['ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX','ROADMC-DEG2-DEG2-TTP-TXRXtoROADMA-DEG1-DEG1-TTP-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
+        # Tests related to links
+        nbLink = len(res['network'][0]['ietf-network-topology:link'])
+        self.assertEqual(nbLink, 20)
+        expressLink = ['ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX',
+                       'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX',
+                       'ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX',
+                       'ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX']
+        addLink = ['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX',
+                   'ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX',
+                   'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX',
+                   'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX',
+                   'ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX',
+                   'ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX']
+        dropLink = ['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX',
+                    'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX',
+                    'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX',
+                    'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX',
+                    'ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX',
+                    'ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX']
+        R2RLink = ['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX',
+                   'ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX']
+        XPDR_IN = ['ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1']
+        XPDR_OUT = ['XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX']
+        for i in range(0, nbLink):
+            nodeType = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-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(find, True)
                 expressLink.remove(linkId)
-            elif(nodeType=='ADD-LINK'):
-                find= linkId in addLink
+            elif nodeType == 'ADD-LINK':
+                find = linkId in addLink
                 self.assertEqual(find, True)
                 addLink.remove(linkId)
-            elif(nodeType=='DROP-LINK'):
-                find= linkId in dropLink
+            elif nodeType == 'DROP-LINK':
+                find = linkId in dropLink
                 self.assertEqual(find, True)
                 dropLink.remove(linkId)
-            elif(nodeType=='ROADM-TO-ROADM'):
-                find= linkId in R2RLink
+            elif nodeType == 'ROADM-TO-ROADM':
+                find = linkId in R2RLink
                 self.assertEqual(find, True)
                 R2RLink.remove(linkId)
-            elif(nodeType=='XPONDER-INPUT'):
-                find= linkId in XPDR_IN
+            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
+            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(R2RLink),0)
-        self.assertEqual(len(XPDR_IN),0)
-        self.assertEqual(len(XPDR_OUT),0)
+        self.assertEqual(len(expressLink), 0)
+        self.assertEqual(len(addLink), 0)
+        self.assertEqual(len(dropLink), 0)
+        self.assertEqual(len(R2RLink), 0)
+        self.assertEqual(len(XPDR_IN), 0)
+        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
-        nbLink=len(res['network'][0]['ietf-network-topology:link'])
-        self.assertEqual(nbLink,20)
-        R2RLink=['ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX',
-                 'ROADMC-DEG2-DEG2-TTP-TXRXtoROADMA-DEG1-DEG1-TTP-TXRX']
-        for i in range(0,nbLink):
-            nodeType = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']
-            link_id=res['network'][0]['ietf-network-topology:link'][i]['link-id']
-            if(link_id in R2RLink):
+        # Tests related to links
+        nbLink = len(res['network'][0]['ietf-network-topology:link'])
+        self.assertEqual(nbLink, 20)
+        R2RLink = ['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX',
+                   'ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX']
+        for i in range(0, nbLink):
+            link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id']
+            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)):
+                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 is not None) & (length is not None):
                     find = True
                 self.assertTrue(find)
                 R2RLink.remove(link_id)
-        self.assertEqual(len(R2RLink),0)
+        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'))
-         res = response.json()
-         #Tests related to nodes
-         self.assertEqual(response.status_code, requests.codes.ok)
-         nbNode=len(res['network'][0]['node'])
-         self.assertEqual(nbNode,8)
-         listNode=['XPDRA-XPDR1',
-                   'ROADMA-SRG1','ROADMA-SRG3','ROADMA-DEG1','ROADMA-DEG2',
-                   'ROADMC-SRG1','ROADMC-DEG1','ROADMC-DEG2']
-         #************************Tests related to XPDRA nodes
-         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']
-             if(nodeId=='XPDRA-XPDR1'):
-                 self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA'},
-                               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 == 6)
-                 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']
-                     if (tpType=='XPONDER-CLIENT'):
-                         client += 1
-                     elif (tpType=='XPONDER-NETWORK'):
-                         network += 1
-                 self.assertTrue(client == 4)
-                 self.assertTrue(network == 2)
-                 listNode.remove(nodeId)
-             elif(nodeId=='ROADMA-SRG1'):
-                 #Test related to SRG1
-                 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17)
-                 self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'},
-                               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'])
-                 self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'SRG')
-                 listNode.remove(nodeId)
-             elif(nodeId=='ROADMA-SRG3'):
-                 #Test related to SRG1
-                 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17)
-                 self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'},
-                               res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
-                 self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'},
-                               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'])
-                 self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'SRG')
-                 listNode.remove(nodeId)
-             elif(nodeId=='ROADMA-DEG1'):
-                 #Test related to DEG1
-                 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'])
-                 self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'DEGREE')
-                 listNode.remove(nodeId)
-             elif(nodeId=='ROADMA-DEG2'):
-                 #Test related to DEG2
-                 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'])
-                 self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'DEGREE')
-                 listNode.remove(nodeId)
-             elif(nodeId=='ROADMC-SRG1'):
-                 #Test related to SRG1
-                 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17)
-                 self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'},
-                               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': 'ROADMC'},
-                               res['network'][0]['node'][i]['supporting-node'])
-                 self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'SRG')
-                 listNode.remove(nodeId)
-             elif(nodeId=='ROADMC-DEG1'):
-                 #Test related to DEG1
-                 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': 'ROADMC'},
-                               res['network'][0]['node'][i]['supporting-node'])
-                 self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'DEGREE')
-                 listNode.remove(nodeId)
-             elif(nodeId=='ROADMC-DEG2'):
-                 #Test related to DEG2
-                 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': 'ROADMC'},
-                               res['network'][0]['node'][i]['supporting-node'])
-                 self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'DEGREE')
-                 listNode.remove(nodeId)
-             else:
+        # 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)
+        nbNode = len(res['network'][0]['node'])
+        self.assertEqual(nbNode, 8)
+        listNode = ['XPDRA01-XPDR1',
+                    'ROADMA01-SRG1', 'ROADMA01-SRG3', 'ROADMA01-DEG1', 'ROADMA01-DEG2',
+                    'ROADMC01-SRG1', 'ROADMC01-DEG1', 'ROADMC01-DEG2']
+        # ************************Tests related to XPDRA nodes
+        for i in range(0, nbNode):
+            nodeType = res['network'][0]['node'][i]['org-openroadm-common-network:node-type']
+            nodeId = res['network'][0]['node'][i]['node-id']
+            if nodeId == 'XPDRA01-XPDR1':
+                self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA01'},
+                              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 == 6)
+                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':
+                        client += 1
+                    elif tpType == 'XPONDER-NETWORK':
+                        network += 1
+                self.assertTrue(client == 4)
+                self.assertTrue(network == 2)
+                listNode.remove(nodeId)
+            elif nodeId == 'ROADMA01-SRG1':
+                # Test related to SRG1
+                self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 17)
+                self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-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'])
+                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'SRG')
+                listNode.remove(nodeId)
+            elif nodeId == 'ROADMA01-SRG3':
+                # Test related to SRG1
+                self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 17)
+                self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-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'])
+                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'SRG')
+                listNode.remove(nodeId)
+            elif nodeId == 'ROADMA01-DEG1':
+                # Test related to DEG1
+                self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-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'])
+                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'DEGREE')
+                listNode.remove(nodeId)
+            elif nodeId == 'ROADMA01-DEG2':
+                # Test related to DEG2
+                self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-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'])
+                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'DEGREE')
+                listNode.remove(nodeId)
+            elif nodeId == 'ROADMC01-SRG1':
+                # Test related to SRG1
+                self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 17)
+                self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-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': 'ROADMC01'},
+                              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 == 'ROADMC01-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'])
+                self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'},
+                              res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
+                self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMC01'},
+                              res['network'][0]['node'][i]['supporting-node'])
+                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'DEGREE')
+                listNode.remove(nodeId)
+            elif nodeId == 'ROADMC01-DEG2':
+                # Test related to DEG2
+                self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-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': 'ROADMC01'},
+                              res['network'][0]['node'][i]['supporting-node'])
+                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'DEGREE')
+                listNode.remove(nodeId)
+            else:
                 self.assertFalse(True)
-         self.assertEqual(len(listNode),0)
+        self.assertEqual(len(listNode), 0)
 
     def test_21_connect_ROADMB(self):
-        url = ("{}/config/network-topology:"
-                "network-topology/topology/topology-netconf/node/ROADMB"
-               .format(self.restconf_baseurl))
-        data = {"node": [{
-             "node-id": "ROADMB",
-             "netconf-node-topology:username": "admin",
-             "netconf-node-topology:password": "admin",
-             "netconf-node-topology:host": "127.0.0.1",
-             "netconf-node-topology:port": "17832",
-             "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("ROADMB01", 'roadmb')
+        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
 
     def test_22_omsAttributes_ROADMA_ROADMB(self):
-        # Config ROADMA-ROADMB oms-attributes
-        url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:"
-               "link/ROADMA-DEG2-DEG2-TTP-TXRXtoROADMB-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:"
-               "OMS-attributes/span"
-               .format(self.restconf_baseurl))
+        # Config ROADMA01-ROADMB01 oms-attributes
         data = {"span": {
-                "clfi": "fiber1",
                 "auto-spanloss": "true",
                 "engineered-spanloss": 12.2,
                 "link-concatenation": [{
@@ -842,20 +638,12 @@ class TransportPCETopologyTesting(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("ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB01-DEG1-DEG1-TTP-TXRX", data)
         self.assertEqual(response.status_code, requests.codes.created)
 
     def test_23_omsAttributes_ROADMB_ROADMA(self):
-        # Config ROADMB-ROADMA oms-attributes
-        url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:"
-               "link/ROADMB-DEG1-DEG1-TTP-TXRXtoROADMA-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:"
-               "OMS-attributes/span"
-               .format(self.restconf_baseurl))
+        # Config ROADMB01-ROADMA01 oms-attributes
         data = {"span": {
-                "clfi": "fiber1",
                 "auto-spanloss": "true",
                 "engineered-spanloss": 12.2,
                 "link-concatenation": [{
@@ -863,20 +651,12 @@ class TransportPCETopologyTesting(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("ROADMB01-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX", data)
         self.assertEqual(response.status_code, requests.codes.created)
 
     def test_24_omsAttributes_ROADMB_ROADMC(self):
-        # Config ROADMB-ROADMC oms-attributes
-        url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:"
-               "link/ROADMB-DEG2-DEG2-TTP-TXRXtoROADMC-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:"
-               "OMS-attributes/span"
-               .format(self.restconf_baseurl))
+        # Config ROADMB01-ROADMC01 oms-attributes
         data = {"span": {
-                "clfi": "fiber1",
                 "auto-spanloss": "true",
                 "engineered-spanloss": 12.2,
                 "link-concatenation": [{
@@ -884,20 +664,12 @@ class TransportPCETopologyTesting(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("ROADMB01-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX", data)
         self.assertEqual(response.status_code, requests.codes.created)
 
     def test_25_omsAttributes_ROADMC_ROADMB(self):
-        # Config ROADMC-ROADMB oms-attributes
-        url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:"
-               "link/ROADMC-DEG1-DEG1-TTP-TXRXtoROADMB-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:"
-               "OMS-attributes/span"
-               .format(self.restconf_baseurl))
+        # Config ROADMC01-ROADMB01 oms-attributes
         data = {"span": {
-                "clfi": "fiber1",
                 "auto-spanloss": "true",
                 "engineered-spanloss": 12.2,
                 "link-concatenation": [{
@@ -905,484 +677,381 @@ class TransportPCETopologyTesting(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("ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB01-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'])
-        listNode=['NodeA','NodeB','NodeC']
-        for i in range(0,nbNode):
+        nbNode = len(res['network'][0]['node'])
+        listNode = ['NodeA', 'NodeB', 'NodeC']
+        for i in range(0, nbNode):
             nodeId = res['network'][0]['node'][i]['node-id']
-            find= nodeId in listNode
+            find = nodeId in listNode
             self.assertEqual(find, True)
-            if(nodeId=='NodeA'):
-                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-clli-network:clli'],'NodeA')
-            elif(nodeId=='NodeB'):
-                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-clli-network:clli'],'NodeB')
+            if nodeId == 'NodeA':
+                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-clli-network:clli'], 'NodeA')
+            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')
+                self.assertEqual(res['network'][0]['node'][i]['org-openroadm-clli-network:clli'], 'NodeC')
             listNode.remove(nodeId)
-
-        self.assertEqual(len(listNode),0)
+        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=['ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX','ROADMC-DEG2-DEG2-TTP-TXRXtoROADMA-DEG1-DEG1-TTP-TXRX',
-           'ROADMA-DEG2-DEG2-TTP-TXRXtoROADMB-DEG1-DEG1-TTP-TXRX','ROADMC-DEG1-DEG1-TTP-TXRXtoROADMB-DEG2-DEG2-TTP-TXRX',
-           'ROADMB-DEG1-DEG1-TTP-TXRXtoROADMA-DEG2-DEG2-TTP-TXRX','ROADMB-DEG2-DEG2-TTP-TXRXtoROADMC-DEG1-DEG1-TTP-TXRX']
-        for i in range(0,nbLink):
-            if res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'] == 'ROADM-TO-ROADM':
+        # Tests related to links
+        nbLink = len(res['network'][0]['ietf-network-topology:link'])
+        listR2RLink = ['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX',
+                       'ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX',
+                       'ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB01-DEG1-DEG1-TTP-TXRX',
+                       'ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB01-DEG2-DEG2-TTP-TXRX',
+                       'ROADMB01-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX',
+                       'ROADMB01-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX']
+        for i in range(0, nbLink):
+            if (res['network'][0]['ietf-network-topology:link'][i]
+                   ['org-openroadm-common-network:link-type'] == 'ROADM-TO-ROADM'):
                 link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id']
-                find= link_id in listR2RLink
+                find = link_id in listR2RLink
                 self.assertEqual(find, True)
                 listR2RLink.remove(link_id)
-        self.assertEqual(len(listR2RLink),0)
+        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
-        nbLink=len(res['network'][0]['ietf-network-topology:link'])
-        self.assertEqual(nbLink,34)
-        for i in range(0,nbLink):
-            link_id=res['network'][0]['ietf-network-topology:link'][i]['link-id']
-            link_type=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']
-            link_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']
-            #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'))
+        # Tests related to links
+        nbLink = len(res['network'][0]['ietf-network-topology:link'])
+        self.assertEqual(nbLink, 34)
+        for i in range(0, nbLink):
+            link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id']
+            link_type = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-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'])
+            # Find the opposite link
+            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]['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']
-            if link_type=='ADD-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-common-network:link-type']
+            if link_type == 'ADD-LINK':
                 self.assertEqual(oppLink_type, 'DROP-LINK')
-            elif link_type=='DROP-LINK':
+            elif link_type == 'DROP-LINK':
                 self.assertEqual(oppLink_type, 'ADD-LINK')
-            elif link_type=='EXPRESS-LINK':
+            elif link_type == 'EXPRESS-LINK':
                 self.assertEqual(oppLink_type, 'EXPRESS-LINK')
-            elif link_type=='ROADM-TO-ROADM':
+            elif link_type == 'ROADM-TO-ROADM':
                 self.assertEqual(oppLink_type, 'ROADM-TO-ROADM')
-            elif link_type=='XPONDER-INPUT':
+            elif link_type == 'XPONDER-INPUT':
                 self.assertEqual(oppLink_type, 'XPONDER-OUTPUT')
-            elif link_type=='XPONDER-OUTPUT':
+            elif link_type == 'XPONDER-OUTPUT':
                 self.assertEqual(oppLink_type, 'XPONDER-INPUT')
-        time.sleep(5)
 
     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'])
-        R2RLink = ['ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX',
-                       'ROADMC-DEG2-DEG2-TTP-TXRXtoROADMA-DEG1-DEG1-TTP-TXRX',
-                       'ROADMA-DEG2-DEG2-TTP-TXRXtoROADMB-DEG1-DEG1-TTP-TXRX',
-                       'ROADMC-DEG1-DEG1-TTP-TXRXtoROADMB-DEG2-DEG2-TTP-TXRX',
-                       'ROADMB-DEG1-DEG1-TTP-TXRXtoROADMA-DEG2-DEG2-TTP-TXRX',
-                       'ROADMB-DEG2-DEG2-TTP-TXRXtoROADMC-DEG1-DEG1-TTP-TXRX']
-        for i in range(0,nbLink):
-            nodeType = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']
-            link_id=res['network'][0]['ietf-network-topology:link'][i]['link-id']
-            if(link_id in R2RLink):
+        nbLink = len(res['network'][0]['ietf-network-topology:link'])
+        R2RLink = ['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX',
+                   'ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX',
+                   'ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB01-DEG1-DEG1-TTP-TXRX',
+                   'ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB01-DEG2-DEG2-TTP-TXRX',
+                   'ROADMB01-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX',
+                   'ROADMB01-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX']
+        for i in range(0, nbLink):
+            link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id']
+            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)
+        self.assertEqual(len(R2RLink), 0)
 
     def test_30_disconnect_ROADMB(self):
-        #Delete in the topology-netconf
-        url = ("{}/config/network-topology:"
-                "network-topology/topology/topology-netconf/node/ROADMB"
-               .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)
-        #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'))
+        # Delete in the topology-netconf
+        response = test_utils.unmount_device("ROADMB01")
+        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        # Delete in the clli-network
+        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/ROADMC"
-               .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)
-        #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.unmount_device("ROADMC01")
+        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        # Delete in the clli-network
+        response = test_utils.del_node_request("NodeC")
         self.assertEqual(response.status_code, requests.codes.ok)
 
     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
+        # Tests related to nodes
         self.assertEqual(response.status_code, requests.codes.ok)
-        nbNode=len(res['network'][0]['node'])
-        self.assertEqual(nbNode,5)
-        listNode=['XPDRA-XPDR1','ROADMA-SRG1', 'ROADMA-SRG3','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'):
+        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'):
+                    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')
+                    if tpid == 'XPDR1-NETWORK1':
                         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': 'XPDRA'},
-                    res['network'][0]['node'][i]['supporting-node'])
+                                         ['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'],
+                                         'ROADMA01-SRG1--SRG1-PP1-TXRX')
+                self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA01'},
+                              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'},
+            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-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': 'ROADMA'},
+                self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
                               res['network'][0]['node'][i]['supporting-node'])
                 listNode.remove(nodeId)
-            elif(nodeId=='ROADMA-SRG3'):
-                #Test related to SRG1
-                self.assertEqual(nodeType,'SRG')
-                self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17)
-                self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'},
+            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-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': 'ROADMA'},
+                self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
                               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'])
+            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=='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'},
+            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-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': 'ROADMA'},
+                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'],'ROADMC-SRG1')
-            self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADMC-DEG1')
-            self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADMC-DEG2')
+        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')
 
     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'])
-        self.assertEqual(nbNode,2)
-        for i in range(0,nbNode-1):
-            self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADMC')
-            self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADMB')
+        nbNode = len(res['network'][0]['node'])
+        self.assertEqual(nbNode, 2)
+        for i in range(0, nbNode-1):
+            self.assertNotEqual(res['network'][0]['node'][i]['node-id'], 'ROADMC01')
+            self.assertNotEqual(res['network'][0]['node'][i]['node-id'], 'ROADMB01')
 
     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')
+        nbNode = len(res['network'][0]['node'])
+        self.assertEqual(nbNode, 1)
+        for i in range(0, nbNode-1):
+            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/XPDRA"
-              .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("XPDRA01")
+        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'])
-        self.assertEqual(nbNode,1)
-        self.assertEqual(res['network'][0]['node'][0]['org-openroadm-clli-network:clli'],'NodeA')
+        nbNode = len(res['network'][0]['node'])
+        self.assertEqual(nbNode, 1)
+        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'])
-        self.assertEqual(nbNode,1)
-        for i in range(0,nbNode):
-            self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'XPDRA')
+        nbNode = len(res['network'][0]['node'])
+        self.assertEqual(nbNode, 1)
+        for i in range(0, nbNode):
+            self.assertNotEqual(res['network'][0]['node'][i]['node-id'], 'XPDRA01')
 
     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
+        # Tests related to nodes
         self.assertEqual(response.status_code, requests.codes.ok)
-        nbNode=len(res['network'][0]['node'])
-        self.assertEqual(nbNode,4)
-        listNode=['ROADMA-SRG1','ROADMA-SRG3','ROADMA-DEG1','ROADMA-DEG2']
-        for i in range(0,nbNode):
-            self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA'},
+        nbNode = len(res['network'][0]['node'])
+        self.assertEqual(nbNode, 4)
+        listNode = ['ROADMA01-SRG1', 'ROADMA01-SRG3', 'ROADMA01-DEG1', 'ROADMA01-DEG2']
+        for i in range(0, nbNode):
+            self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
                           res['network'][0]['node'][i]['supporting-node'])
-            nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type']
-            nodeId=res['network'][0]['node'][i]['node-id']
-            if(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'},
+            nodeType = res['network'][0]['node'][i]['org-openroadm-common-network:node-type']
+            nodeId = res['network'][0]['node'][i]['node-id']
+            if nodeId == 'ROADMA01-SRG1':
+                # Test related to SRG1
+                self.assertEqual(nodeType, 'SRG')
+                self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 17)
+                self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-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=='ROADMA-SRG3'):
-                #Test related to SRG1
-                self.assertEqual(nodeType,'SRG')
-                self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17)
-                self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'},
+            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-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=='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'},
+            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-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=='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'},
+            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-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.assertFalse(True)
-        self.assertEqual(len(listNode),0)
+        self.assertEqual(len(listNode), 0)
 
     def test_39_disconnect_ROADM_XPDRA_link(self):
-        #Link-1
-        url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:"
-               "link/XPDRA-XPDR1-XPDR1-NETWORK1toROADMA-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'))
+        # Link-1
+        response = test_utils.del_link_request("XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-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/ROADMA-SRG1-SRG1-PP1-TXRXtoXPDRA-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'))
+        # Link-2
+        response = test_utils.del_link_request("ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-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=['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',
-                 'ROADMA-SRG3-SRG3-CP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX','ROADMA-SRG3-SRG3-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',
-                  'ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-SRG3-SRG3-CP-TXRX','ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-SRG3-SRG3-CP-TXRX']
+        nbLink = len(res['network'][0]['ietf-network-topology:link'])
+        self.assertEqual(nbLink, 16)
+        expressLink = ['ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX',
+                       'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX']
+        addLink = ['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX',
+                   'ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX',
+                   'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX',
+                   'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX']
+        dropLink = ['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX',
+                    'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX',
+                    'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX',
+                    'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX']
         roadmtoroadmLink = 0
-        for i in range(0,nbLink):
-            if (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']=='EXPRESS-LINK'):
+        for i in range(0, nbLink):
+            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
+                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
+                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
+                find = link_id in dropLink
                 self.assertEqual(find, True)
                 dropLink.remove(link_id)
             else:
                 roadmtoroadmLink += 1
-        self.assertEqual(len(expressLink),0)
-        self.assertEqual(len(addLink),0)
-        self.assertEqual(len(dropLink),0)
+        self.assertEqual(len(expressLink), 0)
+        self.assertEqual(len(addLink), 0)
+        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')
+        for i in range(0, nbLink):
+            self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]
+                                ['org-openroadm-common-network:link-type'], 'XPONDER-OUTPUT')
+            self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]
+                                ['org-openroadm-common-network:link-type'], 'XPONDER-INPUT')
 
     def test_41_disconnect_ROADMA(self):
-        url = ("{}/config/network-topology:"
-                "network-topology/topology/topology-netconf/node/ROADMA"
-               .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)
-        #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.unmount_device("ROADMA01")
+        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        # Delete in the clli-network
+        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'])
+        nbLink = len(res['network'][0]['ietf-network-topology:link'])
         self.assertNotIn('node', res['network'][0])
         self.assertEqual(nbLink, 6)
 
+
 if __name__ == "__main__":
     unittest.main(verbosity=2)