X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2FNetConfTopologyListener.java;h=d11d28695693394690a5786a564b2b916c830bbf;hb=45de2604acea011072a5478eaead6ffb96e1e6ea;hp=d58b88f36693baf0f00f72d7b5a31fea4e6fbd9f;hpb=9d783f6f8421e3d56c92d807f1198ac8115733db;p=transportpce.git diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java index d58b88f36..d11d28695 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java @@ -8,44 +8,48 @@ package org.opendaylight.transportpce.networkmodel; import java.util.Collection; +import java.util.Collections; +import java.util.List; import java.util.Map; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; + import javax.annotation.Nonnull; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.DataObjectModification; -import org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType; -import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener; -import org.opendaylight.controller.md.sal.binding.api.DataTreeModification; -import org.opendaylight.controller.md.sal.binding.api.MountPoint; -import org.opendaylight.controller.md.sal.binding.api.NotificationService; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry; + +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.DataObjectModification; +import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType; +import org.opendaylight.mdsal.binding.api.DataTreeChangeListener; +import org.opendaylight.mdsal.binding.api.DataTreeModification; +import org.opendaylight.mdsal.binding.api.MountPoint; +import org.opendaylight.mdsal.binding.api.NotificationService; +import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; import org.opendaylight.transportpce.common.StringConstants; -import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.networkmodel.dto.NodeRegistration; +import org.opendaylight.transportpce.networkmodel.dto.NodeRegistration22; import org.opendaylight.transportpce.networkmodel.listeners.AlarmNotificationListener; +import org.opendaylight.transportpce.networkmodel.listeners.AlarmNotificationListener221; import org.opendaylight.transportpce.networkmodel.listeners.DeOperationsListener; +import org.opendaylight.transportpce.networkmodel.listeners.DeOperationsListener221; import org.opendaylight.transportpce.networkmodel.listeners.DeviceListener; -import org.opendaylight.transportpce.networkmodel.listeners.LldpListener; +import org.opendaylight.transportpce.networkmodel.listeners.DeviceListener221; import org.opendaylight.transportpce.networkmodel.listeners.TcaListener; +import org.opendaylight.transportpce.networkmodel.listeners.TcaListener221; import org.opendaylight.transportpce.networkmodel.service.NetworkModelService; import org.opendaylight.yang.gen.v1.http.org.openroadm.alarm.rev161014.OrgOpenroadmAlarmListener; import org.opendaylight.yang.gen.v1.http.org.openroadm.de.operations.rev161014.OrgOpenroadmDeOperationsListener; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.OrgOpenroadmDeviceListener; -import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.OrgOpenroadmLldpListener; import org.opendaylight.yang.gen.v1.http.org.openroadm.tca.rev161014.OrgOpenroadmTcaListener; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.CreateSubscriptionInputBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.NotificationsService; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.StreamNameType; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.Netconf; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.netconf.Streams; import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode; import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.available.capabilities.AvailableCapability; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,22 +58,24 @@ public class NetConfTopologyListener implements DataTreeChangeListener { private static final Logger LOG = LoggerFactory.getLogger(NetConfTopologyListener.class); private final NetworkModelService networkModelService; - private final R2RLinkDiscovery linkDiscovery; private final DataBroker dataBroker; private final DeviceTransactionManager deviceTransactionManager; private final Map registrations; + private final Map registrations22; public NetConfTopologyListener(final NetworkModelService networkModelService, final DataBroker dataBroker, - final R2RLinkDiscovery linkDiscovery, DeviceTransactionManager deviceTransactionManager) { + DeviceTransactionManager deviceTransactionManager) { this.networkModelService = networkModelService; - this.linkDiscovery = linkDiscovery; this.dataBroker = dataBroker; this.deviceTransactionManager = deviceTransactionManager; this.registrations = new ConcurrentHashMap<>(); + this.registrations22 = new ConcurrentHashMap<>(); } - private void onDeviceConnected(final String nodeId) { + private void onDeviceConnected(final String nodeId, String openRoadmVersion) { LOG.info("onDeviceConnected: {}", nodeId); + LOG.info(StringConstants.OPENROADM_DEVICE_VERSION_1_2_1); + LOG.info(openRoadmVersion); Optional mountPointOpt = this.deviceTransactionManager.getDeviceMountPoint(nodeId); MountPoint mountPoint; if (mountPointOpt.isPresent()) { @@ -80,38 +86,119 @@ public class NetConfTopologyListener implements DataTreeChangeListener { } final Optional notificationService = - mountPoint.getService(NotificationService.class).toJavaUtil(); + mountPoint.getService(NotificationService.class); if (!notificationService.isPresent()) { LOG.error("Failed to get RpcService for node {}", nodeId); return; } - final OrgOpenroadmAlarmListener alarmListener = new AlarmNotificationListener(this.dataBroker); - LOG.info("Registering notification listener on OrgOpenroadmAlarmListener for node: {}", nodeId); - final ListenerRegistration accessAlarmNotificationListenerRegistration = + if (openRoadmVersion.equals(StringConstants.OPENROADM_DEVICE_VERSION_1_2_1)) { + + final OrgOpenroadmAlarmListener alarmListener = new AlarmNotificationListener(this.dataBroker); + LOG.info("Registering notification listener on OrgOpenroadmAlarmListener for node: {}", nodeId); + final ListenerRegistration accessAlarmNotificationListenerRegistration = notificationService.get().registerNotificationListener(alarmListener); - final OrgOpenroadmDeOperationsListener deOperationsListener = new DeOperationsListener(); - LOG.info("Registering notification listener on OrgOpenroadmDeOperationsListener for node: {}", nodeId); - final ListenerRegistration - accessDeOperationasNotificationListenerRegistration = + final OrgOpenroadmDeOperationsListener deOperationsListener = new DeOperationsListener(); + LOG.info("Registering notification listener on OrgOpenroadmDeOperationsListener for node: {}", nodeId); + final ListenerRegistration + accessDeOperationasNotificationListenerRegistration = notificationService.get().registerNotificationListener(deOperationsListener); - final OrgOpenroadmDeviceListener deviceListener = new DeviceListener(); - LOG.info("Registering notification listener on OrgOpenroadmDeviceListener for node: {}", nodeId); - final ListenerRegistration accessDeviceNotificationListenerRegistration = + final OrgOpenroadmDeviceListener deviceListener = new DeviceListener(); + LOG.info("Registering notification listener on OrgOpenroadmDeviceListener for node: {}", nodeId); + final ListenerRegistration accessDeviceNotificationListenerRegistration = notificationService.get().registerNotificationListener(deviceListener); - final OrgOpenroadmLldpListener lldpListener = new LldpListener(this.linkDiscovery, nodeId); - LOG.info("Registering notification listener on OrgOpenroadmLldpListener for node: {}", nodeId); - final ListenerRegistration accessLldpNotificationListenerRegistration = - notificationService.get().registerNotificationListener(lldpListener); + TcaListener tcaListener = new TcaListener(); + LOG.info("Registering notification listener on OrgOpenroadmTcaListener for node: {}", nodeId); + final ListenerRegistration accessTcaNotificationListenerRegistration = + notificationService.get().registerNotificationListener(tcaListener); + + String streamName = "NETCONF"; + + if (streamName == null) { + streamName = "OPENROADM"; + } + + final Optional service = mountPoint.getService(RpcConsumerRegistry.class); + if (service.isPresent()) { + final NotificationsService rpcService = service.get().getRpcService(NotificationsService.class); + if (rpcService == null) { + LOG.error("Failed to get RpcService for node {}", nodeId); + } else { + final CreateSubscriptionInputBuilder createSubscriptionInputBuilder = + new CreateSubscriptionInputBuilder(); + createSubscriptionInputBuilder.setStream(new StreamNameType(streamName)); + LOG.info("Triggering notification stream {} for node {}", streamName, nodeId); + rpcService.createSubscription(createSubscriptionInputBuilder.build()); + } + } else { + LOG.error("Failed to get RpcService for node {}", nodeId); + } + NodeRegistration nodeRegistration = new NodeRegistration(nodeId, + accessAlarmNotificationListenerRegistration, + accessDeOperationasNotificationListenerRegistration, accessDeviceNotificationListenerRegistration, + null, accessTcaNotificationListenerRegistration); + registrations.put(nodeId, nodeRegistration); + + } else if (openRoadmVersion.equals(StringConstants.OPENROADM_DEVICE_VERSION_2_2_1)) { + final org.opendaylight.yang.gen.v1.http.org.openroadm.alarm.rev181019.OrgOpenroadmAlarmListener + alarmListener = new AlarmNotificationListener221(dataBroker); + LOG.info("Registering notification listener on OrgOpenroadmAlarmListener for node: {}", nodeId); + final ListenerRegistration accessAlarmNotificationListenerRegistration = + notificationService.get().registerNotificationListener(alarmListener); + + final org.opendaylight.yang.gen.v1.http.org.openroadm.de.operations.rev181019 + .OrgOpenroadmDeOperationsListener deOperationsListener = new DeOperationsListener221(); + LOG.info("Registering notification listener on OrgOpenroadmDeOperationsListener for node: {}", nodeId); + final ListenerRegistration accessDeOperationasNotificationListenerRegistration = + notificationService.get().registerNotificationListener(deOperationsListener); + + final org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.OrgOpenroadmDeviceListener + deviceListener = new DeviceListener221(); + LOG.info("Registering notification listener on OrgOpenroadmDeviceListener for node: {}", nodeId); + final ListenerRegistration accessDeviceNotificationListenerRegistration = + notificationService.get().registerNotificationListener(deviceListener); - final OrgOpenroadmTcaListener tcaListener = new TcaListener(); - LOG.info("Registering notification listener on OrgOpenroadmTcaListener for node: {}", nodeId); - final ListenerRegistration accessTcaNotificationListenerRegistration = + final org.opendaylight.yang.gen.v1.http.org.openroadm.tca.rev181019.OrgOpenroadmTcaListener + tcaListener = new TcaListener221(); + LOG.info("Registering notification listener on OrgOpenroadmTcaListener for node: {}", nodeId); + final ListenerRegistration accessTcaNotificationListenerRegistration = notificationService.get().registerNotificationListener(tcaListener); + + String streamName = "NETCONF"; + if (streamName == null) { + streamName = "OPENROADM"; + } + final Optional service = mountPoint.getService(RpcConsumerRegistry.class); + if (service.isPresent()) { + final NotificationsService rpcService = service.get().getRpcService(NotificationsService.class); + if (rpcService == null) { + LOG.error("Failed to get RpcService for node {}", nodeId); + } else { + final CreateSubscriptionInputBuilder createSubscriptionInputBuilder = + new CreateSubscriptionInputBuilder(); + createSubscriptionInputBuilder.setStream(new StreamNameType(streamName)); + LOG.info("Triggering notification stream {} for node {}", streamName, nodeId); + rpcService.createSubscription(createSubscriptionInputBuilder.build()); + } + } else { + LOG.error("Failed to get RpcService for node {}", nodeId); + } + NodeRegistration22 nodeRegistration22 = new NodeRegistration22(nodeId, + accessAlarmNotificationListenerRegistration, + accessDeOperationasNotificationListenerRegistration, accessDeviceNotificationListenerRegistration, + null, accessTcaNotificationListenerRegistration); + registrations22.put(nodeId, nodeRegistration22); + + } + } private void onDeviceDisConnected(final String nodeId) { @@ -121,7 +208,6 @@ public class NetConfTopologyListener implements DataTreeChangeListener { nodeRegistration.getAccessAlarmNotificationListenerRegistration().close(); nodeRegistration.getAccessDeOperationasNotificationListenerRegistration().close(); nodeRegistration.getAccessDeviceNotificationListenerRegistration().close(); - nodeRegistration.getAccessLldpNotificationListenerRegistration().close(); nodeRegistration.getAccessTcaNotificationListenerRegistration().close(); } } @@ -140,7 +226,7 @@ public class NetConfTopologyListener implements DataTreeChangeListener { if (rootNode.getDataBefore() != null) { String nodeId = rootNode.getDataBefore().key().getNodeId().getValue(); LOG.info("Node {} deleted", nodeId); - this.networkModelService.deleteOpenROADMnode(nodeId); + this.networkModelService.deleteOpenRoadmnode(nodeId); onDeviceDisConnected(nodeId); } else { LOG.error("rootNode.getDataBefore is null !"); @@ -158,19 +244,22 @@ public class NetConfTopologyListener implements DataTreeChangeListener { NetconfNodeConnectionStatus.ConnectionStatus connectionStatus = netconfNode.getConnectionStatus(); try { - long count = netconfNode.getAvailableCapabilities().getAvailableCapability().stream() - .filter(cp -> cp.getCapability().contains(StringConstants.OPENROADM_DEVICE_MODEL_NAME)) - .count(); - if (count > 0) { + List deviceCapabilities = netconfNode.getAvailableCapabilities() + .getAvailableCapability().stream().filter(cp -> cp.getCapability() + .contains(StringConstants.OPENROADM_DEVICE_MODEL_NAME)).collect(Collectors.toList()); + if (!deviceCapabilities.isEmpty()) { + Collections.sort(deviceCapabilities, (cp0, cp1) -> cp1.getCapability() + .compareTo(cp0.getCapability())); LOG.info("OpenROADM node detected: {} {}", nodeId, connectionStatus.name()); switch (connectionStatus) { case Connected: - this.networkModelService.createOpenROADMnode(nodeId); - onDeviceConnected(nodeId); + this.networkModelService.createOpenRoadmNode(nodeId, deviceCapabilities.get(0) + .getCapability()); + onDeviceConnected(nodeId,deviceCapabilities.get(0).getCapability()); break; case Connecting: case UnableToConnect: - this.networkModelService.setOpenROADMnodeStatus(nodeId, connectionStatus); + this.networkModelService.setOpenRoadmNodeStatus(nodeId, connectionStatus); onDeviceDisConnected(nodeId); break; default: @@ -178,6 +267,7 @@ public class NetConfTopologyListener implements DataTreeChangeListener { break; } } + } catch (NullPointerException e) { LOG.error("Cannot get available Capabilities"); } @@ -191,15 +281,15 @@ public class NetConfTopologyListener implements DataTreeChangeListener { } - private String getSupportedStream(String nodeId) { + /*private String getSupportedStream(String nodeId) { InstanceIdentifier streamsIID = InstanceIdentifier.create(Netconf.class).child(Streams.class); try { Optional ordmInfoObject = this.deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, streamsIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); if (!ordmInfoObject.isPresent()) { - LOG.error("Info subtree is not present"); - return null; + LOG.error("Get Stream RPC is not supported"); + return "NETCONF"; } for (org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.netconf .streams.Stream strm : ordmInfoObject.get().getStream()) { @@ -211,7 +301,7 @@ public class NetConfTopologyListener implements DataTreeChangeListener { return "NETCONF"; } catch (NullPointerException ex) { LOG.error("NullPointerException thrown while getting Info from a non Open ROADM device {}", nodeId); - return null; + return "NETCONF"; } - } + }*/ }