Migrate with_docker funct tests to RFC8040

JIRA: TRNSPRTPCE-567
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ib6de34a3d3fd688e2c2370c7b357f4e6c33677e2

diff --git a/tests/transportpce_tests/common/test_utils_rfc8040.py b/tests/transportpce_tests/common/test_utils_rfc8040.py
index bcbe35ef467b68da1d6e7a524b2046db5d6228fd..57679731572164ff230335222936c87c5b79394c 100644 (file)
--- a/tests/transportpce_tests/common/test_utils_rfc8040.py
+++ b/tests/transportpce_tests/common/test_utils_rfc8040.py
@@ -626,9 +626,12 @@ def transportpce_api_rpc_request(api_module: str, rpc: str, payload: dict):
     else:
         data = {'input': payload}
     response = post_request(url, data)
-    res = response.json()
-    return_key = {'rfc8040': api_module + ':output',
-                  'draft-bierman02': 'output'}
-    return_output = res[return_key[RESTCONF_VERSION]]
+    if response.status_code == requests.codes.no_content:
+        return_output = None
+    else:
+        res = response.json()
+        return_key = {'rfc8040': api_module + ':output',
+                      'draft-bierman02': 'output'}
+        return_output = res[return_key[RESTCONF_VERSION]]
     return {'status_code': response.status_code,
             'output': return_output}

diff --git a/tests/transportpce_tests/with_docker/test02_nbinotifications.py b/tests/transportpce_tests/with_docker/test02_nbinotifications.py
index 5e5edfae16bb6324feb5c3a60d98e7cced884777..a235b0f5205400cbeac6805eea733d6b5d6d4eb3 100644 (file)
--- a/tests/transportpce_tests/with_docker/test02_nbinotifications.py
+++ b/tests/transportpce_tests/with_docker/test02_nbinotifications.py
@@ -21,12 +21,12 @@ import requests
 sys.path.append('transportpce_tests/common/')
 # pylint: disable=wrong-import-position
 # pylint: disable=import-error
-import test_utils  # nopep8
+import test_utils_rfc8040  # nopep8
 
 
 class TransportNbiNotificationstesting(unittest.TestCase):
     processes = []
