Make TransportPCE functional tests running

- code request "not found" have been replaced by "conflict"
- adapt some tests to new structure returned by the REST API.
- increase karaf JAVA memory size in tapi functional test

JIRA: TRNSPRTPCE-310 TRNSPRTPCE-292
Co-authored-by: guillaume.lambert <guillaume.lambert@orange.com>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I89b441d7fe17823397551b4af472e9d88e9683b2

diff --git a/tests/transportpce_tests/1.2.1/test_end2end.py b/tests/transportpce_tests/1.2.1/test_end2end.py
index 0e8e3041106a88292fa3ad8e78f6f95de023de3b..dd0c9bd17a292965e33b16f846552113aabba35e 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_end2end.py
+++ b/tests/transportpce_tests/1.2.1/test_end2end.py
@@ -784,7 +784,7 @@ class TransportPCEFulltesting(unittest.TestCase):
     def test_46_get_no_oc_services(self):
         print("start test")
         response = test_utils.get_service_list_request("")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn(
             {

diff --git a/tests/transportpce_tests/1.2.1/test_pce.py b/tests/transportpce_tests/1.2.1/test_pce.py
index 48a0fe9e0a12859fe364053aac77340b573b78cc..be417d8f95f6d5d7d1e08a5c9ecf5019e89d3ab7 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_pce.py
+++ b/tests/transportpce_tests/1.2.1/test_pce.py
@@ -124,7 +124,7 @@ class TransportPCEtesting(unittest.TestCase):
     # Test deleted topology
     def test_07_test_topology_simple_bi_deleted(self):
         response = test_utils.get_ordm_topo_request("node/ROADMA01-SRG1")
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.status_code, requests.codes.conflict)
         time.sleep(1)
 
     # Load simple bidirectional topology
@@ -196,7 +196,7 @@ class TransportPCEtesting(unittest.TestCase):
     # Test deleted topology
     def test_14_test_topology_simple_deleted(self):
         response = test_utils.get_ordm_topo_request("node/XPONDER-1-2")
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.status_code, requests.codes.conflict)
         time.sleep(1)
 
     # Load complex topology
@@ -363,7 +363,7 @@ class TransportPCEtesting(unittest.TestCase):
     # Test deleted complex topology
     def test_25_test_topology_complex_deleted(self):
         response = test_utils.get_ordm_topo_request("node/XPONDER-3-2")
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.status_code, requests.codes.conflict)
         time.sleep(1)
 
 

diff --git a/tests/transportpce_tests/1.2.1/test_portmapping.py b/tests/transportpce_tests/1.2.1/test_portmapping.py
index 9bfeb4840f6bec7ef00731ad30fe6096f950f7b5..861d88098bfc93476f7fe83189cacc1d1fcdbf84 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_portmapping.py
+++ b/tests/transportpce_tests/1.2.1/test_portmapping.py
@@ -187,6 +187,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              'port-qual': 'xpdr-client', 'lcp-hash-val': 'AO9UFkY/TLYy'},
             res['mapping'])
 
+    def test_15_xpdr_portmapping_CLIENT4(self):
         response = test_utils.portmapping_request("XPDRA01/mapping/XPDR1-CLIENT4")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
@@ -203,7 +204,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
 
     def test_17_xpdr_device_disconnected(self):
         response = test_utils.get_netconf_oper_request("XPDRA01")
-        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",
@@ -212,7 +213,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
 
     def test_18_xpdr_device_not_connected(self):
         response = test_utils.portmapping_request("XPDRA01")
-        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",
@@ -225,7 +226,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
 
     def test_20_rdm_device_disconnected(self):
         response = test_utils.get_netconf_oper_request("ROADMA01")
-        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",
@@ -234,7 +235,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
 
     def test_21_rdm_device_not_connected(self):
         response = test_utils.portmapping_request("ROADMA01")
-        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",

