Manage 100GE on XPDR with a list of xponder

- Manage the case when a 100GE service is created between specific ports
(port-name, port-device-name) set in the service-create request on XPDR
with a list of xponder
- Adapt func tests consequently

JIRA: TRNSPRTPCE-643
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I97babd2255cf09732d33359219099f331f59cb49

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java
index 2a189e440d752b5d5c79fd6f9edacb3aff679bd4..4b6dcc91e6cba2f96b488f522463ff04db360800 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java
@@ -156,22 +156,21 @@ public class PceCalculation {
     }
 
     private void getAZnodeId() {
-        switch (serviceType) {
-            case StringConstants.SERVICE_TYPE_ODU4:
-            case StringConstants.SERVICE_TYPE_ODUC2:
-            case StringConstants.SERVICE_TYPE_ODUC3:
-            case StringConstants.SERVICE_TYPE_ODUC4:
-            case StringConstants.SERVICE_TYPE_100GE_M:
-            case StringConstants.SERVICE_TYPE_100GE_S:
-            case StringConstants.SERVICE_TYPE_10GE:
-            case StringConstants.SERVICE_TYPE_1GE:
-                anodeId = input.getServiceAEnd().getTxDirection().getPort().getPortDeviceName();
-                znodeId = input.getServiceZEnd().getTxDirection().getPort().getPortDeviceName();
-                break;
-            default:
-                anodeId = input.getServiceAEnd().getNodeId();
-                znodeId = input.getServiceZEnd().getNodeId();
-                break;
+        if (input.getServiceAEnd() != null
+                && input.getServiceAEnd().getTxDirection() != null
+                && input.getServiceAEnd().getTxDirection().getPort() != null
+                && input.getServiceAEnd().getTxDirection().getPort().getPortDeviceName() != null) {
+            anodeId = input.getServiceAEnd().getTxDirection().getPort().getPortDeviceName();
+        } else {
+            anodeId = input.getServiceAEnd().getNodeId();
+        }
+        if (input.getServiceZEnd() != null
+                && input.getServiceZEnd().getTxDirection() != null
+                && input.getServiceZEnd().getTxDirection().getPort() != null
+                && input.getServiceZEnd().getTxDirection().getPort().getPortDeviceName() != null) {
+            znodeId = input.getServiceZEnd().getTxDirection().getPort().getPortDeviceName();
+        } else {
+            znodeId = input.getServiceZEnd().getNodeId();
         }
     }
 
@@ -415,7 +414,7 @@ public class PceCalculation {
     }
 
     private void validateNode(Node node) {
-        LOG.debug("validateNode: node {} ", node);
+        LOG.info("validateNode: node {} ", node);
         // PceNode will be used in Graph algorithm
         Node1 node1 = node.augmentation(Node1.class);
         if (node1 == null) {
@@ -483,14 +482,30 @@ public class PceCalculation {
                 if (pceNode.getSupNetworkNodeId().equals(azNodeId)) {
                     return true;
                 }
+                if ("A".equals(azEndPoint)
+                        && this.input.getServiceAEnd().getTxDirection() != null
+                        && this.input.getServiceAEnd().getTxDirection().getPort() != null
+                        && this.input.getServiceAEnd().getTxDirection().getPort().getPortDeviceName() != null
+                        && pceNode.getNodeId().getValue()
+                        .equals(this.input.getServiceAEnd().getTxDirection().getPort().getPortDeviceName())) {
+                    return true;
+                }
+                if ("Z".equals(azEndPoint)
+                        && this.input.getServiceZEnd().getTxDirection() != null
+                        && this.input.getServiceZEnd().getTxDirection().getPort() != null
+                        && this.input.getServiceZEnd().getTxDirection().getPort().getPortDeviceName() != null
+                        && pceNode.getNodeId().getValue()
+                        .equals(this.input.getServiceZEnd().getTxDirection().getPort().getPortDeviceName())) {
+                    return true;
+                }
                 return false;
             case "OTU":
                 if ("A".equals(azEndPoint) && pceNode.getNodeId().getValue()
-                    .equals(this.input.getServiceAEnd().getRxDirection().getPort().getPortDeviceName())) {
+                        .equals(this.input.getServiceAEnd().getTxDirection().getPort().getPortDeviceName())) {
                     return true;
                 }
                 if ("Z".equals(azEndPoint) && pceNode.getNodeId().getValue()
-                    .equals(this.input.getServiceZEnd().getRxDirection().getPort().getPortDeviceName())) {
+                        .equals(this.input.getServiceZEnd().getTxDirection().getPort().getPortDeviceName())) {
                     return true;
                 }
                 return false;

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java
index a6f8d4267beb3814c605ad26e30c4406b3fefa7d..cc98f95a0500f15064dec085f5bb64569ce54d7a 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java
@@ -376,7 +376,7 @@ public class PceOpticalNode implements PceNode {
             return;
         }
         // Detect A and Z
-        if (this.getSupNetworkNodeId().equals(anodeId) || (this.getSupNetworkNodeId().equals(znodeId))) {
+        if (anodeId.contains(this.getSupNetworkNodeId()) || (znodeId.contains(this.getSupNetworkNodeId()))) {
             LOG.info("validateAZxponder: A or Z node detected == {}", nodeId.getValue());
             initXndrTps(serviceFormat);
             return;

diff --git a/tests/transportpce_tests/1.2.1/test06_end2end.py b/tests/transportpce_tests/1.2.1/test06_end2end.py
index a9f84435c421c1f3dd358b4c396b412f8f8ee1ab..7bfc70c27a3c25bbb2b49067bceafaf0858cdd15 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test06_end2end.py
+++ b/tests/transportpce_tests/1.2.1/test06_end2end.py
@@ -40,40 +40,8 @@ class TransportPCEFulltesting(unittest.TestCase):
             "node-id": "XPDRA01",
             "service-format": "Ethernet",
             "clli": "SNJSCAMCJP8",
-            "tx-direction": {
-                "port": {
-                    "port-device-name":
-                        "ROUTER_SNJSCAMCJP8_000000.00_00",
-                    "port-type": "router",
-                    "port-name": "Gigabit Ethernet_Tx.ge-5/0/0.0",
-                    "port-rack": "000000.00",
-                    "port-shelf": "00"
-                },
-                "lgx": {
-                    "lgx-device-name":
-                        "LGX Panel_SNJSCAMCJP8_000000.00_00",
-                    "lgx-port-name": "LGX Back.3",
-                    "lgx-port-rack": "000000.00",
-                    "lgx-port-shelf": "00"
-                }
-            },
-            "rx-direction": {
-                "port": {
-                    "port-device-name":
-                        "ROUTER_SNJSCAMCJP8_000000.00_00",
-                    "port-type": "router",
-                    "port-name": "Gigabit Ethernet_Rx.ge-5/0/0.0",
-                    "port-rack": "000000.00",
-                    "port-shelf": "00"
-                },
-                "lgx": {
-                    "lgx-device-name":
-                        "LGX Panel_SNJSCAMCJP8_000000.00_00",
-                    "lgx-port-name": "LGX Back.4",
-                    "lgx-port-rack": "000000.00",
-                    "lgx-port-shelf": "00"
-                }
-            },
+            "tx-direction": {},
+            "rx-direction": {},
             "optic-type": "gray"
         },
         "service-z-end": {
@@ -81,40 +49,8 @@ class TransportPCEFulltesting(unittest.TestCase):
             "node-id": "XPDRC01",
             "service-format": "Ethernet",
             "clli": "SNJSCAMCJT4",
-            "tx-direction": {
-                "port": {
-                    "port-device-name":
-                        "ROUTER_SNJSCAMCJT4_000000.00_00",
-                    "port-type": "router",
-                    "port-name": "Gigabit Ethernet_Tx.ge-1/0/0.0",
-                    "port-rack": "000000.00",
-                    "port-shelf": "00"
-                },
-                "lgx": {
-                    "lgx-device-name":
-                        "LGX Panel_SNJSCAMCJT4_000000.00_00",
-                    "lgx-port-name": "LGX Back.29",
-                    "lgx-port-rack": "000000.00",
-                    "lgx-port-shelf": "00"
-                }
-            },
-            "rx-direction": {
-                "port": {
-                    "port-device-name":
-                        "ROUTER_SNJSCAMCJT4_000000.00_00",
-                    "port-type": "router",
-                    "port-name": "Gigabit Ethernet_Rx.ge-1/0/0.0",
-                    "port-rack": "000000.00",
-                    "port-shelf": "00"
-                },
-                "lgx": {
-                    "lgx-device-name":
-                        "LGX Panel_SNJSCAMCJT4_000000.00_00",
-                    "lgx-port-name": "LGX Back.30",
-                    "lgx-port-rack": "000000.00",
-                    "lgx-port-shelf": "00"
-                }
-            },
+            "tx-direction": {},
+            "rx-direction": {},
             "optic-type": "gray"
         },
         "due-date": "2016-11-28T00:00:01Z",

diff --git a/tests/transportpce_tests/2.2.1/test01_portmapping.py b/tests/transportpce_tests/2.2.1/test01_portmapping.py
index a96956a42a44f77c686337829d1bc29c943f2834..1e3cbc35650f78a5f7d1226c6e2ae3b23e900d17 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test01_portmapping.py
+++ b/tests/transportpce_tests/2.2.1/test01_portmapping.py
@@ -138,7 +138,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              'port-admin-state': 'InService', 'port-oper-state': 'InService'},
             response['mapping'])
 
-    def test_12_xpdr_portmapping_NETWORK2(self):
+    def test_12_xpdr_portmapping_XPDR2_NETWORK1(self):
         response = test_utils_rfc8040.portmapping_request("XPDR-A1", "XPDR1-NETWORK2")
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn(
@@ -150,7 +150,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              'port-admin-state': 'InService', 'port-oper-state': 'InService'},
             response['mapping'])
 
-    def test_13_xpdr_portmapping_CLIENT1(self):
+    def test_13_xpdr_portmapping_XPDR1_CLIENT1(self):
         response = test_utils_rfc8040.portmapping_request("XPDR-A1", "XPDR1-CLIENT1")
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn(
@@ -163,7 +163,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              'port-admin-state': 'InService', 'port-oper-state': 'InService'},
             response['mapping'])
 
-    def test_14_xpdr_portmapping_CLIENT2(self):
+    def test_14_xpdr_portmapping_XPDR1_CLIENT2(self):
         response = test_utils_rfc8040.portmapping_request("XPDR-A1", "XPDR1-CLIENT2")
         self.assertEqual(response['status_code'], requests.codes.ok)
         self.assertIn(

diff --git a/tests/transportpce_tests/2.2.1/test03_topology.py b/tests/transportpce_tests/2.2.1/test03_topology.py
index 24f628ed7b754600f367c4c99bc0eccc1d007824..6a263a6c72d311937a8fdc75ff0e478c821b8bde 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test03_topology.py
+++ b/tests/transportpce_tests/2.2.1/test03_topology.py
@@ -646,6 +646,9 @@ class TransportPCEtesting(unittest.TestCase):
                         # pylint: disable=line-too-long
                         self.assertEqual((tp['org-openroadm-network-topology:xpdr-network-attributes']['tail-equipment-id']),
                                          'ROADM-A1-SRG1--SRG1-PP1-TXRX')
+                    elif tpid == 'XPDR2-NETWORK1':
+                        self.assertEqual((tp['org-openroadm-common-network:tp-type']), 'XPONDER-NETWORK')
+                        # pylint: disable=line-too-long
                 self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDR-A1'}, node['supporting-node'])
                 listNode.remove(nodeId)
             # Tests related to ROADMA nodes

diff --git a/tests/transportpce_tests/2.2.1/test12_end2end.py b/tests/transportpce_tests/2.2.1/test12_end2end.py
index 9f3f6617fa7e0209fcebe37a227a33c925c9e877..e0704c88b20e10e3161407ffaf1ab6930ff8fdbc 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test12_end2end.py
+++ b/tests/transportpce_tests/2.2.1/test12_end2end.py
@@ -40,18 +40,74 @@ class TransportPCEFulltesting(unittest.TestCase):
             "service-rate": "100",
             "node-id": "XPDR-A1",
             "service-format": "Ethernet",
-            "clli": "SNJSCAMCJP8",
-            "tx-direction": {},
-            "rx-direction": {},
+            "clli": "NodeA",
+            "tx-direction": {
+                        "port": {
+                            "port-device-name": "XPDR-A1-XPDR1",
+                            "port-type": "fixed",
+                            "port-name": "1/0/2-PLUG-CLIENT",
+                            "port-rack": "000000.00",
+                            "port-shelf": "00"
+                        },
+                "lgx": {
+                            "lgx-device-name": "LGX Panel_SNJSCAMCJP8_000000.00_00",
+                            "lgx-port-name": "LGX Back.3",
+                            "lgx-port-rack": "000000.00",
+                            "lgx-port-shelf": "00"
+                        }
+            },
+            "rx-direction": {
+                "port": {
+                    "port-device-name": "XPDR-A1-XPDR1",
+                    "port-type": "fixed",
+                    "port-name": "1/0/2-PLUG-CLIENT",
+                    "port-rack": "000000.00",
+                    "port-shelf": "00"
+                },
+                "lgx": {
+                    "lgx-device-name": "LGX Panel_SNJSCAMCJP8_000000.00_00",
+                    "lgx-port-name": "LGX Back.4",
+                    "lgx-port-rack": "000000.00",
+                    "lgx-port-shelf": "00"
+                }
+            },
             "optic-type": "gray"
         },
         "service-z-end": {
             "service-rate": "100",
             "node-id": "XPDR-C1",
             "service-format": "Ethernet",
-            "clli": "SNJSCAMCJT4",
-            "tx-direction": {},
-            "rx-direction": {},
+            "clli": "NodeC",
+                    "tx-direction": {
+                        "port": {
+                            "port-device-name": "XPDR-C1-XPDR2",
+                            "port-type": "router",
+                            "port-name": "1/0/2-PLUG-CLIENT",
+                            "port-rack": "000000.00",
+                            "port-shelf": "00"
+                        },
+                        "lgx": {
+                            "lgx-device-name": "LGX Panel_SNJSCAMCJT4_000000.00_00",
+                            "lgx-port-name": "LGX Back.29",
+                            "lgx-port-rack": "000000.00",
+                            "lgx-port-shelf": "00"
+                        }
+                    },
+            "rx-direction": {
+                        "port": {
+                            "port-device-name": "XPDR-C1-XPDR2",
+                            "port-type": "router",
+                            "port-name": "1/0/2-PLUG-CLIENT",
+                            "port-rack": "000000.00",
+                            "port-shelf": "00"
+                        },
+                        "lgx": {
+                            "lgx-device-name": "LGX Panel_SNJSCAMCJT4_000000.00_00",
+                            "lgx-port-name": "LGX Back.30",
+                            "lgx-port-rack": "000000.00",
+                            "lgx-port-shelf": "00"
+                        }
+                    },
             "optic-type": "gray"
         },
         "due-date": "2016-11-28T00:00:01Z",
@@ -113,7 +169,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
         time.sleep(2)
 
-    def test_07_connect_xprdC_N1_to_roadmC_PP1(self):
+    def test_07_connect_xprdC_xpdr1_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)
@@ -121,7 +177,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
         time.sleep(2)
 
