add a method to check nodes configs in func tests
[transportpce.git] / tests / transportpce_tests / 2.2.1 / test_renderer_service_path_nominal.py
index c70bf9dd1ce1f9865e46f209338a0aaf3695d469..bb5f5bb2723ca50e94c8deee7b2d1f295aaf3bd4 100644 (file)
 #############################################################################
 
 import unittest
-import requests
-import time
-import subprocess
-import signal
 import json
-import os
-import psutil
-import shutil
-from unittest.result import failfast
-import test_utils
+#from unittest.result import failfast
+import requests
+from common import test_utils
 
 
 class TransportPCERendererTesting(unittest.TestCase):
 
-    honeynode_process1 = None
-    honeynode_process2 = None
-    odl_process = None
-    restconf_baseurl = "http://localhost:8181/restconf"
-
-#START_IGNORE_XTESTING
+    processes = None
 
     @classmethod
     def setUpClass(cls):
-        print ("starting honeynode1...")
-        cls.honeynode_process1 = test_utils.start_xpdra_honeynode()
-        time.sleep(20)
-
-        print ("starting honeynode2...")
-        cls.honeynode_process2 = test_utils.start_roadma_honeynode()
-        time.sleep(20)
-        print ("all honeynodes started")
-
-        print ("starting opendaylight...")
-        cls.odl_process = test_utils.start_tpce()
-        time.sleep(60)
-        print ("opendaylight started")
+        cls.processes = test_utils.start_tpce()
+        cls.processes = test_utils.start_sims(['xpdra', 'roadma'])
 
     @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()
-
-    def setUp(self):
-        print ("execution of {}".format(self.id().split(".")[-1]))
-        time.sleep(10)
-
-#END_IGNORE_XTESTING
+        for process in cls.processes:
+            test_utils.shutdown_process(process)
+        print("all processes killed")
 
     def test_01_rdm_device_connected(self):
-        url = ("{}/config/network-topology:"
-               "network-topology/topology/topology-netconf/node/ROADM-A1"
-               .format(self.restconf_baseurl))
-        data = {"node": [{
-             "node-id": "ROADM-A1",
-             "netconf-node-topology:username": "admin",
-             "netconf-node-topology:password": "admin",
-             "netconf-node-topology:host": "127.0.0.1",
-             "netconf-node-topology:port": "17841",
-             "netconf-node-topology:tcp-only": "false",
-             "netconf-node-topology:pass-through": {}}]}
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "PUT", url, data=json.dumps(data), headers=headers,
-              auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.created)
-        time.sleep(20)
+        response = test_utils.mount_device("ROADM-A1", 'roadma')
+        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
 
     def test_02_xpdr_device_connected(self):
