fix superflous parenthesis pointed out by pylint

[transportpce.git] / tests / transportpce_tests / 2.2.1 / test_renderer_service_path_nominal.py

diff --git a/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py b/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py
index 29b7fb49c452ad3659b83de3b01026bc56bfc736..adb7a89a168cc6ad74f4724807e8596d62acbd4e 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py
+++ b/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py
@@ -9,8 +9,10 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 #############################################################################
 
+# pylint: disable=no-member
+# pylint: disable=too-many-public-methods
+
 import unittest
-import json
 #from unittest.result import failfast
 import requests
 from common import test_utils
@@ -73,20 +75,13 @@ class TransportPCERendererTesting(unittest.TestCase):
             res['nodes'][0]['mapping'])
 
     def test_05_service_path_create(self):
-        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"}]}}
-        response = test_utils.post_request(url, data)
+        response = test_utils.service_path_request("create", "service_test", "7",
+                                                   [{"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"}])
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Roadm-connection successfully created for nodes: ROADM-A1', res["output"]["result"])
@@ -151,7 +146,7 @@ class TransportPCERendererTesting(unittest.TestCase):
     # -mc supporting interfaces must not be created for SRG, only degrees
     def test_09_service_path_create_rdm_check(self):
         response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-mc-7")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn(
             {"error-type": "application", "error-tag": "data-missing",
@@ -280,26 +275,20 @@ class TransportPCERendererTesting(unittest.TestCase):
         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"
-        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"}]}}
-        response = test_utils.post_request(url, data)
+        response = test_utils.service_path_request("delete", "service_test", "7",
+                                                   [{"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"}])
         self.assertEqual(response.status_code, requests.codes.ok)
         self.assertEqual(response.json(), {
             'output': {'result': 'Request processed', 'success': True}})
 
     def test_18_service_path_delete_rdm_check(self):
         response = test_utils.check_netconf_node_request("ROADM-A1", "interface/DEG1-TTP-TXRX-mc-7")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn(
             {"error-type": "application", "error-tag": "data-missing",
@@ -308,7 +297,7 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_19_service_path_delete_rdm_check(self):
         response = test_utils.check_netconf_node_request("ROADM-A1", "interface/DEG1-TTP-TXRX-nmc-7")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn(
             {"error-type": "application", "error-tag": "data-missing",
@@ -317,7 +306,7 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_20_service_path_delete_rdm_check(self):
         response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-mc-7")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn({
             "error-type": "application",
@@ -327,7 +316,7 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_21_service_path_delete_rdm_check(self):
         response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-nmc-7")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn({
             "error-type": "application",
@@ -337,7 +326,7 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_22_service_path_delete_rdm_check(self):
         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)
+        self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn({
             "error-type": "application",
@@ -347,7 +336,7 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_23_service_path_delete_xpdr_check(self):
         response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-7")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn({
             "error-type": "application",
@@ -357,7 +346,7 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_24_service_path_delete_xpdr_check(self):
         response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-OTU")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn({
             "error-type": "application",
@@ -367,7 +356,7 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_25_service_path_delete_xpdr_check(self):
         response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-ODU")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn({
             "error-type": "application",
@@ -377,7 +366,7 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_26_service_path_delete_xpdr_check(self):
         response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-CLIENT1-ETHERNET")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn({
             "error-type": "application",