Merge changes If1d8e649,I6c3cf5f5,I167b40dd
authorGuillaume Lambert <guillaume.lambert@orange.com>
Mon, 11 Sep 2023 12:02:47 +0000 (12:02 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 11 Sep 2023 12:02:47 +0000 (12:02 +0000)
* changes:
  Switch tests sims to lightynode by default
  Proxify sims install shell scripts
  Add lightynode support to testutils.py

networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/NetworkmodelTestUtil.java
olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmPowerServiceRpcImplUtil.java
olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java
pce/src/main/java/org/opendaylight/transportpce/pce/graph/PostAlgoPathValidator.java
servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImpl.java
servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ServiceDataUtils.java

index 34618a337777a15ebcf1c37fe04a1e2b8a601c05..b718fd2fc3fadec2b1852c60097d2916191964ab 100644 (file)
@@ -30,18 +30,15 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev230526.O
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev230526.OpenroadmTpType;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev230526.xpdr.tp.supported.interfaces.SupportedInterfaceCapability;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev230526.xpdr.tp.supported.interfaces.SupportedInterfaceCapabilityBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev230526.xpdr.tp.supported.interfaces.SupportedInterfaceCapabilityKey;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev210924.ODTU4TsAllocated;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev210924.ODU4;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev230526.TerminationPoint1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev230526.TerminationPoint1Builder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev230526.networks.network.node.termination.point.TpSupportedInterfaces;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev230526.networks.network.node.termination.point.TpSupportedInterfacesBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev230526.networks.network.node.termination.point.XpdrTpPortConnectionAttributesBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev230526.If100GE;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev230526.IfOCH;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev230526.IfOCHOTU4ODU4;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev230526.SupportedIfCapability;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev230526.xpdr.otn.tp.attributes.OdtuTpnPool;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev230526.xpdr.otn.tp.attributes.OdtuTpnPoolBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId;
@@ -56,7 +53,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.termination.point.SupportingTerminationPoint;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.termination.point.SupportingTerminationPointBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.termination.point.SupportingTerminationPointKey;
 import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.slf4j.Logger;
@@ -79,8 +75,8 @@ public final class NetworkmodelTestUtil {
             .build();
     }
 
-    public static Nodes createMappingForXpdr(String nodeId, String clli, int networkPortNb, int clientPortNb,
-        XpdrNodeTypes xpdrNodeType) {
+    public static Nodes createMappingForXpdr(
+            String nodeId, String clli, int networkPortNb, int clientPortNb, XpdrNodeTypes xpdrNodeType) {
         Map<MappingKey,Mapping> mappingMap = new HashMap<>();
         createXpdrMappings(mappingMap, networkPortNb, clientPortNb, xpdrNodeType);
         Nodes mappingNode = new NodesBuilder()
@@ -93,72 +89,71 @@ public final class NetworkmodelTestUtil {
     }
 
     public static List<Link> createSuppOTNLinks(OtnLinkType type, Uint32 availBW) {
-        Link linkAZ = new LinkBuilder()
-            .setLinkId(new LinkId(type.getName() + "-SPDRA-XPDR1-XPDR1-NETWORK1toSPDRZ-XPDR1-XPDR1-NETWORK1"))
-            .setSource(new SourceBuilder()
-                    .setSourceNode(new NodeId("SPDRA-XPDR1"))
-                    .setSourceTp(new TpId("XPDR1-NETWORK1")).build())
-            .setDestination(new DestinationBuilder()
-                    .setDestNode(new NodeId("SPDRZ-XPDR1"))
-                    .setDestTp(new TpId("XPDR1-NETWORK1")).build())
-            .addAugmentation(
-                new Link1Builder()
-                    .setLinkType(OpenroadmLinkType.OTNLINK)
-                    .setOppositeLink(new LinkId(type.getName()
-                        + "-SPDRZ-XPDR1-XPDR1-NETWORK1toSPDRA-XPDR1-XPDR1-NETWORK1"))
-                    .build())
-            .addAugmentation(
-                new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev230526.Link1Builder()
-                    .setAvailableBandwidth(availBW)
-                    .setUsedBandwidth(Uint32.valueOf(100000 - availBW.intValue()))
-                    .build())
-            .addAugmentation(
-                new org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630
-                    .Link1Builder()
-                    .setOtnLinkType(type)
-                    .build())
-            .build();
-        Link linkZA = new LinkBuilder()
-            .setLinkId(new LinkId(type.getName() + "-SPDRZ-XPDR1-XPDR1-NETWORK1toSPDRA-XPDR1-XPDR1-NETWORK1"))
-            .setSource(new SourceBuilder()
-                    .setSourceNode(new NodeId("SPDRZ-XPDR1"))
-                    .setSourceTp(new TpId("XPDR1-NETWORK1")).build())
-            .setDestination(new DestinationBuilder()
-                    .setDestNode(new NodeId("SPDRA-XPDR1"))
-                    .setDestTp(new TpId("XPDR1-NETWORK1")).build())
-            .addAugmentation(
-                new Link1Builder()
-                    .setLinkType(OpenroadmLinkType.OTNLINK)
-                    .setOppositeLink(new LinkId(type.getName()
-                        + "-SPDRA-XPDR1-XPDR1-NETWORK1toSPDRZ-XPDR1-XPDR1-NETWORK1"))
-                    .build())
-            .addAugmentation(
-                new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev230526.Link1Builder()
-                    .setAvailableBandwidth(availBW)
-                    .setUsedBandwidth(Uint32.valueOf(100000 - availBW.intValue()))
-                    .build())
-            .addAugmentation(
-                new org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630
-                        .Link1Builder()
-                    .setOtnLinkType(type)
-                    .build())
-            .build();
-        List<Link> links = new ArrayList<>();
-        links.add(linkAZ);
-        links.add(linkZA);
-        return links;
+        return new ArrayList<>(List.of(
+            //linkAZ,
+            new LinkBuilder()
+                .setLinkId(new LinkId(type.getName() + "-SPDRA-XPDR1-XPDR1-NETWORK1toSPDRZ-XPDR1-XPDR1-NETWORK1"))
+                .setSource(
+                    new SourceBuilder()
+                        .setSourceNode(new NodeId("SPDRA-XPDR1"))
+                        .setSourceTp(new TpId("XPDR1-NETWORK1")).build())
+                .setDestination(
+                    new DestinationBuilder()
+                        .setDestNode(new NodeId("SPDRZ-XPDR1"))
+                        .setDestTp(new TpId("XPDR1-NETWORK1")).build())
+                .addAugmentation(
+                    new Link1Builder()
+                        .setLinkType(OpenroadmLinkType.OTNLINK)
+                        .setOppositeLink(
+                            new LinkId(type.getName() + "-SPDRZ-XPDR1-XPDR1-NETWORK1toSPDRA-XPDR1-XPDR1-NETWORK1"))
+                        .build())
+                .addAugmentation(
+                    new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev230526
+                            .Link1Builder()
+                        .setAvailableBandwidth(availBW)
+                        .setUsedBandwidth(Uint32.valueOf(100000 - availBW.intValue()))
+                        .build())
+                .addAugmentation(
+                    new org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630
+                            .Link1Builder()
+                        .setOtnLinkType(type)
+                        .build())
+                .build(),
+            //linkZA
+            new LinkBuilder()
+                .setLinkId(new LinkId(type.getName() + "-SPDRZ-XPDR1-XPDR1-NETWORK1toSPDRA-XPDR1-XPDR1-NETWORK1"))
+                .setSource(
+                    new SourceBuilder()
+                        .setSourceNode(new NodeId("SPDRZ-XPDR1"))
+                        .setSourceTp(new TpId("XPDR1-NETWORK1"))
+                        .build())
+                .setDestination(
+                    new DestinationBuilder()
+                        .setDestNode(new NodeId("SPDRA-XPDR1"))
+                        .setDestTp(new TpId("XPDR1-NETWORK1"))
+                        .build())
+                .addAugmentation(
+                    new Link1Builder()
+                        .setLinkType(OpenroadmLinkType.OTNLINK)
+                        .setOppositeLink(
+                            new LinkId(type.getName() + "-SPDRA-XPDR1-XPDR1-NETWORK1toSPDRZ-XPDR1-XPDR1-NETWORK1"))
+                        .build())
+                .addAugmentation(
+                    new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev230526
+                            .Link1Builder()
+                        .setAvailableBandwidth(availBW)
+                        .setUsedBandwidth(Uint32.valueOf(100000 - availBW.intValue()))
+                        .build())
+                .addAugmentation(
+                    new org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630
+                            .Link1Builder()
+                        .setOtnLinkType(type)
+                        .build())
+                .build()
+            ));
     }
 
     public static List<TerminationPoint> createTpList(boolean withTpnTsPool) {
-        SupportedInterfaceCapability supCapa = new SupportedInterfaceCapabilityBuilder()
-            .setIfCapType(IfOCHOTU4ODU4.VALUE)
-            .build();
-        Map<SupportedInterfaceCapabilityKey,SupportedInterfaceCapability> supInterCapaList =
-                new HashMap<>();
-        supInterCapaList.put(supCapa.key(),supCapa);
-        TpSupportedInterfaces tpSuppInter = new TpSupportedInterfacesBuilder()
-            .setSupportedInterfaceCapability(supInterCapaList)
-            .build();
         XpdrTpPortConnectionAttributesBuilder xtpcaBldr = new XpdrTpPortConnectionAttributesBuilder()
             .setRate(ODU4.VALUE);
         if (withTpnTsPool) {
@@ -171,13 +166,17 @@ public final class NetworkmodelTestUtil {
             for (int i = 1; i <= 80; i++) {
                 tpnPool.add(Uint16.valueOf(i));
             }
-            OdtuTpnPool odtuTpn = new OdtuTpnPoolBuilder()
-                    .setOdtuType(ODTU4TsAllocated.VALUE)
-                    .setTpnPool(tpnPool).build();
+            OdtuTpnPool odtuTpn =
+                new OdtuTpnPoolBuilder().setOdtuType(ODTU4TsAllocated.VALUE).setTpnPool(tpnPool).build();
             xtpcaBldr.setOdtuTpnPool(ImmutableMap.of(odtuTpn.key(),odtuTpn));
         }
+        SupportedInterfaceCapability supCapa =
+            new SupportedInterfaceCapabilityBuilder().setIfCapType(IfOCHOTU4ODU4.VALUE).build();
         TerminationPoint1 otnTp1 = new TerminationPoint1Builder()
-            .setTpSupportedInterfaces(tpSuppInter)
+            .setTpSupportedInterfaces(
+                new TpSupportedInterfacesBuilder()
+                    .setSupportedInterfaceCapability(new HashMap<>(Map.of(supCapa.key(),supCapa)))
+                    .build())
             .setXpdrTpPortConnectionAttributes(xtpcaBldr.build())
             .build();
         SupportingTerminationPoint supTermPointA = new SupportingTerminationPointBuilder()
@@ -185,41 +184,38 @@ public final class NetworkmodelTestUtil {
             .setNodeRef(new NodeId("SPDRA-XPDR1"))
             .setTpRef(new TpId("XPDR1-NETWORK1"))
             .build();
-        Map<SupportingTerminationPointKey,SupportingTerminationPoint> supTermPointMapA =
-                Map.of(supTermPointA.key(), supTermPointA);
-        TerminationPoint tpA = new TerminationPointBuilder()
-            .setTpId(new TpId("XPDR1-NETWORK1"))
-            .setSupportingTerminationPoint(supTermPointMapA)
-            .addAugmentation(otnTp1)
-            .addAugmentation(
-                new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.TerminationPoint1Builder()
-                .setTpType(OpenroadmTpType.XPONDERNETWORK)
-                .build())
-            .build();
         SupportingTerminationPoint supTermPointZ = new SupportingTerminationPointBuilder()
             .setNetworkRef(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))
             .setNodeRef(new NodeId("SPDRZ-XPDR1"))
             .setTpRef(new TpId("XPDR1-NETWORK1"))
             .build();
-        Map<SupportingTerminationPointKey,SupportingTerminationPoint> supTermPointMapZ =
-                Map.of(supTermPointZ.key(), supTermPointZ);
-        TerminationPoint tpZ = new TerminationPointBuilder()
-            .setTpId(new TpId("XPDR1-NETWORK1"))
-            .setSupportingTerminationPoint(supTermPointMapZ)
-            .addAugmentation(otnTp1)
-            .addAugmentation(
-                new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.TerminationPoint1Builder()
-                .setTpType(OpenroadmTpType.XPONDERNETWORK)
-                .build())
-            .build();
-        List<TerminationPoint> tps = new ArrayList<>();
-        tps.add(tpA);
-        tps.add(tpZ);
-        return tps;
+        return new ArrayList<>(List.of(
+            //tpA
+            new TerminationPointBuilder()
+                .setTpId(new TpId("XPDR1-NETWORK1"))
+                .setSupportingTerminationPoint(Map.of(supTermPointA.key(), supTermPointA))
+                .addAugmentation(otnTp1)
+                .addAugmentation(
+                    new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526
+                            .TerminationPoint1Builder()
+                        .setTpType(OpenroadmTpType.XPONDERNETWORK)
+                        .build())
+                .build(),
+            //tpZ
+            new TerminationPointBuilder()
+                .setTpId(new TpId("XPDR1-NETWORK1"))
+                .setSupportingTerminationPoint(Map.of(supTermPointZ.key(), supTermPointZ))
+                .addAugmentation(otnTp1)
+                .addAugmentation(
+                    new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526
+                            .TerminationPoint1Builder()
+                        .setTpType(OpenroadmTpType.XPONDERNETWORK)
+                        .build())
+                .build()));
     }
 
-    private static Map<MappingKey,Mapping> createDegreeMappings(Map<MappingKey,Mapping> mappingMap,
-            int degNbStart, int degNbStop) {
+    private static Map<MappingKey,Mapping> createDegreeMappings(
+            Map<MappingKey,Mapping> mappingMap, int degNbStart, int degNbStop) {
         for (int i = degNbStart; i <= degNbStop; i++) {
             Mapping mapping = new MappingBuilder()
                 .setLogicalConnectionPoint("DEG" + i + "-TTP-TXRX")
@@ -247,17 +243,14 @@ public final class NetworkmodelTestUtil {
         return mappingMap;
     }
 
-    private static Map<MappingKey,Mapping> createXpdrMappings(Map<MappingKey,Mapping> mappingMap,
-            int networkPortNb, int clientPortNb,
-        XpdrNodeTypes xpdrNodeType) {
+    private static Map<MappingKey,Mapping> createXpdrMappings(
+            Map<MappingKey,Mapping> mappingMap, int networkPortNb, int clientPortNb, XpdrNodeTypes xpdrNodeType) {
         for (int i = 1; i <= networkPortNb; i++) {
-            Set<SupportedIfCapability> supportedIntf = new HashSet<>();
-            supportedIntf.add(IfOCH.VALUE);
             MappingBuilder mappingBldr = new MappingBuilder()
                 .setLogicalConnectionPoint("XPDR1-NETWORK" + i)
                 .setPortDirection("bidirectional")
                 .setSupportingPort("1")
-                .setSupportedInterfaceCapability(supportedIntf)
+                .setSupportedInterfaceCapability(new HashSet<>(Set.of(IfOCH.VALUE)))
                 .setConnectionMapLcp("XPDR1-CLIENT" + i)
                 .setPortQual(PortQual.XpdrNetwork.getName())
                 .setSupportingCircuitPackName("1/0/" + i + "-PLUG-NET");
@@ -268,13 +261,11 @@ public final class NetworkmodelTestUtil {
             mappingMap.put(mapping.key(),mapping);
         }
         for (int i = 1; i <= clientPortNb; i++) {
-            Set<SupportedIfCapability> supportedIntf = new HashSet<>();
-            supportedIntf.add(If100GE.VALUE);
             Mapping mapping = new MappingBuilder()
                 .setLogicalConnectionPoint("XPDR1-CLIENT" + i)
                 .setPortDirection("bidirectional")
                 .setSupportingPort("C1")
-                .setSupportedInterfaceCapability(supportedIntf)
+                .setSupportedInterfaceCapability(new HashSet<>(Set.of(If100GE.VALUE)))
                 .setConnectionMapLcp("XPDR1-NETWORK" + i)
                 .setPortQual(PortQual.XpdrClient.getName())
                 .setSupportingCircuitPackName("1/0/" + i + "-PLUG-CLIENT")
index 396a7b6ba184a363ed6ebd0fa39ccdf478562c95..39a723c564205f46b67ff9b87f005f65bf616be0 100644 (file)
@@ -133,7 +133,7 @@ public final class OlmPowerServiceRpcImplUtil {
 
     public static org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.network
             .Nodes getMappingNodeTpdr(String nodeId, OpenroadmNodeVersion nodeVersion, List<String> lcps) {
-        Map<MappingKey, Mapping> mappings = new HashMap();
+        Map<MappingKey, Mapping> mappings = new HashMap<>();
         for (String lcp:lcps) {
             Mapping mapping = new MappingBuilder()
                     .setLogicalConnectionPoint(lcp)
@@ -155,7 +155,7 @@ public final class OlmPowerServiceRpcImplUtil {
 
     public static org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.network
             .Nodes getMappingNodeRdm(String nodeId, OpenroadmNodeVersion nodeVersion, List<String> lcps) {
-        Map<MappingKey, Mapping> mappings = new HashMap();
+        Map<MappingKey, Mapping> mappings = new HashMap<>();
         for (String lcp:lcps) {
             MappingBuilder mappingBldr = new MappingBuilder()
                     .setLogicalConnectionPoint(lcp)
index df44e29a72e838a888975feb29575baf1b6513a2..0c5a83e3488fac9004ebb36302fff03982bc264c 100644 (file)
@@ -63,7 +63,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.node.SupportingNodeBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.node.SupportingNodeKey;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.LinkId;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1Builder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.TpId;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link;
@@ -71,7 +70,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.link.DestinationBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.link.SourceBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.Decimal64;
@@ -87,19 +85,19 @@ public final class OlmTransactionUtils {
     // FIXME check if the InstanceIdentifier raw type can be avoided
     // Raw types use are discouraged since they lack type safety.
     // Resulting Problems are observed at run time and not at compile time
-    public static void writeTransaction(DataBroker dataBroker, InstanceIdentifier instanceIdentifier,
-                                        DataObject object) {
+    public static void writeTransaction(
+            DataBroker dataBroker, InstanceIdentifier instanceIdentifier, DataObject object) {
         @NonNull
         WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
         transaction.put(LogicalDatastoreType.CONFIGURATION, instanceIdentifier, object);
         transaction.commit();
     }
 
-    public static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks
-            .Network getNetworkForSpanLoss() {
-
+    public static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226
+            .networks.Network getNetworkForSpanLoss() {
         Map<LinkConcatenationKey,LinkConcatenation> linkConcentationValues = new HashMap<>();
-        LinkConcatenation linkConcatenation = new LinkConcatenationBuilder()
+        LinkConcatenation linkConcatenation =
+            new LinkConcatenationBuilder()
                 .withKey(new LinkConcatenationKey(Uint32.valueOf(1)))
                 .addAugmentation(new LinkConcatenation1Builder()
                     .setFiberType(FiberType.Truewave)
@@ -108,12 +106,14 @@ public final class OlmTransactionUtils {
                 .setSRLGId(Uint32.valueOf(1))
                 .setSRLGLength(Decimal64.valueOf("1"))
                 .build();
-        LinkConcatenation linkConcatenation2 = new LinkConcatenationBuilder()
+        LinkConcatenation linkConcatenation2 =
+            new LinkConcatenationBuilder()
                 .withKey(new LinkConcatenationKey(Uint32.valueOf(2)))
-                .addAugmentation(new LinkConcatenation1Builder()
-                    .setFiberType(FiberType.Truewave)
-                    .setPmd(new FiberPmd(Decimal64.valueOf("1")))
-                    .build())
+                .addAugmentation(
+                    new LinkConcatenation1Builder()
+                        .setFiberType(FiberType.Truewave)
+                        .setPmd(new FiberPmd(Decimal64.valueOf("1")))
+                        .build())
                 .setSRLGId(Uint32.valueOf(1))
                 .setSRLGLength(Decimal64.valueOf("1"))
                 .build();
@@ -121,20 +121,25 @@ public final class OlmTransactionUtils {
         linkConcentationValues.put(linkConcatenation2.key(),linkConcatenation2);
         // create 2 openroadm-topology degree nodes, end points of the link to be
         // measured;
-        SupportingNode supportingNode4RoadmA = new SupportingNodeBuilder()
-                .withKey(new SupportingNodeKey(new NetworkId("openroadm-network"),
-                        new NodeId("ROADM-A1")))
+        SupportingNode supportingNode4RoadmA =
+            new SupportingNodeBuilder()
+                .withKey(new SupportingNodeKey(new NetworkId("openroadm-network"), new NodeId("ROADM-A1")))
                 .setNetworkRef(new NetworkId("openroadm-network"))
-                .setNodeRef(new NodeId("ROADM-A1")).build();
-        Node ietfNodeA = new NodeBuilder().setNodeId(new NodeId("ROADM-A1-DEG2"))
+                .setNodeRef(new NodeId("ROADM-A1"))
+                .build();
+        Node ietfNodeA =
+            new NodeBuilder()
+                .setNodeId(new NodeId("ROADM-A1-DEG2"))
                 .setSupportingNode(Map.of(supportingNode4RoadmA.key(),supportingNode4RoadmA))
                 .build();
-        SupportingNode supportingNode4RoadmC = new SupportingNodeBuilder()
-                .withKey(new SupportingNodeKey(new NetworkId("openroadm-network"),
-                        new NodeId("ROADM-C1")))
+        SupportingNode supportingNode4RoadmC =
+            new SupportingNodeBuilder()
+                .withKey(new SupportingNodeKey(new NetworkId("openroadm-network"), new NodeId("ROADM-C1")))
                 .setNetworkRef(new NetworkId("openroadm-network"))
-                .setNodeRef(new NodeId("ROADM-C1")).build();
-        Node ietfNodeC = new NodeBuilder()
+                .setNodeRef(new NodeId("ROADM-C1"))
+                .build();
+        Node ietfNodeC =
+            new NodeBuilder()
                 .setNodeId(new NodeId("ROADM-C1-DEG1"))
                 .setSupportingNode(Map.of(supportingNode4RoadmC.key(),supportingNode4RoadmC))
                 .build();
@@ -142,166 +147,193 @@ public final class OlmTransactionUtils {
         ietfNodeMap.put(ietfNodeA.key(),ietfNodeA);
         ietfNodeMap.put(ietfNodeC.key(),ietfNodeC);
         Map<AmplifiedLinkKey,AmplifiedLink> amplifiedLinkValues = new HashMap<>();
-        org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev230526.amplified.link.attributes.AmplifiedLink al =
-                new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev230526.amplified.link.attributes
-                        .AmplifiedLinkBuilder()
-                        .setSectionElement(new SectionElementBuilder().setSectionElement(
-                                new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev230526.amplified
-                                        .link.attributes
-                                        .amplified.link.section.element.section.element.SpanBuilder()
-                                    .setSpan(new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev230526
-                                            .amplified.link.attributes.amplified.link.section.element
-                                            .section.element
-                                            .span.SpanBuilder()
-                                        .setAdministrativeState(AdminStates.InService)
-                                        .setAutoSpanloss(true)
-                                        .setEngineeredSpanloss(new RatioDB(Decimal64.valueOf("1")))
-                                        .setLinkConcatenation(linkConcentationValues)
-                                        .setSpanlossBase(new RatioDB(Decimal64.valueOf("1")))
-                                        .setSpanlossCurrent(new RatioDB(Decimal64.valueOf("1")))
-                                        .build())
+        var al = new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev230526
+                .amplified.link.attributes.AmplifiedLinkBuilder()
+            .setSectionElement(
+                new SectionElementBuilder()
+                    .setSectionElement(
+                        new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev230526
+                                .amplified.link.attributes.amplified.link.section.element.section.element
+                                .SpanBuilder()
+                            .setSpan(
+                                new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev230526
+                                        .amplified.link.attributes.amplified.link.section.element.section.element
+                                        .span.SpanBuilder()
+                                    .setAdministrativeState(AdminStates.InService)
+                                    .setAutoSpanloss(true)
+                                    .setEngineeredSpanloss(new RatioDB(Decimal64.valueOf("1")))
+                                    .setLinkConcatenation(linkConcentationValues)
+                                    .setSpanlossBase(new RatioDB(Decimal64.valueOf("1")))
+                                    .setSpanlossCurrent(new RatioDB(Decimal64.valueOf("1")))
                                     .build())
-                                .build())
-                        .setSectionEltNumber(Uint16.valueOf(1))
-                        .build();
-        org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev230526.amplified.link.attributes.AmplifiedLink al2 =
-                new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev230526.amplified.link.attributes
-                        .AmplifiedLinkBuilder()
-                        .setSectionElement(new SectionElementBuilder().setSectionElement(
-                                new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev230526.amplified
-                                        .link.attributes
-                                        .amplified.link.section.element.section.element.SpanBuilder()
-                                    .setSpan(new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev230526
-                                            .amplified.link.attributes.amplified.link.section.element
-                                            .section.element.span.SpanBuilder()
-                                        .setAdministrativeState(AdminStates.InService)
-                                        .setAutoSpanloss(true)
-                                        .setEngineeredSpanloss(new RatioDB(Decimal64.valueOf("1")))
-                                        .setLinkConcatenation(linkConcentationValues)
-                                        .setSpanlossBase(new RatioDB(Decimal64.valueOf("1")))
-                                        .setSpanlossCurrent(new RatioDB(Decimal64.valueOf("1")))
-                                        .build())
+                            .build())
+                        .build())
+            .setSectionEltNumber(Uint16.valueOf(1))
+            .build();
+        var al2 = new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev230526
+                .amplified.link.attributes.AmplifiedLinkBuilder()
+            .setSectionElement(
+                new SectionElementBuilder()
+                    .setSectionElement(
+                        new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev230526
+                                .amplified.link.attributes.amplified.link.section.element.section.element
+                                .SpanBuilder()
+                            .setSpan(
+                                new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev230526
+                                        .amplified.link.attributes.amplified.link.section.element.section.element
+                                        .span.SpanBuilder()
+                                    .setAdministrativeState(AdminStates.InService)
+                                    .setAutoSpanloss(true)
+                                    .setEngineeredSpanloss(new RatioDB(Decimal64.valueOf("1")))
+                                    .setLinkConcatenation(linkConcentationValues)
+                                    .setSpanlossBase(new RatioDB(Decimal64.valueOf("1")))
+                                    .setSpanlossCurrent(new RatioDB(Decimal64.valueOf("1")))
                                     .build())
-                                .build())
-                        .setSectionEltNumber(Uint16.valueOf(1))
-                        .build();
+                            .build())
+                    .build())
+            .setSectionEltNumber(Uint16.valueOf(1))
+            .build();
         amplifiedLinkValues.put(al.key(),al);
         amplifiedLinkValues.put(al2.key(),al2);
-        Augmentation<Link> aug11 = new Link1Builder()
-                .setAmplified(true)
-                .setOMSAttributes(new OMSAttributesBuilder()
-                        .setAmplifiedLink(new AmplifiedLinkBuilder().setAmplifiedLink(amplifiedLinkValues).build())
-                        .setSpan(new SpanBuilder().build())
-                        .build())
-                .build();
-        org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.Link1 aug12 =
-                new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.Link1Builder()
-                        .setLinkType(OpenroadmLinkType.ROADMTOROADM).build();
-        Augmentation<Link> aug21 = new Link1Builder()
-                .setAmplified(true)
-                .setOMSAttributes(new OMSAttributesBuilder()
-                        .setAmplifiedLink(new AmplifiedLinkBuilder().setAmplifiedLink(amplifiedLinkValues).build())
-                        .setSpan(new SpanBuilder().build()).build())
-                .build();
-        org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.Link1 aug22 =
-                new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.Link1Builder()
-                        .setLinkType(OpenroadmLinkType.ROADMTOROADM).build();
+
         // create the roadm-to-roadm link to be measured
-        Link roadm2roadmLink = new LinkBuilder().setLinkId(new LinkId("ROADM-A1-to-ROADM-C1"))
-                .setSource(new SourceBuilder()
+        Link roadm2roadmLink =
+            new LinkBuilder()
+                .setLinkId(new LinkId("ROADM-A1-to-ROADM-C1"))
+                .setSource(
+                    new SourceBuilder()
                         .setSourceNode(ietfNodeA.getNodeId())
                         .setSourceTp(new TpId("DEG2-TTP-TXRX"))
                         .build())
-                .setDestination(new DestinationBuilder()
+                .setDestination(
+                    new DestinationBuilder()
                         .setDestNode(ietfNodeC.getNodeId())
                         .setDestTp(new TpId("DEG1-TTP-TXRX"))
                         .build())
-                .addAugmentation(aug11)
-                .addAugmentation(aug12)
-                .addAugmentation(aug21)
-                .addAugmentation(aug22)
+                .addAugmentation(
+                    //aug11
+                    new Link1Builder()
+                        .setAmplified(true)
+                        .setOMSAttributes(
+                            new OMSAttributesBuilder()
+                                .setAmplifiedLink(
+                                    new AmplifiedLinkBuilder().setAmplifiedLink(amplifiedLinkValues).build())
+                                .setSpan(new SpanBuilder().build())
+                                .build())
+                        .build())
+                .addAugmentation(
+                    //aug12
+                    new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.Link1Builder()
+                        .setLinkType(OpenroadmLinkType.ROADMTOROADM)
+                        .build())
+                .addAugmentation(
+                    //aug21
+                    new Link1Builder()
+                        .setAmplified(true)
+                        .setOMSAttributes(
+                            new OMSAttributesBuilder()
+                                .setAmplifiedLink(
+                                    new AmplifiedLinkBuilder().setAmplifiedLink(amplifiedLinkValues).build())
+                                .setSpan(new SpanBuilder().build())
+                                .build())
+                        .build())
+                .addAugmentation(
+                    //aug22
+                    new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.Link1Builder()
+                        .setLinkType(OpenroadmLinkType.ROADMTOROADM)
+                        .build())
                 .build();
-        // create the ietf network
-        Network1 openroadmAugmToIetfNetwork = new Network1Builder()
-                .setLink(Map.of(roadm2roadmLink.key(),roadm2roadmLink)).build();
-        // openroadm Topology builder
-        NetworkBuilder ietfNetworkBldr = new NetworkBuilder()
-                .setNetworkId(new NetworkId("openroadm-topology"))
-                .setNode(ietfNodeMap)
-                .addAugmentation(openroadmAugmToIetfNetwork);
-
-        return ietfNetworkBldr.build();
+        return new NetworkBuilder()
+            .setNetworkId(new NetworkId("openroadm-topology"))
+            .setNode(ietfNodeMap)
+            .addAugmentation(
+                new Network1Builder().setLink(Map.of(roadm2roadmLink.key(),roadm2roadmLink)).build())
+            .build();
     }
 
     public static Mapping getMapping1() {
-        return new MappingBuilder().setLogicalConnectionPoint("DEG2-TTP-TXRX").setSupportingOts("OTS-DEG2-TTP-TXRX")
-                .build();
+        return new MappingBuilder()
+            .setLogicalConnectionPoint("DEG2-TTP-TXRX")
+            .setSupportingOts("OTS-DEG2-TTP-TXRX")
+            .build();
     }
 
     public static Mapping getMapping2() {
-        return new MappingBuilder().setLogicalConnectionPoint("DEG1-TTP-TXRX").setSupportingOts("OTS-DEG1-TTP-TXRX")
-                .build();
+        return new MappingBuilder()
+            .setLogicalConnectionPoint("DEG1-TTP-TXRX")
+            .setSupportingOts("OTS-DEG1-TTP-TXRX")
+            .build();
     }
 
     public static Optional<CurrentPmList> getCurrentPmListA() {
-        Measurement measurementA = new MeasurementBuilder()
+        Measurement measurementA =
+            new MeasurementBuilder()
                 .withKey(new MeasurementKey(PmGranularity._15min))
-                .setGranularity(org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev171215
-                        .PmGranularity._15min)
+                .setGranularity(
+                    org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev171215.PmGranularity._15min)
                 .setPmParameterValue(new PmDataType(Decimal64.valueOf("-3.5")))
                 .setValidity(Validity.Complete)
                 .build();
-        CurrentPm cpA = new CurrentPmBuilder()
-                .withKey(new CurrentPmKey(Direction.Bidirectional,
-                        "", Location.NotApplicable, PmNamesEnum.OpticalPowerOutput))
-                .setType(org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev171215.PmNamesEnum
-                        .OpticalPowerOutput)
+        CurrentPm cpA =
+            new CurrentPmBuilder()
+                .withKey(
+                    new CurrentPmKey(
+                        Direction.Bidirectional, "", Location.NotApplicable, PmNamesEnum.OpticalPowerOutput))
+                .setType(
+                    org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev171215.PmNamesEnum.OpticalPowerOutput)
                 .setMeasurement(Map.of(measurementA.key(),measurementA))
                 .build();
-        InstanceIdentifier<Interface> interfaceIIDA = InstanceIdentifier
-            .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
-            .child(Interface.class, new InterfaceKey("OTS-DEG2-TTP-TXRX"))
-            .build();
-        CurrentPmEntry currentPmEntryA = new CurrentPmEntryBuilder()
+        CurrentPmEntry currentPmEntryA =
+            new CurrentPmEntryBuilder()
                 .setCurrentPm(Map.of(cpA.key(),cpA))
-                .setPmResourceInstance(interfaceIIDA)
+                .setPmResourceInstance(
+                    InstanceIdentifier
+                        .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
+                        .child(Interface.class, new InterfaceKey("OTS-DEG2-TTP-TXRX"))
+                        .build())
                 .setPmResourceType(
-                        org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev181019.ResourceTypeEnum
-                                .Interface)
+                    org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev181019.ResourceTypeEnum.Interface)
                 .setPmResourceTypeExtension("")
                 .setRetrievalTime(new DateAndTime("2018-06-07T13:22:58+00:00"))
                 .build();
-        return Optional.of(new CurrentPmListBuilder()
-                .setCurrentPmEntry(Map.of(currentPmEntryA.key(),currentPmEntryA)).build());
+        return Optional.of(
+            new CurrentPmListBuilder()
+                .setCurrentPmEntry(Map.of(currentPmEntryA.key(),currentPmEntryA))
+                .build());
     }
 
     public static Optional<CurrentPmList> getCurrentPmListC() {
-        Measurement measurementC = new MeasurementBuilder()
+        Measurement measurementC =
+            new MeasurementBuilder()
                 .setGranularity(org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev171215.PmGranularity._15min)
                 .setPmParameterValue(new PmDataType(Decimal64.valueOf("-18.1")))
                 .setValidity(Validity.Complete)
                 .build();
-        CurrentPm cpC = new CurrentPmBuilder()
-                .withKey(new CurrentPmKey(Direction.Bidirectional,
-                        "", Location.NotApplicable, PmNamesEnum.OpticalPowerInput))
-                .setType(org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev171215.PmNamesEnum
-                        .OpticalPowerInput)
+        CurrentPm cpC =
+            new CurrentPmBuilder()
+                .withKey(
+                    new CurrentPmKey(
+                        Direction.Bidirectional, "", Location.NotApplicable, PmNamesEnum.OpticalPowerInput))
+                .setType(
+                    org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev171215.PmNamesEnum.OpticalPowerInput)
                 .setMeasurement(Map.of(measurementC.key(),measurementC))
                 .build();
-        InstanceIdentifier<Interface> interfaceIIDC = InstanceIdentifier
-            .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
-            .child(Interface.class, new InterfaceKey("OTS-DEG1-TTP-TXRX"))
-            .build();
-        CurrentPmEntry currentPmEntryC = new CurrentPmEntryBuilder()
+        CurrentPmEntry currentPmEntryC =
+            new CurrentPmEntryBuilder()
                 .setCurrentPm(Map.of(cpC.key(),cpC))
-                .setPmResourceInstance(interfaceIIDC)
+                .setPmResourceInstance(
+                    InstanceIdentifier
+                        .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
+                        .child(Interface.class, new InterfaceKey("OTS-DEG1-TTP-TXRX"))
+                        .build())
                 .setPmResourceType(
-                        org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev181019
-                                .ResourceTypeEnum.Interface)
+                    org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev181019.ResourceTypeEnum.Interface)
                 .setPmResourceTypeExtension("")
                 .setRetrievalTime(new DateAndTime("2018-06-07T13:22:58+00:00"))
                 .build();
-        return Optional.of(new CurrentPmListBuilder()
-                .setCurrentPmEntry(Map.of(currentPmEntryC.key(),currentPmEntryC)).build());
+        return Optional.of(
+            new CurrentPmListBuilder()
+                .setCurrentPmEntry(Map.of(currentPmEntryC.key(),currentPmEntryC))
+                .build());
     }
 }
index beba206825d9f5d16e25fae0294956981b67b839..544fb40d320bd1b6d8c5ebc8e209c33a91548602 100644 (file)
@@ -370,7 +370,7 @@ public class PostAlgoPathValidator {
 
     private List<OpucnTribSlotDef> getMinMaxTpTs(Map<String, Uint16> tribPort, Map<String, List<Uint16>> tribSlot) {
         String tribport = tribPort.values().toArray()[0].toString();
-        List<Uint16> tsList = (List<Uint16>) tribSlot.values().toArray()[0];
+        @SuppressWarnings("unchecked") List<Uint16> tsList = (List<Uint16>) tribSlot.values().toArray()[0];
         return new ArrayList<>(List.of(
             OpucnTribSlotDef.getDefaultInstance(String.join(".", tribport, tsList.get(0).toString())),
             OpucnTribSlotDef.getDefaultInstance(String.join(".", tribport, tsList.get(tsList.size() - 1).toString()))));
index d3c1ccfe47a9a31e229957163184f1c146b690b9..1d82544f0a33ee1c5db3646cef266188d5e465a3 100644 (file)
@@ -10,12 +10,10 @@ package org.opendaylight.transportpce.servicehandler.service;
 import com.google.common.util.concurrent.FluentFuture;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
@@ -92,9 +90,10 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
         try {
             LOG.info("initializing service registry");
             WriteTransaction transaction = this.dataBroker.newWriteOnlyTransaction();
-            InstanceIdentifier<ServiceList> iid = InstanceIdentifier.create(ServiceList.class);
-            ServiceList initialRegistry = new ServiceListBuilder().build();
-            transaction.put(LogicalDatastoreType.OPERATIONAL, iid, initialRegistry);
+            transaction.put(
+                LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(ServiceList.class),
+                new ServiceListBuilder().build());
             FluentFuture<? extends @NonNull CommitInfo> future = transaction.commit();
             future.get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
@@ -106,9 +105,10 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
         try {
             LOG.info("initializing temp service registry");
             WriteTransaction transaction = this.dataBroker.newWriteOnlyTransaction();
-            InstanceIdentifier<TempServiceList> iid = InstanceIdentifier.create(TempServiceList.class);
-            TempServiceList initialRegistry = new TempServiceListBuilder().build();
-            transaction.put(LogicalDatastoreType.OPERATIONAL, iid, initialRegistry);
+            transaction.put(
+                LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(TempServiceList.class),
+                new TempServiceListBuilder().build());
             FluentFuture<? extends @NonNull CommitInfo> future = transaction.commit();
             future.get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
@@ -119,12 +119,13 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
     @Override
     public Optional<Services> getService(String serviceName) {
         try {
-            ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction();
-            InstanceIdentifier<Services> iid =
-                    InstanceIdentifier.create(ServiceList.class).child(Services.class, new ServicesKey(serviceName));
-            Future<java.util.Optional<Services>> future =
-                    readTx.read(LogicalDatastoreType.OPERATIONAL, iid);
-            return future.get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS);
+            return this.dataBroker.newReadOnlyTransaction()
+                    .read(
+                        LogicalDatastoreType.OPERATIONAL,
+                        InstanceIdentifier.create(ServiceList.class)
+                            .child(Services.class, new ServicesKey(serviceName))
+                        )
+                    .get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
             LOG.warn("Reading service {} failed:", serviceName, e);
         }
@@ -134,12 +135,11 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
     @Override
     public Optional<ServiceList> getServices() {
         try {
-            ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction();
-            InstanceIdentifier<ServiceList> iid =
-                    InstanceIdentifier.create(ServiceList.class);
-            Future<java.util.Optional<ServiceList>> future =
-                    readTx.read(LogicalDatastoreType.OPERATIONAL, iid);
-            return future.get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS);
+            return this.dataBroker.newReadOnlyTransaction()
+                    .read(
+                        LogicalDatastoreType.OPERATIONAL,
+                        InstanceIdentifier.create(ServiceList.class))
+                    .get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
             LOG.warn("Reading services failed:", e);
         }
@@ -147,19 +147,19 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
     }
 
     @Override
-    public Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list.Services>
-            getTempService(String serviceName) {
+    public Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+            .temp.service.list.Services> getTempService(String serviceName) {
         try {
-            ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction();
-            InstanceIdentifier<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list
-                .Services> iid = InstanceIdentifier.create(TempServiceList.class).child(
-                    org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list.Services.class,
-                    new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list.ServicesKey(
-                        serviceName));
-            FluentFuture<Optional<
-                org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list.Services>> future
-                = readTx.read(LogicalDatastoreType.OPERATIONAL, iid);
-            return future.get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS);
+            return this.dataBroker.newReadOnlyTransaction()
+                    .read(
+                        LogicalDatastoreType.OPERATIONAL,
+                        InstanceIdentifier.create(TempServiceList.class)
+                            .child(
+                                org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                                    .temp.service.list.Services.class,
+                                new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                                    .temp.service.list.ServicesKey(serviceName)))
+                    .get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
             LOG.warn("Reading service {} failed:", serviceName, e);
         }
@@ -171,9 +171,10 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
         LOG.debug(DELETING_SERVICE_MSG, serviceName);
         try {
             WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction();
-            InstanceIdentifier<Services> iid =
-                    InstanceIdentifier.create(ServiceList.class).child(Services.class, new ServicesKey(serviceName));
-            writeTx.delete(LogicalDatastoreType.OPERATIONAL, iid);
+            writeTx.delete(
+                LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(ServiceList.class)
+                    .child(Services.class, new ServicesKey(serviceName)));
             writeTx.commit().get(Timeouts.DATASTORE_DELETE, TimeUnit.MILLISECONDS);
             return OperationResult.ok(LogMessages.SUCCESSFUL_MESSAGE);
         } catch (TimeoutException | InterruptedException | ExecutionException e) {
@@ -187,12 +188,14 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
         LOG.debug(DELETING_SERVICE_MSG, commonId);
         try {
             WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction();
-            InstanceIdentifier<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list
-                .Services> iid = InstanceIdentifier.create(TempServiceList.class).child(org.opendaylight.yang.gen.v1
-                        .http.org.openroadm.service.rev230526.temp.service.list.Services.class,
-                        new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list
-                            .ServicesKey(commonId));
-            writeTx.delete(LogicalDatastoreType.OPERATIONAL, iid);
+            writeTx.delete(
+                LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(TempServiceList.class)
+                    .child(
+                        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                            .temp.service.list.Services.class,
+                        new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                            .temp.service.list.ServicesKey(commonId)));
             writeTx.commit().get(Timeouts.DATASTORE_DELETE, TimeUnit.MILLISECONDS);
             return OperationResult.ok(LogMessages.SUCCESSFUL_MESSAGE);
         } catch (TimeoutException | InterruptedException | ExecutionException e) {
@@ -205,19 +208,20 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
     public OperationResult modifyService(String serviceName, State operationalState, AdminStates administrativeState) {
         LOG.debug("Modifying '{}' Service", serviceName);
         Optional<Services> readService = getService(serviceName);
-        if (!readService.isPresent()) {
+        if (readService.isEmpty()) {
             LOG.warn("modifyService: {}", LogMessages.SERVICE_NOT_FOUND);
             return OperationResult.failed(LogMessages.SERVICE_NOT_FOUND);
         }
         try {
             WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction();
-            InstanceIdentifier<Services> iid = InstanceIdentifier.create(ServiceList.class)
-                    .child(Services.class, new ServicesKey(serviceName));
-            Services services = new ServicesBuilder(readService.orElseThrow())
-                .setOperationalState(operationalState)
-                .setAdministrativeState(administrativeState)
-                .build();
-            writeTx.merge(LogicalDatastoreType.OPERATIONAL, iid, services);
+            writeTx.merge(
+                LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(ServiceList.class)
+                    .child(Services.class, new ServicesKey(serviceName)),
+                new ServicesBuilder(readService.orElseThrow())
+                    .setOperationalState(operationalState)
+                    .setAdministrativeState(administrativeState)
+                    .build());
             writeTx.commit().get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
             return OperationResult.ok(LogMessages.SUCCESSFUL_MESSAGE);
         } catch (TimeoutException | InterruptedException | ExecutionException e) {
@@ -227,29 +231,30 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
     }
 
     @Override
-    public OperationResult modifyTempService(String serviceName, State operationalState,
-        AdminStates administrativeState) {
+    public OperationResult modifyTempService(
+            String serviceName, State operationalState, AdminStates administrativeState) {
         LOG.debug("Modifying '{}' Temp Service", serviceName);
-        Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list
-            .Services> readService = getTempService(serviceName);
-        if (!readService.isPresent()) {
+        Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                .temp.service.list.Services> readService = getTempService(serviceName);
+        if (readService.isEmpty()) {
             LOG.warn("modifyTempService: {}", LogMessages.SERVICE_NOT_FOUND);
             return OperationResult.failed(LogMessages.SERVICE_NOT_FOUND);
         }
         try {
             WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction();
-            InstanceIdentifier<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list
-                .Services> iid = InstanceIdentifier.create(TempServiceList.class)
-                    .child(org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list
-                            .Services.class, new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
-                                .temp.service.list.ServicesKey(serviceName));
-            org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list.Services services =
-                new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list.ServicesBuilder(
-                    readService.orElseThrow())
-                .setOperationalState(operationalState)
-                .setAdministrativeState(administrativeState)
-                .build();
-            writeTx.merge(LogicalDatastoreType.OPERATIONAL, iid, services);
+            writeTx.merge(
+                LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(TempServiceList.class)
+                    .child(
+                        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                            .temp.service.list.Services.class,
+                        new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                            .temp.service.list.ServicesKey(serviceName)),
+                new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                        .temp.service.list.ServicesBuilder(readService.orElseThrow())
+                    .setOperationalState(operationalState)
+                    .setAdministrativeState(administrativeState)
+                    .build());
             writeTx.commit().get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
             return OperationResult.ok(LogMessages.SUCCESSFUL_MESSAGE);
         } catch (TimeoutException | InterruptedException | ExecutionException e) {
@@ -262,11 +267,12 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
     public OperationResult createService(ServiceCreateInput serviceCreateInput) {
         LOG.debug("Writing '{}' Service", serviceCreateInput.getServiceName());
         try {
-            InstanceIdentifier<Services> iid = InstanceIdentifier.create(ServiceList.class)
-                    .child(Services.class, new ServicesKey(serviceCreateInput.getServiceName()));
-            Services service = ModelMappingUtils.mappingServices(serviceCreateInput, null);
             WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction();
-            writeTx.put(LogicalDatastoreType.OPERATIONAL, iid, service);
+            writeTx.put(
+                LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(ServiceList.class)
+                    .child(Services.class, new ServicesKey(serviceCreateInput.getServiceName())),
+                ModelMappingUtils.mappingServices(serviceCreateInput, null));
             writeTx.commit().get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
             return OperationResult.ok(LogMessages.SUCCESSFUL_MESSAGE);
         } catch (TimeoutException | InterruptedException | ExecutionException e) {
@@ -282,15 +288,15 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
                     .service.path.rpc.result.PathDescription pathDescription) {
         LOG.debug("Writing '{}' Temp Service", tempServiceCreateInput.getCommonId());
         try {
-            InstanceIdentifier<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list
-                .Services> iid = InstanceIdentifier.create(TempServiceList.class)
-                    .child(org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list
-                            .Services.class, new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp
-                                .service.list.ServicesKey(tempServiceCreateInput.getCommonId()));
-            org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list
-                .Services service = ModelMappingUtils.mappingServices(tempServiceCreateInput, pathDescription);
             WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction();
-            writeTx.put(LogicalDatastoreType.OPERATIONAL, iid, service);
+            writeTx.put(
+                LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(TempServiceList.class)
+                    .child(org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                            .temp.service.list.Services.class,
+                        new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                            .temp.service.list.ServicesKey(tempServiceCreateInput.getCommonId())),
+                ModelMappingUtils.mappingServices(tempServiceCreateInput, pathDescription));
             writeTx.commit().get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
             return OperationResult.ok(LogMessages.SUCCESSFUL_MESSAGE);
         } catch (TimeoutException | InterruptedException | ExecutionException e) {
@@ -304,11 +310,11 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
     public Optional<ServicePathList> getServicePaths() {
         LOG.debug("Retrieving list of ServicePath...");
         try {
-            ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction();
-            InstanceIdentifier<ServicePathList> servicePathListIID = InstanceIdentifier.create(ServicePathList.class);
-            Future<java.util.Optional<ServicePathList>> future = readTx.read(LogicalDatastoreType.OPERATIONAL,
-                    servicePathListIID);
-            return future.get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS);
+            return this.dataBroker.newReadOnlyTransaction()
+                    .read(
+                        LogicalDatastoreType.OPERATIONAL,
+                        InstanceIdentifier.create(ServicePathList.class))
+                    .get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
             LOG.error("Reading service path list failed. Error={}", e.getMessage());
         }
@@ -319,12 +325,12 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
     public Optional<ServicePaths> getServicePath(String serviceName) {
         LOG.debug("Retrieving service path of service {}", serviceName);
         try {
-            ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction();
-            InstanceIdentifier<ServicePaths> servicePathsIID = InstanceIdentifier.create(ServicePathList.class)
-                    .child(ServicePaths.class, new ServicePathsKey(serviceName));
-            Future<java.util.Optional<ServicePaths>> future = readTx.read(LogicalDatastoreType.OPERATIONAL,
-                    servicePathsIID);
-            return future.get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS);
+            return this.dataBroker.newReadOnlyTransaction()
+                    .read(
+                        LogicalDatastoreType.OPERATIONAL,
+                        InstanceIdentifier.create(ServicePathList.class)
+                            .child(ServicePaths.class, new ServicePathsKey(serviceName)))
+                    .get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
             LOG.error("Reading service path failed. Error={}", e.getMessage());
         }
@@ -335,11 +341,12 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
     public OperationResult createServicePath(ServiceInput serviceInput, PathComputationRequestOutput outputFromPce) {
         LOG.debug("Writing '{}' ServicePath ", serviceInput.getServiceName());
         try {
-            InstanceIdentifier<ServicePaths> servicePathsIID = InstanceIdentifier.create(ServicePathList.class)
-                    .child(ServicePaths.class, new ServicePathsKey(serviceInput.getServiceName()));
-            ServicePaths servicePath = ModelMappingUtils.mappingServicePaths(serviceInput, outputFromPce);
             WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction();
-            writeTx.put(LogicalDatastoreType.OPERATIONAL, servicePathsIID, servicePath);
+            writeTx.put(
+                LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(ServicePathList.class)
+                    .child(ServicePaths.class, new ServicePathsKey(serviceInput.getServiceName())),
+                ModelMappingUtils.mappingServicePaths(serviceInput, outputFromPce));
             writeTx.commit().get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
             return OperationResult.ok(LogMessages.SUCCESSFUL_MESSAGE);
         } catch (TimeoutException | InterruptedException | ExecutionException e) {
@@ -353,15 +360,17 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
     public OperationResult modifyServicePath(PathDescription pathDescription, String serviceName) {
         LOG.debug("Updating servicePath because of a change in the openroadm-topology");
         Optional<ServicePaths> readServicePath = getServicePath(serviceName);
-        if (!readServicePath.isPresent()) {
+        if (readServicePath.isEmpty()) {
             LOG.warn("modifyServicePath: {}", LogMessages.SERVICE_PATH_NOT_FOUND);
             return OperationResult.failed(LogMessages.SERVICE_PATH_NOT_FOUND);
         }
         try {
             WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction();
-            InstanceIdentifier<ServicePaths> iid = InstanceIdentifier.create(ServicePathList.class)
-                    .child(ServicePaths.class, new ServicePathsKey(serviceName));
-            ServicePaths servicePaths = new ServicePathsBuilder()
+            writeTx.merge(
+                LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(ServicePathList.class)
+                    .child(ServicePaths.class, new ServicePathsKey(serviceName)),
+                new ServicePathsBuilder()
                     .setServiceAEnd(readServicePath.orElseThrow().getServiceAEnd())
                     .setServiceHandlerHeader(readServicePath.orElseThrow().getServiceHandlerHeader())
                     .setServicePathName(readServicePath.orElseThrow().getServicePathName())
@@ -374,9 +383,7 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
                     .setPathDescription(pathDescription)
                     .setPceRoutingMetric(readServicePath.orElseThrow().getPceRoutingMetric())
                     .setSoftConstraints(readServicePath.orElseThrow().getSoftConstraints())
-                    .build();
-
-            writeTx.merge(LogicalDatastoreType.OPERATIONAL, iid, servicePaths);
+                    .build());
             writeTx.commit().get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
             return OperationResult.ok(LogMessages.SUCCESSFUL_MESSAGE);
         } catch (TimeoutException | InterruptedException | ExecutionException e) {
@@ -387,7 +394,8 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
 
     @Override
     public OperationResult deleteServicePath(String serviceName) {
-        InstanceIdentifier<ServicePaths> servicePathsIID = InstanceIdentifier.create(ServicePathList.class)
+        InstanceIdentifier<ServicePaths> servicePathsIID =
+            InstanceIdentifier.create(ServicePathList.class)
                 .child(ServicePaths.class, new ServicePathsKey(serviceName));
         LOG.debug("Deleting service from {}", servicePathsIID);
         WriteTransaction servicePathsWriteTx = this.dataBroker.newWriteOnlyTransaction();
@@ -416,26 +424,25 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
      */
     @Deprecated
     @Override
-    public String writeOrModifyOrDeleteServiceList(String serviceName, ServiceCreateInput input,
-            PathComputationRequestOutput output, int choice) {
+    public String writeOrModifyOrDeleteServiceList(
+            String serviceName, ServiceCreateInput input, PathComputationRequestOutput output, int choice) {
         LOG.debug("WriteOrModifyOrDeleting '{}' Service", serviceName);
         WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction();
         Optional<Services> readService = getService(serviceName);
-
         /*
          * Write Service.
          */
-        if (!readService.isPresent()) {
+        if (readService.isEmpty()) {
             if (choice != 2) {
                 LOG.warn("writeOrModifyOrDeleteServiceList: {}", LogMessages.SERVICE_NOT_FOUND);
                 return LogMessages.SERVICE_NOT_FOUND;
             }
-
             LOG.debug("Writing '{}' Service", serviceName);
-            InstanceIdentifier<Services> iid = InstanceIdentifier.create(ServiceList.class)
-                    .child(Services.class, new ServicesKey(serviceName));
-            Services service = ModelMappingUtils.mappingServices(input, null);
-            writeTx.put(LogicalDatastoreType.OPERATIONAL, iid, service);
+            writeTx.put(
+                LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(ServiceList.class)
+                    .child(Services.class, new ServicesKey(serviceName)),
+                ModelMappingUtils.mappingServices(input, null));
             try {
                 writeTx.commit().get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
                 return null;
@@ -449,15 +456,18 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
          * Modify / Delete Service.
          */
         InstanceIdentifier<Services> iid =
-                InstanceIdentifier.create(ServiceList.class).child(Services.class, new ServicesKey(serviceName));
-        ServicesBuilder service = new ServicesBuilder(readService.orElseThrow());
+            InstanceIdentifier.create(ServiceList.class).child(Services.class, new ServicesKey(serviceName));
         String action = null;
         switch (choice) {
             case 0 : /* Modify. */
                 LOG.debug("Modifying '{}' Service", serviceName);
-                service.setOperationalState(State.InService)
-                    .setAdministrativeState(AdminStates.InService);
-                writeTx.merge(LogicalDatastoreType.OPERATIONAL, iid, service.build());
+                writeTx.merge(
+                    LogicalDatastoreType.OPERATIONAL,
+                    iid,
+                    new ServicesBuilder(readService.orElseThrow())
+                        .setOperationalState(State.InService)
+                        .setAdministrativeState(AdminStates.InService)
+                        .build());
                 action = "modifyService";
                 break;
             case 1 : /* Delete */
index 88c426207c2421280a90b4d5a315a94bc159b3ec..b68207276511139b68ee95d15e5512864485073e 100644 (file)
@@ -61,13 +61,9 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.TempSer
 import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.TempServiceDeleteInputBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.delete.input.ServiceDeleteReqInfo;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.delete.input.ServiceDeleteReqInfoBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.feasibility.check.inputs.ServiceAEnd;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.feasibility.check.inputs.ServiceAEndBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.feasibility.check.inputs.ServiceZEnd;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.feasibility.check.inputs.ServiceZEndBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev230501.path.description.AToZDirection;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev230501.path.description.AToZDirectionBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev230501.path.description.ZToADirection;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev230501.path.description.ZToADirectionBuilder;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.PceMetric;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.RpcStatusEx;
@@ -80,97 +76,92 @@ import org.opendaylight.yangtools.yang.common.Uint8;
 public final class ServiceDataUtils {
 
     public static ServiceCreateInput buildServiceCreateInput() {
-
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.create.input
-            .ServiceAEnd serviceAEnd = getServiceAEndBuild().build();
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.create.input
-            .ServiceZEnd serviceZEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service
-            .create.input.ServiceZEndBuilder()
-            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
-            .setNodeId(new NodeIdType("XPONDER-3-2"))
-            .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
-            .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
-            .build();
-
-        ServiceCreateInputBuilder builtInput = new ServiceCreateInputBuilder()
+        return new ServiceCreateInputBuilder()
             .setCommonId("commonId")
             .setConnectionType(ConnectionType.Service)
             .setCustomer("Customer")
             .setServiceName("service 1")
-            .setServiceAEnd(serviceAEnd)
-            .setServiceZEnd(serviceZEnd)
-            .setSdncRequestHeader(new SdncRequestHeaderBuilder().setRequestId("request 1")
-                .setRpcAction(RpcActions.ServiceCreate).setNotificationUrl("notification url").build());
-
-        return builtInput.build();
+            .setServiceAEnd(getServiceAEndBuild().build())
+            .setServiceZEnd(
+                new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                        .service.create.input.ServiceZEndBuilder()
+                    .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
+                    .setNodeId(new NodeIdType("XPONDER-3-2"))
+                    .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
+                    .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
+                    .build())
+            .setSdncRequestHeader(
+                new SdncRequestHeaderBuilder()
+                    .setRequestId("request 1")
+                    .setRpcAction(RpcActions.ServiceCreate)
+                    .setNotificationUrl("notification url")
+                    .build())
+            .build();
     }
 
     public static ServiceCreateInput buildServiceCreateInputWithHardConstraints() {
-
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.create.input
-                .ServiceAEnd serviceAEnd = getServiceAEndBuild()
-                .build();
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.create.input
-                .ServiceZEnd serviceZEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service
-                .create.input.ServiceZEndBuilder()
-                .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
-                .setNodeId(new NodeIdType("XPONDER-3-2"))
-                .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
-                .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
-                .build();
-
-        ServiceCreateInputBuilder builtInput = new ServiceCreateInputBuilder()
+        return new ServiceCreateInputBuilder()
             .setCommonId("commonId")
             .setConnectionType(ConnectionType.Service)
             .setCustomer("Customer")
             .setServiceName("service 1")
-            .setServiceAEnd(serviceAEnd)
-            .setServiceZEnd(serviceZEnd)
-            .setSdncRequestHeader(new SdncRequestHeaderBuilder().setRequestId("request 1")
-                .setRpcAction(RpcActions.ServiceCreate).setNotificationUrl("notification url").build())
-            .setHardConstraints(new HardConstraintsBuilder().build());
-
-        return builtInput.build();
+            .setServiceAEnd(getServiceAEndBuild().build())
+            .setServiceZEnd(
+                new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                        .service.create.input.ServiceZEndBuilder()
+                    .setClli("clli")
+                    .setServiceFormat(ServiceFormat.OC)
+                    .setServiceRate(Uint32.valueOf(1))
+                    .setNodeId(new NodeIdType("XPONDER-3-2"))
+                    .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
+                    .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
+                    .build())
+            .setSdncRequestHeader(
+                new SdncRequestHeaderBuilder()
+                    .setRequestId("request 1")
+                    .setRpcAction(RpcActions.ServiceCreate)
+                    .setNotificationUrl("notification url")
+                    .build())
+            .setHardConstraints(new HardConstraintsBuilder().build())
+            .build();
     }
 
     public static ServiceCreateInput buildServiceCreateInputWithSoftConstraints() {
-
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.create.input
-                .ServiceAEnd serviceAEnd = getServiceAEndBuild()
-                .build();
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.create.input
-                .ServiceZEnd serviceZEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service
-                .create.input.ServiceZEndBuilder()
-                .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
-                .setNodeId(new NodeIdType("XPONDER-3-2"))
-                .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
-                .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
-                .build();
-
-        ServiceCreateInputBuilder builtInput = new ServiceCreateInputBuilder()
+        return new ServiceCreateInputBuilder()
             .setCommonId("commonId")
             .setConnectionType(ConnectionType.Service)
             .setCustomer("Customer")
             .setServiceName("service 1")
-            .setServiceAEnd(serviceAEnd)
-            .setServiceZEnd(serviceZEnd)
-            .setSdncRequestHeader(new SdncRequestHeaderBuilder().setRequestId("request 1")
-                .setRpcAction(RpcActions.ServiceCreate).setNotificationUrl("notification url").build())
-            .setSoftConstraints(new SoftConstraintsBuilder().build());
-
-        return builtInput.build();
+            .setServiceAEnd(getServiceAEndBuild().build())
+            .setServiceZEnd(
+                new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                        .service.create.input.ServiceZEndBuilder()
+                    .setClli("clli")
+                    .setServiceFormat(ServiceFormat.OC)
+                    .setServiceRate(Uint32.valueOf(1))
+                    .setNodeId(new NodeIdType("XPONDER-3-2"))
+                    .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
+                    .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
+                    .build())
+            .setSdncRequestHeader(
+                new SdncRequestHeaderBuilder()
+                    .setRequestId("request 1")
+                    .setRpcAction(RpcActions.ServiceCreate)
+                    .setNotificationUrl("notification url")
+                    .build())
+            .setSoftConstraints(new SoftConstraintsBuilder().build())
+            .build();
     }
 
     public static PathComputationRequestInput createPceRequestInput(ServiceCreateInput input) {
-        ServiceHandlerHeaderBuilder serviceHandlerHeader = new ServiceHandlerHeaderBuilder();
         SdncRequestHeader serviceHandler = input.getSdncRequestHeader();
-        if (serviceHandler != null) {
-            serviceHandlerHeader.setRequestId(serviceHandler.getRequestId());
-        }
         return new PathComputationRequestInputBuilder()
             .setServiceName(input.getServiceName())
             .setResourceReserve(true)
-            .setServiceHandlerHeader(serviceHandlerHeader.build())
+            .setServiceHandlerHeader(
+                serviceHandler == null
+                    ? new ServiceHandlerHeaderBuilder().build()
+                    : new ServiceHandlerHeaderBuilder().setRequestId(serviceHandler.getRequestId()).build())
             .setHardConstraints(input.getHardConstraints())
             .setSoftConstraints(input.getSoftConstraints())
             .setPceRoutingMetric(PceMetric.TEMetric)
@@ -180,194 +171,226 @@ public final class ServiceDataUtils {
     }
 
     public static TempServiceCreateInput buildTempServiceCreateInput() {
-
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.create.input
-            .ServiceAEnd serviceAEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp
-                .service.create.input.ServiceAEndBuilder()
-            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
-            .setNodeId(new NodeIdType("XPONDER-1-2"))
-            .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
-            .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
-            .build();
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.create.input
-            .ServiceZEnd serviceZEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp
-            .service.create.input.ServiceZEndBuilder()
-            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
-            .setNodeId(new NodeIdType("XPONDER-3-2"))
-            .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
-            .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
-            .build();
-
-        TempServiceCreateInputBuilder builtInput = new TempServiceCreateInputBuilder()
+        return new TempServiceCreateInputBuilder()
             .setCommonId("commonId")
             .setConnectionType(ConnectionType.Service)
             .setCustomer("Customer")
-            .setServiceAEnd(serviceAEnd)
-            .setServiceZEnd(serviceZEnd)
-            .setSdncRequestHeader(new SdncRequestHeaderBuilder().setRequestId("request 1")
-                .setRpcAction(RpcActions.TempServiceCreate).setNotificationUrl("notification url").build());
-
-        return builtInput.build();
-    }
-
-    public static ServiceFeasibilityCheckInput buildServiceFeasibilityCheckInput() {
-
-        ServiceAEnd serviceAEnd = new ServiceAEndBuilder()
+            .setServiceAEnd(
+                new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                        .temp.service.create.input.ServiceAEndBuilder()
                     .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
                     .setNodeId(new NodeIdType("XPONDER-1-2"))
                     .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
-                    .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection())).build();
-        ServiceZEnd serviceZEnd = new ServiceZEndBuilder()
+                    .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
+                    .build())
+            .setServiceZEnd(
+                new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                        .temp.service.create.input.ServiceZEndBuilder()
                     .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
                     .setNodeId(new NodeIdType("XPONDER-3-2"))
                     .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
-                    .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection())).build();
+                    .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
+                    .build())
+            .setSdncRequestHeader(
+                new SdncRequestHeaderBuilder()
+                    .setRequestId("request 1")
+                    .setRpcAction(RpcActions.TempServiceCreate)
+                    .setNotificationUrl("notification url")
+                    .build())
+            .build();
+    }
 
-        ServiceFeasibilityCheckInputBuilder builtInput = new ServiceFeasibilityCheckInputBuilder()
+    public static ServiceFeasibilityCheckInput buildServiceFeasibilityCheckInput() {
+        return new ServiceFeasibilityCheckInputBuilder()
             .setCommonId("commonId")
             .setConnectionType(ConnectionType.Service)
             .setCustomer("Customer")
-            .setServiceAEnd(serviceAEnd)
-            .setServiceZEnd(serviceZEnd)
-            .setSdncRequestHeader(new SdncRequestHeaderBuilder().setRequestId("request 1")
-                .setRpcAction(RpcActions.ServiceFeasibilityCheck).setNotificationUrl("notification url").build());
-        return builtInput.build();
+            .setServiceAEnd(
+                new ServiceAEndBuilder()
+                    .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
+                    .setNodeId(new NodeIdType("XPONDER-1-2"))
+                    .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
+                    .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
+                    .build())
+            .setServiceZEnd(
+                new ServiceZEndBuilder()
+                    .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
+                    .setNodeId(new NodeIdType("XPONDER-3-2"))
+                    .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
+                    .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
+                    .build())
+            .setSdncRequestHeader(
+                new SdncRequestHeaderBuilder()
+                    .setRequestId("request 1")
+                    .setRpcAction(RpcActions.ServiceFeasibilityCheck)
+                    .setNotificationUrl("notification url")
+                    .build())
+            .build();
     }
 
-    public static org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.create.input
-            .ServiceAEndBuilder getServiceAEndBuild() {
-        return new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.create.input
-                .ServiceAEndBuilder()
-            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
+    public static org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+            .service.create.input.ServiceAEndBuilder getServiceAEndBuild() {
+        return new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                .service.create.input.ServiceAEndBuilder()
+            .setClli("clli")
+            .setServiceFormat(ServiceFormat.OC)
+            .setServiceRate(Uint32.valueOf(1))
             .setNodeId(new NodeIdType("XPONDER-1-2"))
             .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
             .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()));
     }
 
-    public static org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.create.input
-        .ServiceZEndBuilder getServiceZEndBuild() {
-        return new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.create.input
-                .ServiceZEndBuilder()
-            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
+    public static org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+            .service.create.input.ServiceZEndBuilder getServiceZEndBuild() {
+        return new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                .service.create.input.ServiceZEndBuilder()
+            .setClli("clli")
+            .setServiceFormat(ServiceFormat.OC)
+            .setServiceRate(Uint32.valueOf(1))
             .setNodeId(new NodeIdType("XPONDER-1-2"))
             .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
             .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()));
     }
 
     private static TxDirection getTxDirection() {
-        return new org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev230526.service
-                .endpoint.TxDirectionBuilder().setPort(new PortBuilder().setPortDeviceName("device name")
-                        .setPortName("port name").setPortRack("port rack").setPortShelf("port shelf")
-                        .setPortSlot("port slot").setPortSubSlot("port subslot").setPortType("port type").build())
-                        .setLgx(new LgxBuilder().setLgxDeviceName("lgx device name").setLgxPortName("lgx port name")
-                                .setLgxPortRack("lgx port rack").setLgxPortShelf("lgx port shelf").build())
-                        .setIndex(Uint8.ZERO)
-                        .build();
+        return new org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev230526
+                .service.endpoint.TxDirectionBuilder()
+            .setPort(
+                new PortBuilder()
+                    .setPortDeviceName("device name")
+                    .setPortName("port name")
+                    .setPortRack("port rack")
+                    .setPortShelf("port shelf")
+                    .setPortSlot("port slot")
+                    .setPortSubSlot("port subslot")
+                    .setPortType("port type")
+                    .build())
+            .setLgx(
+                new LgxBuilder()
+                    .setLgxDeviceName("lgx device name")
+                    .setLgxPortName("lgx port name")
+                    .setLgxPortRack("lgx port rack")
+                    .setLgxPortShelf("lgx port shelf")
+                    .build())
+            .setIndex(Uint8.ZERO)
+            .build();
     }
 
     private static RxDirection getRxDirection() {
-        return new org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev230526.service
-                .endpoint.RxDirectionBuilder()
-                    .setPort(new PortBuilder().setPortDeviceName("device name").setPortName("port name")
-                        .setPortRack("port rack").setPortShelf("port shelf").setPortSlot("port slot")
-                        .setPortSubSlot("port subslot").setPortType("port type").build())
-                    .setLgx(new LgxBuilder().setLgxDeviceName("lgx device name")
-                        .setLgxPortName("lgx port name").setLgxPortRack("lgx port rack")
-                        .setLgxPortShelf("lgx port shelf").build())
-                    .setIndex(Uint8.ZERO)
-                    .build();
+        return new org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev230526
+                .service.endpoint.RxDirectionBuilder()
+            .setPort(
+                new PortBuilder()
+                    .setPortDeviceName("device name")
+                    .setPortName("port name")
+                    .setPortRack("port rack")
+                    .setPortShelf("port shelf")
+                    .setPortSlot("port slot")
+                    .setPortSubSlot("port subslot")
+                    .setPortType("port type")
+                    .build())
+            .setLgx(
+                new LgxBuilder()
+                    .setLgxDeviceName("lgx device name")
+                    .setLgxPortName("lgx port name")
+                    .setLgxPortRack("lgx port rack")
+                    .setLgxPortShelf("lgx port shelf")
+                    .build())
+            .setIndex(Uint8.ZERO)
+            .build();
     }
 
     public static ServiceDeleteInput buildServiceDeleteInput() {
-
-        ServiceDeleteInputBuilder deleteInputBldr = new ServiceDeleteInputBuilder();
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx");
-        OffsetDateTime offsetDateTime = OffsetDateTime.now(ZoneOffset.UTC);
-        DateAndTime datetime = new DateAndTime(dtf.format(offsetDateTime));
-        deleteInputBldr.setServiceDeleteReqInfo(new ServiceDeleteReqInfoBuilder().setServiceName("service 1")
-            .setDueDate(datetime).setTailRetention(ServiceDeleteReqInfo.TailRetention.No).build());
-        SdncRequestHeaderBuilder sdncBuilder = new SdncRequestHeaderBuilder()
-            .setNotificationUrl("notification url")
-            .setRequestId("request 1")
-            .setRequestSystemId("request system 1")
-            .setRpcAction(RpcActions.ServiceDelete);
-        deleteInputBldr.setSdncRequestHeader(sdncBuilder.build());
-        return deleteInputBldr.build();
+        return new ServiceDeleteInputBuilder()
+            .setServiceDeleteReqInfo(
+                new ServiceDeleteReqInfoBuilder().setServiceName("service 1")
+                    .setDueDate(
+                        new DateAndTime(
+                            DateTimeFormatter
+                                .ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx")
+                                .format(OffsetDateTime.now(ZoneOffset.UTC))))
+                    .setTailRetention(ServiceDeleteReqInfo.TailRetention.No)
+                    .build())
+            .setSdncRequestHeader(
+                new SdncRequestHeaderBuilder()
+                    .setNotificationUrl("notification url")
+                    .setRequestId("request 1")
+                    .setRequestSystemId("request system 1")
+                    .setRpcAction(RpcActions.ServiceDelete)
+                    .build())
+            .build();
     }
 
     public static TempServiceDeleteInput buildTempServiceDeleteInput() {
-        TempServiceDeleteInputBuilder deleteInputBldr = new TempServiceDeleteInputBuilder()
-            .setCommonId("service 1");
-        return deleteInputBldr.build();
+        return new TempServiceDeleteInputBuilder().setCommonId("service 1").build();
     }
 
     public static TempServiceDeleteInput buildTempServiceDeleteInput(String commonId) {
-        TempServiceDeleteInputBuilder deleteInputBldr = new TempServiceDeleteInputBuilder()
-            .setCommonId(commonId);
-        return deleteInputBldr.build();
+        return new TempServiceDeleteInputBuilder().setCommonId(commonId).build();
     }
 
     public static ServiceRerouteInput buildServiceRerouteInput() {
-        ServiceRerouteInputBuilder builder = new ServiceRerouteInputBuilder()
-            .setServiceName("service 1");
-        return builder.build();
+        return new ServiceRerouteInputBuilder().setServiceName("service 1").build();
     }
 
     public static ServiceRestorationInput buildServiceRestorationInput() {
-        ServiceRestorationInputBuilder builder = new ServiceRestorationInputBuilder()
+        return new ServiceRestorationInputBuilder()
             .setServiceName("service 1")
-            .setOption(Option.Permanent);
-        return builder.build();
+            .setOption(Option.Permanent)
+            .build();
     }
 
     public static ServiceReconfigureInput buildServiceReconfigureInput() {
-
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.reconfigure.input
-            .ServiceAEnd serviceAEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service
-                .reconfigure.input.ServiceAEndBuilder()
-                .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
-                .setNodeId(new NodeIdType("XPONDER-1-2"))
-                .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
-                .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
-                .build();
-        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.reconfigure.input
-            .ServiceZEnd serviceZEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service
-                .reconfigure.input.ServiceZEndBuilder()
-                .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
-                .setNodeId(new NodeIdType("XPONDER-3-2"))
-                .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
-                .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
-                .build();
-
-        ServiceReconfigureInputBuilder builtInput = new ServiceReconfigureInputBuilder()
+        return new ServiceReconfigureInputBuilder()
             .setCommonId("commonId")
             .setConnectionType(ConnectionType.Service)
             .setCustomer("Customer")
             .setServiceName("service 1")
-            .setServiceAEnd(serviceAEnd)
-            .setServiceZEnd(serviceZEnd);
-        return builtInput.build();
+            .setServiceAEnd(
+                new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                        .service.reconfigure.input.ServiceAEndBuilder()
+                    .setClli("clli")
+                    .setServiceFormat(ServiceFormat.OC)
+                    .setServiceRate(Uint32.valueOf(1))
+                    .setNodeId(new NodeIdType("XPONDER-1-2"))
+                    .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
+                    .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
+                    .build())
+            .setServiceZEnd(
+                new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                        .service.reconfigure.input.ServiceZEndBuilder()
+                    .setClli("clli")
+                    .setServiceFormat(ServiceFormat.OC)
+                    .setServiceRate(Uint32.valueOf(1))
+                    .setNodeId(new NodeIdType("XPONDER-3-2"))
+                    .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
+                    .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()))
+                    .build())
+            .build();
     }
 
     public static ServicePathRpcResult buildServicePathRpcResult() {
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx");
-        OffsetDateTime offsetDateTime = OffsetDateTime.now(ZoneOffset.UTC);
-        DateAndTime datetime = new DateAndTime(dtf.format(offsetDateTime));
-        ServicePathRpcResultBuilder builder = new ServicePathRpcResultBuilder();
-        builder.setActualDate(datetime).setNotificationType(ServicePathNotificationTypes.PathComputationRequest)
+        return new ServicePathRpcResultBuilder()
+            .setActualDate(
+                new DateAndTime(
+                    DateTimeFormatter
+                        .ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx")
+                        .format(OffsetDateTime.now(ZoneOffset.UTC))))
+            .setNotificationType(ServicePathNotificationTypes.PathComputationRequest)
             .setPathDescription(createPathDescription(0,1, 0, 1))
             .setServiceName("service 1")
-            .setStatus(RpcStatusEx.Successful).setStatusMessage("success");
-        return builder.build();
+            .setStatus(RpcStatusEx.Successful).setStatusMessage("success")
+            .build();
     }
 
     public static ServicePathRpcResult buildServicePathRpcResult(
             ServicePathNotificationTypes servicePathNotificationTypes, String serviceName, RpcStatusEx rpcStatusEx,
             String message, Boolean pathDescription) {
-        ServicePathRpcResultBuilder builder = new ServicePathRpcResultBuilder();
-        builder.setNotificationType(servicePathNotificationTypes)
-                .setServiceName(serviceName)
-                .setStatus(rpcStatusEx).setStatusMessage(message);
+        ServicePathRpcResultBuilder builder = new ServicePathRpcResultBuilder()
+            .setNotificationType(servicePathNotificationTypes)
+            .setServiceName(serviceName)
+            .setStatus(rpcStatusEx)
+            .setStatusMessage(message);
         if (pathDescription) {
             builder.setPathDescription(createPathDescription(0L, 5L, 0L, 5L));
         }
@@ -375,101 +398,122 @@ public final class ServiceDataUtils {
     }
 
     public static ServicePathRpcResult buildFailedPceServicePathRpcResult() {
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx");
-        OffsetDateTime offsetDateTime = OffsetDateTime.now(ZoneOffset.UTC);
-        DateAndTime datetime = new DateAndTime(dtf.format(offsetDateTime));
-        ServicePathRpcResultBuilder builder = new ServicePathRpcResultBuilder();
-        builder.setActualDate(datetime).setNotificationType(ServicePathNotificationTypes.PathComputationRequest)
-                .setPathDescription(createPathDescription(0, 1, 0, 1)).setServiceName("service 1")
-                .setStatus(RpcStatusEx.Failed).setStatusMessage("failed");
-        return builder.build();
+        return new ServicePathRpcResultBuilder()
+            .setActualDate(
+                new DateAndTime(
+                    DateTimeFormatter
+                        .ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx")
+                        .format(OffsetDateTime.now(ZoneOffset.UTC))))
+            .setNotificationType(ServicePathNotificationTypes.PathComputationRequest)
+            .setPathDescription(createPathDescription(0, 1, 0, 1))
+            .setServiceName("service 1")
+            .setStatus(RpcStatusEx.Failed).setStatusMessage("failed")
+        .build();
     }
 
     public static ServicePathRpcResult buildFailedServicePathRpcResult() {
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx");
-        OffsetDateTime offsetDateTime = OffsetDateTime.now(ZoneOffset.UTC);
-        DateAndTime datetime = new DateAndTime(dtf.format(offsetDateTime));
-        ServicePathRpcResultBuilder builder = new ServicePathRpcResultBuilder();
-        builder.setActualDate(datetime).setNotificationType(ServicePathNotificationTypes.ServiceImplementationRequest)
+        return new ServicePathRpcResultBuilder()
+            .setActualDate(
+                new DateAndTime(
+                    DateTimeFormatter
+                        .ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx")
+                        .format(OffsetDateTime.now(ZoneOffset.UTC))))
+            .setNotificationType(ServicePathNotificationTypes.ServiceImplementationRequest)
             .setPathDescription(createPathDescription(0,1, 0, 1))
             .setServiceName("service 1")
-                .setStatus(RpcStatusEx.Failed).setStatusMessage("failed");
-        return builder.build();
+            .setStatus(RpcStatusEx.Failed)
+            .setStatusMessage("failed")
+            .build();
     }
 
     public static RendererRpcResultSp buildRendererRpcResultSp() {
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx");
-        OffsetDateTime offsetDateTime = OffsetDateTime.now(ZoneOffset.UTC);
-        DateAndTime datetime = new DateAndTime(dtf.format(offsetDateTime));
-        RendererRpcResultSpBuilder builder = new RendererRpcResultSpBuilder();
-        builder.setActualDate(datetime).setNotificationType(ServicePathNotificationTypes.ServiceImplementationRequest)
-                .setServiceName("service 1").setStatus(RpcStatusEx.Successful).setStatusMessage("success");
-        return builder.build();
+        return new RendererRpcResultSpBuilder()
+            .setActualDate(
+                new DateAndTime(
+                    DateTimeFormatter
+                        .ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx")
+                        .format(OffsetDateTime.now(ZoneOffset.UTC))))
+            .setNotificationType(ServicePathNotificationTypes.ServiceImplementationRequest)
+            .setServiceName("service 1")
+            .setStatus(RpcStatusEx.Successful)
+            .setStatusMessage("success")
+            .build();
     }
 
     public static RendererRpcResultSp buildRendererRpcResultSp(
             ServicePathNotificationTypes servicePathNotificationTypes,
             String serviceName, RpcStatusEx rpcStatusEx, String message) {
-        RendererRpcResultSpBuilder builder = new RendererRpcResultSpBuilder();
-        builder.setNotificationType(servicePathNotificationTypes).setServiceName(serviceName)
-                .setStatus(rpcStatusEx).setStatusMessage(message);
-        return builder.build();
+        return new RendererRpcResultSpBuilder()
+            .setNotificationType(servicePathNotificationTypes)
+            .setServiceName(serviceName)
+            .setStatus(rpcStatusEx)
+            .setStatusMessage(message)
+            .build();
     }
 
     public static ServiceRpcResultSh buildServiceRpcResultSh(
             ServiceNotificationTypes serviceNotificationTypes,
             String serviceName,
-            org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.RpcStatusEx
-                rpcStatusEx,
+            org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118
+                .RpcStatusEx rpcStatusEx,
             String message) {
-        ServiceRpcResultShBuilder builder = new ServiceRpcResultShBuilder();
-        builder.setNotificationType(serviceNotificationTypes).setServiceName(serviceName)
-                .setStatus(rpcStatusEx).setStatusMessage(message);
-        return builder.build();
+        return new ServiceRpcResultShBuilder()
+            .setNotificationType(serviceNotificationTypes)
+            .setServiceName(serviceName)
+            .setStatus(rpcStatusEx)
+            .setStatusMessage(message)
+            .build();
     }
 
     public static RendererRpcResultSp buildFailedRendererRpcResultSp() {
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx");
-        OffsetDateTime offsetDateTime = OffsetDateTime.now(ZoneOffset.UTC);
-        DateAndTime datetime = new DateAndTime(dtf.format(offsetDateTime));
-        RendererRpcResultSpBuilder builder = new RendererRpcResultSpBuilder();
-        builder.setActualDate(datetime).setNotificationType(ServicePathNotificationTypes.ServiceImplementationRequest)
-                .setServiceName("service 1").setStatus(RpcStatusEx.Failed).setStatusMessage("failed");
-        return builder.build();
+        return new RendererRpcResultSpBuilder()
+            .setActualDate(
+                new DateAndTime(
+                    DateTimeFormatter
+                        .ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx")
+                        .format(OffsetDateTime.now(ZoneOffset.UTC))))
+            .setNotificationType(ServicePathNotificationTypes.ServiceImplementationRequest)
+            .setServiceName("service 1")
+            .setStatus(RpcStatusEx.Failed)
+            .setStatusMessage("failed")
+            .build();
     }
 
-    public static PathDescription createPathDescription(long azRate, long azWaveLength, long zaRate,
-        long zaWaveLength) {
-        AToZDirection atozDirection = new AToZDirectionBuilder()
-            .setRate(Uint32.valueOf(azRate))
-            .setAToZWavelengthNumber(Uint32.valueOf(azWaveLength))
-            .build();
-        ZToADirection ztoaDirection = new ZToADirectionBuilder()
-            .setRate(Uint32.valueOf(zaRate))
-            .setZToAWavelengthNumber(Uint32.valueOf(zaWaveLength))
-            .build();
-        PathDescription pathDescription = new PathDescriptionBuilder()
-            .setAToZDirection(atozDirection)
-            .setZToADirection(ztoaDirection)
+    public static PathDescription createPathDescription(
+            long azRate, long azWaveLength, long zaRate, long zaWaveLength) {
+        return new PathDescriptionBuilder()
+            .setAToZDirection(
+                new AToZDirectionBuilder()
+                    .setRate(Uint32.valueOf(azRate))
+                    .setAToZWavelengthNumber(Uint32.valueOf(azWaveLength))
+                    .build())
+            .setZToADirection(
+                new ZToADirectionBuilder()
+                    .setRate(Uint32.valueOf(zaRate))
+                    .setZToAWavelengthNumber(Uint32.valueOf(zaWaveLength))
+                    .build())
             .build();
-        return pathDescription;
     }
 
-    public static org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.reconfigure.input
-        .ServiceAEndBuilder getServiceAEndBuildReconfigure() {
-        return new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.reconfigure.input
-            .ServiceAEndBuilder()
-            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
+    public static org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+            .service.reconfigure.input.ServiceAEndBuilder getServiceAEndBuildReconfigure() {
+        return new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                .service.reconfigure.input.ServiceAEndBuilder()
+            .setClli("clli")
+            .setServiceFormat(ServiceFormat.OC)
+            .setServiceRate(Uint32.valueOf(1))
             .setNodeId(new NodeIdType("XPONDER-1-2"))
             .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
             .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()));
     }
 
-    public static org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.reconfigure.input
-        .ServiceZEndBuilder getServiceZEndBuildReconfigure() {
-        return new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.reconfigure.input
-            .ServiceZEndBuilder()
-            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1))
+    public static org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+            .service.reconfigure.input.ServiceZEndBuilder getServiceZEndBuildReconfigure() {
+        return new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                .service.reconfigure.input.ServiceZEndBuilder()
+            .setClli("clli")
+            .setServiceFormat(ServiceFormat.OC)
+            .setServiceRate(Uint32.valueOf(1))
             .setNodeId(new NodeIdType("XPONDER-1-2"))
             .setTxDirection(Map.of(new TxDirectionKey(getTxDirection().key()),getTxDirection()))
             .setRxDirection(Map.of(new RxDirectionKey(getRxDirection().key()), getRxDirection()));