-        url = ("{}/config/network-topology:"
-               "network-topology/topology/topology-netconf/node/XPDR-A1"
-              .format(self.restconf_baseurl))
-        data = {"node": [{
-            "node-id": "XPDR-A1",
-            "netconf-node-topology:username": "admin",
-            "netconf-node-topology:password": "admin",
-            "netconf-node-topology:host": "127.0.0.1",
-            "netconf-node-topology:port": "17840",
-            "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("XPDR-A1", 'xpdra')
+        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
 
     def test_03_rdm_portmapping(self):
-        url = ("{}/config/transportpce-portmapping:network/"
-               "nodes/ROADM-A1"
-               .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+        url = "{}/config/transportpce-portmapping:network/nodes/ROADM-A1"
+        response = test_utils.get_request(url)
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn(
-             {'supporting-port': 'L1', 'supporting-circuit-pack-name': '1/0',
-              'logical-connection-point': 'DEG1-TTP-TXRX', 'port-direction': 'bidirectional'},
-             res['nodes'][0]['mapping'])
+            {'supporting-port': 'L1', 'supporting-circuit-pack-name': '1/0',
+             'logical-connection-point': 'DEG1-TTP-TXRX', 'port-direction': 'bidirectional'},
+            res['nodes'][0]['mapping'])
         self.assertIn(
-             {'supporting-port': 'C3', 'supporting-circuit-pack-name': '3/0',
-              'logical-connection-point': 'SRG1-PP3-TXRX', 'port-direction': 'bidirectional'},
-             res['nodes'][0]['mapping'])
+            {'supporting-port': 'C3', 'supporting-circuit-pack-name': '3/0',
+             'logical-connection-point': 'SRG1-PP3-TXRX', 'port-direction': 'bidirectional'},
+            res['nodes'][0]['mapping'])
 
     def test_04_xpdr_portmapping(self):
-        url = ("{}/config/transportpce-portmapping:network/"
-               "nodes/XPDR-A1"
-               .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+        url = "{}/config/transportpce-portmapping:network/nodes/XPDR-A1"
+        response = test_utils.get_request(url)
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn(
-             {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
-              'logical-connection-point': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-network',
-              'port-direction': 'bidirectional', 'associated-lcp': 'XPDR1-CLIENT1'},
-             res['nodes'][0]['mapping'])
+            {'supported-interface-capability': ['org-openroadm-port-types:if-OCH'],
+             'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
+             'logical-connection-point': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-network',
+             'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-CLIENT1',
+             'lcp-hash-val': 'AMkDwQ7xTmRI'},
+            res['nodes'][0]['mapping'])
         self.assertIn(
-             {'supporting-port': 'C1',
-              'supporting-circuit-pack-name': '1/0/1-PLUG-CLIENT',
-              'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional',
-              'associated-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client'},
-             res['nodes'][0]['mapping'])
+            {'supported-interface-capability': ['org-openroadm-port-types:if-100GE'],
+             'supporting-port': 'C1',
+             'supporting-circuit-pack-name': '1/0/1-PLUG-CLIENT',
+             'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional',
+             'connection-map-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client',
+             'lcp-hash-val': 'AJUUr6I5fALj'},
+            res['nodes'][0]['mapping'])
 
     def test_05_service_path_create(self):
-        url = "{}/operations/transportpce-device-renderer:service-path".format(self.restconf_baseurl)
+        url = "{}/operations/transportpce-device-renderer:service-path"
         data = {"renderer:input": {
-             "renderer:service-name": "service_test",
-             "renderer:wave-number": "7",
-             "renderer:modulation-format": "qpsk",
-             "renderer:operation": "create",
-             "renderer:nodes": [
-                 {"renderer:node-id": "ROADM-A1",
-                  "renderer:src-tp": "SRG1-PP3-TXRX",
-                  "renderer:dest-tp": "DEG1-TTP-TXRX"},
-                 {"renderer:node-id": "XPDR-A1",
-                  "renderer:src-tp": "XPDR1-CLIENT1",
-                  "renderer:dest-tp": "XPDR1-NETWORK1"}]}}
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "POST", url, data=json.dumps(data),
-             headers=headers, auth=('admin', 'admin'))
+            "renderer:service-name": "service_test",
+            "renderer:wave-number": "7",
+            "renderer:modulation-format": "qpsk",
+            "renderer:operation": "create",
+            "renderer:nodes": [
+                {"renderer:node-id": "ROADM-A1",
+                 "renderer:src-tp": "SRG1-PP3-TXRX",
+                 "renderer:dest-tp": "DEG1-TTP-TXRX"},
+                {"renderer:node-id": "XPDR-A1",
+                 "renderer:src-tp": "XPDR1-CLIENT1",
+                 "renderer:dest-tp": "XPDR1-NETWORK1"}]}}
+        response = test_utils.post_request(url, data)
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Roadm-connection successfully created for nodes: ROADM-A1', res["output"]["result"])
 
     def test_06_service_path_create_rdm_check(self):
