rationalize service deletion in E2E functests

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I55c75329eb599ad8f525641d5eb694f6e42843d8

diff --git a/tests/transportpce_tests/1.2.1/test_end2end.py b/tests/transportpce_tests/1.2.1/test_end2end.py
index 6c3b543c8c2b0f84bccf0a7c8e13d4a1f3c9f560..0e8e3041106a88292fa3ad8e78f6f95de023de3b 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_end2end.py
+++ b/tests/transportpce_tests/1.2.1/test_end2end.py
@@ -531,22 +531,7 @@ class TransportPCEFulltesting(unittest.TestCase):
     # contains 2 elements
 
     def test_29_delete_eth_service3(self):
     # contains 2 elements
 
     def test_29_delete_eth_service3(self):

-        url = "{}/operations/org-openroadm-service:service-delete"
-        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": "service3",
-                "tail-retention": "no"
-            }
-        }
-        }
-        response = test_utils.post_request(url, data)
+        response = test_utils.service_delete_request("service3")

         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Service \'service3\' does not exist in datastore',
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Service \'service3\' does not exist in datastore',


@@ -557,22 +542,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(20)
 
     def test_30_delete_eth_service1(self):
         time.sleep(20)
 
     def test_30_delete_eth_service1(self):

-        url = "{}/operations/org-openroadm-service:service-delete"
-        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": "service1",
-                "tail-retention": "no"
-            }
-        }
-        }
-        response = test_utils.post_request(url, data)
+        response = test_utils.service_delete_request("service1")

         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Renderer service delete in progress',
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Renderer service delete in progress',


@@ -581,22 +551,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(20)
 
     def test_31_delete_eth_service2(self):
         time.sleep(20)
 
     def test_31_delete_eth_service2(self):

-        url = "{}/operations/org-openroadm-service:service-delete"
-        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": "service2",
-                "tail-retention": "no"
-            }
-        }
-        }
-        response = test_utils.post_request(url, data)
+        response = test_utils.service_delete_request("service2")

         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Renderer service delete in progress',
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Renderer service delete in progress',


@@ -809,22 +764,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(3)
 
     def test_44_delete_oc_service1(self):
         time.sleep(3)
 
     def test_44_delete_oc_service1(self):

-        url = "{}/operations/org-openroadm-service:service-delete"
-        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": "service1",
-                "tail-retention": "no"
-            }
-        }
-        }
-        response = test_utils.post_request(url, data)
+        response = test_utils.service_delete_request("service1")

         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Renderer service delete in progress',
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Renderer service delete in progress',


@@ -833,22 +773,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(20)
 
     def test_45_delete_oc_service2(self):
         time.sleep(20)
 
     def test_45_delete_oc_service2(self):

-        url = "{}/operations/org-openroadm-service:service-delete"
-        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": "service2",
-                "tail-retention": "no"
-            }
-        }
-        }
-        response = test_utils.post_request(url, data)
+        response = test_utils.service_delete_request("service2")

         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Renderer service delete in progress',
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Renderer service delete in progress',


@@ -898,22 +823,7 @@ class TransportPCEFulltesting(unittest.TestCase):
     def test_50_loop_create_oc_service(self):
         response = test_utils.get_service_list_request("services/service1")
         if response.status_code != 404:
     def test_50_loop_create_oc_service(self):
         response = test_utils.get_service_list_request("services/service1")
         if response.status_code != 404:

-            url = "{}/operations/org-openroadm-service:service-delete"
-            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": "service1",
-                    "tail-retention": "no"
-                }
-            }
-            }
-            test_utils.post_request(url, data)
+            response = test_utils.service_delete_request("service1")

             time.sleep(5)
 
         for i in range(1, 6):
             time.sleep(5)
 
         for i in range(1, 6):

diff --git a/tests/transportpce_tests/2.2.1/test_end2end.py b/tests/transportpce_tests/2.2.1/test_end2end.py
index c927d5bfd5b76f1e0054cb0c20ae8d83cf23545b..5e8cc9820bb37f73d307cee79c44e85d95799a4a 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_end2end.py
+++ b/tests/transportpce_tests/2.2.1/test_end2end.py
@@ -475,21 +475,7 @@ class TransportPCEFulltesting(unittest.TestCase):
 
 # add a test that check the openroadm-service-list still only contains 2 elements
     def test_29_delete_eth_service3(self):
 
 # add a test that check the openroadm-service-list still only contains 2 elements
     def test_29_delete_eth_service3(self):

-        url = "{}/operations/org-openroadm-service:service-delete"
-        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": "service3",
-                    "tail-retention": "no"
-                }
-                }
-                }
-        response = test_utils.post_request(url, data)
+        response = test_utils.service_delete_request("service3")

         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Service \'service3\' does not exist in datastore',
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Service \'service3\' does not exist in datastore',


@@ -498,21 +484,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(20)
 
     def test_30_delete_eth_service1(self):
         time.sleep(20)
 
     def test_30_delete_eth_service1(self):

-        url = "{}/operations/org-openroadm-service:service-delete"
-        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": "service1",
-                    "tail-retention": "no"
-                }
-                }
-                }
-        response = test_utils.post_request(url, data)
+        response = test_utils.service_delete_request("service1")

         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Renderer service delete in progress',
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Renderer service delete in progress',


