Change way to start simulators

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

diff --git a/tests/transportpce_tests/2.2.1/test_topology.py b/tests/transportpce_tests/2.2.1/test_topology.py
index b9969c7b28dc848536b1d9d195948c349a614e7a..8ab6386e8ad318f4f0052e40403b7584b4aabee4 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_topology.py
+++ b/tests/transportpce_tests/2.2.1/test_topology.py
@@ -17,7 +17,9 @@ import unittest
 import time
 import logging
 import requests
-from common import test_utils
+import sys
+sys.path.append('transportpce_tests/common/')
+import test_utils
 
 
 class TransportPCEtesting(unittest.TestCase):
@@ -26,47 +28,77 @@ class TransportPCEtesting(unittest.TestCase):
     CHECK_DICT1 = {
         'ROADM-A1-SRG1': {
             'node_type': 'SRG',
-            'checks_tp': [({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}),
-                          ({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'})]
+            'checks_tp': [({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:administrative-state': 'inService',
+                            'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP',
+                            'org-openroadm-common-network:operational-state': 'inService'}),
+                          ({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:administrative-state': 'inService',
+                            'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP',
+                            'org-openroadm-common-network:operational-state': 'inService'})]
         },
         'ROADM-A1-SRG3': {
             'node_type': 'SRG',
-            'checks_tp': [({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}),
-                          ({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'})]
+            'checks_tp': [({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-common-network:administrative-state': 'inService',
+                            'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP',
+                            'org-openroadm-common-network:operational-state': 'inService'}),
+                          ({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-common-network:administrative-state': 'inService',
+                            'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP',
+                            'org-openroadm-common-network:operational-state': 'inService'})]
         },
         'ROADM-A1-DEG1': {
             'node_type': 'DEGREE',
-            'checks_tp': [({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}),
-                          ({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'})]
+            'checks_tp': [({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:administrative-state': 'inService',
+                            'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP',
+                            'org-openroadm-common-network:operational-state': 'inService'}),
+                          ({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:administrative-state': 'inService',
+                            'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP',
+                            'org-openroadm-common-network:operational-state': 'inService'})]
         },
         'ROADM-A1-DEG2': {
             'node_type': 'DEGREE',
-            'checks_tp': [({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}),
-                          ({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'})]
+            'checks_tp': [({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:administrative-state': 'inService',
+                            'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP',
+                            'org-openroadm-common-network:operational-state': 'inService'}),
+                          ({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-common-network:administrative-state': 'inService',
+                            'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP',
+                            'org-openroadm-common-network:operational-state': 'inService'})]
         }
     }
     CHECK_DICT2 = {
         'ROADM-C1-SRG1': {
             'node_type': 'SRG',
-            'checks_tp': [({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}),
-                          ({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'})]
+            'checks_tp': [({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:administrative-state': 'inService',
+                            'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP',
+                            'org-openroadm-common-network:operational-state': 'inService'}),
+                          ({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:administrative-state': 'inService',
+                            'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP',
+                            'org-openroadm-common-network:operational-state': 'inService'})]
         },
         'ROADM-C1-DEG1': {
             'node_type': 'DEGREE',
-            'checks_tp': [({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}),
-                          ({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'})]
+            'checks_tp': [({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:administrative-state': 'inService',
+                            'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP',
+                            'org-openroadm-common-network:operational-state': 'inService'}),
+                          ({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:administrative-state': 'inService',
+                            'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP',
+                            'org-openroadm-common-network:operational-state': 'inService'})]
         },
         'ROADM-C1-DEG2': {
             'node_type': 'DEGREE',
-            'checks_tp': [({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}),
-                          ({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'})]
+            'checks_tp': [({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:administrative-state': 'inService',
+                            'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP',
+                            'org-openroadm-common-network:operational-state': 'inService'}),
+                          ({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-common-network:administrative-state': 'inService',
+                            'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP',
+                            'org-openroadm-common-network:operational-state': 'inService'})]
         }
     }
+    NODE_VERSION = '2.2.1'
 
     @classmethod
     def setUpClass(cls):
         cls.processes = test_utils.start_tpce()
-        cls.processes = test_utils.start_sims(['xpdra', 'roadma', 'roadmb', 'roadmc'])
+        cls.processes = test_utils.start_sims([('xpdra', cls.NODE_VERSION), ('roadma', cls.NODE_VERSION),
+                                               ('roadmb', cls.NODE_VERSION), ('roadmc', cls.NODE_VERSION)])
 
     @classmethod
     def tearDownClass(cls):
@@ -79,7 +111,7 @@ class TransportPCEtesting(unittest.TestCase):
         time.sleep(5)
 
     def test_01_connect_ROADM_A1(self):
-        response = test_utils.mount_device("ROADM-A1", 'roadma')
+        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)
 
     def test_02_getClliNetwork(self):
@@ -161,7 +193,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(len(listNode), 0)
 
     def test_06_connect_XPDRA(self):
-        response = test_utils.mount_device("XPDR-A1", 'xpdra')
+        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)
 
     def test_07_getClliNetwork(self):
@@ -292,7 +324,7 @@ class TransportPCEtesting(unittest.TestCase):
             self.assertEqual(len(check_list[link_type]), 0)
 
     def test_13_connect_ROADMC(self):
-        response = test_utils.mount_device("ROADM-C1", 'roadmc')
+        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)
 
     def test_14_omsAttributes_ROADMA_ROADMC(self):
@@ -493,7 +525,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(len(listNode), 0)
 
     def test_21_connect_ROADMB(self):
-        response = test_utils.mount_device("ROADM-B1", 'roadmb')
+        response = test_utils.mount_device("ROADM-B1", ('roadmb', self.NODE_VERSION))
         self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
 
     def test_22_omsAttributes_ROADMA_ROADMB(self):