-        url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-                "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-                "interface/DEG1-TTP-TXRX-nmc-7"
-                .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+        response = test_utils.check_netconf_node_request("ROADM-A1", "interface/DEG1-TTP-TXRX-nmc-7")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
-        self.assertDictContainsSubset({'name': 'DEG1-TTP-TXRX-nmc-7', 'administrative-state': 'inService',
-              'supporting-circuit-pack-name': '1/0',
-              'type': 'org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint',
-              'supporting-port': 'L1'}, res['interface'][0])
+        # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
+        self.assertDictEqual(
+            dict({
+                 'name': 'DEG1-TTP-TXRX-nmc-7',
+                 'administrative-state': 'inService',
+                 'supporting-circuit-pack-name': '1/0',
+                 'type': 'org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint',
+                 'supporting-port': 'L1'
+                 }, **res['interface'][0]),
+            res['interface'][0]
+        )
         self.assertDictEqual(
-             {u'frequency': 195.8, u'width': 40},
-             res['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp'])
+            {u'frequency': 195.8, u'width': 40},
+            res['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp'])
 
     def test_07_service_path_create_rdm_check(self):
-        url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-                "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-                "interface/DEG1-TTP-TXRX-mc-7"
-                .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+        response = test_utils.check_netconf_node_request("ROADM-A1", "interface/DEG1-TTP-TXRX-mc-7")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
-        self.assertDictContainsSubset({'name': 'DEG1-TTP-TXRX-mc-7', 'administrative-state': 'inService',
-              'supporting-circuit-pack-name': '1/0',
-              'type': 'org-openroadm-interfaces:mediaChannelTrailTerminationPoint',
-              'supporting-port': 'L1'}, res['interface'][0])
+        # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
         self.assertDictEqual(
-             {u'min-freq': 195.775, u'max-freq': 195.825},
-             res['interface'][0]['org-openroadm-media-channel-interfaces:mc-ttp'])
-
+            dict({
+                 'name': 'DEG1-TTP-TXRX-mc-7',
+                 'administrative-state': 'inService',
+                 'supporting-circuit-pack-name': '1/0',
+                 'type': 'org-openroadm-interfaces:mediaChannelTrailTerminationPoint',
+                 'supporting-port': 'L1'
+                 }, **res['interface'][0]),
+            res['interface'][0]
+        )
+        self.assertDictEqual(
+            {u'min-freq': 195.775, u'max-freq': 195.825},
+            res['interface'][0]['org-openroadm-media-channel-interfaces:mc-ttp'])
 
     def test_08_service_path_create_rdm_check(self):
-        url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-                "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-                "interface/SRG1-PP3-TXRX-nmc-7"
-                .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+        response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-nmc-7")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
-        self.assertDictContainsSubset({'name': 'SRG1-PP3-TXRX-nmc-7', 'administrative-state': 'inService',
-              'supporting-circuit-pack-name': '3/0',
-              'type': 'org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint',
-              'supporting-port': 'C3'}, res['interface'][0])
+        # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
+        self.assertDictEqual(
+            dict({
+                 'name': 'SRG1-PP3-TXRX-nmc-7',
+                 'administrative-state': 'inService',
+                 'supporting-circuit-pack-name': '3/0',
+                 'type': 'org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint',
+                 'supporting-port': 'C3'
+                 }, **res['interface'][0]),
+            res['interface'][0]
+        )
         self.assertDictEqual(
-             {u'frequency': 195.8, u'width': 40},
-             res['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp'])
+            {u'frequency': 195.8, u'width': 40},
+            res['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp'])
 
     # -mc supporting interfaces must not be created for SRG, only degrees
     def test_09_service_path_create_rdm_check(self):
-        url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-                "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-                "interface/SRG1-PP3-TXRX-mc-7"
-                .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+        response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-mc-7")
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing",
-              "error-message":"Request could not be completed because the relevant data model content does not exist"},
-             res['errors']['error'])
+            {"error-type": "application", "error-tag": "data-missing",
+             "error-message": "Request could not be completed because the relevant data model content does not exist"},
+            res['errors']['error'])
 
     def test_10_service_path_create_rdm_check(self):