-    cr_serv_sample_data = {"input": {
+    cr_serv_input_data = {
         "sdnc-request-header": {
             "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
             "rpc-action": "service-create",
@@ -57,6 +57,22 @@ class TransportNbiNotificationstesting(unittest.TestCase):
         "due-date": "2016-11-28T00:00:01Z",
         "operator-contact": "pw1234"
     }
+
+    del_serv_input_data = {
+        "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": "TBD",
+            "tail-retention": "no"}
+    }
+
+    nbi_notif_input_data = {
+        "connection-type": "service",
+        "id-consumer": "consumer",
+        "group-id": "transportpceTest"
     }
 
     WAITING = 20  # nominal value is 300
@@ -67,33 +83,33 @@ class TransportNbiNotificationstesting(unittest.TestCase):
         # pylint: disable=unsubscriptable-object
         # TODO: for lighty manage the activation of NBI notification feature
         cls.init_failed = False
-        cls.processes = test_utils.start_tpce()
+        cls.processes = test_utils_rfc8040.start_tpce()
         # NBI notification feature is not installed by default in Karaf
         if "USE_LIGHTY" not in os.environ or os.environ['USE_LIGHTY'] != 'True':
             print("installing NBI notification feature...")
-            result = test_utils.install_karaf_feature("odl-transportpce-nbinotifications")
+            result = test_utils_rfc8040.install_karaf_feature("odl-transportpce-nbinotifications")
             if result.returncode != 0:
                 cls.init_failed = True
             print("Restarting OpenDaylight...")
-            test_utils.shutdown_process(cls.processes[0])
-            cls.processes[0] = test_utils.start_karaf()
-            test_utils.process_list[0] = cls.processes[0]
-            cls.init_failed = not test_utils.wait_until_log_contains(
-                test_utils.KARAF_LOG, test_utils.KARAF_OK_START_MSG, time_to_wait=60)
+            test_utils_rfc8040.shutdown_process(cls.processes[0])
+            cls.processes[0] = test_utils_rfc8040.start_karaf()
+            test_utils_rfc8040.process_list[0] = cls.processes[0]
+            cls.init_failed = not test_utils_rfc8040.wait_until_log_contains(
+                test_utils_rfc8040.KARAF_LOG, test_utils_rfc8040.KARAF_OK_START_MSG, time_to_wait=60)
         if cls.init_failed:
             print("NBI notification installation feature failed...")
-            test_utils.shutdown_process(cls.processes[0])
+            test_utils_rfc8040.shutdown_process(cls.processes[0])
             sys.exit(2)
-        cls.processes = test_utils.start_sims([('xpdra', cls.NODE_VERSION),
-                                               ('roadma', cls.NODE_VERSION),
-                                               ('roadmc', cls.NODE_VERSION),
-                                               ('xpdrc', cls.NODE_VERSION)])
+        cls.processes = test_utils_rfc8040.start_sims([('xpdra', cls.NODE_VERSION),
+                                                       ('roadma', cls.NODE_VERSION),
+                                                       ('roadmc', cls.NODE_VERSION),
+                                                       ('xpdrc', cls.NODE_VERSION)])
 
     @classmethod
     def tearDownClass(cls):
         # pylint: disable=not-an-iterable
         for process in cls.processes:
-            test_utils.shutdown_process(process)
+            test_utils_rfc8040.shutdown_process(process)
         print("all processes killed")
 
     def setUp(self):  # instruction executed before each test method
@@ -101,90 +117,85 @@ class TransportNbiNotificationstesting(unittest.TestCase):
         print("execution of {}".format(self.id().split(".")[-1]))
 
     def test_01_connect_xpdrA(self):
-        response = test_utils.mount_device("XPDR-A1", ('xpdra', self.NODE_VERSION))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        response = test_utils_rfc8040.mount_device("XPDR-A1", ('xpdra', self.NODE_VERSION))
+        self.assertEqual(response.status_code,
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
 
     def test_02_connect_xpdrC(self):
-        response = test_utils.mount_device("XPDR-C1", ('xpdrc', self.NODE_VERSION))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        response = test_utils_rfc8040.mount_device("XPDR-C1", ('xpdrc', self.NODE_VERSION))
+        self.assertEqual(response.status_code,
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
 
     def test_03_connect_rdmA(self):
-        response = test_utils.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        response = test_utils_rfc8040.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION))
+        self.assertEqual(response.status_code,
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
 
     def test_04_connect_rdmC(self):
-        response = test_utils.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        response = test_utils_rfc8040.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION))
+        self.assertEqual(response.status_code,
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
 
     def test_05_connect_xprdA_N1_to_roadmA_PP1(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDR-A1", "1", "1",
-                                                          "ROADM-A1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
         time.sleep(2)
 
     def test_06_connect_roadmA_PP1_to_xpdrA_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDR-A1", "1", "1",
-                                                          "ROADM-A1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
         time.sleep(2)
 
     def test_07_connect_xprdC_N1_to_roadmC_PP1(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDR-C1", "1", "1",
-                                                          "ROADM-C1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
         time.sleep(2)
 
     def test_08_connect_roadmC_PP1_to_xpdrC_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDR-C1", "1", "1",
-                                                          "ROADM-C1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
         time.sleep(2)
 
     def test_09_get_notifications_service1(self):
-        data = {
-            "input": {
-                "connection-type": "service",
-                "id-consumer": "consumer",
-                "group-id": "transportpceTest"
-            }
-        }
-        response = test_utils.get_notifications_process_service_request(data)
-        self.assertEqual(response.status_code, requests.codes.no_content)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'nbi-notifications', 'get-notifications-process-service', self.nbi_notif_input_data)
+        self.assertEqual(response['status_code'], requests.codes.no_content)
         time.sleep(2)
 
     def test_10_create_eth_service1(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service1"
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service1"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create', self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
         time.sleep(self.WAITING)
 
     def test_11_get_notifications_service1(self):
-        data = {
-            "input": {
-                "connection-type": "service",
-                "id-consumer": "consumer",
-                "group-id": "transportpceTest"
-            }
-        }
-        response = test_utils.get_notifications_process_service_request(data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(res['output']['notifications-process-service'][-1]['service-name'], 'service1')
-        self.assertEqual(res['output']['notifications-process-service'][-1]['connection-type'], 'service')
-        self.assertEqual(res['output']['notifications-process-service'][-1]['message'],
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'nbi-notifications', 'get-notifications-process-service', self.nbi_notif_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['output']['notifications-process-service'][-1]['service-name'], 'service1')
+        self.assertEqual(response['output']['notifications-process-service'][-1]['connection-type'], 'service')
+        self.assertEqual(response['output']['notifications-process-service'][-1]['message'],
                          'ServiceCreate request failed ...')
-        self.assertEqual(res['output']['notifications-process-service'][-1]['response-failed'],
+        self.assertEqual(response['output']['notifications-process-service'][-1]['response-failed'],
                          'PCE path computation failed !')
         time.sleep(2)
 
@@ -200,7 +211,8 @@ class TransportNbiNotificationstesting(unittest.TestCase):
                 "fiber-type": "smf",
                 "SRLG-length": 100000,
                 "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request("ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request(
+            "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data)
         self.assertEqual(response.status_code, requests.codes.created)
 
     def test_13_add_omsAttributes_ROADMC_ROADMA(self):
@@ -215,65 +227,45 @@ class TransportNbiNotificationstesting(unittest.TestCase):
                 "fiber-type": "smf",
                 "SRLG-length": 100000,
                 "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request("ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request(
+            "ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data)
         self.assertEqual(response.status_code, requests.codes.created)
 
     # test service-create for Eth service from xpdr to xpdr
     def test_14_create_eth_service1(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service1"
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service1"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create', self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
         time.sleep(self.WAITING)
 
     def test_15_get_eth_service1(self):
-        response = test_utils.get_service_list_request("services/service1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service1')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'service')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service1")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service1')
+        self.assertEqual(response['services'][0]['connection-type'], 'service')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
 
     def test_16_get_notifications_service1(self):
-        data = {
-            "input": {
-                "connection-type": "service",
-                "id-consumer": "consumer",
-                "group-id": "transportpceTest"
-            }
-        }
-        response = test_utils.get_notifications_process_service_request(data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(res['output']['notifications-process-service'][-1]['service-name'], 'service1')
-        self.assertEqual(res['output']['notifications-process-service'][-1]['connection-type'], 'service')
-        self.assertEqual(res['output']['notifications-process-service'][-1]['message'], 'Service implemented !')
-        time.sleep(2)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'nbi-notifications', 'get-notifications-process-service', self.nbi_notif_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['output']['notifications-process-service'][-1]['service-name'], 'service1')
+        self.assertEqual(response['output']['notifications-process-service'][-1]['connection-type'], 'service')
+        self.assertEqual(response['output']['notifications-process-service'][-1]['message'], 'Service implemented !')
 
     def test_17_get_notifications_alarm_service1(self):
-        data = {
-            "input": {
-                "connection-type": "service",
-                "id-consumer": "consumer",
-                "group-id": "transportpceTest"
-            }
-        }
-        response = test_utils.get_notifications_alarm_service_request(data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(res['output']['notifications-alarm-service'][-1]['service-name'], 'service1')
-        self.assertEqual(res['output']['notifications-alarm-service'][-1]['connection-type'], 'service')
-        self.assertEqual(res['output']['notifications-alarm-service'][-1]['operational-state'], 'inService')
-        self.assertEqual(res['output']['notifications-alarm-service'][-1]['message'], 'The service is now inService')
-        time.sleep(2)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'nbi-notifications', 'get-notifications-alarm-service', self.nbi_notif_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['output']['notifications-alarm-service'][-1]['service-name'], 'service1')
+        self.assertEqual(response['output']['notifications-alarm-service'][-1]['connection-type'], 'service')
+        self.assertEqual(response['output']['notifications-alarm-service'][-1]['operational-state'], 'inService')
+        self.assertEqual(response['output']['notifications-alarm-service'][-1]['message'],
+                         'The service is now inService')
 
     def test_18_change_status_port_roadma_srg(self):
         url = "{}/config/org-openroadm-device:org-openroadm-device/circuit-packs/3%2F0/ports/C1"
@@ -285,28 +277,21 @@ class TransportNbiNotificationstesting(unittest.TestCase):
             "administrative-state": "outOfService",
             "port-qual": "roadm-external"}]}
         response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
-                                    data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
-                                    timeout=test_utils.REQUEST_TIMEOUT)
+                                    data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+                                    auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+                                    timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
         self.assertEqual(response.status_code, requests.codes.ok)
         time.sleep(2)
 
     def test_19_get_notifications_alarm_service1(self):
-        data = {
-            "input": {
-                "connection-type": "service",
-                "id-consumer": "consumer",
-                "group-id": "transportpceTest"
-            }
-        }
-        response = test_utils.get_notifications_alarm_service_request(data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(res['output']['notifications-alarm-service'][-1]['service-name'], 'service1')
-        self.assertEqual(res['output']['notifications-alarm-service'][-1]['connection-type'], 'service')
-        self.assertEqual(res['output']['notifications-alarm-service'][-1]['operational-state'], 'outOfService')
-        self.assertEqual(res['output']['notifications-alarm-service'][-1]['message'], 'The service is now outOfService')
-        time.sleep(2)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'nbi-notifications', 'get-notifications-alarm-service', self.nbi_notif_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['output']['notifications-alarm-service'][-1]['service-name'], 'service1')
+        self.assertEqual(response['output']['notifications-alarm-service'][-1]['connection-type'], 'service')
+        self.assertEqual(response['output']['notifications-alarm-service'][-1]['operational-state'], 'outOfService')
+        self.assertEqual(response['output']['notifications-alarm-service'][-1]['message'],
+                         'The service is now outOfService')
 
     def test_20_restore_status_port_roadma_srg(self):
         url = "{}/config/org-openroadm-device:org-openroadm-device/circuit-packs/3%2F0/ports/C1"
@@ -318,9 +303,9 @@ class TransportNbiNotificationstesting(unittest.TestCase):
             "administrative-state": "inService",
             "port-qual": "roadm-external"}]}
         response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
-                                    data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
-                                    timeout=test_utils.REQUEST_TIMEOUT)
+                                    data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+                                    auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+                                    timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
         self.assertEqual(response.status_code, requests.codes.ok)
         time.sleep(2)
 
@@ -328,44 +313,38 @@ class TransportNbiNotificationstesting(unittest.TestCase):
         self.test_17_get_notifications_alarm_service1()
 
     def test_22_delete_eth_service1(self):
-        response = test_utils.service_delete_request("service1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete', self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
         time.sleep(20)
 
     def test_23_get_notifications_service1(self):
-        data = {
-            "input": {
-                "connection-type": "service",
-                "id-consumer": "consumer",
-                "group-id": "transportpceTest"
-            }
-        }
-        response = test_utils.get_notifications_process_service_request(data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(res['output']['notifications-process-service'][-1]['service-name'], 'service1')
-        self.assertEqual(res['output']['notifications-process-service'][-1]['connection-type'], 'service')
-        self.assertEqual(res['output']['notifications-process-service'][-1]['message'], 'Service deleted !')
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'nbi-notifications', 'get-notifications-process-service', self.nbi_notif_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['output']['notifications-process-service'][-1]['service-name'], 'service1')
+        self.assertEqual(response['output']['notifications-process-service'][-1]['connection-type'], 'service')
+        self.assertEqual(response['output']['notifications-process-service'][-1]['message'], 'Service deleted !')
         time.sleep(2)
 
     def test_24_disconnect_XPDRA(self):
-        response = test_utils.unmount_device("XPDR-A1")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("XPDR-A1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
 
     def test_25_disconnect_XPDRC(self):
-        response = test_utils.unmount_device("XPDR-C1")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("XPDR-C1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
 
     def test_26_disconnect_ROADMA(self):
-        response = test_utils.unmount_device("ROADM-A1")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("ROADM-A1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
 
     def test_27_disconnect_ROADMC(self):
-        response = test_utils.unmount_device("ROADM-C1")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("ROADM-C1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
 
 
 if __name__ == "__main__":

diff --git a/tests/transportpce_tests/with_docker/test03_tapi_nbinotifications.py b/tests/transportpce_tests/with_docker/test03_tapi_nbinotifications.py
index ca59c8162f294f815a5c878f495f4b97056170d5..54f3ddf865f355d45781f131649d384d4dfd97a1 100644 (file)
--- a/tests/transportpce_tests/with_docker/test03_tapi_nbinotifications.py
+++ b/tests/transportpce_tests/with_docker/test03_tapi_nbinotifications.py
@@ -21,7 +21,7 @@ import requests
 sys.path.append('transportpce_tests/common/')
 # pylint: disable=wrong-import-position
 # pylint: disable=import-error
-import test_utils  # nopep8
+import test_utils_rfc8040  # nopep8
 
 
 # pylint: disable=too-few-public-methods
@@ -45,94 +45,90 @@ class UuidSubscriptions:
 
 
 class TransportNbiNotificationstesting(unittest.TestCase):
-    cr_serv_sample_data = {
-        "input": {
-            "end-point": [
-                {
-                    "layer-protocol-name": "DSR",
-                    "service-interface-point": {
-                        "service-interface-point-uuid": "b1f4bd3b-7fa9-367b-a8ab-6e80293238df"
-                    },
-                    "administrative-state": "UNLOCKED",
-                    "operational-state": "ENABLED",
-                    "direction": "BIDIRECTIONAL",
-                    "role": "SYMMETRIC",
-                    "protection-role": "WORK",
-                    "local-id": "XPDR-C1-XPDR1",
-                    "name": [
+    cr_serv_input_data = {
+        "end-point": [
+            {
+                "layer-protocol-name": "DSR",
+                "service-interface-point": {
+                    "service-interface-point-uuid": "b1f4bd3b-7fa9-367b-a8ab-6e80293238df"
+                },
+                "administrative-state": "UNLOCKED",
+                "operational-state": "ENABLED",
+                "direction": "BIDIRECTIONAL",
+                "role": "SYMMETRIC",
+                "protection-role": "WORK",
+                "local-id": "XPDR-C1-XPDR1",
+                "name": [
                         {
                             "value-name": "OpenROADM node id",
                             "value": "XPDR-C1-XPDR1"
                         }
-                    ]
+                ]
+            },
+            {
+                "layer-protocol-name": "DSR",
+                "service-interface-point": {
+                    "service-interface-point-uuid": "b5964ce9-274c-3f68-b4d1-83c0b61bc74e"
                 },
-                {
-                    "layer-protocol-name": "DSR",
-                    "service-interface-point": {
-                        "service-interface-point-uuid": "b5964ce9-274c-3f68-b4d1-83c0b61bc74e"
-                    },
-                    "administrative-state": "UNLOCKED",
-                    "operational-state": "ENABLED",
-                    "direction": "BIDIRECTIONAL",
-                    "role": "SYMMETRIC",
-                    "protection-role": "WORK",
-                    "local-id": "XPDR-A1-XPDR1",
-                    "name": [
+                "administrative-state": "UNLOCKED",
+                "operational-state": "ENABLED",
+                "direction": "BIDIRECTIONAL",
+                "role": "SYMMETRIC",
+                "protection-role": "WORK",
+                "local-id": "XPDR-A1-XPDR1",
+                "name": [
                         {
                             "value-name": "OpenROADM node id",
                             "value": "XPDR-A1-XPDR1"
                         }
-                    ]
-                }
-            ],
-            "connectivity-constraint": {
-                "service-layer": "ETH",
-                "service-type": "POINT_TO_POINT_CONNECTIVITY",
-                "service-level": "Some service-level",
-                "requested-capacity": {
-                    "total-size": {
-                        "value": "100",
-                        "unit": "GB"
-                    }
+                ]
+            }
+        ],
+        "connectivity-constraint": {
+            "service-layer": "ETH",
+            "service-type": "POINT_TO_POINT_CONNECTIVITY",
+            "service-level": "Some service-level",
+            "requested-capacity": {
+                "total-size": {
+                    "value": "100",
+                    "unit": "GB"
                 }
-            },
-            "state": "Some state"
-        }
+            }
+        },
+        "state": "Some state"
     }
 
-    cr_notif_subs_sample_data = {
-        "input": {
-            "subscription-filter": {
-                "requested-notification-types": [
-                    "ALARM_EVENT"
-                ],
-                "requested-object-types": [
-                    "CONNECTIVITY_SERVICE"
-                ],
-                "requested-layer-protocols": [
-                    "ETH"
-                ],
-                "requested-object-identifier": [
-                    "76d8f07b-ead5-4132-8eb8-cf3fdef7e079"
-                ],
-                "include-content": True,
-                "local-id": "localId",
-                "name": [
-                    {
+    tapi_serv_details = {"service-id-or-name": "TBD"}
+
+    cr_notif_subs_input_data = {
+        "subscription-filter": {
+            "requested-notification-types": [
+                "ALARM_EVENT"
+            ],
+            "requested-object-types": [
+                "CONNECTIVITY_SERVICE"
+            ],
+            "requested-layer-protocols": [
+                "ETH"
+            ],
+            "requested-object-identifier": [
+                "76d8f07b-ead5-4132-8eb8-cf3fdef7e079"
+            ],
+            "include-content": True,
+            "local-id": "localId",
+            "name": [
+                {
                         "value-name": "Subscription name",
                         "value": "test subscription"
-                    }
-                ]
-            },
-            "subscription-state": "ACTIVE"
-        }
+                }
+            ]
+        },
+        "subscription-state": "ACTIVE"
     }
 
-    cr_get_notif_list_sample_data = {
-        "input": {
-            "subscription-id-or-name": "c07e7fd1-0377-4fbf-8928-36c17b0d0d68",
-            "time-period": "time-period"
-        }
+    cr_get_notif_list_input_data = {
+        "subscription-id-or-name": "c07e7fd1-0377-4fbf-8928-36c17b0d0d68",
+        "time-period": "time-period"
     }
 
     processes = []
@@ -149,41 +145,41 @@ class TransportNbiNotificationstesting(unittest.TestCase):
         cls.init_failed_tapi = False
         os.environ['JAVA_MIN_MEM'] = '1024M'
         os.environ['JAVA_MAX_MEM'] = '4096M'
-        cls.processes = test_utils.start_tpce()
+        cls.processes = test_utils_rfc8040.start_tpce()
         # NBI notification feature is not installed by default in Karaf
         if "USE_LIGHTY" not in os.environ or os.environ['USE_LIGHTY'] != 'True':
             print("installing NBI notification feature...")
-            result = test_utils.install_karaf_feature("odl-transportpce-nbinotifications")
+            result = test_utils_rfc8040.install_karaf_feature("odl-transportpce-nbinotifications")
             if result.returncode != 0:
                 cls.init_failed_nbi = True
             print("installing tapi feature...")
-            result = test_utils.install_karaf_feature("odl-transportpce-tapi")
+            result = test_utils_rfc8040.install_karaf_feature("odl-transportpce-tapi")
             if result.returncode != 0:
                 cls.init_failed_tapi = True
             print("Restarting OpenDaylight...")
-            test_utils.shutdown_process(cls.processes[0])
-            cls.processes[0] = test_utils.start_karaf()
-            test_utils.process_list[0] = cls.processes[0]
-            cls.init_failed = not test_utils.wait_until_log_contains(
-                test_utils.KARAF_LOG, test_utils.KARAF_OK_START_MSG, time_to_wait=60)
+            test_utils_rfc8040.shutdown_process(cls.processes[0])
+            cls.processes[0] = test_utils_rfc8040.start_karaf()
+            test_utils_rfc8040.process_list[0] = cls.processes[0]
+            cls.init_failed = not test_utils_rfc8040.wait_until_log_contains(
+                test_utils_rfc8040.KARAF_LOG, test_utils_rfc8040.KARAF_OK_START_MSG, time_to_wait=60)
         if cls.init_failed_nbi:
             print("NBI notification installation feature failed...")
-            test_utils.shutdown_process(cls.processes[0])
+            test_utils_rfc8040.shutdown_process(cls.processes[0])
             sys.exit(2)
         if cls.init_failed_tapi:
             print("tapi installation feature failed...")
-            test_utils.shutdown_process(cls.processes[0])
+            test_utils_rfc8040.shutdown_process(cls.processes[0])
             sys.exit(2)
-        cls.processes = test_utils.start_sims([('xpdra', cls.NODE_VERSION_221),
-                                               ('roadma', cls.NODE_VERSION_221),
-                                               ('roadmc', cls.NODE_VERSION_221),
-                                               ('xpdrc', cls.NODE_VERSION_221)])
+        cls.processes = test_utils_rfc8040.start_sims([('xpdra', cls.NODE_VERSION_221),
+                                                       ('roadma', cls.NODE_VERSION_221),
+                                                       ('roadmc', cls.NODE_VERSION_221),
+                                                       ('xpdrc', cls.NODE_VERSION_221)])
 
     @classmethod
     def tearDownClass(cls):
         # pylint: disable=not-an-iterable
         for process in cls.processes:
-            test_utils.shutdown_process(process)
+            test_utils_rfc8040.shutdown_process(process)
         print("all processes killed")
 
     def setUp(self):  # instruction executed before each test method
@@ -191,51 +187,59 @@ class TransportNbiNotificationstesting(unittest.TestCase):
         print("execution of {}".format(self.id().split(".")[-1]))
 
     def test_01_connect_xpdrA(self):
-        response = test_utils.mount_device("XPDR-A1", ('xpdra', self.NODE_VERSION_221))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        response = test_utils_rfc8040.mount_device("XPDR-A1", ('xpdra', self.NODE_VERSION_221))
+        self.assertEqual(response.status_code,
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
 
     def test_02_connect_xpdrC(self):
-        response = test_utils.mount_device("XPDR-C1", ('xpdrc', self.NODE_VERSION_221))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        response = test_utils_rfc8040.mount_device("XPDR-C1", ('xpdrc', self.NODE_VERSION_221))
+        self.assertEqual(response.status_code,
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
 
     def test_03_connect_rdmA(self):
-        response = test_utils.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION_221))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        response = test_utils_rfc8040.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION_221))
+        self.assertEqual(response.status_code,
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
 
     def test_04_connect_rdmC(self):
-        response = test_utils.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION_221))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        response = test_utils_rfc8040.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION_221))
+        self.assertEqual(response.status_code,
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
 
     def test_05_connect_xprdA_N1_to_roadmA_PP1(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDR-A1", "1", "1",
-                                                          "ROADM-A1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
         time.sleep(2)
 
     def test_06_connect_roadmA_PP1_to_xpdrA_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDR-A1", "1", "1",
-                                                          "ROADM-A1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
         time.sleep(2)
 
     def test_07_connect_xprdC_N1_to_roadmC_PP1(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDR-C1", "1", "1",
-                                                          "ROADM-C1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
         time.sleep(2)
 
     def test_08_connect_roadmC_PP1_to_xpdrC_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDR-C1", "1", "1",
-                                                          "ROADM-C1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
         time.sleep(2)
 
     def test_09_add_omsAttributes_ROADMA_ROADMC(self):
@@ -250,7 +254,8 @@ class TransportNbiNotificationstesting(unittest.TestCase):
                 "fiber-type": "smf",
                 "SRLG-length": 100000,
                 "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request("ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request(
+            "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data)
         self.assertEqual(response.status_code, requests.codes.created)
 
     def test_10_add_omsAttributes_ROADMC_ROADMA(self):
@@ -265,16 +270,17 @@ class TransportNbiNotificationstesting(unittest.TestCase):
                 "fiber-type": "smf",
                 "SRLG-length": 100000,
                 "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request("ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request(
+            "ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data)
         self.assertEqual(response.status_code, requests.codes.created)
 
     # test service-create for Eth service from xpdr to xpdr
     def test_11_create_connectivity_service_Ethernet(self):
-        response = test_utils.tapi_create_connectivity_request(self.cr_serv_sample_data)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'tapi-connectivity', 'create-connectivity-service', self.cr_serv_input_data)
         time.sleep(self.WAITING)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.uuid_services.eth = res['output']['service']['uuid']
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.uuid_services.eth = response['output']['service']['uuid']
         # pylint: disable=consider-using-f-string
 
         input_dict_1 = {'administrative-state': 'LOCKED',
@@ -289,55 +295,46 @@ class TransportNbiNotificationstesting(unittest.TestCase):
         input_dict_3 = {'value-name': 'OpenROADM node id',
                         'value': 'XPDR-A1-XPDR1'}
 
-        self.assertDictEqual(dict(input_dict_1, **res['output']['service']),
-                             res['output']['service'])
-        self.assertDictEqual(dict(input_dict_2, **res['output']['service']['end-point'][0]['name'][0]),
-                             res['output']['service']['end-point'][0]['name'][0])
-        self.assertDictEqual(dict(input_dict_3, **res['output']['service']['end-point'][1]['name'][0]),
-                             res['output']['service']['end-point'][1]['name'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['output']['service']),
+                             response['output']['service'])
+        self.assertDictEqual(dict(input_dict_2, **response['output']['service']['end-point'][0]['name'][0]),
+                             response['output']['service']['end-point'][0]['name'][0])
+        self.assertDictEqual(dict(input_dict_3, **response['output']['service']['end-point'][1]['name'][0]),
+                             response['output']['service']['end-point'][1]['name'][0])
         # If the gate fails is because of the waiting time not being enough
         time.sleep(self.WAITING)
 
     def test_12_get_service_Ethernet(self):
-        response = test_utils.get_service_list_request("services/" + str(self.uuid_services.eth))
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], self.uuid_services.eth)
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'service')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", str(self.uuid_services.eth))
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], str(self.uuid_services.eth))
+        self.assertEqual(response['services'][0]['connection-type'], 'service')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+        time.sleep(1)
 
     def test_13_get_connectivity_service_Ethernet(self):
-        response = test_utils.tapi_get_connectivity_request(str(self.uuid_services.eth))
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['output']['service']['operational-state'], 'ENABLED')
-        self.assertEqual(
-            res['output']['service']['name'][0]['value'], self.uuid_services.eth)
-        self.assertEqual(
-            res['output']['service']['administrative-state'], 'UNLOCKED')
-        self.assertEqual(
-            res['output']['service']['lifecycle-state'], 'INSTALLED')
-        time.sleep(2)
+        self.tapi_serv_details["service-id-or-name"] = str(self.uuid_services.eth)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'tapi-connectivity', 'get-connectivity-service-details', self.tapi_serv_details)
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['output']['service']['operational-state'], 'ENABLED')
+        self.assertEqual(response['output']['service']['name'][0]['value'], self.uuid_services.eth)
+        self.assertEqual(response['output']['service']['administrative-state'], 'UNLOCKED')
+        self.assertEqual(response['output']['service']['lifecycle-state'], 'INSTALLED')
 
     def test_14_create_notifications_subscription_service(self):
-        self.cr_notif_subs_sample_data["input"]["subscription-filter"]["requested-object-identifier"][0] = str(
-            self.uuid_services.eth)
-        response = test_utils.tapi_create_notification_subscription_service_request(self.cr_notif_subs_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.uuid_subscriptions.eth = res['output']['subscription-service']['uuid']
-        self.assertEqual(res['output']['subscription-service']['subscription-filter']
+        self.cr_notif_subs_input_data["subscription-filter"]["requested-object-identifier"][0] =\
+            str(self.uuid_services.eth)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'tapi-notification', 'create-notification-subscription-service', self.cr_notif_subs_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.uuid_subscriptions.eth = response['output']['subscription-service']['uuid']
+        self.assertEqual(response['output']['subscription-service']['subscription-filter']
                          ['requested-object-types'][0], 'CONNECTIVITY_SERVICE')
-        self.assertEqual(res['output']['subscription-service']['subscription-filter']
+        self.assertEqual(response['output']['subscription-service']['subscription-filter']
                          ['requested-notification-types'][0], 'ALARM_EVENT')
-        self.assertEqual(res['output']['subscription-service']['subscription-filter']
+        self.assertEqual(response['output']['subscription-service']['subscription-filter']
                          ['requested-object-identifier'][0], str(self.uuid_services.eth))
         time.sleep(2)
 
@@ -351,22 +348,22 @@ class TransportNbiNotificationstesting(unittest.TestCase):
             "administrative-state": "outOfService",
             "port-qual": "roadm-external"}]}
         response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
-                                    data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
-                                    timeout=test_utils.REQUEST_TIMEOUT)
+                                    data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+                                    auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+                                    timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
         self.assertEqual(response.status_code, requests.codes.ok)
         # If the gate fails is because of the waiting time not being enough
         time.sleep(2)
 
     def test_16_get_tapi_notifications_connectivity_service_Ethernet(self):
-        self.cr_get_notif_list_sample_data["input"]["subscription-id-or-name"] = str(self.uuid_subscriptions.eth)
-        response = test_utils.tapi_get_notifications_list_request(self.cr_get_notif_list_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(res['output']['notification'][0]['target-object-identifier'], str(self.uuid_services.eth))
-        self.assertEqual(res['output']['notification'][0]['target-object-type'], 'CONNECTIVITY_SERVICE')
-        self.assertEqual(res['output']['notification'][0]['changed-attributes'][0]['new-value'], 'LOCKED')
-        self.assertEqual(res['output']['notification'][0]['changed-attributes'][1]['new-value'], 'DISABLED')
+        self.cr_get_notif_list_input_data["subscription-id-or-name"] = str(self.uuid_subscriptions.eth)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'tapi-notification', 'get-notification-list', self.cr_get_notif_list_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['output']['notification'][0]['target-object-identifier'], str(self.uuid_services.eth))
+        self.assertEqual(response['output']['notification'][0]['target-object-type'], 'CONNECTIVITY_SERVICE')
+        self.assertEqual(response['output']['notification'][0]['changed-attributes'][0]['new-value'], 'LOCKED')
+        self.assertEqual(response['output']['notification'][0]['changed-attributes'][1]['new-value'], 'DISABLED')
         time.sleep(2)
 
     def test_17_restore_status_port_roadma_srg(self):
@@ -379,44 +376,46 @@ class TransportNbiNotificationstesting(unittest.TestCase):
             "administrative-state": "inService",
             "port-qual": "roadm-external"}]}
         response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