-    def test_08_connect_roadmC_PP1_to_xpdrC_N1(self):
+    def test_08_connect_roadmC_PP1_to_xpdrC_xprd1_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)
@@ -145,7 +201,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
         time.sleep(2)
 
-    def test_11_connect_xprdC_N2_to_roadmC_PP2(self):
+    def test_11_connect_xprdC_xpdr2_N1_to_roadmC_PP2(self):
         response = test_utils.connect_xpdr_to_rdm_request("XPDR-C1", "2", "1",
                                                           "ROADM-C1", "1", "SRG1-PP2-TXRX")
         self.assertEqual(response.status_code, requests.codes.ok)
@@ -153,7 +209,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
         time.sleep(2)
 
-    def test_12_connect_roadmC_PP2_to_xpdrC_N2(self):
+    def test_12_connect_roadmC_PP2_to_xpdrC_xpdr2_N1(self):
         response = test_utils.connect_rdm_to_xpdr_request("XPDR-C1", "2", "1",
                                                           "ROADM-C1", "1", "SRG1-PP2-TXRX")
         self.assertEqual(response.status_code, requests.codes.ok)
@@ -192,8 +248,8 @@ class TransportPCEFulltesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.created)
 
 # test service-create for Eth service from xpdr to xpdr
-    def test_15_create_eth_service1(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service1"
+    def test_15_create_eth_service2(self):
+        self.cr_serv_sample_data["input"]["service-name"] = "service2"
         response = test_utils.service_create_request(self.cr_serv_sample_data)
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
@@ -202,13 +258,13 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(self.WAITING)
 
     def test_16_get_eth_service1(self):
-        response = test_utils.get_service_list_request("services/service1")
+        response = test_utils.get_service_list_request("services/service2")
         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')
+            res['services'][0]['service-name'], 'service2')
         self.assertEqual(
             res['services'][0]['connection-type'], 'service')
         self.assertEqual(
@@ -239,20 +295,20 @@ class TransportPCEFulltesting(unittest.TestCase):
 
     def test_18_check_xc1_ROADMC(self):
         response = test_utils.check_netconf_node_request(
-            "ROADM-C1", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768")
+            "ROADM-C1", "roadm-connections/SRG1-PP2-TXRX-DEG1-TTP-TXRX-761:768")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
         self.assertDictEqual(
             dict({
-                'connection-name': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768',
+                'connection-name': 'SRG1-PP2-TXRX-DEG1-TTP-TXRX-761:768',
                 'opticalControlMode': 'gainLoss',
                 'target-output-power': -3.0
             }, **res['roadm-connections'][0]),
             res['roadm-connections'][0]
         )
         self.assertDictEqual(
-            {'src-if': 'SRG1-PP1-TXRX-nmc-761:768'},
+            {'src-if': 'SRG1-PP2-TXRX-nmc-761:768'},
             res['roadm-connections'][0]['source'])
         self.assertDictEqual(
             {'dst-if': 'DEG1-TTP-TXRX-nmc-761:768'},
@@ -269,7 +325,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                 self.assertEqual({'frequency': 196.1,
                                   'width': 40},
                                  ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
-            elif ele['tp-id'] in ('XPDR1-CLIENT2'):
+            elif ele['tp-id'] in ('XPDR1-CLIENT1', 'XPDR1-CLIENT2'):
                 self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
             elif ele['tp-id'] == 'XPDR1-NETWORK2':
                 self.assertIn('org-openroadm-network-topology:xpdr-network-attributes', dict.keys(ele))
@@ -316,9 +372,17 @@ class TransportPCEFulltesting(unittest.TestCase):
                 self.assertEqual(freq_map_array[95], 0, "Index 1 should not be available")
         time.sleep(3)
 
-    @unittest.skip("Bug will be resolved in a future change")
-    def test_22_create_eth_service2(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service2"
+    def test_22_create_eth_service1(self):
+        self.cr_serv_sample_data["input"]["service-name"] = "service1"
+        del self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-device-name"]
+        del self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-name"]
+        del self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-device-name"]
+        del self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-name"]
+        del self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-device-name"]
+        del self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-name"]
+        del self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-device-name"]
+        del self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-name"]
+
         response = test_utils.service_create_request(self.cr_serv_sample_data)
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
@@ -326,24 +390,22 @@ class TransportPCEFulltesting(unittest.TestCase):
                       res['output']['configuration-response-common']['response-message'])
         time.sleep(self.WAITING)
 
-    @unittest.skip("Bug will be resolved in a future change")
-    def test_23_get_eth_service2(self):
-        response = test_utils.get_service_list_request("services/service2")
+    def test_23_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'], 'service2')
+            res['services'][0]['service-name'], 'service1')
         self.assertEqual(
             res['services'][0]['connection-type'], 'service')
         self.assertEqual(
             res['services'][0]['lifecycle-state'], 'planned')
         time.sleep(1)
 
-    @unittest.skip("Bug will be resolved in a future change")
-    def test_24_check_xc2_ROADMA(self):
+    def test_24_check_xc1_ROADMA(self):
         response = test_utils.check_netconf_node_request(
             "ROADM-A1", "roadm-connections/DEG2-TTP-TXRX-SRG1-PP2-TXRX-753:760")
         self.assertEqual(response.status_code, requests.codes.ok)
@@ -363,26 +425,20 @@ class TransportPCEFulltesting(unittest.TestCase):
             {'dst-if': 'SRG1-PP2-TXRX-nmc-753:760'},
             res['roadm-connections'][0]['destination'])
 
-    @unittest.skip("Bug will be resolved in a future change")
     def test_25_check_topo_XPDRA(self):
         response = test_utils.get_ordm_topo_request("node/XPDR-A1-XPDR1")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         liste_tp = res['node'][0]['ietf-network-topology:termination-point']
         for ele in liste_tp:
-            if ele['tp-id'] == 'XPDR1-NETWORK1':
-                self.assertEqual({'frequency': 196.1,
-                                  'width': 40},
-                                 ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
-            elif ele['tp-id'] == 'XPDR1-NETWORK2':
+            if ele['tp-id'] == 'XPDR1-NETWORK2':
                 self.assertEqual({'frequency': 196.05,
                                   'width': 40},
                                  ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
-            elif ele['tp-id'] in ('XPDR1-CLIENT1', 'XPDR1-CLIENT2'):
+            elif ele['tp-id'] in ('XPDR1-CLIENT1'):
                 self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
         time.sleep(10)
 
-    @unittest.skip("Bug will be resolved in a future change")
     def test_26_check_topo_ROADMA_SRG1(self):
         response = test_utils.get_ordm_topo_request("node/ROADM-A1-SRG1")
         self.assertEqual(response.status_code, requests.codes.ok)
@@ -410,7 +466,6 @@ class TransportPCEFulltesting(unittest.TestCase):
                 self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele))
         time.sleep(10)
 
-    @unittest.skip("Bug will be resolved in a future change")
     def test_27_check_topo_ROADMA_DEG2(self):
         response = test_utils.get_ordm_topo_request("node/ROADM-A1-DEG2")
         self.assertEqual(response.status_code, requests.codes.ok)
@@ -436,8 +491,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                 self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
         time.sleep(10)
 
-# creation service test on a non-available resource
-    @unittest.skip("Bug will be resolved in a future change")
+#     creation service test on a non-available resource
     def test_28_create_eth_service3(self):
         self.cr_serv_sample_data["input"]["service-name"] = "service3"
         response = test_utils.service_create_request(self.cr_serv_sample_data)
@@ -449,7 +503,6 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(self.WAITING)
 
 # add a test that check the openroadm-service-list still only contains 2 elements
-    @unittest.skip("Bug will be resolved in a future change")
     def test_29_delete_eth_service3(self):
         response = test_utils.service_delete_request("service3")
         self.assertEqual(response.status_code, requests.codes.ok)
@@ -467,7 +520,6 @@ class TransportPCEFulltesting(unittest.TestCase):
                       res['output']['configuration-response-common']['response-message'])
         time.sleep(20)
 