-        url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-               "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-               "roadm-connections/SRG1-PP3-TXRX-DEG1-TTP-TXRX-7"
-               .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+        response = test_utils.check_netconf_node_request("ROADM-A1", "roadm-connections/SRG1-PP3-TXRX-DEG1-TTP-TXRX-7")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
-        self.assertDictContainsSubset(
-             {'connection-name': 'SRG1-PP3-TXRX-DEG1-TTP-TXRX-7',
-              'opticalControlMode': 'off'},
-             res['roadm-connections'][0])
+        # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
         self.assertDictEqual(
-             {'src-if': 'SRG1-PP3-TXRX-nmc-7'},
-             res['roadm-connections'][0]['source'])
+            dict({
+                 'connection-name': 'SRG1-PP3-TXRX-DEG1-TTP-TXRX-7',
+                 'opticalControlMode': 'off'
+                 }, **res['roadm-connections'][0]),
+            res['roadm-connections'][0]
+        )
         self.assertDictEqual(
-             {'dst-if': 'DEG1-TTP-TXRX-nmc-7'},
-             res['roadm-connections'][0]['destination'])
+            {'src-if': 'SRG1-PP3-TXRX-nmc-7'},
+            res['roadm-connections'][0]['source'])
+        self.assertDictEqual(
+            {'dst-if': 'DEG1-TTP-TXRX-nmc-7'},
+            res['roadm-connections'][0]['destination'])
 
     def test_11_service_path_create_xpdr_check(self):
-        url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-                "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-                "interface/XPDR1-NETWORK1-7"
-                .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+        response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-7")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
-        self.assertDictContainsSubset(
-             {'name': 'XPDR1-NETWORK1-7', 'administrative-state': 'inService',
-              'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
-              'type': 'org-openroadm-interfaces:opticalChannel',
-              'supporting-port': '1'},
-             res['interface'][0])
+        # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
+        self.assertDictEqual(
+            dict({
+                 'name': 'XPDR1-NETWORK1-7',
+                 'administrative-state': 'inService',
+                 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
+                 'type': 'org-openroadm-interfaces:opticalChannel',
+                 'supporting-port': '1'
+                 }, **res['interface'][0]),
+            res['interface'][0]
+        )
         self.assertDictEqual(
-             {u'rate': u'org-openroadm-common-types:R100G',
-              u'transmit-power':-5,
-              u'frequency': 195.8},
-             res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
+            {u'rate': u'org-openroadm-common-types:R100G',
+             u'transmit-power': -5,
+             u'frequency': 195.8},
+            res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
 
     def test_12_service_path_create_xpdr_check(self):
-        url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-                "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-                "interface/XPDR1-NETWORK1-OTU"
-                .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+        response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-OTU")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
-        self.assertDictContainsSubset(
-             {'name': 'XPDR1-NETWORK1-OTU', 'administrative-state': 'inService',
-              'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
-              'type': 'org-openroadm-interfaces:otnOtu',
-              'supporting-port': '1',
-              'supporting-interface': 'XPDR1-NETWORK1-7'},
-             res['interface'][0])
+        # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
         self.assertDictEqual(
-             {u'rate': u'org-openroadm-otn-common-types:OTU4',
-              u'fec': u'scfec'},
-             res['interface'][0]['org-openroadm-otn-otu-interfaces:otu'])
+            dict({
+                 'name': 'XPDR1-NETWORK1-OTU',
+                 'administrative-state': 'inService',
+                 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
+                 'type': 'org-openroadm-interfaces:otnOtu',
+                 'supporting-port': '1',
+                 'supporting-interface': 'XPDR1-NETWORK1-7'
+                 }, **res['interface'][0]),
+            res['interface'][0]
+        )
+        input_dict_2 = {'tx-sapi': 'AMkDwQ7xTmRI',
+                        'expected-dapi': 'AMkDwQ7xTmRI',
+                        'rate': 'org-openroadm-otn-common-types:OTU4',
+                        'fec': 'scfec'}
+        self.assertDictEqual(input_dict_2,
+                             res['interface'][0]['org-openroadm-otn-otu-interfaces:otu'])
 
     def test_13_service_path_create_xpdr_check(self):
