Code Review / transportpce.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Change way to start simulators
[transportpce.git] / tests / transportpce_tests / 2.2.1 / test_flex_grid.py
diff --git a/tests/transportpce_tests/2.2.1/test_flex_grid.py b/tests/transportpce_tests/2.2.1/test_flex_grid.py
index 4bf94c00a0589596f5d8ca979514299df414858f..b48c9aacc05919e6455a09dd427e77f5949652d3 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_flex_grid.py
+++ b/tests/transportpce_tests/2.2.1/test_flex_grid.py
@@ -12,17 +12,20 @@
 import unittest
 import time
 import requests
-from common import test_utils
+import sys
+sys.path.append('transportpce_tests/common/')
+import test_utils
 
 
 class TransportPCEPortMappingTesting(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(['roadmd'])
+        cls.processes = test_utils.start_sims([('roadmd', cls.NODE_VERSION)])
 
     @classmethod
     def tearDownClass(cls):
@@ -35,7 +38,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         time.sleep(10)
 
     def test_01_rdm_device_connection(self):
-        response = test_utils.mount_device("ROADM-D1", 'roadmd')
+        response = test_utils.mount_device("ROADM-D1", ('roadmd', self.NODE_VERSION))
         self.assertEqual(response.status_code, requests.codes.created,
                          test_utils.CODE_SHOULD_BE_201)
 
@@ -117,16 +120,20 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
             "transportpce-device-renderer:modulation-format": "dp-qpsk",
             "transportpce-device-renderer:operation": "create",
             "transportpce-device-renderer:service-name": "testNMC-MC",
-            "transportpce-device-renderer:wave-number": "2",
+            "transportpce-device-renderer:wave-number": "0",
             "transportpce-device-renderer:center-freq": "196.05",
-            "transportpce-device-renderer:slot-width": "87.5",
+            "transportpce-device-renderer:width": "80",
             "transportpce-device-renderer:nodes": [
               {
                 "transportpce-device-renderer:node-id": "ROADM-D1",
                 "transportpce-device-renderer:src-tp": "SRG1-PP1-TXRX",
                 "transportpce-device-renderer:dest-tp": "DEG1-TTP-TXRX"
               }
-            ]
+            ],
+            "transportpce-device-renderer:min-freq": 196.00625,
+            "transportpce-device-renderer:max-freq": 196.09375,
+            "transportpce-device-renderer:lower-spectral-slot-number": 749,
+            "transportpce-device-renderer:higher-spectral-slot-number": 763
           }
         }
         url = test_utils.RESTCONF_BASE_URL + \