-    @unittest.skip("Bug will be resolved in a future change")
     def test_31_delete_eth_service2(self):
         response = test_utils.service_delete_request("service2")
         self.assertEqual(response.status_code, requests.codes.ok)
@@ -509,7 +561,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         self.assertEqual(freq_map_array[94], 255, "Index 2 should  be available")
         liste_tp = res['node'][0]['ietf-network-topology:termination-point']
         for ele in liste_tp:
-            if ele['tp-id'] in ('SRG1-PP1-TXRX'):
+            if ele['tp-id'] in ('SRG1-PP1-TXRX', 'SRG1-PP2-TXRX'):
                 freq_map = base64.b64decode(
                     ele['org-openroadm-network-topology:pp-attributes']['avail-freq-maps'][0]['freq-map'])
                 freq_map_array = [int(x) for x in freq_map]
@@ -624,7 +676,6 @@ class TransportPCEFulltesting(unittest.TestCase):
             res['roadm-connections'][0]['destination'])
         time.sleep(7)
 
-    @unittest.skip("Bug will be resolved in a future change")
     def test_40_create_oc_service2(self):
         self.cr_serv_sample_data["input"]["service-name"] = "service2"
         self.cr_serv_sample_data["input"]["connection-type"] = "roadm-line"
@@ -639,7 +690,6 @@ class TransportPCEFulltesting(unittest.TestCase):
                       res['output']['configuration-response-common']['response-message'])
         time.sleep(self.WAITING)
 