-                                    data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
-                                    timeout=test_utils.REQUEST_TIMEOUT)
+                                    data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+                                    auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+                                    timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
         self.assertEqual(response.status_code, requests.codes.ok)
         # If the gate fails is because of the waiting time not being enough
         time.sleep(2)
 
     def test_18_get_tapi_notifications_connectivity_service_Ethernet(self):
-        self.cr_get_notif_list_sample_data["input"]["subscription-id-or-name"] = str(self.uuid_subscriptions.eth)
-        response = test_utils.tapi_get_notifications_list_request(self.cr_get_notif_list_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(res['output']['notification'][1]['target-object-identifier'], str(self.uuid_services.eth))
-        self.assertEqual(res['output']['notification'][1]['target-object-type'], 'CONNECTIVITY_SERVICE')
-        self.assertEqual(res['output']['notification'][1]['changed-attributes'][0]['new-value'], 'UNLOCKED')
-        self.assertEqual(res['output']['notification'][1]['changed-attributes'][1]['new-value'], 'ENABLED')
+        self.cr_get_notif_list_input_data["subscription-id-or-name"] = str(self.uuid_subscriptions.eth)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'tapi-notification', 'get-notification-list', self.cr_get_notif_list_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['output']['notification'][1]['target-object-identifier'], str(self.uuid_services.eth))
+        self.assertEqual(response['output']['notification'][1]['target-object-type'], 'CONNECTIVITY_SERVICE')
+        self.assertEqual(response['output']['notification'][1]['changed-attributes'][0]['new-value'], 'UNLOCKED')
+        self.assertEqual(response['output']['notification'][1]['changed-attributes'][1]['new-value'], 'ENABLED')
         time.sleep(2)
 
     def test_19_delete_connectivity_service_Ethernet(self):