@@ -141,11 +148,11 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
     # Get Degree MC interface and check
     def test_08_degree_mc_interface(self):
         response = test_utils.check_netconf_node_request("ROADM-D1",
-                                                         "interface/DEG1-TTP-TXRX-mc-2")
+                                                         "interface/DEG1-TTP-TXRX-mc-749:763")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertDictEqual(
-            dict({"name": "DEG1-TTP-TXRX-mc-2",
+            dict({"name": "DEG1-TTP-TXRX-mc-749:763",
                   "supporting-interface": "OMS-DEG1-TTP-TXRX",
                   "supporting-circuit-pack-name": "1/0",
                   "circuit-id": "TBD",
@@ -166,12 +173,12 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
     # get DEG-NMC interface and check
     def test_09_degree_nmc_interface(self):
         response = test_utils.check_netconf_node_request("ROADM-D1",
-                                                         "interface/DEG1-TTP-TXRX-nmc-2")
+                                                         "interface/DEG1-TTP-TXRX-nmc-749:763")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertDictEqual(
-            dict({"name": "DEG1-TTP-TXRX-nmc-2",
-                  "supporting-interface": "DEG1-TTP-TXRX-mc-2",
+            dict({"name": "DEG1-TTP-TXRX-nmc-749:763",
+                  "supporting-interface": "DEG1-TTP-TXRX-mc-749:763",
                   "supporting-circuit-pack-name": "1/0",
                   "circuit-id": "TBD",
                   "description": "TBD",
@@ -183,7 +190,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         # Check the mc-ttp max and min-freq
         self.assertEqual({
           "frequency": 196.05,
-          "width": 75
+          "width": 80
         },
         res['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp'])
         time.sleep(3)
@@ -191,32 +198,32 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
     # get SRG-NMC interface
     def test_10_srg_nmc_interface(self):
         response = test_utils.check_netconf_node_request("ROADM-D1",
-                                                         "interface/SRG1-PP1-TXRX-nmc-2")
+                                                         "interface/SRG1-PP1-TXRX-nmc-749:763")
         res = response.json()
         self.assertEqual(response.status_code, requests.codes.ok)
         self.assertEqual(
-            dict({"name": "SRG1-PP1-TXRX-nmc-2",
+            dict({"name": "SRG1-PP1-TXRX-nmc-749:763",
                   "supporting-circuit-pack-name": "3/0",
                   "circuit-id": "TBD",
                   "description": "TBD",
                   "supporting-port": "C1",
                   "type": "org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint"},
                  **res['interface'][0]), res['interface'][0])
-        self.assertEqual({"frequency": 196.05, "width": 75},
+        self.assertEqual({"frequency": 196.05, "width": 80},
                          res['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp'])
         time.sleep(3)
 
     # Create ROADM-connection
     def test_11_roadm_connection(self):
         response = test_utils.check_netconf_node_request("ROADM-D1",
-                                          "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-2")
+                                          "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-749:763")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
-        self.assertEqual("SRG1-PP1-TXRX-DEG1-TTP-TXRX-2",
+        self.assertEqual("SRG1-PP1-TXRX-DEG1-TTP-TXRX-749:763",
                          res['roadm-connections'][0]['connection-name'])
-        self.assertEqual("SRG1-PP1-TXRX-nmc-2",
+        self.assertEqual("SRG1-PP1-TXRX-nmc-749:763",
                          res['roadm-connections'][0]['source']['src-if'])
-        self.assertEqual("DEG1-TTP-TXRX-nmc-2",
+        self.assertEqual("DEG1-TTP-TXRX-nmc-749:763",
                          res['roadm-connections'][0]['destination']['dst-if'])
         time.sleep(3)
 
@@ -227,7 +234,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         response = test_utils.delete_request(test_utils.URL_CONFIG_NETCONF_TOPO +
                    "node/ROADM-D1/yang-ext:mount/" +
                    "org-openroadm-device:org-openroadm-device/" +
-                   "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-2")
+                   "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-749:763")
         self.assertEqual(response.status_code, requests.codes.ok)
         time.sleep(3)
 
@@ -236,7 +243,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         response = test_utils.delete_request(test_utils.URL_CONFIG_NETCONF_TOPO +
                                            "node/ROADM-D1/yang-ext:mount/" +
                                            "org-openroadm-device:org-openroadm-device/" +
-                                           "interface/SRG1-PP1-TXRX-nmc-2")
+                                           "interface/SRG1-PP1-TXRX-nmc-749:763")
         self.assertEqual(response.status_code, requests.codes.ok)
         time.sleep(3)
 
@@ -245,7 +252,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         response = test_utils.delete_request(test_utils.URL_CONFIG_NETCONF_TOPO +
                                              "node/ROADM-D1/yang-ext:mount/" +
                                              "org-openroadm-device:org-openroadm-device/" +
-                                             "interface/DEG1-TTP-TXRX-nmc-2")
+                                             "interface/DEG1-TTP-TXRX-nmc-749:763")
         self.assertEqual(response.status_code, requests.codes.ok)
         time.sleep(3)
 
@@ -254,7 +261,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         response = test_utils.delete_request(test_utils.URL_CONFIG_NETCONF_TOPO +
                                              "node/ROADM-D1/yang-ext:mount/" +
                                              "org-openroadm-device:org-openroadm-device/" +
-                                             "interface/DEG1-TTP-TXRX-mc-2")
+                                             "interface/DEG1-TTP-TXRX-mc-749:763")
         self.assertEqual(response.status_code, requests.codes.ok)
         time.sleep(3)
 
Repository for Transport PCE project.