-        url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-                "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-                "interface/XPDR1-NETWORK1-ODU"
-                .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+        response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-ODU")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
-        self.assertDictContainsSubset(
-             {'name': 'XPDR1-NETWORK1-ODU', 'administrative-state': 'inService',
-              'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
-              'type': 'org-openroadm-interfaces:otnOdu',
-              'supporting-port': '1',
-              'supporting-interface': 'XPDR1-NETWORK1-OTU'},
-             res['interface'][0])
-        self.assertDictContainsSubset(
-             {'rate': 'org-openroadm-otn-common-types:ODU4',
-              u'monitoring-mode': u'terminated'},
-             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
-        self.assertDictEqual({u'exp-payload-type': u'07', u'payload-type': u'07'}, 
+        # the 2 following statements replace self.assertDictContainsSubset deprecated in python 3.2
+        self.assertDictEqual(
+            dict({
+                 'name': 'XPDR1-NETWORK1-ODU',
+                 'administrative-state': 'inService',
+                 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
+                 'type': 'org-openroadm-interfaces:otnOdu',
+                 'supporting-port': '1',
+                 'supporting-interface': 'XPDR1-NETWORK1-OTU'
+                 }, **res['interface'][0]),
+            res['interface'][0]
+        )
+        self.assertDictEqual(
+            dict({
+                 'rate': 'org-openroadm-otn-common-types:ODU4',
+                 u'monitoring-mode': u'terminated'
+                 }, **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+            res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
+        )
+        self.assertDictEqual({u'exp-payload-type': u'07', u'payload-type': u'07'},
                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_14_service_path_create_xpdr_check(self):
-        url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-               "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-               "interface/XPDR1-CLIENT1-ETHERNET"
-               .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+        response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-CLIENT1-ETHERNET")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
-        self.assertDictContainsSubset(
-             {'name': 'XPDR1-CLIENT1-ETHERNET', 'administrative-state': 'inService',
-              'supporting-circuit-pack-name': '1/0/1-PLUG-CLIENT',
-              'type': 'org-openroadm-interfaces:ethernetCsmacd',
-              'supporting-port': 'C1'},
-             res['interface'][0])
+        # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
+        self.assertDictEqual(
+            dict({
+                 'name': 'XPDR1-CLIENT1-ETHERNET',
+                 'administrative-state': 'inService',
+                 'supporting-circuit-pack-name': '1/0/1-PLUG-CLIENT',
+                 'type': 'org-openroadm-interfaces:ethernetCsmacd',
+                 'supporting-port': 'C1'
+                 }, **res['interface'][0]),
+            res['interface'][0]
+        )
         self.assertDictEqual(
-             {u'fec': u'off', u'speed': 100000},
-             res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
+            {u'fec': u'off', u'speed': 100000},
+            res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
 
     def test_15_service_path_create_xpdr_check(self):
-        url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-                "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-                "circuit-packs/1%2F0%2F1-PLUG-NET"
-                .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+        response = test_utils.check_netconf_node_request("XPDR-A1", "circuit-packs/1%2F0%2F1-PLUG-NET")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('not-reserved-inuse', res['circuit-packs'][0]["equipment-state"])
 
     def test_16_service_path_create_xpdr_check(self):
-        url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-                "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-                "circuit-packs/1%2F0%2F1-PLUG-CLIENT"
-                .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+        response = test_utils.check_netconf_node_request("XPDR-A1", "circuit-packs/1%2F0%2F1-PLUG-CLIENT")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('not-reserved-inuse', res['circuit-packs'][0]["equipment-state"])
 
     def test_17_service_path_delete(self):
-        url = "{}/operations/transportpce-device-renderer:service-path".format(self.restconf_baseurl)
+        url = "{}/operations/transportpce-device-renderer:service-path"
         data = {"renderer:input": {
-             "renderer:service-name": "service_test",
-             "renderer:wave-number": "7",
-             "renderer:operation": "delete",
-             "renderer:nodes": [
-                 {"renderer:node-id": "ROADM-A1",
-                  "renderer:src-tp": "SRG1-PP3-TXRX",
-                  "renderer:dest-tp": "DEG1-TTP-TXRX"},
-                 {"renderer:node-id": "XPDR-A1",
-                  "renderer:src-tp": "XPDR1-CLIENT1",
-                  "renderer:dest-tp": "XPDR1-NETWORK1"}]}}
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "POST", url, data=json.dumps(data),
-             headers=headers, auth=('admin', 'admin'))
+            "renderer:service-name": "service_test",
+            "renderer:wave-number": "7",
+            "renderer:operation": "delete",
+            "renderer:nodes": [
+                {"renderer:node-id": "ROADM-A1",
+                 "renderer:src-tp": "SRG1-PP3-TXRX",
+                 "renderer:dest-tp": "DEG1-TTP-TXRX"},
+                {"renderer:node-id": "XPDR-A1",
+                 "renderer:src-tp": "XPDR1-CLIENT1",
+                 "renderer:dest-tp": "XPDR1-NETWORK1"}]}}
+        response = test_utils.post_request(url, data)
         self.assertEqual(response.status_code, requests.codes.ok)
         self.assertEqual(response.json(), {
-             'output': {'result': 'Request processed', 'success': True}})
+            'output': {'result': 'Request processed', 'success': True}})
 
     def test_18_service_path_delete_rdm_check(self):