diff --git a/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py b/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
index 898cf34384aeecc504e2ceab58f2c1a28c9e1d9b..dbf11a074addba0b13ddefb41f8d9204dab8740b 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
+++ b/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
@@ -252,7 +252,7 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_15_service_path_delete_rdm_check(self):
         response = test_utils.check_netconf_node_request("ROADMA01", "interface/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", "error-tag": "data-missing",
@@ -261,7 +261,7 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_16_service_path_delete_rdm_check(self):
         response = test_utils.check_netconf_node_request("ROADMA01", "interface/SRG1-PP7-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", "error-tag": "data-missing",
@@ -270,7 +270,7 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_17_service_path_delete_rdm_check(self):
         response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP7-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", "error-tag": "data-missing",
@@ -279,7 +279,7 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_18_service_path_delete_xpdr_check(self):
         response = test_utils.check_netconf_node_request("XPDRA01", "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", "error-tag": "data-missing",
@@ -288,7 +288,7 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_19_service_path_delete_xpdr_check(self):
         response = test_utils.check_netconf_node_request("XPDRA01", "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", "error-tag": "data-missing",
@@ -297,7 +297,7 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_20_service_path_delete_xpdr_check(self):
         response = test_utils.check_netconf_node_request("XPDRA01", "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", "error-tag": "data-missing",
@@ -306,7 +306,7 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_21_service_path_delete_xpdr_check(self):
         response = test_utils.check_netconf_node_request("XPDRA01", "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", "error-tag": "data-missing",

diff --git a/tests/transportpce_tests/2.2.1/test_end2end.py b/tests/transportpce_tests/2.2.1/test_end2end.py
index 5e8cc9820bb37f73d307cee79c44e85d95799a4a..f5013e09327332e9aedf7e81459ae550c2ba7b23 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_end2end.py
+++ b/tests/transportpce_tests/2.2.1/test_end2end.py
@@ -699,7 +699,7 @@ class TransportPCEFulltesting(unittest.TestCase):
     def test_46_get_no_oc_services(self):
         print("start test")
         response = test_utils.get_service_list_request("")
-        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",

diff --git a/tests/transportpce_tests/2.2.1/test_otn_end2end.py b/tests/transportpce_tests/2.2.1/test_otn_end2end.py
index 5602bff005e80d83d9fe1a2ca15d872f8565d398..ffda6a582e0ad182de832d5f6c71e8355c5e310f 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_otn_end2end.py
+++ b/tests/transportpce_tests/2.2.1/test_otn_end2end.py
@@ -331,7 +331,7 @@ class TransportPCEtesting(unittest.TestCase):
 
     def test_18_check_no_interface_ODU4_spdra(self):
         response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-ODU4")
-        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",
@@ -789,15 +789,15 @@ class TransportPCEtesting(unittest.TestCase):
 
     def test_44_check_no_interface_ODU2E_NETWORK_spdra(self):
         response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e-service1")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
 
     def test_45_check_no_interface_ODU2E_CLIENT_spdra(self):
         response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e-service1")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
 
     def test_46_check_no_interface_10GE_CLIENT_spdra(self):
         response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT1-ETHERNET10G")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
 
     def test_47_check_otn_topo_links(self):
         response = test_utils.get_otn_topo_request()
@@ -841,7 +841,7 @@ class TransportPCEtesting(unittest.TestCase):
 
     def test_51_check_no_interface_ODU4_spdra(self):
         response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
 
     def test_52_check_otn_topo_links(self):
         self.test_22_check_otn_topo_otu4_links()
@@ -868,7 +868,7 @@ class TransportPCEtesting(unittest.TestCase):
 
     def test_55_get_no_service(self):
         response = test_utils.get_service_list_request("")
-        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",
@@ -878,11 +878,11 @@ class TransportPCEtesting(unittest.TestCase):
 
     def test_56_check_no_interface_OTU4_spdra(self):
         response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-OTU")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
 
     def test_57_check_no_interface_OCH_spdra(self):
         response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-1")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
 
     def test_58_getLinks_OtnTopology(self):
         response = test_utils.get_otn_topo_request()

diff --git a/tests/transportpce_tests/2.2.1/test_otn_renderer.py b/tests/transportpce_tests/2.2.1/test_otn_renderer.py
index a854d11fa16f0b927c14da4675ce7b00ebe9832d..e5a3816f764acc7e3175ecd63779ef5986bc9515 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_otn_renderer.py
+++ b/tests/transportpce_tests/2.2.1/test_otn_renderer.py
@@ -46,24 +46,19 @@ class TransportPCEtesting(unittest.TestCase):
             res['node'][0]['netconf-node-topology:connection-status'],
             'connected')
 
-    def test_02_get_portmapping_CLIENT1(self):
-        response = test_utils.portmapping_request("SPDR-SA1/mapping/XPDR1-CLIENT1")
+    def test_02_get_portmapping_CLIENT4(self):
+        response = test_utils.portmapping_request("SPDR-SA1/mapping/XPDR1-CLIENT4")
         self.assertEqual(response.status_code, requests.codes.ok)
-        res_mapping = (response.json())['mapping'][0]
-        self.assertSetEqual({'org-openroadm-port-types:if-10GE-ODU2e',
-                         'org-openroadm-port-types:if-10GE-ODU2',
-                         'org-openroadm-port-types:if-10GE'},
-                        set(res_mapping['supported-interface-capability']))
-        self.assertDictEqual(
-            dict(
-                {'supporting-port': 'CP1-SFP4-P1',
-                 'supporting-circuit-pack-name': 'CP1-SFP4',
-                 'logical-connection-point': 'XPDR1-CLIENT1',
-                 'port-direction': 'bidirectional',
-                 'port-qual': 'xpdr-client',
-                 'lcp-hash-val': 'FqlcrxV7p30='},
-                **res_mapping),
-            res_mapping)
+        res = response.json()
+        self.assertEqual('CP1-SFP4-P1', res['mapping'][0]['supporting-port'])
+        self.assertEqual('CP1-SFP4', res['mapping'][0]['supporting-circuit-pack-name'])
+        self.assertEqual('XPDR1-CLIENT4', res['mapping'][0]['logical-connection-point'])
+        self.assertEqual('bidirectional', res['mapping'][0]['port-direction'])
+        self.assertEqual('xpdr-client', res['mapping'][0]['port-qual'])
+        self.assertEqual('FqlcrxV7p3g=', res['mapping'][0]['lcp-hash-val'])
+        self.assertIn('org-openroadm-port-types:if-10GE-ODU2e', res['mapping'][0]['supported-interface-capability'])
+        self.assertIn('org-openroadm-port-types:if-10GE-ODU2', res['mapping'][0]['supported-interface-capability'])
+        self.assertIn('org-openroadm-port-types:if-10GE', res['mapping'][0]['supported-interface-capability'])
 
     def test_03_get_portmapping_NETWORK1(self):
         response = test_utils.portmapping_request("SPDR-SA1/mapping/XPDR1-NETWORK1")
@@ -215,7 +210,7 @@ class TransportPCEtesting(unittest.TestCase):
 
     def test_11_otn_service_path_create_10GE(self):
         response = test_utils.otn_service_path_request("create", "service1", "10G", "Ethernet",
-                                                       [{"node-id": "SPDR-SA1", "client-tp": "XPDR1-CLIENT1",
+                                                       [{"node-id": "SPDR-SA1", "client-tp": "XPDR1-CLIENT4",
                                                            "network-tp": "XPDR1-NETWORK1"}],
                                                        {"ethernet-encoding": "eth encode", "trib-slot": ["1"], "trib-port-number": "1"})
         time.sleep(3)
@@ -223,17 +218,18 @@ class TransportPCEtesting(unittest.TestCase):
         res = response.json()
         self.assertIn('Otn Service path was set up successfully for node :SPDR-SA1', res["output"]["result"])
         self.assertTrue(res["output"]["success"])
-        self.assertIn(
-            {'node-id': 'SPDR-SA1',
-             'connection-id': ['XPDR1-CLIENT1-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1'],
-             'odu-interface-id': ['XPDR1-NETWORK1-ODU2e-service1', 'XPDR1-CLIENT1-ODU2e-service1'],
-             'eth-interface-id': ['XPDR1-CLIENT1-ETHERNET10G']}, res["output"]['node-interface'])
+        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'])
+        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'])
 
     def test_12_check_interface_10GE_CLIENT(self):
-        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT1-ETHERNET10G")
+        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT4-ETHERNET10G")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
-        input_dict = {'name': 'XPDR1-CLIENT1-ETHERNET10G',
+        input_dict = {'name': 'XPDR1-CLIENT4-ETHERNET10G',
                       'administrative-state': 'inService',
                       'supporting-circuit-pack-name': 'CP1-SFP4',
                       'type': 'org-openroadm-interfaces:ethernetCsmacd',
@@ -246,14 +242,14 @@ class TransportPCEtesting(unittest.TestCase):
             res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
 
     def test_13_check_interface_ODU2E_CLIENT(self):
-        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e-service1")
+        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT4-ODU2e-service1")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
 
-        input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e-service1',
+        input_dict_1 = {'name': 'XPDR1-CLIENT4-ODU2e-service1',
                         'administrative-state': 'inService',
                         'supporting-circuit-pack-name': 'CP1-SFP4',
-                        'supporting-interface': 'XPDR1-CLIENT1-ETHERNET10G',
+                        'supporting-interface': 'XPDR1-CLIENT4-ETHERNET10G',
                         'type': 'org-openroadm-interfaces:otnOdu',
                         'supporting-port': 'CP1-SFP4-P1'}
         input_dict_2 = {
@@ -304,12 +300,12 @@ class TransportPCEtesting(unittest.TestCase):
     def test_15_check_ODU2E_connection(self):
         response = test_utils.check_netconf_node_request(
             "SPDR-SA1",
-            "odu-connection/XPDR1-CLIENT1-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1")
+            "odu-connection/XPDR1-CLIENT4-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         input_dict_1 = {
             'connection-name':
-            'XPDR1-CLIENT1-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1',
+            'XPDR1-CLIENT4-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1',
             'direction': 'bidirectional'
         }
 
@@ -317,12 +313,12 @@ class TransportPCEtesting(unittest.TestCase):
                              res['odu-connection'][0])
         self.assertDictEqual({u'dst-if': u'XPDR1-NETWORK1-ODU2e-service1'},
                              res['odu-connection'][0]['destination'])
-        self.assertDictEqual({u'src-if': u'XPDR1-CLIENT1-ODU2e-service1'},
+        self.assertDictEqual({u'src-if': u'XPDR1-CLIENT4-ODU2e-service1'},
                              res['odu-connection'][0]['source'])
 
     def test_16_otn_service_path_delete_10GE(self):
         response = test_utils.otn_service_path_request("delete", "service1", "10G", "Ethernet",
-                                                       [{"node-id": "SPDR-SA1", "client-tp": "XPDR1-CLIENT1",
+                                                       [{"node-id": "SPDR-SA1", "client-tp": "XPDR1-CLIENT4",
                                                            "network-tp": "XPDR1-NETWORK1"}],
                                                        {"ethernet-encoding": "eth encode", "trib-slot": ["1"], "trib-port-number": "1"})
         time.sleep(3)
@@ -334,20 +330,20 @@ class TransportPCEtesting(unittest.TestCase):
     def test_17_check_no_ODU2E_connection(self):
         response = test_utils.check_netconf_node_request(
             "SPDR-SA1",
-            "odu-connection/XPDR1-CLIENT1-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+            "odu-connection/XPDR1-CLIENT4-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1")
+        self.assertEqual(response.status_code, requests.codes.conflict)
 
     def test_18_check_no_interface_ODU2E_NETWORK(self):
         response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e-service1")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
 
     def test_19_check_no_interface_ODU2E_CLIENT(self):
-        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e-service1")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT4-ODU2e-service1")
+        self.assertEqual(response.status_code, requests.codes.conflict)
 
     def test_20_check_no_interface_10GE_CLIENT(self):
-        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT1-ETHERNET10G")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT4-ETHERNET10G")
+        self.assertEqual(response.status_code, requests.codes.conflict)
 
     def test_21_otn_service_path_delete_ODU4(self):
         response = test_utils.otn_service_path_request("delete", "service_ODU4", "100G", "ODU",
@@ -360,7 +356,7 @@ class TransportPCEtesting(unittest.TestCase):
 
     def test_22_check_no_interface_ODU4(self):
         response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
 
     def test_23_service_path_delete_OCH_OTU4(self):
         response = test_utils.service_path_request("delete", "service_OCH_OTU4", "1",
@@ -373,11 +369,11 @@ class TransportPCEtesting(unittest.TestCase):
 
     def test_24_check_no_interface_OTU4(self):
         response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-OTU")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
 
     def test_25_check_no_interface_OCH(self):
         response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-1")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
 
     def test_26_disconnect_SPDR_SA1(self):
         response = test_utils.unmount_device("SPDR-SA1")

diff --git a/tests/transportpce_tests/2.2.1/test_portmapping.py b/tests/transportpce_tests/2.2.1/test_portmapping.py
index d84aa8ffa7262c58d92945d998ce19de13ba8a6b..ddc4d0b0616007f89bc2f1c553ec4a567e08b160 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_portmapping.py
+++ b/tests/transportpce_tests/2.2.1/test_portmapping.py
@@ -180,7 +180,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
 
     def test_16_xpdr_device_disconnected(self):
         response = test_utils.get_netconf_oper_request("XPDR-A1")
-        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",
@@ -189,7 +189,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
 
     def test_17_xpdr_device_not_connected(self):
         response = test_utils.portmapping_request("XPDR-A1")
-        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",
@@ -202,7 +202,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
 
     def test_19_rdm_device_disconnected(self):
         response = test_utils.get_netconf_oper_request("ROADM-A1")
-        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",
@@ -211,7 +211,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
 
     def test_20_rdm_device_not_connected(self):
         response = test_utils.portmapping_request("ROADM-A1")
-        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",

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 12f7c09830864fd82eeb0bed139edb5e0b8bc9e9..29b0789da3ee7a5336d893800d230008e8435811 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
@@ -142,7 +142,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",
@@ -282,7 +282,7 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     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",
@@ -291,7 +291,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",
@@ -300,7 +300,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",
@@ -310,7 +310,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",
@@ -320,7 +320,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",
@@ -330,7 +330,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",
@@ -340,7 +340,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",
@@ -350,7 +350,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",
@@ -360,7 +360,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",

diff --git a/tests/transportpce_tests/2.2.1/test_tapi.py b/tests/transportpce_tests/2.2.1/test_tapi.py
index 9467034383e8a8feb51d7db1c7c506b72975b072..01c99fb8835ef130872f93b7ee4a5c896310ae83 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_tapi.py
+++ b/tests/transportpce_tests/2.2.1/test_tapi.py
@@ -27,7 +27,8 @@ class TransportTapitesting(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.init_failed = False
-
+        os.environ['JAVA_MIN_MEM'] = '1024M'
+        os.environ['JAVA_MAX_MEM'] = '4069M'
         cls.processes = test_utils.start_tpce()
         # TAPI feature is not installed by default in Karaf
         if "USE_LIGHTY" not in os.environ or os.environ['USE_LIGHTY'] != 'True':