Reactive FrequenciesService UT

JIRA: TRNSPRTPCE-730
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I76ff40ffa47a56d27fe0f1a45e787ccd5d2f31ed

diff --git a/api/src/main/yang/transportpce-stub@2023-02-28.yang b/api/src/main/yang/transportpce-stub@2023-02-28.yang
new file mode 100644 (file)
index 0000000..6e8acc9
--- /dev/null
+++ b/api/src/main/yang/transportpce-stub@2023-02-28.yang
@@ -0,0 +1,29 @@
+module transportpce-stub {
+  yang-version 1;
+  namespace "http://org/opendaylight/transportpce/stub";
+  prefix org-opendaylight-transportpce-stub;
+
+  import transportpce-pathDescription {
+    prefix transportpce-pathDescription;
+    revision-date 2021-07-05;
+  }
+
+
+  organization
+    "transportPCE";
+  contact
+    "transportPCE committers - ODL";
+  description
+    "YANG definitions for defining port mapping in TransportPCE.
+     Copyright (c) 2023 Orange and others. All rights reserved.
+     authors: Gilles Thouenon Emmanuelle Delfour";
+
+  revision 2023-02-28 {
+    description
+      "Model to parse json input file for FrequenciesServiceTests";
+  }
+
+  container path-description {
+      uses transportpce-pathDescription:path-description;
+  }
+}

diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceTest.java
index 7df86407cb5fc37db1f3513f4bad9211ee7fbc62..a354f779a1ce80d64fdd6eebded2d6b1977f4d96 100644 (file)
--- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceTest.java
+++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceTest.java
@@ -24,7 +24,6 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
@@ -37,7 +36,7 @@ import org.opendaylight.transportpce.test.AbstractTest;
 import org.opendaylight.transportpce.test.converter.DataObjectConverter;
 import org.opendaylight.transportpce.test.converter.JSONDataObjectConverter;
 import org.opendaylight.transportpce.test.utils.TopologyDataUtils;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.service.path.rpc.result.PathDescription;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stub.rev230228.PathDescription;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.Node1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.TerminationPoint1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.available.freq.map.AvailFreqMapsKey;