-    @unittest.skip("Bug will be resolved in a future change")
     def test_41_get_oc_service2(self):
         response = test_utils.get_service_list_request("services/service2")
         self.assertEqual(response.status_code, requests.codes.ok)
@@ -655,7 +705,6 @@ class TransportPCEFulltesting(unittest.TestCase):
             res['services'][0]['lifecycle-state'], 'planned')
         time.sleep(2)
 
-    @unittest.skip("Bug will be resolved in a future change")
     def test_42_check_xc2_ROADMA(self):
         response = test_utils.check_netconf_node_request(
             "ROADM-A1", "roadm-connections/SRG1-PP2-TXRX-DEG2-TTP-TXRX-753:760")
@@ -679,7 +728,31 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(2)
 
     def test_43_check_topo_ROADMA(self):
-        self.test_26_check_topo_ROADMA_SRG1()
+        response = test_utils.get_ordm_topo_request("node/ROADM-A1-SRG1")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        freq_map = base64.b64decode(
+            res['node'][0]['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
+        freq_map_array = [int(x) for x in freq_map]
+        self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
+        self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
+        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        for ele in liste_tp:
+            if ele['tp-id'] == 'SRG1-PP1-TXRX':
+                freq_map = base64.b64decode(
+                    ele['org-openroadm-network-topology:pp-attributes']['avail-freq-maps'][0]['freq-map'])
+                freq_map_array = [int(x) for x in freq_map]
+                self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
+                self.assertEqual(freq_map_array[94], 255, "Lambda 2 should be available")
+            elif ele['tp-id'] == 'SRG1-PP2-TXRX':
+                freq_map = base64.b64decode(
+                    ele['org-openroadm-network-topology:pp-attributes']['avail-freq-maps'][0]['freq-map'])
+                freq_map_array = [int(x) for x in freq_map]
+                self.assertEqual(freq_map_array[95], 255, "Lambda 1 should be available")
+                self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
+            elif ele['tp-id'] == 'SRG1-PP3-TXRX':
+                self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele))
+        time.sleep(10)
         self.test_27_check_topo_ROADMA_DEG2()
         time.sleep(3)
 
