Merge "Bump project to 2.0.0 and fix feature deployment"

[transportpce.git] / tests / transportpce_tests / 1.2.1 / test_pce.py

diff --git a/tests/transportpce_tests/1.2.1/test_pce.py b/tests/transportpce_tests/1.2.1/test_pce.py
index 3b3cf13e6c02230cd2c2703add4487421d83b97c..2cad24181fe1e62311f9e486135969c0a2a37a25 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_pce.py
+++ b/tests/transportpce_tests/1.2.1/test_pce.py
@@ -77,7 +77,7 @@ class TransportPCEtesting(unittest.TestCase):
 
     # Get existing nodeId
     def test_02_get_nodeId(self):
-        url = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA-SRG1"
+        url = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-SRG1"
                 .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json',
         "Accept": "application/json"}
@@ -86,12 +86,12 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(
-            res['node'][0]['node-id'], 'ROADMA-SRG1')
+            res['node'][0]['node-id'], 'ROADMA01-SRG1')
         time.sleep(1)
 
     # Get existing linkId
     def test_03_get_linkId(self):
-        url = ("{}/config/ietf-network:networks/network/openroadm-topology/link/XPDRA-XPDR1-XPDR1-NETWORK1toROADMA-SRG1-SRG1-PP1-TXRX"
+        url = ("{}/config/ietf-network:networks/network/openroadm-topology/link/XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX"
               .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json',
         "Accept": "application/json"}
@@ -101,7 +101,7 @@ class TransportPCEtesting(unittest.TestCase):
         res = response.json()
         self.assertEqual(
             res['ietf-network-topology:link'][0]['link-id'],
-            'XPDRA-XPDR1-XPDR1-NETWORK1toROADMA-SRG1-SRG1-PP1-TXRX')
+            'XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX')
         time.sleep(1)
 
     # Path Computation success
@@ -116,13 +116,15 @@ class TransportPCEtesting(unittest.TestCase):
                     "request-id": "request-1"
                 },
                 "service-a-end": {
-                    "node-id": "XPDRA",
-                    "service-rate": "0",
+                    "node-id": "XPDRA01",
+                    "service-rate": "100",
+                    "service-format": "Ethernet",
                     "clli": "nodeA"
                 },
                 "service-z-end": {
-                    "node-id": "XPDRC",
-                    "service-rate": "0",
+                    "node-id": "XPDRC01",
+                    "service-rate": "100",
+                    "service-format": "Ethernet",
                     "clli": "nodeC"
                 }
             }
@@ -150,14 +152,16 @@ class TransportPCEtesting(unittest.TestCase):
                     "request-id": "request-1"
                 },
                 "service-a-end": {
-                    "node-id": "ROADMA",
-                    "service-rate": "0",
-                    "clli": "nodeA"
+                    "node-id": "ROADMA01",
+                    "service-rate": "100",
+                    "service-format": "Ethernet",
+                    "clli": "NodeA"
                 },
                 "service-z-end": {
-                    "node-id": "ROADMC",
-                    "service-rate": "0",
-                    "clli": "nodeC"
+                    "node-id": "ROADMC01",
+                    "service-rate": "100",
+                    "service-format": "Ethernet",
+                    "clli": "NodeC"
                 }
             }
         }
@@ -185,7 +189,7 @@ class TransportPCEtesting(unittest.TestCase):
 
     # Test deleted topology
     def test_07_test_topology_simple_bi_deleted(self):
-        url = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA-SRG1"
+        url = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-SRG1"
                 .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json',
         "Accept": "application/json"}
@@ -250,13 +254,15 @@ class TransportPCEtesting(unittest.TestCase):
                 },
                 "service-a-end": {
                     "node-id": "XPONDER-1-2",
-                    "service-rate": "0",
+                    "service-rate": "100",
+                    "service-format": "Ethernet",
                     "clli": "ORANGE1"
                 },
                 "service-z-end": {
                     "node-id": "XPONDER-3-2",
-                    "service-rate": "0",
-                    "clli": "ORANGE1"
+                    "service-rate": "100",
+                    "service-format": "Ethernet",
+                    "clli": "ORANGE3"
                 }
             }
         }
@@ -282,12 +288,14 @@ class TransportPCEtesting(unittest.TestCase):
                   "request-id": "request1"
                 },
                 "service-a-end": {
-                  "service-rate": "0",
+                  "service-rate": "100",
+                  "service-format": "Ethernet",
                   "clli": "cll21",
                   "node-id": "OpenROADM-2-1"
                 },
                 "service-z-end": {
-                  "service-rate": "0",
+                  "service-rate": "100",
+                  "service-format": "Ethernet",
                   "clli": "ncli22",
                   "node-id": "OpenROADM-2-2"
                   },
@@ -400,8 +408,8 @@ class TransportPCEtesting(unittest.TestCase):
                 },
                 "service-a-end": {
                   "service-format": "Ethernet",
-                  "service-rate": "0",
-                  "clli": "clli11",
+                  "service-rate": "100",
+                  "clli": "ORANGE2",
                   "node-id": "XPONDER-2-2",
                   "tx-direction": {
                     "port": {
@@ -428,8 +436,8 @@ class TransportPCEtesting(unittest.TestCase):
                 },
                 "service-z-end": {
                   "service-format": "Ethernet",
-                  "service-rate": "0",
-                  "clli": "clli11",
+                  "service-rate": "100",
+                  "clli": "ORANGE1",
                   "node-id": "XPONDER-1-2",
                   "tx-direction": {
                     "port": {
@@ -500,12 +508,16 @@ class TransportPCEtesting(unittest.TestCase):
                     "request-id": "request 1"
                 },
                 "service-a-end": {
-                    "service-rate": "0",
-                    "node-id": "XPONDER-1-2"
+                    "service-rate": "100",
+                    "service-format": "Ethernet",
+                    "node-id": "XPONDER-1-2",
+                    "clli": "ORANGE1"
                 },
                 "service-z-end": {
-                    "service-rate": "0",
-                    "node-id": "XPONDER-3-2"
+                    "service-rate": "100",
+                    "service-format": "Ethernet",
+                    "node-id": "XPONDER-3-2",
+                    "clli": "ORANGE3"
              },
              "pce-metric": "hop-count"
            }
@@ -536,12 +548,16 @@ class TransportPCEtesting(unittest.TestCase):
                     "request-id": "request 1"
                 },
                 "service-a-end": {
-                    "service-rate": "0",
-                    "node-id": "XPONDER-1-2"
+                    "service-rate": "100",
+                    "service-format": "Ethernet",
+                    "node-id": "XPONDER-1-2",
+                    "clli": "ORANGE1"
                 },
                 "service-z-end": {
-                    "service-rate": "0",
-                    "node-id": "XPONDER-3-2"
+                    "service-rate": "100",
+                    "service-format": "Ethernet",
+                    "node-id": "XPONDER-3-2",
+                    "clli": "ORANGE3"
                 },
                 "hard-constraints": {
                     "exclude_": {