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=0d45a835aa37da7b096eae45cc6409aeda64f705;hb=1f9f09e6578a5500de469f9bdb4e05ae0970c711;hp=73bcecd5da9e1e7fb7b724870110069f80edfef1;hpb=2c74d3b1109043024a1e251766ed6fcc39ffedf1;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 73bcecd5d..0d45a835a 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 @@ -9,19 +9,27 @@ package org.opendaylight.transportpce.networkmodel.service; import java.util.HashMap; import java.util.concurrent.ExecutionException; +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.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.common.network.NetworkTransactionService; +import org.opendaylight.transportpce.networkmodel.R2RLinkDiscovery; 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.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.Network; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NetworkId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NetworkKey; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NodeId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.network.Node; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.network.NodeKey; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.Network1; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.network.Link; import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus; @@ -36,17 +44,18 @@ public class NetworkModelServiceImpl implements NetworkModelService { 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; public NetworkModelServiceImpl(final NetworkTransactionService networkTransactionService, - DeviceTransactionManager deviceTransactionManager, - OpenRoadmFactory openRoadmFactory, PortMapping portMapping) { + final R2RLinkDiscovery linkDiscovery, DeviceTransactionManager deviceTransactionManager, + OpenRoadmFactory openRoadmFactory, PortMapping portMapping) { this.networkTransactionService = networkTransactionService; - //this.linkDiscovery = linkDiscovery; + this.linkDiscovery = linkDiscovery; this.deviceTransactionManager = deviceTransactionManager; this.openRoadmFactory = openRoadmFactory; this.portMapping = portMapping; @@ -65,13 +74,13 @@ public class NetworkModelServiceImpl implements NetworkModelService { try { LOG.info("createOpenROADMNode: {} ", nodeId); - if (!portMapping.createMappingData(nodeId,openRoadmVersion)) { - LOG.warn("Could not generate port mapping for {} skipping network model creation",nodeId); + if (!portMapping.createMappingData(nodeId, openRoadmVersion)) { + LOG.warn("Could not generate port mapping for {} skipping network model creation", nodeId); return; } - //this.linkDiscovery.readLLDP(new NodeId(nodeId)); + this.linkDiscovery.readLLDP(new NodeId(nodeId), openRoadmVersion); - Node clliNode = ClliNetwork.createNode(this.deviceTransactionManager, nodeId,openRoadmVersion); + Node clliNode = ClliNetwork.createNode(this.deviceTransactionManager, nodeId, openRoadmVersion); if (clliNode == null) { LOG.error("Unable to create clli node! Node id: {}", nodeId); return; @@ -88,7 +97,7 @@ public class NetworkModelServiceImpl implements NetworkModelService { networkTransactionService.merge(LogicalDatastoreType.CONFIGURATION, iiClliNode, clliNode, CREATE_MISSING_PARENTS); - Node openRoadmNode = OpenRoadmNetwork.createNode(nodeId, this.deviceTransactionManager,openRoadmVersion); + Node openRoadmNode = OpenRoadmNetwork.createNode(nodeId, this.deviceTransactionManager, openRoadmVersion); if (openRoadmNode == null) { LOG.error("Unable to create OpenRoadm node! Node id: {}", nodeId); return; @@ -161,26 +170,28 @@ public class NetworkModelServiceImpl implements NetworkModelService { @Override public void deleteOpenRoadmnode(String nodeId) { - /*try { - LOG.info("deleteOpenROADMnode: {} ", nodeId); + try { + @Nullable + OpenroadmVersion deviceVersion = this.portMapping.getNode(nodeId).getOpenroadmVersion(); + LOG.info("deleteOpenROADMnode: {} version {}", nodeId, deviceVersion.getName()); this.portMapping.deleteMappingData(nodeId); NodeKey nodeIdKey = new NodeKey(new NodeId(nodeId)); - WriteTransaction writeTransaction = this.dataBroker.newWriteOnlyTransaction(); + LOG.info("deleting node in {}", NetworkUtils.CLLI_NETWORK_ID); InstanceIdentifier iiClliNode = InstanceIdentifier - .builder(Networks.class) - .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.CLLI_NETWORK_ID))) + .builder(Network.class, new NetworkKey(new NetworkId(NetworkUtils.CLLI_NETWORK_ID))) .child(Node.class, nodeIdKey) .build(); - writeTransaction.delete(LogicalDatastoreType.CONFIGURATION, iiClliNode); + this.networkTransactionService.delete(LogicalDatastoreType.CONFIGURATION, iiClliNode); + LOG.info("deleting node in {}", NetworkUtils.UNDERLAY_NETWORK_ID); InstanceIdentifier iiOpenRoadmNode = InstanceIdentifier - .builder(Networks.class) - .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID))) + .builder(Network.class, new NetworkKey(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID))) .child(Node.class, nodeIdKey) .build(); - writeTransaction.delete(LogicalDatastoreType.CONFIGURATION, iiOpenRoadmNode); + this.networkTransactionService.delete(LogicalDatastoreType.CONFIGURATION, iiOpenRoadmNode); + TopologyShard topologyShard = this.topologyShardMountedDevice.get(nodeId); if (topologyShard != null) { LOG.info("TopologyShard for node '{}' is present", nodeId); @@ -188,30 +199,28 @@ public class NetworkModelServiceImpl implements NetworkModelService { LOG.info("deleting node {} in {}", openRoadmTopologyNode.getNodeId().getValue(), NetworkUtils.OVERLAY_NETWORK_ID); InstanceIdentifier iiOpenRoadmTopologyNode = InstanceIdentifier - .builder(Networks.class) - .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))) + .builder(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))) .child(Node.class, openRoadmTopologyNode.key()) .build(); - writeTransaction.delete(LogicalDatastoreType.CONFIGURATION, iiOpenRoadmTopologyNode); + this.networkTransactionService.delete(LogicalDatastoreType.CONFIGURATION, iiOpenRoadmTopologyNode); } for (Link openRoadmTopologyLink: topologyShard.getLinks()) { LOG.info("deleting link {} in {}", openRoadmTopologyLink.getLinkId().getValue(), NetworkUtils.OVERLAY_NETWORK_ID); InstanceIdentifier iiOpenRoadmTopologyLink = InstanceIdentifier - .builder(Networks.class) - .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))) + .builder(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))) .augmentation(Network1.class) .child(Link.class, openRoadmTopologyLink.key()) .build(); - writeTransaction.delete(LogicalDatastoreType.CONFIGURATION, iiOpenRoadmTopologyLink); + this.networkTransactionService.delete(LogicalDatastoreType.CONFIGURATION, iiOpenRoadmTopologyLink); } } else { LOG.warn("TopologyShard for node '{}' is not present", nodeId); } - writeTransaction.submit().get(); + this.networkTransactionService.submit().get(1, TimeUnit.SECONDS); LOG.info("all nodes and links deleted ! "); - } catch (InterruptedException | ExecutionException e) { + } catch (InterruptedException | ExecutionException | TimeoutException e) { LOG.error("Error when trying to delete node : {}", nodeId, e); - }*/ + } } }