X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2Fservice%2FNetworkModelServiceImpl.java;h=99db959fb97011477bf6069967ca44eacf6ab2eb;hb=7181ac3c2277d1e1b4411a3b1b19d89a7bcc70fb;hp=0863538c347034caffe1a3f4101db42dd0f5ed9c;hpb=69fccc0eab90a90d0699caa1ccf2a92dd59b96a8;p=transportpce.git diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java index 0863538c3..99db959fb 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java @@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.mapping.PortMapping; @@ -23,7 +23,10 @@ import org.opendaylight.transportpce.networkmodel.dto.TopologyShard; import org.opendaylight.transportpce.networkmodel.util.ClliNetwork; import org.opendaylight.transportpce.networkmodel.util.OpenRoadmFactory; import org.opendaylight.transportpce.networkmodel.util.OpenRoadmNetwork; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.Nodes.OpenroadmVersion; +import org.opendaylight.transportpce.networkmodel.util.OpenRoadmOtnTopology22; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo.OpenroadmVersion; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.NodeTypes; 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; @@ -44,12 +47,12 @@ public class NetworkModelServiceImpl implements NetworkModelService { private static final boolean CREATE_MISSING_PARENTS = true; private NetworkTransactionService networkTransactionService; - //private final R2RLinkDiscoveryFactoryMethod linkDiscovery; private final R2RLinkDiscovery linkDiscovery; private final DeviceTransactionManager deviceTransactionManager; private final OpenRoadmFactory openRoadmFactory; private final PortMapping portMapping; private HashMap topologyShardMountedDevice; + private HashMap otnTopologyShardMountedDevice; public NetworkModelServiceImpl(final NetworkTransactionService networkTransactionService, final R2RLinkDiscovery linkDiscovery, DeviceTransactionManager deviceTransactionManager, @@ -61,6 +64,7 @@ public class NetworkModelServiceImpl implements NetworkModelService { this.openRoadmFactory = openRoadmFactory; this.portMapping = portMapping; this.topologyShardMountedDevice = new HashMap(); + this.otnTopologyShardMountedDevice = new HashMap(); } public void init() { @@ -79,40 +83,31 @@ public class NetworkModelServiceImpl implements NetworkModelService { LOG.warn("Could not generate port mapping for {} skipping network model creation", nodeId); return; } - this.linkDiscovery.readLLDP(new NodeId(nodeId), openRoadmVersion); - - Node clliNode = ClliNetwork.createNode(this.deviceTransactionManager, nodeId, openRoadmVersion); - if (clliNode == null) { - LOG.error("Unable to create clli node! Node id: {}", nodeId); - return; + NodeInfo nodeInfo = portMapping.getNode(nodeId).getNodeInfo(); + if (nodeInfo.getNodeType().getIntValue() == 1) { + this.linkDiscovery.readLLDP(new NodeId(nodeId), openRoadmVersion); } + Node clliNode = ClliNetwork.createNode(nodeId, nodeInfo); InstanceIdentifier iiClliNode = InstanceIdentifier.builder(Networks.class) .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.CLLI_NETWORK_ID))) .child(Node.class, clliNode.key()) .build(); - - LOG.info("creating node in {}", NetworkUtils.CLLI_NETWORK_ID); networkTransactionService.merge(LogicalDatastoreType.CONFIGURATION, iiClliNode, clliNode, CREATE_MISSING_PARENTS); - Node openRoadmNode = OpenRoadmNetwork.createNode(nodeId, this.deviceTransactionManager, openRoadmVersion); - if (openRoadmNode == null) { - LOG.error("Unable to create OpenRoadm node! Node id: {}", nodeId); - return; - } + Node openRoadmNode = OpenRoadmNetwork.createNode(nodeId, nodeInfo); InstanceIdentifier iiOpenRoadmNode = InstanceIdentifier.builder(Networks.class) .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID))) .child(Node.class, openRoadmNode.key()) .build(); - LOG.info("creating node in {}", NetworkUtils.UNDERLAY_NETWORK_ID); networkTransactionService.merge(LogicalDatastoreType.CONFIGURATION, iiOpenRoadmNode, openRoadmNode, CREATE_MISSING_PARENTS); - - TopologyShard topologyShard = openRoadmFactory.createTopologyShardVersionControl(nodeId); + TopologyShard topologyShard = + openRoadmFactory.createTopologyShardVersionControl(portMapping.getNode(nodeId)); if (topologyShard == null) { LOG.error("Unable to create topology shard for node {}!", nodeId); @@ -141,8 +136,29 @@ public class NetworkModelServiceImpl implements NetworkModelService { networkTransactionService.merge(LogicalDatastoreType.CONFIGURATION, iiOpenRoadmTopologyLink, openRoadmTopologyLink, CREATE_MISSING_PARENTS); } - networkTransactionService.submit().get(); - //linkDiscovery.readLLDP(nodeId); + if (nodeInfo.getNodeType().equals(NodeTypes.Xpdr) && (nodeInfo.getOpenroadmVersion().getIntValue() != 1)) { + TopologyShard otnTopologyShard = new OpenRoadmOtnTopology22(this.networkTransactionService, + this.deviceTransactionManager).createTopologyShard(portMapping.getNode(nodeId)); + if (otnTopologyShard == null) { + LOG.error("Unable to create OTN topology shard for node {}!", nodeId); + return; + } + this.otnTopologyShardMountedDevice.put(nodeId, otnTopologyShard); + + for (Node openRoadmOtnTopologyNode: otnTopologyShard.getNodes()) { + LOG.info("creating node {} in {}", openRoadmOtnTopologyNode.getNodeId().getValue(), + // NetworkUtils.OVERLAY_NETWORK_ID); + NetworkUtils.OTN_NETWORK_ID); + InstanceIdentifier iiOpenRoadmOtnTopologyNode = InstanceIdentifier.builder(Networks.class) + // .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))) + .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OTN_NETWORK_ID))) + .child(Node.class, openRoadmOtnTopologyNode.key()) + .build(); + networkTransactionService.merge(LogicalDatastoreType.CONFIGURATION, iiOpenRoadmOtnTopologyNode, + openRoadmOtnTopologyNode); + } + } + networkTransactionService.commit().get(); LOG.info("all nodes and links created"); } catch (InterruptedException | ExecutionException e) { LOG.error("ERROR: ", e); @@ -171,7 +187,7 @@ public class NetworkModelServiceImpl implements NetworkModelService { public void deleteOpenRoadmnode(String nodeId) { try { @Nullable - OpenroadmVersion deviceVersion = this.portMapping.getNode(nodeId).getOpenroadmVersion(); + OpenroadmVersion deviceVersion = this.portMapping.getNode(nodeId).getNodeInfo().getOpenroadmVersion(); LOG.info("deleteOpenROADMnode: {} version {}", nodeId, deviceVersion.getName()); this.portMapping.deleteMappingData(nodeId); @@ -209,7 +225,7 @@ public class NetworkModelServiceImpl implements NetworkModelService { } else { LOG.warn("TopologyShard for node '{}' is not present", nodeId); } - this.networkTransactionService.submit().get(1, TimeUnit.SECONDS); + this.networkTransactionService.commit().get(1, TimeUnit.SECONDS); LOG.info("all nodes and links deleted ! "); } catch (InterruptedException | ExecutionException | TimeoutException e) { LOG.error("Error when trying to delete node : {}", nodeId, e);