-        url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-                "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-                "interface/DEG1-TTP-TXRX-mc-7"
-                .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+        response = test_utils.check_netconf_node_request("ROADM-A1", "interface/DEG1-TTP-TXRX-mc-7")
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing",
-              "error-message":"Request could not be completed because the relevant data model content does not exist"},
-             res['errors']['error'])
+            {"error-type": "application", "error-tag": "data-missing",
+             "error-message": "Request could not be completed because the relevant data model content does not exist"},
+            res['errors']['error'])
 
     def test_19_service_path_delete_rdm_check(self):
-        url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-                "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-                "interface/DEG1-TTP-TXRX-nmc-7"
-                .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+        response = test_utils.check_netconf_node_request("ROADM-A1", "interface/DEG1-TTP-TXRX-nmc-7")
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing",
-              "error-message":"Request could not be completed because the relevant data model content does not exist"},
-             res['errors']['error'])
+            {"error-type": "application", "error-tag": "data-missing",
+             "error-message": "Request could not be completed because the relevant data model content does not exist"},
+            res['errors']['error'])
 
     def test_20_service_path_delete_rdm_check(self):
-        url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-               "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-               "interface/SRG1-PP3-TXRX-mc-7"
-               .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+        response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-mc-7")
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
-        self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist"},
-             res['errors']['error'])
+        self.assertIn({
+            "error-type": "application",
+            "error-tag": "data-missing",
+            "error-message": "Request could not be completed because the relevant data model content does not exist"},
+            res['errors']['error'])
 
     def test_21_service_path_delete_rdm_check(self):
-        url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-               "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-               "interface/SRG1-PP3-TXRX-nmc-7"
-               .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+        response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-nmc-7")
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
-        self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist"},
-             res['errors']['error'])
+        self.assertIn({
+            "error-type": "application",
+            "error-tag": "data-missing",
+            "error-message": "Request could not be completed because the relevant data model content does not exist"},
+            res['errors']['error'])
 
     def test_22_service_path_delete_rdm_check(self):