@@ -47,7 +46,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Disabled
+
 public class FrequenciesServiceTest extends AbstractTest {
     private static final Logger LOG = LoggerFactory.getLogger(FrequenciesServiceTest.class);
     private static final String OPENROADM_TOPOLOGY_FILE = "src/test/resources/openroadm-topology.xml";
@@ -65,8 +64,7 @@ public class FrequenciesServiceTest extends AbstractTest {
         DataObjectConverter dataObjectConverter = JSONDataObjectConverter
                 .createWithDataStoreUtil(getDataStoreContextUtil());
         try (Reader reader = new FileReader(PATH_DESCRIPTION_FILE, StandardCharsets.UTF_8)) {
-            NormalizedNode normalizedNode = dataObjectConverter
-                    .transformIntoNormalizedNode(reader).get();
+            NormalizedNode normalizedNode = dataObjectConverter.transformIntoNormalizedNode(reader).get();
             pathDescription = (PathDescription) getDataStoreContextUtil()
                     .getBindingDOMCodecServices().fromNormalizedNode(YangInstanceIdentifier
                             .of(PathDescription.QNAME), normalizedNode).getValue();

diff --git a/networkmodel/src/test/resources/path_description.json b/networkmodel/src/test/resources/path_description.json
index 5b9ff1ba24e9d42089a30a84f4f6772de297034d..8b0e7dd6df3f998fc851c5b439ab179184c6b62f 100644 (file)
--- a/networkmodel/src/test/resources/path_description.json
+++ b/networkmodel/src/test/resources/path_description.json
@@ -1,5 +1,5 @@
  {
-    "pathdescription-stub:path-description": {
+    "transportpce-stub:path-description": {
         "zToA-direction": {
             "rate": 100,
             "zToA": [
@@ -107,119 +107,119 @@
             "zToA-max-frequency": 196.125,
             "modulation-format": "dp-qpsk"
         },
-            "aToZ-direction": {
-                "aToZ": [
-                    {
-                        "id": "0",
-                        "resource": {
-                            "tp-node-id": "ROADM-A1-SRG1",
-                            "tp-id": "SRG1-PP1-TXRX"
-                        }
-                    },
-                    {
-                        "id": "1",
-                        "resource": {
-                            "node-id": "ROADM-A1-SRG1"
-                        }
-                    },
-                    {
-                        "id": "2",
-                        "resource": {
-                            "tp-node-id": "ROADM-A1-SRG1",
-                            "tp-id": "SRG1-CP-TXRX"
-                        }
-                    },
-                    {
-                        "id": "14",
-                        "resource": {
-                            "tp-node-id": "OpenROADM-2-2-SRG1",
-                            "tp-id": "SRG1-PP1-TX"
-                        }
-                    },
-                    {
-                        "id": "10",
-                        "resource": {
-                            "tp-node-id": "ROADM-C1-DEG1",
-                            "tp-id": "DEG1-CTP-TXRX"
-                        }
-                    },
-                    {
-                        "id": "11",
-                        "resource": {
-                            "link-id": "ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX"
-                        }
-                    },
-                    {
-                        "id": "12",
-                        "resource": {
-                            "tp-node-id": "ROADM-C1-SRG1",
-                            "tp-id": "SRG1-CP-TXRX"
-                        }
-                    },
-                    {
-                        "id": "13",
-                        "resource": {
-                            "node-id": "ROADM-C1-SRG1"
-                        }
-                    },
-                    {
-                        "id": "14",
-                        "resource": {
-                            "tp-node-id": "ROADM-C1-SRG1",
-                            "tp-id": "SRG1-PP1-TXRX"
-                        }
-                    },
-                    {
-                        "id": "3",
-                        "resource": {
-                            "link-id": "ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX"
-                        }
-                    },
-                    {
-                        "id": "4",
-                        "resource": {
-                            "tp-node-id": "ROADM-A1-DEG2",
-                            "tp-id": "DEG2-CTP-TXRX"
-                        }
-                    },
-                    {
-                        "id": "5",
-                        "resource": {
-                            "node-id": "ROADM-A1-DEG2"
-                        }
-                    },
-                    {
-                        "id": "6",
-                        "resource": {
-                            "tp-node-id": "ROADM-A1-DEG2",
-                            "tp-id": "DEG2-TTP-TXRX"
-                        }
-                    },
-                    {
-                        "id": "7",
-                        "resource": {
-                            "link-id": "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX"
-                        }
-                    },
-                    {
-                        "id": "8",
-                        "resource": {
-                            "tp-node-id": "ROADM-C1-DEG1",
-                            "tp-id": "DEG1-TTP-TXRX"
-                        }
-                    },
-                    {
-                        "id": "9",
-                        "resource": {
-                            "node-id": "ROADM-C1-DEG1"
-                        }
+        "aToZ-direction": {
+            "aToZ": [
+                {
+                    "id": "0",
+                    "resource": {
+                        "tp-node-id": "ROADM-A1-SRG1",
+                        "tp-id": "SRG1-PP1-TXRX"
+                    }
+                },
+                {
+                    "id": "1",
+                    "resource": {
+                        "node-id": "ROADM-A1-SRG1"
+                    }
+                },
+                {
+                    "id": "2",
+                    "resource": {
+                        "tp-node-id": "ROADM-A1-SRG1",
+                        "tp-id": "SRG1-CP-TXRX"
                     }
-                ],
-                "aToZ-min-frequency": 196.075,
-                "aToZ-max-frequency": 196.125,
-                "rate": 100,
-                "aToZ-wavelength-number": 1,
-                "modulation-format": "dp-qpsk"
-            }
+                },
+                {
+                    "id": "14",
+                    "resource": {
+                        "tp-node-id": "OpenROADM-2-2-SRG1",
+                        "tp-id": "SRG1-PP1-TX"
+                    }
+                },
+                {
+                    "id": "10",
+                    "resource": {
+                        "tp-node-id": "ROADM-C1-DEG1",
+                        "tp-id": "DEG1-CTP-TXRX"
+                    }
+                },
+                {
+                    "id": "11",
+                    "resource": {
+                        "link-id": "ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX"
+                    }
+                },
+                {
+                    "id": "12",
+                    "resource": {
+                        "tp-node-id": "ROADM-C1-SRG1",
+                        "tp-id": "SRG1-CP-TXRX"
+                    }
+                },
+                {
+                    "id": "13",
+                    "resource": {
+                        "node-id": "ROADM-C1-SRG1"
+                    }
+                },
+                {
+                    "id": "14",
+                    "resource": {
+                        "tp-node-id": "ROADM-C1-SRG1",
+                        "tp-id": "SRG1-PP1-TXRX"
+                    }
+                },
+                {
+                    "id": "3",
+                    "resource": {
+                        "link-id": "ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX"
+                    }
+                },
+                {
+                    "id": "4",
+                    "resource": {
+                        "tp-node-id": "ROADM-A1-DEG2",
+                        "tp-id": "DEG2-CTP-TXRX"
+                    }
+                },
+                {
+                    "id": "5",
+                    "resource": {
+                        "node-id": "ROADM-A1-DEG2"
+                    }
+                },
+                {
+                    "id": "6",
+                    "resource": {
+                        "tp-node-id": "ROADM-A1-DEG2",
+                        "tp-id": "DEG2-TTP-TXRX"
+                    }
+                },
+                {
+                    "id": "7",
+                    "resource": {
+                        "link-id": "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX"
+                    }
+                },
+                {
+                    "id": "8",
+                    "resource": {
+                        "tp-node-id": "ROADM-C1-DEG1",
+                        "tp-id": "DEG1-TTP-TXRX"
+                    }
+                },
+                {
+                    "id": "9",
+                    "resource": {
+                        "node-id": "ROADM-C1-DEG1"
+                    }
+                }
+            ],
+            "aToZ-min-frequency": 196.075,
+            "aToZ-max-frequency": 196.125,
+            "rate": 100,
+            "aToZ-wavelength-number": 1,
+            "modulation-format": "dp-qpsk"
+        }
         }
 }
\ No newline at end of file