@@ -520,21 +492,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(20)
 
     def test_31_delete_eth_service2(self):
         time.sleep(20)
 
     def test_31_delete_eth_service2(self):

-        url = "{}/operations/org-openroadm-service:service-delete"
-        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": "service2",
-                    "tail-retention": "no"
-                }
-                }
-                }
-        response = test_utils.post_request(url, data)
+        response = test_utils.service_delete_request("service2")

         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Renderer service delete in progress',
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Renderer service delete in progress',


@@ -723,21 +681,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(3)
 
     def test_44_delete_oc_service1(self):
         time.sleep(3)
 
     def test_44_delete_oc_service1(self):

-        url = "{}/operations/org-openroadm-service:service-delete"
-        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": "service1",
-                    "tail-retention": "no"
-                }
-                }
-                }
-        response = test_utils.post_request(url, data)
+        response = test_utils.service_delete_request("service1")

         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Renderer service delete in progress',
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Renderer service delete in progress',


@@ -745,21 +689,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(20)
 
     def test_45_delete_oc_service2(self):
         time.sleep(20)
 
     def test_45_delete_oc_service2(self):

-        url = "{}/operations/org-openroadm-service:service-delete"
-        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": "service2",
-                    "tail-retention": "no"
-                }
-                }
-                }
-        response = test_utils.post_request(url, data)
+        response = test_utils.service_delete_request("service2")

         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Renderer service delete in progress',
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Renderer service delete in progress',


@@ -803,21 +733,7 @@ class TransportPCEFulltesting(unittest.TestCase):
     def test_50_loop_create_oc_service(self):
         response = test_utils.get_service_list_request("services/service1")
         if response.status_code != 404:
     def test_50_loop_create_oc_service(self):
         response = test_utils.get_service_list_request("services/service1")
         if response.status_code != 404:

-            url = "{}/operations/org-openroadm-service:service-delete"
-            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": "service1",
-                    "tail-retention": "no"
-                }
-            }
-            }
-            test_utils.post_request(url, data)
+            response = test_utils.service_delete_request("service1")

             time.sleep(5)
 
         for i in range(1, 6):
             time.sleep(5)
 
         for i in range(1, 6):

diff --git a/tests/transportpce_tests/common/test_utils.py b/tests/transportpce_tests/common/test_utils.py
index a2158cb0f309d97c96861e3b2cf83b62fa8de989..da746393c0d903d82b00df8ce5ddfb9229a2e10b 100644 (file)
--- a/tests/transportpce_tests/common/test_utils.py
+++ b/tests/transportpce_tests/common/test_utils.py
@@ -42,6 +42,7 @@ URL_CONFIG_ORDM_NET = "{}/config/ietf-network:networks/network/openroadm-network
 URL_PORTMAPPING = "{}/config/transportpce-portmapping:network/nodes/"
 URL_OPER_SERV_LIST = "{}/operational/org-openroadm-service:service-list/"
 URL_SERV_CREATE = "{}/operations/org-openroadm-service:service-create"
 URL_PORTMAPPING = "{}/config/transportpce-portmapping:network/nodes/"
 URL_OPER_SERV_LIST = "{}/operational/org-openroadm-service:service-list/"
 URL_SERV_CREATE = "{}/operations/org-openroadm-service:service-create"

+URL_SERV_DELETE = "{}/operations/org-openroadm-service:service-delete"

 URL_SERVICE_PATH = "{}/operations/transportpce-device-renderer:service-path"
 URL_OTN_SERVICE_PATH = "{}/operations/transportpce-device-renderer:otn-service-path"
 URL_CREATE_OTS_OMS = "{}/operations/transportpce-device-renderer:create-ots-oms"
 URL_SERVICE_PATH = "{}/operations/transportpce-device-renderer:service-path"
 URL_OTN_SERVICE_PATH = "{}/operations/transportpce-device-renderer:otn-service-path"
 URL_CREATE_OTS_OMS = "{}/operations/transportpce-device-renderer:create-ots-oms"


@@ -327,6 +328,20 @@ def get_service_list_request(suffix: str):
 def service_create_request(attr):
     return post_request(URL_SERV_CREATE, attr)
 
 def service_create_request(attr):
     return post_request(URL_SERV_CREATE, attr)
 

+def service_delete_request(servicename : str,
+                           requestid = "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
+                           notificationurl="http://localhost:8585/NotificationServer/notify"):
+    attr = {"input": {
+                "sdnc-request-header": {
+                     "request-id": requestid,
+                     "rpc-action": "service-delete",
+                     "request-system-id": "appname",
+                     "notification-url": notificationurl},
+                "service-delete-req-info": {
+                     "service-name": servicename,
+                     "tail-retention": "no"}}}
+    return post_request(URL_SERV_DELETE, attr)
+

 
 def service_path_request(operation: str, servicename: str, wavenumber: str, nodes):
     attr = {"renderer:input": {
 
 def service_path_request(operation: str, servicename: str, wavenumber: str, nodes):
     attr = {"renderer:input": {