import org.opendaylight.transportpce.networkmodel.util.LinkIdUtil;
import org.opendaylight.transportpce.networkmodel.util.TopologyUtils;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.links.input.grouping.LinksInput;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Link1;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Link1Builder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.TerminationPoint1;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.TerminationPoint1Builder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.termination.point.XpdrNetworkAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmLinkType;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1Builder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.Link1;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.TerminationPoint1;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.TerminationPoint1Builder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.networks.network.node.termination.point.XpdrNetworkAttributesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmLinkType;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.Networks;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId;
String destTp = linksInput.getTerminationPointNum();
// update tail-equipment-id for tp of link
TerminationPoint xpdrTp = getTpofNode(srcNode, srcTp, dataBroker);
+ TerminationPoint rdmTp = getTpofNode(destNode, destTp, dataBroker);
- Network topoNetowkLayer = createNetworkBuilder(srcNode, srcTp, destNode, destTp, false, xpdrTp).build();
+ Network topoNetowkLayer = createNetworkBuilder(srcNode, srcTp, destNode, destTp, false, xpdrTp,
+ rdmTp).build();
InstanceIdentifier.InstanceIdentifierBuilder<Network> nwIID = InstanceIdentifier.builder(Networks.class)
.child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)));
WriteTransaction wrtx = dataBroker.newWriteOnlyTransaction();
String destTp = new StringBuilder("XPDR").append(linksInput.getXpdrNum()).append("-NETWORK")
.append(linksInput.getNetworkNum()).toString();
TerminationPoint xpdrTp = getTpofNode(destNode, destTp, dataBroker);
+ TerminationPoint rdmTp = getTpofNode(srcNode, srcTp, dataBroker);
- Network topoNetowkLayer = createNetworkBuilder(srcNode, srcTp, destNode, destTp, true, xpdrTp).build();
+ Network topoNetowkLayer = createNetworkBuilder(srcNode, srcTp, destNode, destTp, true, xpdrTp,
+ rdmTp).build();
InstanceIdentifier.InstanceIdentifierBuilder<Network> nwIID =
InstanceIdentifier.builder(Networks.class).child(Network.class,
- new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)));
+ new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)));
WriteTransaction wrtx = dataBroker.newWriteOnlyTransaction();
wrtx.merge(LogicalDatastoreType.CONFIGURATION, nwIID.build(), topoNetowkLayer);
FluentFuture<? extends @NonNull CommitInfo> commit = wrtx.commit();
}
private static NetworkBuilder createNetworkBuilder(String srcNode, String srcTp, String destNode, String destTp,
- boolean isXponderInput, TerminationPoint xpdrTp) {
+ boolean isXponderInput, TerminationPoint xpdrTp, TerminationPoint rdmTp) {
//update tp of nodes
TerminationPointBuilder xpdrTpBldr = new TerminationPointBuilder(xpdrTp);
if (xpdrTpBldr.augmentation(TerminationPoint1.class) != null) {
nodeBldr.setNodeId(new NodeId(srcNode));
}
- Link1Builder lnk1bldr = new Link1Builder();
- org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder lnk2bldr
- = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder()
+ Link1Builder lnk2bldr
+ = new Link1Builder()
.setLinkType(isXponderInput ? OpenroadmLinkType.XPONDERINPUT : OpenroadmLinkType.XPONDEROUTPUT)
.setOppositeLink(LinkIdUtil.getOppositeLinkId(srcNode, srcTp, destNode, destTp));
+ // If both TPs of the Xpdr2Rdm link are inService --> link inService. Otherwise outOfService
+ if (State.InService.equals(xpdrTp.augmentation(org.opendaylight.yang.gen.v1.http
+ .org.openroadm.common.network.rev200529.TerminationPoint1.class).getOperationalState())
+ && State.InService.equals(rdmTp.augmentation(org.opendaylight.yang.gen.v1.http
+ .org.openroadm.common.network.rev200529.TerminationPoint1.class).getOperationalState())) {
+ lnk2bldr.setOperationalState(State.InService).setAdministrativeState(AdminStates.InService);
+ } else {
+ lnk2bldr.setOperationalState(State.OutOfService).setAdministrativeState(AdminStates.OutOfService);
+ }
LinkBuilder linkBuilder = TopologyUtils.createLink(srcNode, destNode, srcTp, destTp, null)
- .addAugmentation(lnk1bldr.build())
.addAugmentation(lnk2bldr.build());
LOG.info("Link id in the linkbldr {}", linkBuilder.getLinkId());
NetworkId nwId = new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID);
Node node = nodeBldr.build();
- NetworkBuilder nwBuilder = new NetworkBuilder()
+ return new NetworkBuilder()
.setNetworkId(nwId)
.withKey(new NetworkKey(nwId))
.addAugmentation(nwBldr1.build())
.setNode(ImmutableMap.of(node.key(),node));
- return nwBuilder;
}
private static TerminationPoint getTpofNode(String srcNode, String srcTp, DataBroker dataBroker) {