import org.opendaylight.transportpce.common.fixedflex.GridUtils;
import org.opendaylight.transportpce.common.network.NetworkTransactionService;
import org.opendaylight.transportpce.networkmodel.dto.TopologyShard;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Link1;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Link1Builder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev231221.mapping.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev231221.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.Link1;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.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.rev211210.Node1;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.Node1Builder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.TerminationPoint1;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.networks.network.node.DegreeAttributes;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.networks.network.node.DegreeAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.networks.network.node.SrgAttributes;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.networks.network.node.SrgAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmLinkType;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmNodeType;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmTpType;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev230526.Node1;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev230526.Node1Builder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev230526.networks.network.node.DegreeAttributes;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev230526.networks.network.node.DegreeAttributesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev230526.networks.network.node.SrgAttributes;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev230526.networks.network.node.SrgAttributesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev230526.OpenroadmLinkType;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev230526.OpenroadmNodeType;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev230526.OpenroadmTpType;
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;
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.TerminationPointKey;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdentifierBuilder;
import org.opendaylight.yangtools.yang.common.Uint16;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
"switch-network", OpenroadmTpType.XPONDERNETWORK,
"xpdr-client", OpenroadmTpType.XPONDERCLIENT
);
- private static Map<String, OpenroadmTpType> PORTDIR_ORD_DEG_TYPE_MAP = Map.of(
- "bidirectional", OpenroadmTpType.DEGREETXRXTTP,
- "tx", OpenroadmTpType.DEGREETXTTP,
- "rx", OpenroadmTpType.DEGREERXTTP
- );
- private static Map<String, OpenroadmTpType> PORTDIR_ORD_SRG_TYPE_MAP = Map.of(
- "bidirectional", OpenroadmTpType.SRGTXRXPP,
- "tx", OpenroadmTpType.SRGTXPP,
- "rx", OpenroadmTpType.SRGRXPP
+ private static Map<String, List<OpenroadmTpType>> PORTDIR_ORD_TYPE_MAP = Map.of(
+ "bidirectional", List.of(OpenroadmTpType.DEGREETXRXTTP, OpenroadmTpType.SRGTXRXPP),
+ "tx", List.of(OpenroadmTpType.DEGREETXTTP, OpenroadmTpType.SRGTXPP),
+ "rx", List.of(OpenroadmTpType.DEGREERXTTP, OpenroadmTpType.SRGRXPP)
);
private OpenRoadmTopology() {
List<Mapping> extractedMappings = mappingNode.nonnullMapping().values()
.stream().filter(lcp -> lcp.getLogicalConnectionPoint().contains("XPDR" + xpdrNb))
.collect(Collectors.toList());
- Boolean lastArg;
+ Boolean isOtn;
String xpdrType;
- switch (mapping.getXponderType() == null ? Tpdr : mapping.getXponderType()) {
+ switch (mapping.getXpdrType() == null ? Tpdr : mapping.getXpdrType()) {
case Tpdr :
- lastArg = false;
+ isOtn = false;
xpdrType = "Tpdr";
break;
case Mpdr :
case Switch :
- lastArg = true;
- xpdrType = mapping.getXponderType().getName();
+ isOtn = true;
+ xpdrType = mapping.getXpdrType().getName();
+ break;
+ // Both regen and regen-uni are added here, though initial support is
+ // only for regen xpdr-type
+ case Regen:
+ case RegenUni:
+ isOtn = false;
+ xpdrType = mapping.getXpdrType().getName();
break;
default :
LOG.warn("cannot create xpdr node {} in openroadm-topology: type {} not supported",
- mappingNode.getNodeId() + "-XPDR" + xpdrNb, mapping.getXponderType().getName());
+ mappingNode.getNodeId() + "-XPDR" + xpdrNb, mapping.getXpdrType().getName());
continue;
}
LOG.info("creating xpdr node {} of type {} in openroadm-topology",
mappingNode.getNodeInfo().getNodeClli(),
xpdrNb,
extractedMappings,
- lastArg)
+ isOtn)
.build());
}
}
.withKey((new NodeKey(new NodeId(nodeIdtopo))))
.addAugmentation(
// Create openroadm-network-topo augmentation to set node type to Xponder
- new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Node1Builder()
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.Node1Builder()
.setNodeType(OpenroadmNodeType.XPONDER)
.setAdministrativeState(AdminStates.InService)
.setOperationalState(State.InService)
if (isOtn && m.getPortQual().equals("xpdr-client")) {
continue;
}
- org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.TerminationPoint1Builder
- ocnTp1Bldr = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210
+ var ocnTp1Bldr = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526
.TerminationPoint1Builder()
- .setTpType(PORTQUAL_ORD_TYPE_MAP.get(m.getPortQual()))
- .setAdministrativeState(TopologyUtils.setNetworkAdminState(m.getPortAdminState()))
- .setOperationalState(TopologyUtils.setNetworkOperState(m.getPortOperState()));
+ .setTpType(PORTQUAL_ORD_TYPE_MAP.get(m.getPortQual()))
+ .setAdministrativeState(TopologyUtils.setNetworkAdminState(m.getPortAdminState()))
+ .setOperationalState(TopologyUtils.setNetworkOperState(m.getPortOperState()));
if (!isOtn && m.getConnectionMapLcp() != null) {
ocnTp1Bldr.setAssociatedConnectionMapTp(Set.of(new TpId(m.getConnectionMapLcp())));
}
for (Mapping m : degListMap) {
// Add openroadm-common-network tp type augmentations
// Added states to degree port. TODO: add to mapping relation between abstracted and physical node states
- if (!PORTDIR_ORD_DEG_TYPE_MAP.containsKey(m.getPortDirection())) {
+ if (!PORTDIR_ORD_TYPE_MAP.containsKey(m.getPortDirection())) {
LOG.error("impossible to set tp-type to {}", m.getLogicalConnectionPoint());
}
TerminationPoint ietfTp = createTpBldr(m.getLogicalConnectionPoint())
.addAugmentation(
- new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526
.TerminationPoint1Builder()
- .setTpType(PORTDIR_ORD_DEG_TYPE_MAP.get(m.getPortDirection()))
+ .setTpType(PORTDIR_ORD_TYPE_MAP.get(m.getPortDirection()).get(0))
.setAdministrativeState(TopologyUtils.setNetworkAdminState(m.getPortAdminState()))
.setOperationalState(TopologyUtils.setNetworkOperState(m.getPortOperState()))
.build())
// Add CTP to tp-list + added states. TODO: same comment as before with the relation between states
TerminationPoint ietfTp = createTpBldr(degNb + "-CTP-TXRX")
.addAugmentation(new org.opendaylight.yang.gen.v1.http
- .org.openroadm.common.network.rev211210.TerminationPoint1Builder()
+ .org.openroadm.common.network.rev230526.TerminationPoint1Builder()
.setTpType(OpenroadmTpType.DEGREETXRXCTP)
.setAdministrativeState(AdminStates.InService)
.setOperationalState(State.InService)
.withKey((new NodeKey(new NodeId(nodeIdtopo))))
.addAugmentation(new Node1Builder().setDegreeAttributes(degAtt).build())
.addAugmentation(
- new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526
.Node1Builder()
.setNodeType(OpenroadmNodeType.DEGREE)
.setAdministrativeState(AdminStates.InService)
Map<TerminationPointKey,TerminationPoint> tpMap = new HashMap<>();
for (Mapping m : srgListMap) {
// Added states to srg port. TODO: add to mapping relation between abstracted and physical node states
- if (!PORTDIR_ORD_SRG_TYPE_MAP.containsKey(m.getPortDirection())) {
+ if (!PORTDIR_ORD_TYPE_MAP.containsKey(m.getPortDirection())) {
LOG.error("impossible to set tp-type to {}", m.getLogicalConnectionPoint());
}
TerminationPoint ietfTp = createTpBldr(m.getLogicalConnectionPoint())
.addAugmentation(
// Add openroadm-common-network tp type augmentations
- new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526
.TerminationPoint1Builder()
- .setTpType(PORTDIR_ORD_SRG_TYPE_MAP.get(m.getPortDirection()))
+ .setTpType(PORTDIR_ORD_TYPE_MAP.get(m.getPortDirection()).get(1))
.setAdministrativeState(TopologyUtils.setNetworkAdminState(m.getPortAdminState()))
.setOperationalState(TopologyUtils.setNetworkOperState(m.getPortOperState()))
.build())
// Add CP to tp-list + added states. TODO: same comment as before with the relation between states
TerminationPoint ietfTp = createTpBldr(srgNb + "-CP-TXRX")
.addAugmentation(
- new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526
.TerminationPoint1Builder()
.setTpType(OpenroadmTpType.SRGTXRXCP)
.setAdministrativeState(AdminStates.InService)
.withKey((new NodeKey(new NodeId(nodeIdtopo))))
.addAugmentation(new Node1Builder().setSrgAttributes(srgAttr).build())
.addAugmentation(
- new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526
.Node1Builder()
.setNodeType(OpenroadmNodeType.SRG)
.setAdministrativeState(AdminStates.InService)
.ietf.network.topology.rev180226.Node1.class)
.nonnullTerminationPoint().values().stream()
.filter(tp -> tp.getTpId().getValue().contains("CP") || tp.getTpId().getValue().contains("CTP"))
- .findFirst().get().getTpId().getValue();
+ .findFirst().orElseThrow().getTpId().getValue();
destTp = nodes.get(j)
.augmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang
.ietf.network.topology.rev180226.Node1.class)
.nonnullTerminationPoint().values().stream()
.filter(tp -> tp.getTpId().getValue().contains("CP") || tp.getTpId().getValue().contains("CTP"))
- .findFirst().get().getTpId().getValue();
+ .findFirst().orElseThrow().getTpId().getValue();
Link1Builder ocnAzLinkBldr = new Link1Builder();
Link1Builder ocnZaLinkBldr = new Link1Builder();
int srcNodeType = nodes.get(i).augmentation(org.opendaylight.yang.gen.v1.http
- .org.openroadm.common.network.rev211210.Node1.class).getNodeType().getIntValue();
+ .org.openroadm.common.network.rev230526.Node1.class).getNodeType().getIntValue();
int destNodeType = nodes.get(j).augmentation(org.opendaylight.yang.gen.v1.http
- .org.openroadm.common.network.rev211210.Node1.class).getNodeType().getIntValue();
+ .org.openroadm.common.network.rev230526.Node1.class).getNodeType().getIntValue();
if (srcNodeType == 11 && destNodeType == 11) {
ocnAzLinkBldr.setLinkType(OpenroadmLinkType.EXPRESSLINK);
.ietf.network.topology.rev180226.Node1.class)
.getTerminationPoint().values().stream()
.filter(tp -> tp.getTpId().getValue().contains("CP") || tp.getTpId().getValue().contains("CTP"))
- .findFirst().get()
- .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210
+ .findFirst().orElseThrow()
+ .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526
.TerminationPoint1.class)
.getOperationalState();
State destTpState = nodes.get(j)
.ietf.network.topology.rev180226.Node1.class)
.getTerminationPoint().values().stream()
.filter(tp -> tp.getTpId().getValue().contains("CP") || tp.getTpId().getValue().contains("CTP"))
- .findFirst().get()
- .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210
+ .findFirst().orElseThrow()
+ .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526
.TerminationPoint1.class)
.getOperationalState();
if (State.InService.equals(srcTpState) && State.InService.equals(destTpState)) {
public static boolean deleteLinkLinkId(LinkId linkId , NetworkTransactionService networkTransactionService) {
LOG.info("deleting link for LinkId: {}", linkId.getValue());
try {
- InstanceIdentifierBuilder<Link> linkIID = InstanceIdentifier.builder(Networks.class)
+ InstanceIdentifier.Builder<Link> linkIID = InstanceIdentifier.builder(Networks.class)
.child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)))
.augmentation(Network1.class)
.child(Link.class, new LinkKey(linkId));
LOG.error("No link found for given LinkId: {}", linkId);
return false;
}
- LinkBuilder linkBuilder = new LinkBuilder(link.get());
+ LinkBuilder linkBuilder = new LinkBuilder(link.orElseThrow());
networkTransactionService.merge(
LogicalDatastoreType.CONFIGURATION,
linkIID.build(),
linkBuilder
.removeAugmentation(Link1.class)
.addAugmentation(
- new org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev230526
.Link1Builder(linkBuilder
- .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210
+ .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev230526
.Link1.class))
.build())
.build());
* @param tpId String
* @return InstanceIdentifierBuilder
*/
- public static InstanceIdentifierBuilder<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210
+ public static InstanceIdentifier.Builder<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526
.TerminationPoint1> createCommonNetworkTerminationPointIIDBuilder(String nodeId, String tpId) {
return InstanceIdentifier.builder(Networks.class)
.child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)))
.child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226
.networks.network.node.TerminationPoint.class,
new TerminationPointKey(new TpId(tpId)))
- .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210
+ .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526
.TerminationPoint1.class);
}
- /**
- * Get a builder for instance identifier related to network termination point.
- * @param nodeId String
- * @param tpId String
- * @return InstanceIdentifierBuilder
- */
- public static InstanceIdentifierBuilder<TerminationPoint1> createNetworkTerminationPointIIDBuilder(String nodeId,
- String tpId) {
- return InstanceIdentifier.builder(Networks.class)
- .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)))
- .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226
- .networks.network.Node.class,
- new NodeKey(new NodeId(nodeId)))
- .augmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226
- .Node1.class)
- .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226
- .networks.network.node.TerminationPoint.class,
- new TerminationPointKey(new TpId(tpId)))
- .augmentation(TerminationPoint1.class);
- }
-
/**
* Get an instance identifier related to network node.
* @param nodeId String
* @param nodeId String
* @return InstanceIdentifier
*/
- public static InstanceIdentifier<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210
+ public static InstanceIdentifier<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526
.Node1> createCommonNetworkNodeIID(String nodeId) {
return InstanceIdentifier.builder(Networks.class)
.child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)))
.child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226
.networks.network.Node.class,
new NodeKey(new NodeId(nodeId)))
- .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Node1.class)
+ .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.Node1.class)
.build();
}
}