Update Functional tests for SP1.6
[transportpce.git] / tests / transportpce_tests / test_servicehandler.py
index e3bdc1184f50fcfc36ba1dee16fc58061f0fcca8..51271fa15eaca92b625453cac681594ac84ea0be 100644 (file)
@@ -1,6 +1,6 @@
 #!/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
@@ -22,18 +22,27 @@ import unittest
 class TransportPCEtesting(unittest.TestCase):
 
     odl_process = None
-    restconf_baseurl = "http://127.0.0.1:8181/restconf"
+    honeynode_topology = None
+    restconf_baseurl = "http://localhost:8181/restconf"
+
+    @classmethod
+    def _get_file(cls):
+        honeynode_topology_file = "sample_configs/honeynode-topo.xml"
+        if os.path.isfile(honeynode_topology_file):
+            with open(honeynode_topology_file, 'r') as honeynode_file:
+                cls.honeynode_topo = honeynode_file.read();
 
     @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], stdout=outfile,
+                ["bash", executable, "server"], stdout=outfile,
                 stdin=open(os.devnull))
 
     @classmethod
-    def setUpClass(cls):        #a class method called before tests in an individual class run.
+    def setUpClass(cls):  # a class method called before tests in an individual class run.
+        cls._get_file()
         cls.__start_odl()
         time.sleep(90)
 
@@ -45,37 +54,71 @@ class TransportPCEtesting(unittest.TestCase):
         cls.odl_process.send_signal(signal.SIGINT)
         cls.odl_process.wait()
 