-        url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-               "node/ROADM-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-               "roadm-connections/SRG1-PP3-TXRX-DEG1-TTP-TXRX-7"
-               .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+        response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-DEG1-TTP-TXRX-7")
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
-        self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist"},
-             res['errors']['error'])
+        self.assertIn({
+            "error-type": "application",
+            "error-tag": "data-missing",
+            "error-message": "Request could not be completed because the relevant data model content does not exist"},
+            res['errors']['error'])
 
     def test_23_service_path_delete_xpdr_check(self):
-        url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-               "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-               "interface/XPDR1-NETWORK1-7"
-               .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+        response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-7")
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
-        self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist"},
-             res['errors']['error'])
+        self.assertIn({
+            "error-type": "application",
+            "error-tag": "data-missing",
+            "error-message": "Request could not be completed because the relevant data model content does not exist"},
+            res['errors']['error'])
 
     def test_24_service_path_delete_xpdr_check(self):
-        url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-               "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-               "interface/XPDR1-NETWORK1-OTU"
-               .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+        response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-OTU")
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
-        self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist"},
-             res['errors']['error'])
+        self.assertIn({
+            "error-type": "application",
+            "error-tag": "data-missing",
+            "error-message": "Request could not be completed because the relevant data model content does not exist"},
+            res['errors']['error'])
 
     def test_25_service_path_delete_xpdr_check(self):
-        url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-               "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-               "interface/XPDR1-NETWORK1-ODU"
-               .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+        response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-ODU")
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
-        self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist"},
-             res['errors']['error'])
+        self.assertIn({
+            "error-type": "application",
+            "error-tag": "data-missing",
+            "error-message": "Request could not be completed because the relevant data model content does not exist"},
+            res['errors']['error'])
 
     def test_26_service_path_delete_xpdr_check(self):
-        url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-               "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-               "interface/XPDR1-CLIENT1-ETHERNET"
-               .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+        response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-CLIENT1-ETHERNET")
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
-        self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist"},
-             res['errors']['error'])
+        self.assertIn({
+            "error-type": "application",
+            "error-tag": "data-missing",
+            "error-message": "Request could not be completed because the relevant data model content does not exist"},
+            res['errors']['error'])
 
     def test_27_service_path_delete_xpdr_check(self):
-        url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-               "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-               "circuit-packs/1%2F0%2F1-PLUG-NET"
-               .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-            "GET", url, headers=headers, auth=('admin', 'admin'))
+        response = test_utils.check_netconf_node_request("XPDR-A1", "circuit-packs/1%2F0%2F1-PLUG-NET")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual('not-reserved-available', res["circuit-packs"][0]['equipment-state'])
 
     def test_28_service_path_delete_xpdr_check(self):
-        url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-               "node/XPDR-A1/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-               "circuit-packs/1%2F0%2F1-PLUG-CLIENT"
-               .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-            "GET", url, headers=headers, auth=('admin', 'admin'))
+        response = test_utils.check_netconf_node_request("XPDR-A1", "circuit-packs/1%2F0%2F1-PLUG-CLIENT")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual('not-reserved-available', res["circuit-packs"][0]['equipment-state'])
 
     def test_29_rdm_device_disconnected(self):
-        url = ("{}/config/network-topology:"
-               "network-topology/topology/topology-netconf/node/ROADM-A1"
-               .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-              "DELETE", url, headers=headers,
-              auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
-        time.sleep(20)
+        response = test_utils.unmount_device("ROADM-A1")
+        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
 
     def test_30_xpdr_device_disconnected(self):
-        url = ("{}/config/network-topology:"
-                "network-topology/topology/topology-netconf/node/XPDR-A1"
-               .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-             "DELETE", url, headers=headers,
-             auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
-        time.sleep(20)
+        response = test_utils.unmount_device("XPDR-A1")
+        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
 
 
 if __name__ == "__main__":
-    unittest.main(verbosity=2, failfast=True)
+    unittest.main(verbosity=2, failfast=False)