-        response = test_utils.tapi_delete_connectivity_request(str(self.uuid_services.eth))
-        self.assertEqual(response.status_code, requests.codes.no_content)
+        self.tapi_serv_details["service-id-or-name"] = str(self.uuid_services.eth)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'tapi-connectivity', 'delete-connectivity-service', self.tapi_serv_details)
+        self.assertIn(response['status_code'], (requests.codes.ok, requests.codes.no_content))
         time.sleep(self.WAITING)
 
     def test_20_disconnect_XPDRA(self):
-        response = test_utils.unmount_device("XPDR-A1")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("XPDR-A1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
 
     def test_21_disconnect_XPDRC(self):
-        response = test_utils.unmount_device("XPDR-C1")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("XPDR-C1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
 
     def test_22_disconnect_ROADMA(self):
-        response = test_utils.unmount_device("ROADM-A1")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("ROADM-A1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
 
     def test_23_disconnect_ROADMC(self):
-        response = test_utils.unmount_device("ROADM-C1")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("ROADM-C1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
 
 
 if __name__ == "__main__":

diff --git a/tox.ini b/tox.ini
index 20de1d61c5c24f9f0a3ccc2dcb4767358a7eebe5..34f1def24634f82f30488d916fca6aab48eb8913 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -208,6 +208,7 @@ setenv =
     OLM_TIMER2=2000
     INSTALL_TAPI=True
     INSTALL_NBINOTIFICATIONS=True
+    USE_ODL_RESTCONF_VERSION=draft-bierman02
 
 commands =
   ./dockercmd.sh run -d -p 2181:2181 -p 9092:9092 --env ADVERTISED_LISTENERS=PLAINTEXT://localhost:9092 --name tpce_kafka1 teivah/kafka:2.0.0