Refactor NBINotification & add ServiceListener tests

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

diff --git a/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py b/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py
index 26054626b8946035c19101c71bd9efa4ba35b846..44e2e8fef7b3351a1d1a5b21bf4a6bf65a73f333 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py
+++ b/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py
@@ -15,17 +15,21 @@
 import unittest
 import time
 import requests
-from common import test_utils
+import sys
+sys.path.append('transportpce_tests/common/')
+import test_utils
 
 
 class TransportPCEtesting(unittest.TestCase):
 
     processes = None
+    NODE_VERSION = '2.2.1'
 
     @classmethod
     def setUpClass(cls):
         cls.processes = test_utils.start_tpce()
-        cls.processes = test_utils.start_sims(['spdra', 'spdrc'])
+        cls.processes = test_utils.start_sims([('spdra', cls.NODE_VERSION),
+                                               ('spdrc', cls.NODE_VERSION)])
 
     @classmethod
     def tearDownClass(cls):
@@ -38,7 +42,7 @@ class TransportPCEtesting(unittest.TestCase):
         time.sleep(5)
 
     def test_01_connect_SPDR_SA1(self):
-        response = test_utils.mount_device("SPDR-SA1", 'spdra')
+        response = test_utils.mount_device("SPDR-SA1", ('spdra', self.NODE_VERSION))
         self.assertEqual(response.status_code, requests.codes.created,
                          test_utils.CODE_SHOULD_BE_201)
         time.sleep(10)
@@ -51,7 +55,7 @@ class TransportPCEtesting(unittest.TestCase):
             'connected')
 
     def test_02_connect_SPDR_SC1(self):
-        response = test_utils.mount_device("SPDR-SC1", 'spdrc')
+        response = test_utils.mount_device("SPDR-SC1", ('spdrc', self.NODE_VERSION))
         self.assertEqual(response.status_code, requests.codes.created,
                          test_utils.CODE_SHOULD_BE_201)
         time.sleep(10)
@@ -119,7 +123,9 @@ class TransportPCEtesting(unittest.TestCase):
                                     "tp-id": ""
                                 }
                             }
-                        ]
+                        ],
+                        "transportpce-renderer:aToZ-min-frequency": 196.075,
+                        "transportpce-renderer:aToZ-max-frequency": 196.125
                     },
                     "transportpce-renderer:zToA-direction": {
                         "transportpce-renderer:zToA-wavelength-number": "1",
@@ -154,13 +160,16 @@ class TransportPCEtesting(unittest.TestCase):
                                     "tp-id": ""
                                 }
                             }
-                        ]
+                        ],
+                        "transportpce-renderer:zToA-min-frequency": 196.075,
+                        "transportpce-renderer:zToA-max-frequency": 196.125
                     }
                 }
             }
         }
         response = test_utils.post_request(url, data)
         time.sleep(3)
+        print(response.json())
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Operation Successful',
@@ -168,10 +177,10 @@ class TransportPCEtesting(unittest.TestCase):
 
     # Test OCH-OTU interfaces on SPDR-A1
     def test_04_check_interface_och(self):
-        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-1")
+        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-761:768")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
-        self.assertDictEqual(dict({'name': 'XPDR1-NETWORK1-1',
+        self.assertDictEqual(dict({'name': 'XPDR1-NETWORK1-761:768',
                                    'administrative-state': 'inService',
                                    'supporting-circuit-pack-name': 'CP1-CFP0',
                                    'type': 'org-openroadm-interfaces:opticalChannel',
@@ -211,7 +220,7 @@ class TransportPCEtesting(unittest.TestCase):
 
     # Test OCH-OTU interfaces on SPDR-C1
     def test_06_check_interface_och(self):
-        response = test_utils.check_netconf_node_request("SPDR-SC1", "interface/XPDR1-NETWORK1-1")
+        response = test_utils.check_netconf_node_request("SPDR-SC1", "interface/XPDR1-NETWORK1-761:768")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertDictEqual(dict({'name': 'XPDR1-NETWORK1-1',
@@ -441,8 +450,8 @@ class TransportPCEtesting(unittest.TestCase):
                 "transportpce-renderer:path-description": {
                     "aToZ-direction": {
                         "rate": 10,
-                        "trib-port-number": 1,
-                        "trib-slot-number": 1,
+                        "min-trib-slot": "1.1",
+                        "max-trib-slot": "1.8",
                         "aToZ": [
                             {
                                 "id": "0",
@@ -477,8 +486,8 @@ class TransportPCEtesting(unittest.TestCase):
                     },
                     "transportpce-renderer:zToA-direction": {
                         "rate": "10",
-                        "trib-port-number": 1,
-                        "trib-slot-number": 1,
+                        "min-trib-slot": "1.1",
+                        "max-trib-slot": "1.8",
                         "zToA": [
                             {
                                 "id": "0",