X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=servicehandler%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fservicehandler%2Futils%2FCatalogDataUtils.java;h=499c8c48321aa82fde65a97e994340f12a74d47a;hb=9f17579836675a4a48db481176726bb050ec8ca1;hp=127b04e359feb275ae7badfe0727e1ac3c5044bd;hpb=f5cb5dd25e896eb6cdcb37c897ee4451f7ec4cbf;p=transportpce.git

diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/utils/CatalogDataUtils.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/utils/CatalogDataUtils.java
index 127b04e35..499c8c483 100644
--- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/utils/CatalogDataUtils.java
+++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/utils/CatalogDataUtils.java
@@ -10,24 +10,22 @@ package org.opendaylight.transportpce.servicehandler.utils;
 
 import java.util.HashMap;
 import java.util.Map;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.RpcActions;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.sdnc.request.header.SdncRequestHeaderBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.AddOpenroadmOperationalModesToCatalogInput;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.AddOpenroadmOperationalModesToCatalogInputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.AddSpecificOperationalModesToCatalogInput;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.AddSpecificOperationalModesToCatalogInputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.add.openroadm.operational.modes.to.catalog.input.OperationalModeInfoBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.add.openroadm.operational.modes.to.catalog.input.operational.mode.info.AmplifiersBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.add.openroadm.operational.modes.to.catalog.input.operational.mode.info.GridParametersBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.add.openroadm.operational.modes.to.catalog.input.operational.mode.info.RoadmsBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.add.openroadm.operational.modes.to.catalog.input.operational.mode.info.XpondersPluggablesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.add.openroadm.operational.modes.to.catalog.input.operational.mode.info.xponders.pluggables.XponderPluggableOpenroadmOperationalMode;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.add.openroadm.operational.modes.to.catalog.input.operational.mode.info.xponders.pluggables.XponderPluggableOpenroadmOperationalModeBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.add.openroadm.operational.modes.to.catalog.input.operational.mode.info.xponders.pluggables.XponderPluggableOpenroadmOperationalModeKey;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.add.specific.operational.modes.to.catalog.input.operational.mode.info.SpecificOperationalModesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.add.specific.operational.modes.to.catalog.input.operational.mode.info.specific.operational.modes.SpecificOperationalMode;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.add.specific.operational.modes.to.catalog.input.operational.mode.info.specific.operational.modes.SpecificOperationalModeBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.add.specific.operational.modes.to.catalog.input.operational.mode.info.specific.operational.modes.SpecificOperationalModeKey;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev230526.RpcActions;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev230526.sdnc.request.header.SdncRequestHeaderBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.AddOpenroadmOperationalModesToCatalogInput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.AddOpenroadmOperationalModesToCatalogInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.AddSpecificOperationalModesToCatalogInput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.AddSpecificOperationalModesToCatalogInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.add.openroadm.operational.modes.to.catalog.input.OperationalModeInfoBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.add.openroadm.operational.modes.to.catalog.input.operational.mode.info.AmplifiersBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.add.openroadm.operational.modes.to.catalog.input.operational.mode.info.GridParametersBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.add.openroadm.operational.modes.to.catalog.input.operational.mode.info.RoadmsBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.add.openroadm.operational.modes.to.catalog.input.operational.mode.info.XpondersPluggablesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.add.openroadm.operational.modes.to.catalog.input.operational.mode.info.xponders.pluggables.XponderPluggableOpenroadmOperationalModeBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.add.openroadm.operational.modes.to.catalog.input.operational.mode.info.xponders.pluggables.XponderPluggableOpenroadmOperationalModeKey;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.add.specific.operational.modes.to.catalog.input.operational.mode.info.SpecificOperationalModesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.add.specific.operational.modes.to.catalog.input.operational.mode.info.specific.operational.modes.SpecificOperationalModeBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.add.specific.operational.modes.to.catalog.input.operational.mode.info.specific.operational.modes.SpecificOperationalModeKey;
 
 public final class CatalogDataUtils {
 
@@ -36,16 +34,8 @@ public final class CatalogDataUtils {
     }
 
     public static AddOpenroadmOperationalModesToCatalogInput buildAddORToCatalogInput() {
-        Map<XponderPluggableOpenroadmOperationalModeKey, XponderPluggableOpenroadmOperationalMode> map =
-            new HashMap<>();
-        XponderPluggableOpenroadmOperationalModeBuilder modeBuilder =
-            new XponderPluggableOpenroadmOperationalModeBuilder();
         XponderPluggableOpenroadmOperationalModeKey key =
             new XponderPluggableOpenroadmOperationalModeKey("testOROperationalMode");
-        modeBuilder.setOpenroadmOperationalModeId(key.toString());
-        map.put(key, modeBuilder.build());
-        XpondersPluggablesBuilder xpondersPluggablesBuilder =
-            new XpondersPluggablesBuilder().setXponderPluggableOpenroadmOperationalMode(map);
         return new AddOpenroadmOperationalModesToCatalogInputBuilder()
             .setSdncRequestHeader(new SdncRequestHeaderBuilder()
                 .setRequestId("load-OM-Catalog")
@@ -54,7 +44,14 @@ public final class CatalogDataUtils {
                 .build())
             .setOperationalModeInfo(new OperationalModeInfoBuilder()
                 .setGridParameters(new GridParametersBuilder().build())
-                .setXpondersPluggables(xpondersPluggablesBuilder.build())
+                .setXpondersPluggables(
+                    new XpondersPluggablesBuilder()
+                        .setXponderPluggableOpenroadmOperationalMode(new HashMap<>(Map.of(
+                            key,
+                            new XponderPluggableOpenroadmOperationalModeBuilder()
+                                .setOpenroadmOperationalModeId(key.toString())
+                                .build())))
+                        .build())
                 .setRoadms(new RoadmsBuilder().build())
                 .setAmplifiers(new AmplifiersBuilder().build())
                 .build())
@@ -62,22 +59,25 @@ public final class CatalogDataUtils {
     }
 
     public static AddSpecificOperationalModesToCatalogInput buildAddSpecificToCatalogInput() {
-        Map<SpecificOperationalModeKey, SpecificOperationalMode> map = new HashMap<>();
         SpecificOperationalModeKey key = new SpecificOperationalModeKey("testSpecificOperationalMode");
-        SpecificOperationalModeBuilder modeBuilder = new SpecificOperationalModeBuilder();
-        modeBuilder.setOperationalModeId(key.toString());
-        map.put(key, modeBuilder.build());
-        SpecificOperationalModesBuilder specificOperationalModesBuilder =
-            new SpecificOperationalModesBuilder().setSpecificOperationalMode(map);
         return new AddSpecificOperationalModesToCatalogInputBuilder()
             .setSdncRequestHeader(new SdncRequestHeaderBuilder()
                 .setRequestId("load-specific-OM-Catalog")
                 .setRequestSystemId("test")
                 .setRpcAction(RpcActions.FillCatalogWithSpecificOperationalModes)
                 .build())
-            .setOperationalModeInfo(new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210
+            .setOperationalModeInfo(new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
                     .add.specific.operational.modes.to.catalog.input.OperationalModeInfoBuilder()
-                .setSpecificOperationalModes(specificOperationalModesBuilder.build())
+                .setSpecificOperationalModes(
+                    new SpecificOperationalModesBuilder()
+                        .setSpecificOperationalMode(
+                            new HashMap<>(Map.of(
+                                key,
+                                new SpecificOperationalModeBuilder()
+                                    .setOperationalModeId(key.toString())
+                                    .build()))
+                            )
+                        .build())
                 .build())
             .build();
     }