Prepare NetworkModel to support ordm 2.2.x devices

[transportpce.git] / networkmodel / src / main / java / org / opendaylight / transportpce / networkmodel / OrdLink.java

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java
index 1f83df4f593a6a98e7f5fc27a55da6fc0cb21f50..3bbd15147e550ece0e45c620b6379ad414f1b968 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java
@@ -14,7 +14,7 @@ import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.transportpce.common.NetworkUtils;
 import org.opendaylight.transportpce.networkmodel.util.LinkIdUtil;
-import org.opendaylight.transportpce.networkmodel.util.OpenRoadmTopology;
+import org.opendaylight.transportpce.networkmodel.util.OpenRoadmFactory;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRoadmNodesInput;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.Link1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.Link1Builder;
@@ -37,48 +37,47 @@ final class OrdLink {
     private static final Logger LOG = LoggerFactory.getLogger(OrdLink.class);
 
     /**Method to create OMS links if not discovered by LLDP. This is helpful
-    to create test topologies using simulators**/
+     to create test topologies using simulators**/
     public static boolean createRdm2RdmLinks(InitRoadmNodesInput input,
-        OpenRoadmTopology openRoadmTopology, DataBroker dataBroker) {
+                                             OpenRoadmFactory openRoadmFactory, DataBroker dataBroker) {
 
         LinkId oppositeLinkId = LinkIdUtil.getRdm2RdmOppositeLinkId(input);
 
         //For setting up attributes for openRoadm augment
         Link1Builder link1Builder = new Link1Builder();
-        link1Builder.setLinkType(OpenroadmLinkType.ROADMTOROADM);
         OMSAttributesBuilder omsAttributesBuilder = new OMSAttributesBuilder();
         omsAttributesBuilder.setOppositeLink(oppositeLinkId);
         link1Builder.setOMSAttributes(omsAttributesBuilder.build());
 
         //For opposite link augment
         org.opendaylight.yang.gen.v1.http.org.openroadm.opposite.links.rev170929.Link1Builder oppsiteLinkBuilder =
-                new org.opendaylight.yang.gen.v1.http.org.openroadm.opposite.links.rev170929.Link1Builder();
+            new org.opendaylight.yang.gen.v1.http.org.openroadm.opposite.links.rev170929.Link1Builder();
         oppsiteLinkBuilder.setOppositeLink(oppositeLinkId);
-
+        link1Builder.setLinkType(OpenroadmLinkType.ROADMTOROADM);
         String srcNode = new StringBuilder(input.getRdmANode()).append("-DEG").append(input.getDegANum()).toString();
         String srcTp = input.getTerminationPointA();
         String destNode = new StringBuilder(input.getRdmZNode()).append("-DEG").append(input.getDegZNum()).toString();
         String destTp = input.getTerminationPointZ();
 
         //IETF link builder
-        LinkBuilder linkBuilder = openRoadmTopology.createLink(srcNode, destNode, srcTp, destTp);
+        LinkBuilder linkBuilder = openRoadmFactory.createLink(srcNode, destNode, srcTp, destTp);
 
         linkBuilder.addAugmentation(Link1.class,link1Builder.build());
-        linkBuilder.addAugmentation(org.opendaylight.yang.gen.v1.http
-                .org.openroadm.opposite.links.rev170929.Link1.class,oppsiteLinkBuilder.build());
+        linkBuilder.addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.opposite.links.rev170929.Link1
+            .class, oppsiteLinkBuilder.build());
         LinkId linkId = LinkIdUtil.buildLinkId(srcNode, srcTp, destNode, destTp);
 
         // Building link instance identifier
         InstanceIdentifier.InstanceIdentifierBuilder<Link> linkIID =
             InstanceIdentifier.builder(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)))
-            .augmentation(Network1.class).child(Link.class, new LinkKey(linkId));
+                .augmentation(Network1.class).child(Link.class, new LinkKey(linkId));
 
         WriteTransaction writeTransaction = dataBroker.newWriteOnlyTransaction();
         writeTransaction.merge(LogicalDatastoreType.CONFIGURATION, linkIID.build(), linkBuilder.build());
         try {
             writeTransaction.submit().get();
             LOG.info("A new link with linkId: {} added into {} layer.",
-                    linkId.getValue(), NetworkUtils.OVERLAY_NETWORK_ID);
+                linkId.getValue(), NetworkUtils.OVERLAY_NETWORK_ID);
             return true;
         } catch (InterruptedException | ExecutionException e) {
             LOG.warn("Failed to create Roadm 2 Roadm Link for topo layer ");