import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
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.rev220922.mapping.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.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.common.types.rev181019.NodeTypes;
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() {
}
public static TopologyShard createTopologyShard(Nodes mappingNode, boolean firstMount) {
- int numOfDegrees;
- int numOfSrgs;
- List<Node> nodes = new ArrayList<>();
- List<Link> links = new ArrayList<>();
+ switch (mappingNode.getNodeInfo().getNodeType()) {
+ case Rdm :
+ return createRdmTopologyShard(mappingNode, firstMount);
+ case Xpdr :
+ return createXpdrTopologyShard(mappingNode);
+ default :
+ LOG.error("Device node Type not managed yet");
+ return null;
+ }
+ }
- // Check if node is ROADM
- if (NodeTypes.Rdm.getIntValue() == mappingNode.getNodeInfo().getNodeType().getIntValue()) {
- LOG.info("creating rdm node in openroadmtopology for node {}",
- mappingNode.getNodeId());
- // transform flat mapping list to per degree and per srg mapping lists
- Map<String, List<Mapping>> mapDeg = new HashMap<>();
- Map<String, List<Mapping>> mapSrg = new HashMap<>();
- List<Mapping> mappingList = new ArrayList<>(mappingNode.nonnullMapping().values());
- mappingList.sort(Comparator.comparing(Mapping::getLogicalConnectionPoint));
- List<String> nodeShardList = new ArrayList<>();
- for (Mapping mapping : mappingList) {
- String str = mapping.getLogicalConnectionPoint().split("-")[0];
- if (!nodeShardList.contains(str)) {
- nodeShardList.add(str);
- }
- }
- for (String str : nodeShardList) {
- List<Mapping> interList =
- mappingList.stream()
- .filter(x -> x.getLogicalConnectionPoint().split("-")[0].equals(str))
- .collect(Collectors.toList());
- if (str.contains("DEG")) {
- mapDeg.put(str, interList);
- } else if (str.contains("SRG")) {
- mapSrg.put(str, interList);
- } else {
- LOG.error("unknow element");
- }
- }
- // create degree nodes
- for (Map.Entry<String, List<Mapping>> entry : mapDeg.entrySet()) {
- NodeBuilder ietfNode =
- createDegree(entry.getKey(), entry.getValue(), mappingNode.getNodeId(),
- mappingNode.getNodeInfo().getNodeClli(), firstMount);
- nodes.add(ietfNode.build());
+ public static TopologyShard createRdmTopologyShard(Nodes mappingNode, boolean firstMount) {
+ List<Node> nodes = new ArrayList<>();
+ LOG.info("creating rdm node in openroadmtopology for node {}",
+ mappingNode.getNodeId());
+ // transform flat mapping list to per degree and per srg mapping lists
+ Map<String, List<Mapping>> mapDeg = new HashMap<>();
+ Map<String, List<Mapping>> mapSrg = new HashMap<>();
+ List<Mapping> mappingList = new ArrayList<>(mappingNode.nonnullMapping().values());
+ mappingList.sort(Comparator.comparing(Mapping::getLogicalConnectionPoint));
+ List<String> nodeShardList = new ArrayList<>();
+ for (Mapping mapping : mappingList) {
+ String str = mapping.getLogicalConnectionPoint().split("-")[0];
+ if (!nodeShardList.contains(str)) {
+ nodeShardList.add(str);
}
- // create srg nodes
- for (Map.Entry<String, List<Mapping>> entry : mapSrg.entrySet()) {
- NodeBuilder ietfNode =
- createSrg(entry.getKey(), entry.getValue(), mappingNode.getNodeId(),
- mappingNode.getNodeInfo().getNodeClli(), firstMount);
- nodes.add(ietfNode.build());
+ }
+ for (String str : nodeShardList) {
+ List<Mapping> interList =
+ mappingList.stream()
+ .filter(x -> x.getLogicalConnectionPoint().split("-")[0].equals(str))
+ .collect(Collectors.toList());
+ if (str.contains("DEG")) {
+ mapDeg.put(str, interList);
+ } else if (str.contains("SRG")) {
+ mapSrg.put(str, interList);
+ } else {
+ LOG.error("unknow element");
}
+ }
+ // create degree nodes
+ for (Map.Entry<String, List<Mapping>> entry : mapDeg.entrySet()) {
+ nodes.add(
+ createDegree(entry.getKey(), entry.getValue(), mappingNode.getNodeId(),
+ mappingNode.getNodeInfo().getNodeClli(), firstMount)
+ .build());
+ }
+ // create srg nodes
+ for (Map.Entry<String, List<Mapping>> entry : mapSrg.entrySet()) {
+ nodes.add(
+ createSrg(entry.getKey(), entry.getValue(), mappingNode.getNodeId(),
+ mappingNode.getNodeInfo().getNodeClli(), firstMount)
+ .build());
+ }
+ LOG.info("adding links numOfDegrees={} numOfSrgs={}", mapDeg.size(), mapSrg.size());
+ List<Link> links = createNewLinks(nodes);
+ LOG.info("created nodes/links: {}/{}", nodes.size(), links.size());
+ return new TopologyShard(nodes, links);
+ }
- numOfDegrees = mapDeg.size();
- numOfSrgs = mapSrg.size();
-
- LOG.info("adding links numOfDegrees={} numOfSrgs={}", numOfDegrees, numOfSrgs);
- links.addAll(createNewLinks(nodes));
- LOG.info("created nodes/links: {}/{}", nodes.size(), links.size());
- return new TopologyShard(nodes, links);
- } else if (NodeTypes.Xpdr.getIntValue() == mappingNode.getNodeInfo().getNodeType().getIntValue()) {
- // Check if node is Xpdr is a Transponder
- List<Mapping> networkMappings =
- mappingNode.nonnullMapping().values()
- .stream().filter(k -> k.getLogicalConnectionPoint().contains("NETWORK"))
- .collect(Collectors.toList());
- List<Integer> tpdrList = new ArrayList<>();
- for (Mapping mapping : networkMappings) {
- Integer xpdrNb = Integer.parseInt(mapping.getLogicalConnectionPoint().split("XPDR")[1].split("-")[0]);
- if (!tpdrList.contains(xpdrNb)) {
- tpdrList.add(xpdrNb);
- List<Mapping> extractedMappings = mappingNode.nonnullMapping().values().stream()
- .filter(lcp -> lcp.getLogicalConnectionPoint().contains("XPDR" + xpdrNb))
- .collect(Collectors.toList());
- Boolean lastArg;
- String xpdrType;
- switch (mapping.getXponderType() == null ? Tpdr : mapping.getXponderType()) {
- case Tpdr :
- lastArg = false;
- xpdrType = "Tpdr";
- break;
- case Mpdr :
- case Switch :
- lastArg = true;
- xpdrType = mapping.getXponderType().getName();
- break;
- default :
- LOG.warn("cannot create xpdr node {} in openroadm-topology: type {} not supported",
- mappingNode.getNodeId() + "-XPDR" + xpdrNb, mapping.getXponderType().getName());
- continue;
- }
- LOG.info("creating xpdr node {} of type {} in openroadm-topology",
- mappingNode.getNodeId() + "-XPDR" + xpdrNb, xpdrType);
- nodes.add(createXpdr(
- mappingNode.getNodeId(),
- mappingNode.getNodeInfo().getNodeClli(),
- xpdrNb,
- extractedMappings,
- lastArg)
- .build());
+ public static TopologyShard createXpdrTopologyShard(Nodes mappingNode) {
+ List<Node> nodes = new ArrayList<>();
+ List<Mapping> networkMappings =
+ mappingNode.nonnullMapping().values()
+ .stream().filter(k -> k.getLogicalConnectionPoint().contains("NETWORK"))
+ .collect(Collectors.toList());
+ List<Integer> tpdrList = new ArrayList<>();
+ for (Mapping mapping : networkMappings) {
+ Integer xpdrNb = Integer.parseInt(mapping.getLogicalConnectionPoint().split("XPDR")[1].split("-")[0]);
+ if (!tpdrList.contains(xpdrNb)) {
+ tpdrList.add(xpdrNb);
+ List<Mapping> extractedMappings = mappingNode.nonnullMapping().values()
+ .stream().filter(lcp -> lcp.getLogicalConnectionPoint().contains("XPDR" + xpdrNb))
+ .collect(Collectors.toList());
+ Boolean isOtn;
+ String xpdrType;
+ switch (mapping.getXpdrType() == null ? Tpdr : mapping.getXpdrType()) {
+ case Tpdr :
+ isOtn = false;
+ xpdrType = "Tpdr";
+ break;
+ case Mpdr :
+ case Switch :
+ 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.getXpdrType().getName());
+ continue;
}
+ LOG.info("creating xpdr node {} of type {} in openroadm-topology",
+ mappingNode.getNodeId() + "-XPDR" + xpdrNb, xpdrType);
+ nodes.add(createXpdr(
+ mappingNode.getNodeId(),
+ mappingNode.getNodeInfo().getNodeClli(),
+ xpdrNb,
+ extractedMappings,
+ isOtn)
+ .build());
}
- return nodes.isEmpty() ? null : new TopologyShard(nodes, links);
}
- LOG.error("Device node Type not managed yet");
- return null;
+ return nodes.isEmpty() ? null : new TopologyShard(nodes, new ArrayList<Link>());
}
private static NodeBuilder createXpdr(String nodeId, String clli, Integer xpdrNb, List<Mapping> mappings,
.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)
.build());
-
// Create tp-map
Map<TerminationPointKey, TerminationPoint> tpMap = new HashMap<>();
for (Mapping m : mappings) {
if (isOtn && m.getPortQual().equals("xpdr-client")) {
continue;
}
+ 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()));
+ if (!isOtn && m.getConnectionMapLcp() != null) {
+ ocnTp1Bldr.setAssociatedConnectionMapTp(Set.of(new TpId(m.getConnectionMapLcp())));
+ }
TerminationPointBuilder ietfTpBldr = createTpBldr(m.getLogicalConnectionPoint())
.addAugmentation(
// Add openroadm-network-topology tp augmentations
- new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210
- .TerminationPoint1Builder()
- .setTpType(PORTQUAL_ORD_TYPE_MAP.get(m.getPortQual()))
- .setAdministrativeState(TopologyUtils.setNetworkAdminState(m.getPortAdminState()))
- .setOperationalState(TopologyUtils.setNetworkOperState(m.getPortOperState()))
- .build());
- if (!isOtn) {
- ietfTpBldr.addAugmentation(
- new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123
- .TerminationPoint1Builder()
- .setAssociatedConnectionMapPort(m.getConnectionMapLcp())
- .build());
- }
+ ocnTp1Bldr.build());
TerminationPoint ietfTp = ietfTpBldr.build();
tpMap.put(ietfTp.key(),ietfTp);
}
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();
}
}
Code Review / transportpce.git / blobdiff