-    def setUp(self):        #instruction executed before each test method
-        time.sleep(1)
-
-    #Get existing PathDesciption
-    def test_01_get_pathdescriptions(self):
-        url = ("{}/operational/stubpce:path-description-list/pathDescriptions/NodeAToNodeZ_direct_1"
+    def setUp(self):  # instruction executed before each test method
+        print ("execution of {}".format(self.id().split(".")[-1]))
+
+#    def test_01_restconfAPI(self):
+#        url = ("{}/operational/network-topology:network-topology/topology/"
+#        "topology-netconf/node/controller-config".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['node'] [0] ['netconf-node-topology:connection-status'],
+#                         'connected')
+#        time.sleep(1)
+
+    # Load honeynode topology
+    def test_02_load_honeynode_topology(self):
+        url = ("{}/config/ietf-network:network/openroadm-topology"
               .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json',
+        body = self.honeynode_topo
+        headers = {'content-type': 'application/xml',
         "Accept": "application/json"}
         response = requests.request(
-            "GET", url, headers=headers, auth=('admin', 'admin'))
+            "PUT", url, data=body, headers=headers,
+            auth=('admin', 'admin'))
+        self.assertEqual(response.status_code, requests.codes.ok)
+        time.sleep(2)
+
+    def test_03_check_link_xpdra_roadma(self):
+        url = ("{}/config/ietf-network:network/openroadm-topology/link/"
+               "XPDRA-XPDR1-XPDR1-NETWORK1toROADMA-SRG1-SRG1-PP1-TXRX".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['pathDescriptions'][0]['path-name'],
-            'NodeAToNodeZ_direct_1')
         time.sleep(1)
 
-    #Get non existing PathDesciption
-    def test_02_get_pathdescriptions(self):
-        url = ("{}/operational/stubpce:path-description-list/pathDescriptions/Node"
-              .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json',
-        "Accept": "application/json"}
-        response = requests.request(
-            "GET", url, headers=headers, auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, 404)
+    def test_04_check_link_xpdrc_roadmc(self):
+        url = ("{}/config/ietf-network:network/openroadm-topology/link/"
+               "XPDRC-XPDR1-XPDR1-NETWORK1toROADMC-SRG1-SRG1-PP1-TXRX".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()
+        time.sleep(1)
+
+    def test_05_check_link_roadma_xpdra(self):
+        url = ("{}/config/ietf-network:network/openroadm-topology/link/"
+               "ROADMA-SRG1-SRG1-PP1-TXRXtoXPDRA-XPDR1-XPDR1-NETWORK1".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()
+        time.sleep(1)
+
+    def test_06_check_link_roadmc_xpdrc(self):
+        url = ("{}/config/ietf-network:network/openroadm-topology/link/"
+               "ROADMC-SRG1-SRG1-PP1-TXRXtoXPDRC-XPDR1-XPDR1-NETWORK1".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()
         time.sleep(1)
 
-    #Create Service 'test' with correct parameters
-    def test_03_create_service(self):
+    # Create Service 'test' with correct parameters
+    def test_07_create_service(self):
         url = ("{}/operations/org-openroadm-service:service-create"
               .format(self.restconf_baseurl))
         data = {"input": {
@@ -173,12 +216,12 @@ class TransportPCEtesting(unittest.TestCase):
             auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
-        self.assertIn('in progress',
+        self.assertIn('Service rendered successfully !',
             res['output']['configuration-response-common']['response-message'])
-        time.sleep(30)
+        time.sleep(10)
 
-    #Create Service 'test' with not compliant parameter : no 'sdnc-request-header' parameter
-    def test_04_create_service(self):
+    # Create Service 'test' with not compliant parameter : no 'sdnc-request-header' parameter
+    def test_08_create_service(self):
         url = ("{}/operations/org-openroadm-service:service-create"
               .format(self.restconf_baseurl))
         data = {"input": {
@@ -270,12 +313,12 @@ class TransportPCEtesting(unittest.TestCase):
             auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
-        self.assertIn('Service not compliant',
+        self.assertIn('Service sndc-request-header is not set',
             res['output']['configuration-response-common']['response-message'])
         time.sleep(5)
 
-    #Create Service 'test' with not compliant parameter : no 'tx-direction' for serviceAEnd
-    def test_05_create_service(self):
+    # Create Service 'test' with not compliant parameter : no 'tx-direction' for serviceAEnd
+    def test_09_create_service(self):
         url = ("{}/operations/org-openroadm-service:service-create"
               .format(self.restconf_baseurl))
         data = {"input": {
@@ -358,12 +401,12 @@ class TransportPCEtesting(unittest.TestCase):
             auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
-        self.assertIn('Service not compliant',
+        self.assertIn('Service TxDirection is not correctly set',
             res['output']['configuration-response-common']['response-message'])
         time.sleep(5)
 
-    #Get 'test' service created
-    def test_06_get_service(self):
+    # Get 'test' service created
+    def test_10_get_service(self):
         url = ("{}/operational/org-openroadm-service:service-list/services/test"
               .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json',
@@ -377,8 +420,8 @@ class TransportPCEtesting(unittest.TestCase):
             'inService')
         time.sleep(1)
 
-    #get non existing service
-    def test_07_get_service(self):
+    # get non existing service
+    def test_11_get_service(self):
         url = ("{}/operational/org-openroadm-service:service-list/services/test1"
               .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json',
@@ -388,237 +431,204 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(response.status_code, 404)
         time.sleep(1)
 
-    #reconfigure 'test' to be 'test-new'
-    def test_08_reconfigure_service(self):
-        url = ("{}/operations/org-openroadm-service:service-reconfigure"
-              .format(self.restconf_baseurl))
-        data = {"input": {
-                "service-name": "test",
-                "new-service-name": "test-new",
-                "common-id": "ASATT1234567",
-                "connection-type": "infrastructure",
-                "service-a-end": {
-                    "service-rate": "100",
-                    "node-id": "XPDRA",
-                    "service-format": "Ethernet",
-                    "clli": "SNJSCAMCJP8",
-                    "tx-direction": {
-                        "port": {
-                            "port-device-name": "ROUTER_SNJSCAMCJP8_000000.00_00",
-                            "port-type": "router",
-                            "port-name": "Gigabit Ethernet_Tx.ge-5/0/0.0",
-                            "port-rack": "000000.00",
-                            "port-shelf": "00"
-                        },
-                        "lgx": {
-                            "lgx-device-name": "LGX Panel_SNJSCAMCJP8_000000.00_00",
-                            "lgx-port-name": "LGX Back.3",
-                            "lgx-port-rack": "000000.00",
-                            "lgx-port-shelf": "00"
-                        }
-                    },
-                    "rx-direction": {
-                        "port": {
-                            "port-device-name": "ROUTER_SNJSCAMCJP8_000000.00_00",
-                            "port-type": "router",
-                            "port-name": "Gigabit Ethernet_Rx.ge-5/0/0.0",
-                            "port-rack": "000000.00",
-                            "port-shelf": "00"
-                        },
-                        "lgx": {
-                            "lgx-device-name": "LGX Panel_SNJSCAMCJP8_000000.00_00",
-                            "lgx-port-name": "LGX Back.4",
-                            "lgx-port-rack": "000000.00",
-                            "lgx-port-shelf": "00"
-                        }
-                    },
-                    "optic-type": "gray"
-                },
-                "service-z-end": {
-                    "service-rate": "100",
-                    "node-id": "XPDRC",
-                    "service-format": "Ethernet",
-                    "clli": "SNJSCAMCJT4",
-                    "tx-direction": {
-                        "port": {
-                            "port-device-name": "ROUTER_SNJSCAMCJT4_000000.00_00",
-                            "port-type": "router",
-                            "port-name": "Gigabit Ethernet_Tx.ge-1/0/0.0",
-                            "port-rack": "000000.00",
-                            "port-shelf": "00"
-                        },
-                        "lgx": {
-                            "lgx-device-name": "LGX Panel_SNJSCAMCJT4_000000.00_00",
-                            "lgx-port-name": "LGX Back.29",
-                            "lgx-port-rack": "000000.00",
-                            "lgx-port-shelf": "00"
-                        }
-                    },
-                    "rx-direction": {
-                        "port": {
-                            "port-device-name": "ROUTER_SNJSCAMCJT4_000000.00_00",
-                            "port-type": "router",
-                            "port-name": "Gigabit Ethernet_Rx.ge-1/0/0.0",
-                            "port-rack": "000000.00",
-                            "port-shelf": "00"
-                        },
-                        "lgx": {
-                            "lgx-device-name": "LGX Panel_SNJSCAMCJT4_000000.00_00",
-                            "lgx-port-name": "LGX Back.30",
-                            "lgx-port-rack": "000000.00",
-                            "lgx-port-shelf": "00"
-                        }
-                    },
-                    "optic-type": "gray"
-                },
-                "hard-constraints": {
-                    "diversity": {
-                        "existing-service": [
-                            "104/GE100/SNJSCAMCJP8/SNJSCAMCJT4"
-                        ],
-                        "existing-service-applicability": {
-                            "node": "true"
-                        }
-                    },
-                    "exclude": {
-                        "fiber-bundle": [
-                            "l(string)"
-                        ],
-                        "node-id": [
-                            "SNJSCAMCJP8_000000.00"
-                        ]
-                    },
-                    "latency": {
-                        "max-latency": "30"
-                    }
-                }
-            }
-        }
-        headers = {'content-type': 'application/json',
-        "Accept": "application/json"}
-        response = requests.request(
-            "POST", url, data=json.dumps(data), headers=headers,
-            auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('in progress',
-            res['output']['status-message'])
-        time.sleep(30)
-
-
-    #get new service 'test-new'
-    def test_09_get_service(self):
-        url = ("{}/operational/org-openroadm-service:service-list/services/test-new"
-              .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json',
-        "Accept": "application/json"}
-        response = requests.request(
-            "GET", url, headers=headers, auth=('admin', 'admin'))
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['operational-state'],
-            'inService')
-        time.sleep(1)
-
-
-    #Modify 'test-new' state
-    def test_10_modify_service_state(self):
-        url = ("{}/operations/servicehandler:service-state-modify"
-              .format(self.restconf_baseurl))
-        data = {"input": {
-                "service-name": "test-new",
-                "operational-state": "outOfService"
-            }
-        }
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-            "POST", url, data=json.dumps(data), headers=headers,
-            auth=('admin', 'admin'))
-        res = response.json()
-        self.assertIn('Service state modified',
-            res['output']['configuration-response-common']['response-message'])
-        time.sleep(5)
-
-
-    #get new service 'test-new' state
-    def test_11_get_service(self):
-        url = ("{}/operational/org-openroadm-service:service-list/services/test-new"
-              .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json',
-        "Accept": "application/json"}
-        response = requests.request(
-            "GET", url, headers=headers, auth=('admin', 'admin'))
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['operational-state'],
-            'outOfService')
-        time.sleep(1)
-
-
-    #restore service 'test-new'
-    def test_12_restore_service(self):
-        url = ("{}/operations/org-openroadm-service:service-restoration"
-              .format(self.restconf_baseurl))
-        data = {"input": {
-                "service-name": "test-new",
-                "option": "permanent"
-            }
-        }
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-            "POST", url, data=json.dumps(data), headers=headers,
-            auth=('admin', 'admin'))
-        res = response.json()
-        self.assertIn('in progress',
-            res['output']['status-message'])
-        time.sleep(60)
-
-
-    #get new service 'test-new' state
-    def test_13_get_service(self):
-        url = ("{}/operational/org-openroadm-service:service-list/services/test-new"
-              .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json',
-        "Accept": "application/json"}
-        response = requests.request(
-            "GET", url, headers=headers, auth=('admin', 'admin'))
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['operational-state'],
-            'inService')
-        time.sleep(1)
-
-
-    #Delete 'test-new' service
-    def test_14_delete_service(self):
-        url = ("{}/operations/org-openroadm-service:service-delete"
-              .format(self.restconf_baseurl))
-        data = {"input": {
-                "sdnc-request-header": {
-                    "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
-                    "rpc-action": "service-delete",
-                    "request-system-id": "appname",
-                    "notification-url": "http://localhost:8585/NotificationServer/notify"
-                },
-                "service-delete-req-info": {
-                    "service-name": "test-new",
-                    "due-date": "2016-11-28T00:00:01Z",
-                    "tail-retention": "no"
-                }
-            }
-        }
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-            "POST", url, data=json.dumps(data), headers=headers,
-            auth=('admin', 'admin'))
-        res = response.json()
-        self.assertIn('in progress',
-            res['output']['configuration-response-common']['response-message'])
-        time.sleep(30)
-
-
-    #Delete non existing service
-    def test_15_delete_service(self):
+# These tests is not available in this commit (cf commit message )
+# reconfigure 'test' to be 'test-new'
+#     def test_08_reconfigure_service(self):
+#         url = ("{}/operations/org-openroadm-service:service-reconfigure"
+#               .format(self.restconf_baseurl))
+#         data = {"input": {
+#                 "service-name": "test",
+#                 "new-service-name": "test-new",
+#                 "common-id": "ASATT1234567",
+#                 "connection-type": "infrastructure",
+#                 "service-a-end": {
+#                     "service-rate": "100",
+#                     "node-id": "XPDRA",
+#                     "service-format": "Ethernet",
+#                     "clli": "SNJSCAMCJP8",
+#                     "tx-direction": {
+#                         "port": {
+#                             "port-device-name": "ROUTER_SNJSCAMCJP8_000000.00_00",
+#                             "port-type": "router",
+#                             "port-name": "Gigabit Ethernet_Tx.ge-5/0/0.0",
+#                             "port-rack": "000000.00",
+#                             "port-shelf": "00"
+#                         },
+#                         "lgx": {
+#                             "lgx-device-name": "LGX Panel_SNJSCAMCJP8_000000.00_00",
+#                             "lgx-port-name": "LGX Back.3",
+#                             "lgx-port-rack": "000000.00",
+#                             "lgx-port-shelf": "00"
+#                         }
+#                     },
+#                     "rx-direction": {
+#                         "port": {
+#                             "port-device-name": "ROUTER_SNJSCAMCJP8_000000.00_00",
+#                             "port-type": "router",
+#                             "port-name": "Gigabit Ethernet_Rx.ge-5/0/0.0",
+#                             "port-rack": "000000.00",
+#                             "port-shelf": "00"
+#                         },
+#                         "lgx": {
+#                             "lgx-device-name": "LGX Panel_SNJSCAMCJP8_000000.00_00",
+#                             "lgx-port-name": "LGX Back.4",
+#                             "lgx-port-rack": "000000.00",
+#                             "lgx-port-shelf": "00"
+#                         }
+#                     },
+#                     "optic-type": "gray"
+#                 },
+#                 "service-z-end": {
+#                     "service-rate": "100",
+#                     "node-id": "XPDRC",
+#                     "service-format": "Ethernet",
+#                     "clli": "SNJSCAMCJT4",
+#                     "tx-direction": {
+#                         "port": {
+#                             "port-device-name": "ROUTER_SNJSCAMCJT4_000000.00_00",
+#                             "port-type": "router",
+#                             "port-name": "Gigabit Ethernet_Tx.ge-1/0/0.0",
+#                             "port-rack": "000000.00",
+#                             "port-shelf": "00"
+#                         },
+#                         "lgx": {
+#                             "lgx-device-name": "LGX Panel_SNJSCAMCJT4_000000.00_00",
+#                             "lgx-port-name": "LGX Back.29",
+#                             "lgx-port-rack": "000000.00",
+#                             "lgx-port-shelf": "00"
+#                         }
+#                     },
+#                     "rx-direction": {
+#                         "port": {
+#                             "port-device-name": "ROUTER_SNJSCAMCJT4_000000.00_00",
+#                             "port-type": "router",
+#                             "port-name": "Gigabit Ethernet_Rx.ge-1/0/0.0",
+#                             "port-rack": "000000.00",
+#                             "port-shelf": "00"
+#                         },
+#                         "lgx": {
+#                             "lgx-device-name": "LGX Panel_SNJSCAMCJT4_000000.00_00",
+#                             "lgx-port-name": "LGX Back.30",
+#                             "lgx-port-rack": "000000.00",
+#                             "lgx-port-shelf": "00"
+#                         }
+#                     },
+#                     "optic-type": "gray"
+#                 },
+#                 "hard-constraints": {
+#                     "diversity": {
+#                         "existing-service": [
+#                             "104/GE100/SNJSCAMCJP8/SNJSCAMCJT4"
+#                         ],
+#                         "existing-service-applicability": {
+#                             "node": "true"
+#                         }
+#                     },
+#                     "exclude": {
+#                         "fiber-bundle": [
+#                             "l(string)"
+#                         ],
+#                         "node-id": [
+#                             "SNJSCAMCJP8_000000.00"
+#                         ]
+#                     },
+#                     "latency": {
+#                         "max-latency": "30"
+#                     }
+#                 }
+#             }
+#         }
+#         headers = {'content-type': 'application/json',
+#         "Accept": "application/json"}
+#         response = requests.request(
+#             "POST", url, data=json.dumps(data), headers=headers,
+#             auth=('admin', 'admin'))
+#         self.assertEqual(response.status_code, requests.codes.ok)
+#         res = response.json()
+#         self.assertIn('in progress',
+#             res['output']['status-message'])
+#         time.sleep(30)
+#
+#     # get new service 'test-new'
+#     def test_09_get_service(self):
+#         url = ("{}/operational/org-openroadm-service:service-list/services/test-new"
+#               .format(self.restconf_baseurl))
+#         headers = {'content-type': 'application/json',
+#         "Accept": "application/json"}
+#         response = requests.request(
+#             "GET", url, headers=headers, auth=('admin', 'admin'))
+#         res = response.json()
+#         self.assertEqual(
+#             res['services'][0]['operational-state'],
+#             'inService')
+#         time.sleep(1)
+#
+#     # Modify 'test-new' state
+#     def test_10_modify_service_state(self):
+#         url = ("{}/operations/servicehandler:service-state-modify"
+#               .format(self.restconf_baseurl))
+#         data = {"input": {
+#                 "service-name": "test-new",
+#                 "operational-state": "outOfService"
+#             }
+#         }
+#         headers = {'content-type': 'application/json'}
+#         response = requests.request(
+#             "POST", url, data=json.dumps(data), headers=headers,
+#             auth=('admin', 'admin'))
+#         res = response.json()
+#         self.assertIn('Service state modified',
+#             res['output']['configuration-response-common']['response-message'])
+#         time.sleep(5)
+#
+#     # get new service 'test-new' state
+#     def test_11_get_service(self):
+#         url = ("{}/operational/org-openroadm-service:service-list/services/test-new"
+#               .format(self.restconf_baseurl))
+#         headers = {'content-type': 'application/json',
+#         "Accept": "application/json"}
+#         response = requests.request(
+#             "GET", url, headers=headers, auth=('admin', 'admin'))
+#         res = response.json()
+#         self.assertEqual(
+#             res['services'][0]['operational-state'],
+#             'outOfService')
+#         time.sleep(1)
+#
+#     # restore service 'test-new'
+#     def test_12_restore_service(self):
+#         url = ("{}/operations/org-openroadm-service:service-restoration"
+#               .format(self.restconf_baseurl))
+#         data = {"input": {
+#                 "service-name": "test-new",
+#                 "option": "permanent"
+#             }
+#         }
+#         headers = {'content-type': 'application/json'}
+#         response = requests.request(
+#             "POST", url, data=json.dumps(data), headers=headers,
+#             auth=('admin', 'admin'))
+#         res = response.json()
+#         self.assertIn('in progress',
+#             res['output']['status-message'])
+#         time.sleep(60)
+#
+#     # get new service 'test-new' state
+#     def test_13_get_service(self):
+#         url = ("{}/operational/org-openroadm-service:service-list/services/test-new"
+#               .format(self.restconf_baseurl))
+#         headers = {'content-type': 'application/json',
+#         "Accept": "application/json"}
+#         response = requests.request(
+#             "GET", url, headers=headers, auth=('admin', 'admin'))
+#         res = response.json()
+#         self.assertEqual(
+#             res['services'][0]['operational-state'],
+#             'inService')
+#         time.sleep(1)
+
+    # Delete non existing service
+    def test_12_delete_service(self):
         url = ("{}/operations/org-openroadm-service:service-delete"
               .format(self.restconf_baseurl))
         data = {"input": {
@@ -641,14 +651,13 @@ class TransportPCEtesting(unittest.TestCase):
             auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
-        self.assertIn('not exists in datastore',
+        self.assertIn('Service delete was successful!',
             res['output']['configuration-response-common']['response-message'])
         time.sleep(1)
 
-
-    #Verify 'test' service deleted
-    def test_16_get_service(self):
-        url = ("{}/operational/org-openroadm-service:service-list/services/test-new"
+    # Verify 'test' service deleted
+    def test_13_get_service(self):
+        url = ("{}/operational/org-openroadm-service:service-list/services/test"
               .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json',
         "Accept": "application/json"}
@@ -657,5 +666,6 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(response.status_code, 404)
         time.sleep(1)
 
+
 if __name__ == "__main__":
     unittest.main(verbosity=2)