@@ -691,7 +764,6 @@ class TransportPCEFulltesting(unittest.TestCase):
                       res['output']['configuration-response-common']['response-message'])
         time.sleep(20)
 
-    @unittest.skip("Bug will be resolved in a future change")
     def test_45_delete_oc_service2(self):
         response = test_utils.service_delete_request("service2")
         self.assertEqual(response.status_code, requests.codes.ok)
@@ -749,11 +821,11 @@ class TransportPCEFulltesting(unittest.TestCase):
             # pylint: disable=consider-using-f-string
             print("iteration number {}".format(i))
             print("eth service creation")
-            self.test_15_create_eth_service1()
+            self.test_15_create_eth_service2()
             print("check xc in ROADM-A1")
             self.test_17_check_xc1_ROADMA()
             print("eth service deletion\n")
-            self.test_30_delete_eth_service1()
+            self.test_31_delete_eth_service2()
 
     def test_51_disconnect_XPDRA(self):
         response = test_utils.unmount_device("XPDR-A1")

diff --git a/tests/transportpce_tests/hybrid/test01_device_change_notifications.py b/tests/transportpce_tests/hybrid/test01_device_change_notifications.py
index 275c55ce0115c35e250746e7fb8d2e627e44d1f1..c489551b1be95dba2a1e7a5e963d92a4d1f12ae1 100644 (file)
--- a/tests/transportpce_tests/hybrid/test01_device_change_notifications.py
+++ b/tests/transportpce_tests/hybrid/test01_device_change_notifications.py
@@ -42,9 +42,7 @@ class TransportPCEFulltesting(unittest.TestCase):
             "clli": "SNJSCAMCJP8",
                     "tx-direction": {
                         "port": {
-                            "port-device-name": "1/0/C1",
                             "port-type": "fixed",
-                            "port-name": "1",
                             "port-rack": "000000.00",
                             "port-shelf": "Chassis#1"
                         },
@@ -57,9 +55,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                     },
             "rx-direction": {
                         "port": {
-                            "port-device-name": "1/0/C1",
                             "port-type": "fixed",
-                            "port-name": "1",
                             "port-rack": "000000.00",
                             "port-shelf": "Chassis#1"
                         },
@@ -79,9 +75,7 @@ class TransportPCEFulltesting(unittest.TestCase):
             "clli": "SNJSCAMCJT4",
                     "tx-direction": {
                         "port": {
-                            "port-device-name": "1/0/C1",
                             "port-type": "fixed",
-                            "port-name": "1",
                             "port-rack": "000000.00",
                             "port-shelf": "Chassis#1"
                         },
@@ -94,9 +88,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                     },
             "rx-direction": {
                         "port": {
-                            "port-device-name": "1/0/C1",
                             "port-type": "fixed",
-                            "port-name": "1",
                             "port-rack": "000000.00",
                             "port-shelf": "Chassis#1"
                         },

diff --git a/tests/transportpce_tests/hybrid/test02_B100G_end2end.py b/tests/transportpce_tests/hybrid/test02_B100G_end2end.py
index 9ebcffcd914ba868decb767773f90087978ba971..70d21dafdb0b02e450e0f27b2d1da11dd7ae7a06 100644 (file)
--- a/tests/transportpce_tests/hybrid/test02_B100G_end2end.py
+++ b/tests/transportpce_tests/hybrid/test02_B100G_end2end.py
@@ -1142,6 +1142,14 @@ class TransportPCEtesting(unittest.TestCase):
         self.cr_serv_sample_data["input"]["service-name"] = "service-400GE"
         self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "400"
         self.cr_serv_sample_data["input"]["service-z-end"]["service-rate"] = "400"
+        del self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-name"]
+        del self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-device-name"]
+        del self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-name"]
+        del self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-device-name"]
+        del self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-name"]
+        del self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-device-name"]
+        del self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-name"]
+        del self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-device-name"]
         response = test_utils.service_create_request(self.cr_serv_sample_data)
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()

diff --git a/tests/transportpce_tests/pce/test01_pce.py b/tests/transportpce_tests/pce/test01_pce.py
index e20a04a1b4a5af5dffe18b6c4b8fdc127400c768..dfbd553b0233806ae0f0e195d050c025555dca0e 100644 (file)
--- a/tests/transportpce_tests/pce/test01_pce.py
+++ b/tests/transportpce_tests/pce/test01_pce.py
@@ -256,45 +256,9 @@ class TransportPCEtesting(unittest.TestCase):
     def test_18_success1_path_computation(self):
         response = test_utils.path_computation_request("request1", "service1",
                                                        {"service-format": "Ethernet", "service-rate": "100",
-                                                        "clli": "ORANGE2", "node-id": "XPONDER-2-2",
-                                                        "tx-direction": {"port": {
-                                                            "port-device-name": "Some port-device-name",
-                                                            "port-type": "Some port-type",
-                                                            "port-name": "Some port-name",
-                                                            "port-rack": "Some port-rack",
-                                                            "port-shelf": "Some port-shelf",
-                                                            "port-slot": "Some port-slot",
-                                                            "port-sub-slot": "Some port-sub-slot"
-                                                        }},
-                                                           "rx-direction": {"port": {
-                                                               "port-device-name": "Some port-device-name",
-                                                               "port-type": "Some port-type",
-                                                               "port-name": "Some port-name",
-                                                               "port-rack": "Some port-rack",
-                                                               "port-shelf": "Some port-shelf",
-                                                               "port-slot": "Some port-slot",
-                                                               "port-sub-slot": "Some port-sub-slot"
-                                                           }}},
+                                                        "clli": "ORANGE2", "node-id": "XPONDER-2-2"},
                                                        {"service-format": "Ethernet", "service-rate": "100",
-                                                           "clli": "ORANGE1", "node-id": "XPONDER-1-2",
-                                                           "tx-direction": {"port": {
-                                                               "port-device-name": "Some port-device-name",
-                                                               "port-type": "Some port-type",
-                                                               "port-name": "Some port-name",
-                                                               "port-rack": "Some port-rack",
-                                                               "port-shelf": "Some port-shelf",
-                                                               "port-slot": "Some port-slot",
-                                                               "port-sub-slot": "Some port-sub-slot"
-                                                           }},
-                                                           "rx-direction": {"port": {
-                                                               "port-device-name": "Some port-device-name",
-                                                               "port-type": "Some port-type",
-                                                               "port-name": "Some port-name",
-                                                               "port-rack": "Some port-rack",
-                                                               "port-shelf": "Some port-shelf",
-                                                               "port-slot": "Some port-slot",
-                                                               "port-sub-slot": "Some port-sub-slot"
-                                                           }}},
+                                                           "clli": "ORANGE1", "node-id": "XPONDER-1-2"},
                                                        {"customer-code": ["Some customer-code"],
                                                            "co-routing": {"existing-service": ["Some existing-service"]}
                                                         },

diff --git a/tests/transportpce_tests/pce/test02_pce_400G.py b/tests/transportpce_tests/pce/test02_pce_400G.py
index afe3b9a157d59da771791b95f8d3ad387118f5e7..cdea9d7bd4cde219481eae46225a49749f155fd0 100644 (file)
--- a/tests/transportpce_tests/pce/test02_pce_400G.py
+++ b/tests/transportpce_tests/pce/test02_pce_400G.py
@@ -151,13 +151,13 @@ class TransportPCE400Gtesting(unittest.TestCase):
                                                         "clli": "NodeA",
                                                         "service-format": "OTU",
                                                         "node-id": "XPDR-A2",
-                                                        "rx-direction": {"port": {"port-device-name": "XPDR-A2-XPDR2"}}
+                                                        "tx-direction": {"port": {"port-device-name": "XPDR-A2-XPDR2"}}
                                                         },
                                                        {"service-rate": "400",
                                                         "clli": "NodeC",
                                                         "service-format": "OTU",
                                                         "node-id": "XPDR-C2",
-                                                        "rx-direction": {"port": {"port-device-name": "XPDR-C2-XPDR2"}}
+                                                        "tx-direction": {"port": {"port-device-name": "XPDR-C2-XPDR2"}}
                                                         })
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()