From: Archana Date: Mon, 14 Aug 2017 20:50:48 +0000 (-0400) Subject: Applies some changes proposed by Sonar X-Git-Tag: v0.2.0~112 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=d2498c91c2f71b86e4d89b46fd26291190adbacc Applies some changes proposed by Sonar Change-Id: Ia4f30a6be60b1cd87103e0330b82913d8945259b Signed-off-by: Archana --- diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/RendererNotificationsImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/RendererNotificationsImpl.java index 6c1388840..15fd24aee 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/RendererNotificationsImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/RendererNotificationsImpl.java @@ -16,7 +16,6 @@ import com.google.common.cache.LoadingCache; import java.util.Collection; import java.util.List; import java.util.Set; -import java.util.concurrent.Future; import java.util.stream.Collectors; import org.opendaylight.controller.md.sal.binding.api.DataBroker; @@ -58,7 +57,6 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; -import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -111,39 +109,31 @@ public class RendererNotificationsImpl implements DataTreeChangeListener { alarmListener = new AlarmNotificationListener(); LOG.info("Registering notification listener on {} for node: {}", AlarmNotification.QNAME, nodeId); // Register notification listener - final ListenerRegistration - accessAlarmNotificationListenerRegistration = - notificationService.get().registerNotificationListener(alarmListener); + final OrgOpenroadmDeOperationsListener deOperationsListener; deOperationsListener = new DeOperationsListener(); LOG.info("Registering notification listener on OrgOpenroadmDeOperationsListener for node: {}", nodeId); // Register notification listener - final ListenerRegistration - accessDeOperationasNotificationListenerRegistration = - notificationService.get().registerNotificationListener(deOperationsListener); + final OrgOpenroadmDeviceListener deviceListener; deviceListener = new DeviceListener(); LOG.info("Registering notification listener on OrgOpenroadmDeviceListener for node: {}", nodeId); // Register notification listener - final ListenerRegistration - accessDeviceNotificationListenerRegistration = notificationService.get() - .registerNotificationListener(deviceListener); + final OrgOpenroadmLldpListener lldpListener; lldpListener = new LldpListener(); LOG.info("Registering notification listener on OrgOpenroadmLldpListener for node: {}", nodeId); // Register notification listener - final ListenerRegistration accessLldpNotificationListenerRegistration = - notificationService.get().registerNotificationListener(lldpListener); + final OrgOpenroadmTcaListener tcaListener; tcaListener = new TcaListener(); LOG.info("Registering notification listener on OrgOpenroadmTcaListener for node: {}", nodeId); // Register notification listener - final ListenerRegistration accessTcaNotificationListenerRegistration = - notificationService.get().registerNotificationListener(tcaListener); + // Listening to NETCONF datastream final String streamName = "NETCONF"; @@ -156,8 +146,7 @@ public class RendererNotificationsImpl implements DataTreeChangeListener { final CreateSubscriptionInputBuilder createSubscriptionInputBuilder = new CreateSubscriptionInputBuilder(); createSubscriptionInputBuilder.setStream(new StreamNameType(streamName)); LOG.info("Triggering notification stream {} for node {}", streamName, nodeId); - final Future> subscription = rpcService.createSubscription(createSubscriptionInputBuilder - .build()); + } public void close() { @@ -199,9 +188,8 @@ public class RendererNotificationsImpl implements DataTreeChangeListener { /* * TODO: check for required * capabilities to listen for notifications - * registerNotificationListener(rootNode. - * getDataAfter(). getNodeId()); */ + registerNotificationListener(rootNode.getDataAfter(). getNodeId()); currentMountedDevice.add(nodeId); new PortMapping(dataBroker, mountService, nodeId).createMappingData(); break; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaces.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaces.java index 7039df857..333177d43 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaces.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaces.java @@ -112,12 +112,11 @@ public class OpenRoadmInterfaces { public boolean postInterface(InterfaceBuilder ifBuilder) { String intf2Post = ifBuilder.getName(); Interface intf2PostCheck = getInterface(intf2Post); - if (intf2PostCheck != null) { - if (intf2PostCheck.getAdministrativeState() == AdminStates.InService) { - LOG.info("Interface with same name in service already exists on node " + nodeId); - return true; - } + if (intf2PostCheck != null && intf2PostCheck.getAdministrativeState() == AdminStates.InService) { + LOG.info("Interface with same name in service already exists on node " + nodeId); + return true; } + // Post interface with its specific augmentation to the device if (netconfNodeDataBroker != null) { InstanceIdentifier interfacesIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/CrossConnect.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/CrossConnect.java index af220f7bb..993a6a762 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/CrossConnect.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/CrossConnect.java @@ -64,16 +64,11 @@ public class CrossConnect { * This method return the RoadmConnection subtree for a given connection * number. * - * @param connectionNumber - * Name of the cross connect. - * * @return Roadm connection subtree from the device. */ - public RoadmConnections getCrossConnect(String connectionNumber) { - if (connectionNumber == null && this.connectionNumber != null) { - connectionNumber = this.connectionNumber; - } - if (deviceDb != null) { + public RoadmConnections getCrossConnect() { + + if (deviceDb != null && connectionNumber != null) { ReadOnlyTransaction rtx = deviceDb.newReadOnlyTransaction(); Optional roadmConnectionsObject; try { @@ -131,21 +126,7 @@ public class CrossConnect { } } - /** - * This method does a delete(edit-config) on roadm connection subtree for a - * given connection number. - * - * @param connectionNumber - * Name of the cross connect. - * @return true/false based on status of operation. - */ - public boolean deleteCrossConnect(String connectionNumber) { - if (connectionNumber == null && this.connectionNumber != null) { - connectionNumber = this.connectionNumber; - } - return deleteCrossConnect(); - } /** * This method does a delete(edit-config) on roadm connection subtree for a @@ -157,7 +138,7 @@ public class CrossConnect { public boolean deleteCrossConnect() { //Check if cross connect exists before delete - if (getCrossConnect(connectionNumber) == null) { + if (getCrossConnect() == null) { LOG.info("Cross connect does not exist, halting delete"); return false; } @@ -180,25 +161,7 @@ public class CrossConnect { } } - /** - * This method does an edit-config on roadm connection subtree for a given - * connection number in order to set power level for use by the optical - * power control. - * - * @param mode - * Optical control modelcan be off, power or gainLoss. - * @param value - * Power value in DBm. - * @param connectionNumber - * Name of the cross connect. - * @return true/false based on status of operation. - */ - public boolean setPowerLevel(OpticalControlMode mode, PowerDBm value, String connectionNumber) { - if (connectionNumber == null && this.connectionNumber != null) { - connectionNumber = this.connectionNumber; - } - return setPowerLevel(mode, value); - } + /** * This method does an edit-config on roadm connection subtree for a given @@ -213,7 +176,7 @@ public class CrossConnect { */ public boolean setPowerLevel(OpticalControlMode mode, PowerDBm value) { - RoadmConnections rdmConn = getCrossConnect(connectionNumber); + RoadmConnections rdmConn = getCrossConnect(); if (rdmConn != null) { RoadmConnectionsBuilder rdmConnBldr = new RoadmConnectionsBuilder(rdmConn); rdmConnBldr.setOpticalControlMode(mode); diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRenderer.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRenderer.java index da94656ed..1cabf6dc9 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRenderer.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRenderer.java @@ -159,7 +159,7 @@ public class DeviceRenderer implements RendererService { DataBroker netconfNodeDataBroker = PortMapping.getDeviceDataBroker(nodeId, mps); String crossConnectName = srcTp + "-" + destTp + "-" + waveNumber; CrossConnect roadmConnections = new CrossConnect(netconfNodeDataBroker); - if (roadmConnections.postCrossConnect(waveNumber, srcTp, destTp) == true) { + if (roadmConnections.postCrossConnect(waveNumber, srcTp, destTp)) { nodesProvisioned.add(nodeId); roadmConnections.getConnectionPortTrail(nodeId, mps, waveNumber, srcTp, destTp); } else { @@ -237,14 +237,14 @@ public class DeviceRenderer implements RendererService { LOG.error("Failed to delete {} ", srcTp + "-" + destTp + "-" + waveNumber); } // Deleting interface on source termination point - if (new OpenRoadmInterfaces(db, mps, nodeId, srcTp) - .deleteInterface(srcTp + "-" + waveNumber.toString()) == false) { + if (!new OpenRoadmInterfaces(db, mps, nodeId, srcTp) + .deleteInterface(srcTp + "-" + waveNumber.toString())) { LOG.error("Failed to delete interface " + srcTp + "-" + waveNumber.toString()); } // Deleting interface on destination termination point - if (new OpenRoadmInterfaces(db, mps, nodeId, destTp) - .deleteInterface(destTp + "-" + waveNumber.toString()) == false) { + if (!new OpenRoadmInterfaces(db, mps, nodeId, destTp) + .deleteInterface(destTp + "-" + waveNumber.toString())) { LOG.error("Failed to delete interface " + destTp + "-" + waveNumber.toString()); } } else {