run autopep8 on functional tests 43/92543/1
authorguillaume.lambert <guillaume.lambert@orange.com>
Fri, 4 Sep 2020 08:41:16 +0000 (10:41 +0200)
committerGuillaume Lambert <guillaume.lambert@orange.com>
Thu, 24 Sep 2020 15:25:30 +0000 (15:25 +0000)
JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I6a4bc50291e1debde1ecf3bbdf57368ba235ace6
(cherry picked from commit 33dfc1e027c4eabdb78d5a30388840fa09a7157e)

tests/transportpce_tests/1.2.1/test_gnpy.py
tests/transportpce_tests/1.2.1/test_pce.py
tests/transportpce_tests/2.2.1/test_otn_renderer.py
tests/transportpce_tests/2.2.1/test_topology.py
tests/transportpce_tests/common/test_utils.py

index 3b8b69be2c83f8849ab0576eaaf977bb06185bc7..20e7d7578a63cfa44f1972cc85932177db8e8140 100644 (file)
@@ -94,8 +94,10 @@ class TransportGNPYtesting(unittest.TestCase):
     # Path computed by PCE is feasible according to Gnpy
     def test_04_path_computation_FeasibleWithPCE(self):
         response = test_utils.path_computation_request("request-1", "service-1",
-                {"node-id": "XPONDER-1", "service-rate": "100", "service-format": "Ethernet", "clli": "Node1"},
-                {"node-id": "XPONDER-5", "service-rate": "100", "service-format": "Ethernet", "clli": "Node5"})
+                                                       {"node-id": "XPONDER-1", "service-rate": "100",
+                                                           "service-format": "Ethernet", "clli": "Node1"},
+                                                       {"node-id": "XPONDER-5", "service-rate": "100",
+                                                           "service-format": "Ethernet", "clli": "Node5"})
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(res['output']['configuration-response-common'][
@@ -115,12 +117,14 @@ class TransportGNPYtesting(unittest.TestCase):
     # another one (low SNR)
     def test_05_path_computation_FoundByPCE_NotFeasibleByGnpy(self):
         response = test_utils.path_computation_request("request-2", "service-2",
-            {"node-id": "XPONDER-1", "service-rate": "100", "service-format": "Ethernet", "clli": "Node1"},
-            {"node-id": "XPONDER-5", "service-rate": "100", "service-format": "Ethernet", "clli": "Node5"},
-            {"include_": { "ordered-hops": [
-              {"hop-number": "0", "hop-type": {"node-id": "OpenROADM-2"}},
-              {"hop-number": "1", "hop-type": {"node-id": "OpenROADM-3"}},
-              {"hop-number": "2", "hop-type": {"node-id": "OpenROADM-4"}}]}})
+                                                       {"node-id": "XPONDER-1", "service-rate": "100",
+                                                           "service-format": "Ethernet", "clli": "Node1"},
+                                                       {"node-id": "XPONDER-5", "service-rate": "100",
+                                                           "service-format": "Ethernet", "clli": "Node5"},
+                                                       {"include_": {"ordered-hops": [
+                                                           {"hop-number": "0", "hop-type": {"node-id": "OpenROADM-2"}},
+                                                           {"hop-number": "1", "hop-type": {"node-id": "OpenROADM-3"}},
+                                                           {"hop-number": "2", "hop-type": {"node-id": "OpenROADM-4"}}]}})
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(res['output']['configuration-response-common'][
@@ -141,11 +145,13 @@ class TransportGNPYtesting(unittest.TestCase):
     # #PCE cannot find a path while GNPy finds a feasible one
     def test_06_path_computation_NotFoundByPCE_FoundByGNPy(self):
         response = test_utils.path_computation_request("request-3", "service-3",
-            {"node-id": "XPONDER-1", "service-rate": "100", "service-format": "Ethernet", "clli": "Node1"},
-            {"node-id": "XPONDER-4", "service-rate": "100", "service-format": "Ethernet", "clli": "Node5"},
-            {"include_": {"ordered-hops": [
-               {"hop-number": "0", "hop-type": {"node-id": "OpenROADM-2"}},
-               {"hop-number": "1", "hop-type": {"node-id": "OpenROADM-3"}}]}})
+                                                       {"node-id": "XPONDER-1", "service-rate": "100",
+                                                           "service-format": "Ethernet", "clli": "Node1"},
+                                                       {"node-id": "XPONDER-4", "service-rate": "100",
+                                                           "service-format": "Ethernet", "clli": "Node5"},
+                                                       {"include_": {"ordered-hops": [
+                                                           {"hop-number": "0", "hop-type": {"node-id": "OpenROADM-2"}},
+                                                           {"hop-number": "1", "hop-type": {"node-id": "OpenROADM-3"}}]}})
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(res['output']['configuration-response-common'][
@@ -164,13 +170,15 @@ class TransportGNPYtesting(unittest.TestCase):
     # Not found path by PCE and GNPy cannot find another one
     def test_07_path_computation_FoundByPCE_NotFeasibleByGnpy(self):
         response = test_utils.path_computation_request("request-4", "service-4",
-            {"node-id": "XPONDER-1", "service-rate": "100", "service-format": "Ethernet", "clli": "Node1"},
-            {"node-id": "XPONDER-4", "service-rate": "100", "service-format": "Ethernet", "clli": "Node5"},
-            {"include_": {"ordered-hops": [
-                {"hop-number": "0","hop-type": {"node-id": "OpenROADM-2"}},
-                {"hop-number": "1","hop-type": {"node-id": "OpenROADM-3"}},
-                {"hop-number": "2","hop-type": {"node-id": "OpenROADM-4"}},
-                {"hop-number": "3","hop-type": {"node-id": "OpenROADM-3"}}]}})
+                                                       {"node-id": "XPONDER-1", "service-rate": "100",
+                                                           "service-format": "Ethernet", "clli": "Node1"},
+                                                       {"node-id": "XPONDER-4", "service-rate": "100",
+                                                           "service-format": "Ethernet", "clli": "Node5"},
+                                                       {"include_": {"ordered-hops": [
+                                                           {"hop-number": "0", "hop-type": {"node-id": "OpenROADM-2"}},
+                                                           {"hop-number": "1", "hop-type": {"node-id": "OpenROADM-3"}},
+                                                           {"hop-number": "2", "hop-type": {"node-id": "OpenROADM-4"}},
+                                                           {"hop-number": "3", "hop-type": {"node-id": "OpenROADM-3"}}]}})
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(res['output']['configuration-response-common'][
index be417d8f95f6d5d7d1e08a5c9ecf5019e89d3ab7..00aab10de22aa02ae3a1996dfc4489b7a40feba0 100644 (file)
@@ -96,8 +96,9 @@ class TransportPCEtesting(unittest.TestCase):
     # Path Computation success
     def test_04_path_computation_xpdr_bi(self):
         response = test_utils.path_computation_request("request-1", "service-1",
-                {"node-id": "XPDRA01", "service-rate": "100", "service-format": "Ethernet", "clli": "nodeA"},
-                {"node-id": "XPDRC01", "service-rate": "100", "service-format": "Ethernet", "clli": "nodeC"})
+                                                       {"node-id": "XPDRA01", "service-rate": "100",
+                                                           "service-format": "Ethernet", "clli": "nodeA"},
+                                                       {"node-id": "XPDRC01", "service-rate": "100", "service-format": "Ethernet", "clli": "nodeC"})
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Path is calculated',
@@ -107,8 +108,9 @@ class TransportPCEtesting(unittest.TestCase):
     # Path Computation success
     def test_05_path_computation_rdm_bi(self):
         response = test_utils.path_computation_request("request-1", "service-1",
-                {"node-id": "ROADMA01", "service-rate": "100", "service-format": "Ethernet", "clli": "NodeA"},
-                {"node-id": "ROADMC01", "service-rate": "100", "service-format": "Ethernet", "clli": "NodeC"})
+                                                       {"node-id": "ROADMA01", "service-rate": "100",
+                                                           "service-format": "Ethernet", "clli": "NodeA"},
+                                                       {"node-id": "ROADMC01", "service-rate": "100", "service-format": "Ethernet", "clli": "NodeC"})
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Path is calculated',
@@ -156,8 +158,9 @@ class TransportPCEtesting(unittest.TestCase):
     # Path Computation success
     def test_11_path_computation_xpdr_uni(self):
         response = test_utils.path_computation_request("request-1", "service-1",
-                {"node-id": "XPONDER-1-2", "service-rate": "100", "service-format": "Ethernet", "clli": "ORANGE1"},
-                {"node-id": "XPONDER-3-2", "service-rate": "100", "service-format": "Ethernet", "clli": "ORANGE3"})
+                                                       {"node-id": "XPONDER-1-2", "service-rate": "100",
+                                                           "service-format": "Ethernet", "clli": "ORANGE1"},
+                                                       {"node-id": "XPONDER-3-2", "service-rate": "100", "service-format": "Ethernet", "clli": "ORANGE3"})
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Path is calculated',
@@ -167,8 +170,9 @@ class TransportPCEtesting(unittest.TestCase):
     # Path Computation success
     def test_12_path_computation_rdm_uni(self):
         response = test_utils.path_computation_request("request1", "service1",
-                {"service-rate": "100", "service-format": "Ethernet", "clli": "cll21", "node-id": "OpenROADM-2-1"},
-                {"service-rate": "100", "service-format": "Ethernet", "clli": "ncli22", "node-id": "OpenROADM-2-2"})
+                                                       {"service-rate": "100", "service-format": "Ethernet",
+                                                           "clli": "cll21", "node-id": "OpenROADM-2-1"},
+                                                       {"service-rate": "100", "service-format": "Ethernet", "clli": "ncli22", "node-id": "OpenROADM-2-2"})
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Path is calculated',
@@ -218,7 +222,7 @@ class TransportPCEtesting(unittest.TestCase):
     # Test failed path computation
     def test_17_fail_path_computation(self):
         response = test_utils.post_request(test_utils.URL_PATH_COMPUTATION_REQUEST,
-                {"input": { "service-handler-header": { "request-id": "request-1" }}})
+                                           {"input": {"service-handler-header": {"request-id": "request-1"}}})
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Service Name is not set',
@@ -228,47 +232,49 @@ class TransportPCEtesting(unittest.TestCase):
     # Test1 success path computation
     def test_18_success1_path_computation(self):
         response = test_utils.path_computation_request("request1", "service1",
-                {"service-format": "Ethernet","service-rate": "100", "clli": "ORANGE2", "node-id": "XPONDER-2-2",
-                    "tx-direction": {"port": {
-                            "port-device-name": "Some port-device-name",
-                            "port-type": "Some port-type",
-                            "port-name": "Some port-name",
-                            "port-rack": "Some port-rack",
-                            "port-shelf": "Some port-shelf",
-                            "port-slot": "Some port-slot",
-                            "port-sub-slot": "Some port-sub-slot"
-                        }},
-                    "rx-direction": {"port": {
-                            "port-device-name": "Some port-device-name",
-                            "port-type": "Some port-type",
-                            "port-name": "Some port-name",
-                            "port-rack": "Some port-rack",
-                            "port-shelf": "Some port-shelf",
-                            "port-slot": "Some port-slot",
-                            "port-sub-slot": "Some port-sub-slot"
-                        }}},
-                {"service-format": "Ethernet", "service-rate": "100", "clli": "ORANGE1", "node-id": "XPONDER-1-2",
-                    "tx-direction": {"port": {
-                            "port-device-name": "Some port-device-name",
-                            "port-type": "Some port-type",
-                            "port-name": "Some port-name",
-                            "port-rack": "Some port-rack",
-                            "port-shelf": "Some port-shelf",
-                            "port-slot": "Some port-slot",
-                            "port-sub-slot": "Some port-sub-slot"
-                        }},
-                    "rx-direction": {"port": {
-                            "port-device-name": "Some port-device-name",
-                            "port-type": "Some port-type",
-                            "port-name": "Some port-name",
-                            "port-rack": "Some port-rack",
-                            "port-shelf": "Some port-shelf",
-                            "port-slot": "Some port-slot",
-                            "port-sub-slot": "Some port-sub-slot"
-                        }}},
-                {"customer-code": ["Some customer-code"], "co-routing": {"existing-service": ["Some existing-service"]}},
-                {"customer-code": ["Some customer-code"], "co-routing": {"existing-service": ["Some existing-service"]}},
-                "hop-count", {"locally-protected-links": "true"})
+                                                       {"service-format": "Ethernet", "service-rate": "100", "clli": "ORANGE2", "node-id": "XPONDER-2-2",
+                                                        "tx-direction": {"port": {
+                                                            "port-device-name": "Some port-device-name",
+                                                            "port-type": "Some port-type",
+                                                            "port-name": "Some port-name",
+                                                            "port-rack": "Some port-rack",
+                                                            "port-shelf": "Some port-shelf",
+                                                            "port-slot": "Some port-slot",
+                                                            "port-sub-slot": "Some port-sub-slot"
+                                                        }},
+                                                           "rx-direction": {"port": {
+                                                               "port-device-name": "Some port-device-name",
+                                                               "port-type": "Some port-type",
+                                                               "port-name": "Some port-name",
+                                                               "port-rack": "Some port-rack",
+                                                               "port-shelf": "Some port-shelf",
+                                                               "port-slot": "Some port-slot",
+                                                               "port-sub-slot": "Some port-sub-slot"
+                                                           }}},
+                                                       {"service-format": "Ethernet", "service-rate": "100", "clli": "ORANGE1", "node-id": "XPONDER-1-2",
+                                                           "tx-direction": {"port": {
+                                                               "port-device-name": "Some port-device-name",
+                                                               "port-type": "Some port-type",
+                                                               "port-name": "Some port-name",
+                                                               "port-rack": "Some port-rack",
+                                                               "port-shelf": "Some port-shelf",
+                                                               "port-slot": "Some port-slot",
+                                                               "port-sub-slot": "Some port-sub-slot"
+                                                           }},
+                                                           "rx-direction": {"port": {
+                                                               "port-device-name": "Some port-device-name",
+                                                               "port-type": "Some port-type",
+                                                               "port-name": "Some port-name",
+                                                               "port-rack": "Some port-rack",
+                                                               "port-shelf": "Some port-shelf",
+                                                               "port-slot": "Some port-slot",
+                                                               "port-sub-slot": "Some port-sub-slot"
+                                                           }}},
+                                                       {"customer-code": ["Some customer-code"],
+                                                           "co-routing": {"existing-service": ["Some existing-service"]}},
+                                                       {"customer-code": ["Some customer-code"],
+                                                           "co-routing": {"existing-service": ["Some existing-service"]}},
+                                                       "hop-count", {"locally-protected-links": "true"})
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Path is calculated',
@@ -278,8 +284,9 @@ class TransportPCEtesting(unittest.TestCase):
     # Test2 success path computation with path description
     def test_19_success2_path_computation(self):
         response = test_utils.path_computation_request("request 1", "service 1",
-                {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-1-2", "clli": "ORANGE1"},
-                {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-3-2", "clli": "ORANGE3"})
+                                                       {"service-rate": "100", "service-format": "Ethernet",
+                                                           "node-id": "XPONDER-1-2", "clli": "ORANGE1"},
+                                                       {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-3-2", "clli": "ORANGE3"})
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Path is calculated',
@@ -293,9 +300,11 @@ class TransportPCEtesting(unittest.TestCase):
     # Test3 success path computation with hard-constraints exclude
     def test_20_success3_path_computation(self):
         response = test_utils.path_computation_request("request 1", "service 1",
-                {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-1-2", "clli": "ORANGE1"},
-                {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-3-2", "clli": "ORANGE3"},
-                {"exclude_": { "node-id": ["OpenROADM-2-1", "OpenROADM-2-2"] }})
+                                                       {"service-rate": "100", "service-format": "Ethernet",
+                                                           "node-id": "XPONDER-1-2", "clli": "ORANGE1"},
+                                                       {"service-rate": "100", "service-format": "Ethernet",
+                                                           "node-id": "XPONDER-3-2", "clli": "ORANGE3"},
+                                                       {"exclude_": {"node-id": ["OpenROADM-2-1", "OpenROADM-2-2"]}})
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Path is calculated',
@@ -309,8 +318,9 @@ class TransportPCEtesting(unittest.TestCase):
     # Path computation before deleting oms-attribute of the link :openroadm1-3 to openroadm1-2
     def test_21_path_computation_before_oms_attribute_deletion(self):
         response = test_utils.path_computation_request("request 1", "service 1",
-                {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-2-2", "clli": "ORANGE2"},
-                {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-1-2", "clli": "ORANGE1"})
+                                                       {"service-rate": "100", "service-format": "Ethernet",
+                                                           "node-id": "XPONDER-2-2", "clli": "ORANGE2"},
+                                                       {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-1-2", "clli": "ORANGE1"})
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Path is calculated',
@@ -336,8 +346,9 @@ class TransportPCEtesting(unittest.TestCase):
     # Path computation after deleting oms-attribute of the link :openroadm1-3 to openroadm1-2
     def test_23_path_computation_after_oms_attribute_deletion(self):
         response = test_utils.path_computation_request("request 1", "service 1",
-                {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-2-2", "clli": "ORANGE2"},
-                {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-1-2", "clli": "ORANGE1"})
+                                                       {"service-rate": "100", "service-format": "Ethernet",
+                                                           "node-id": "XPONDER-2-2", "clli": "ORANGE2"},
+                                                       {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-1-2", "clli": "ORANGE1"})
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Path is calculated',
index e5a3816f764acc7e3175ecd63779ef5986bc9515..35262a5f589c6390bb8a2c0acab132d400aa71c6 100644 (file)
@@ -220,7 +220,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertTrue(res["output"]["success"])
         self.assertEqual('SPDR-SA1', res["output"]['node-interface'][0]['node-id'])
         self.assertIn('XPDR1-CLIENT4-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1',
-                         res["output"]['node-interface'][0]['connection-id'])
+                      res["output"]['node-interface'][0]['connection-id'])
         self.assertIn('XPDR1-CLIENT4-ETHERNET10G', res["output"]['node-interface'][0]['eth-interface-id'])
         self.assertIn('XPDR1-NETWORK1-ODU2e-service1', res["output"]['node-interface'][0]['odu-interface-id'])
         self.assertIn('XPDR1-CLIENT4-ODU2e-service1', res["output"]['node-interface'][0]['odu-interface-id'])
index 3d8cf50dfa24da8ac6662e0baf2f2fbdf560cc58..c90f0a4308531001523f0e32feea825c10c99f57 100644 (file)
@@ -279,12 +279,12 @@ class TransportPCEtesting(unittest.TestCase):
     def test_10_connect_tail_xpdr_rdm(self):
         # Connect the tail: XPDRA to ROADMA
         response = test_utils.connect_xpdr_to_rdm_request("XPDR-A1", "1", "1",
-                                                           "ROADM-A1", "1", "SRG1-PP1-TXRX")
+                                                          "ROADM-A1", "1", "SRG1-PP1-TXRX")
         self.assertEqual(response.status_code, requests.codes.ok)
 
     def test_11_connect_tail_rdm_xpdr(self):
         response = test_utils.connect_rdm_to_xpdr_request("XPDR-A1", "1", "1",
-                                                           "ROADM-A1", "1", "SRG1-PP1-TXRX")
+                                                          "ROADM-A1", "1", "SRG1-PP1-TXRX")
         self.assertEqual(response.status_code, requests.codes.ok)
 
     def test_12_getLinks_OpenRoadmTopology(self):
index 3a2d6e9ea2936b0684dca000ddc2ad41ff166e70..ee5df6997116f5a0f9a2036559be53748879971a 100644 (file)
@@ -329,18 +329,19 @@ def get_service_list_request(suffix: str):
 def service_create_request(attr):
     return post_request(URL_SERV_CREATE, attr)
 
-def service_delete_request(servicename : str,
-                           requestid = "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
+
+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"}}}
+        "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)
 
 
@@ -371,21 +372,22 @@ def create_ots_oms_request(nodeid: str, lcp: str):
             "logical-connection-point": lcp}}
     return post_request(URL_CREATE_OTS_OMS, attr)
 
+
 def path_computation_request(requestid: str, servicename: str, serviceaend, servicezend,
                              hardconstraints=None, softconstraints=None, metric="hop-count", other_attr=None):
-    attr =  {"service-name": servicename,
-             "resource-reserve": "true",
-             "service-handler-header": { "request-id": requestid },
-             "service-a-end": serviceaend,
-             "service-z-end": servicezend,
-             "pce-metric": metric}
+    attr = {"service-name": servicename,
+            "resource-reserve": "true",
+            "service-handler-header": {"request-id": requestid},
+            "service-a-end": serviceaend,
+            "service-z-end": servicezend,
+            "pce-metric": metric}
     if hardconstraints:
-        attr.update({ "hard-constraints": hardconstraints})
+        attr.update({"hard-constraints": hardconstraints})
     if softconstraints:
-        attr.update({ "soft-constraints": softconstraints})
+        attr.update({"soft-constraints": softconstraints})
     if other_attr:
         attr.update(other_attr)
-    return post_request(URL_PATH_COMPUTATION_REQUEST, {"input": attr })
+    return post_request(URL_PATH_COMPUTATION_REQUEST, {"input": attr})
 
 
 def shutdown_process(process):