From 710f6707e286f60d69b3a8f3863848c98b79712f Mon Sep 17 00:00:00 2001 From: Rashmi Pujar Date: Fri, 22 Jan 2016 17:22:56 -0500 Subject: [PATCH] Code cleanup for vpnintent module as per comments Change-Id: I017bbdc5c8f5272e68fd9b42f56152de61ada725 Signed-off-by: Rashmi Pujar --- features/src/main/features/features.xml | 1 - vpnintent/impl/pom.xml | 10 +++++----- .../vpnservice/impl/IntentServiceManager.java | 14 ++++++-------- .../vpnservice/impl/MappingServiceManager.java | 4 ++++ .../vpnservice/impl/MplsLabelManagerService.java | 2 +- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml index 74e321ff..0a8154c2 100644 --- a/features/src/main/features/features.xml +++ b/features/src/main/features/features.xml @@ -67,7 +67,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html mvn:org.opendaylight.vpnservice/elanmanager-impl/${elanmgr.version} - wrap:mvn:org.apache.thrift/libthrift/0.9.1$overwrite=merge&Bundle-Version=0.9.1&Export-Package=*;-noimport:=true;version="0.9.1" mvn:org.opendaylight.vpnservice/lockmanager-impl/${lockmanager.version}/xml/config diff --git a/vpnintent/impl/pom.xml b/vpnintent/impl/pom.xml index 0be7d94b..f69f9c82 100644 --- a/vpnintent/impl/pom.xml +++ b/vpnintent/impl/pom.xml @@ -37,6 +37,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL intent-api ${nic.version} + + org.opendaylight.nic + intent-mapping-interface + ${nic.version} + org.opendaylight.nic utils @@ -68,11 +73,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL test - - org.opendaylight.nic - intent-mapping-interface - ${nic.version} - diff --git a/vpnintent/impl/src/main/java/org/opendaylight/vpnservice/impl/IntentServiceManager.java b/vpnintent/impl/src/main/java/org/opendaylight/vpnservice/impl/IntentServiceManager.java index dda5447d..5fe24662 100644 --- a/vpnintent/impl/src/main/java/org/opendaylight/vpnservice/impl/IntentServiceManager.java +++ b/vpnintent/impl/src/main/java/org/opendaylight/vpnservice/impl/IntentServiceManager.java @@ -41,15 +41,13 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; - +/** + * This class is used to build Intents object and + * write it to Network Intent Composition md-sal tree + * in order to create/delete intents between two endpoint groups. + */ public class IntentServiceManager { - /** - * This class is used to build Intents object and - * write it to Network Intent Composition md-sal tree - * in order to create/delete intents between two endpoint groups. - */ - private static final Logger LOG = LoggerFactory.getLogger(IntentServiceManager.class); private static final short FIRST_SUBJECT = 1; private static final short SECOND_SUBJECT = 2; @@ -59,7 +57,7 @@ public class IntentServiceManager { public static final String SLOW_REROUTE = "slow-reroute"; private final DataBroker dataBroker; private static final InstanceIdentifier INTENTS_IID = IidFactory.getIntentsIid(); - private MdsalUtils mdsal; + private final MdsalUtils mdsal; public IntentServiceManager(DataBroker dataBroker) { this.dataBroker = dataBroker; diff --git a/vpnintent/impl/src/main/java/org/opendaylight/vpnservice/impl/MappingServiceManager.java b/vpnintent/impl/src/main/java/org/opendaylight/vpnservice/impl/MappingServiceManager.java index e025b917..4ef274ef 100644 --- a/vpnintent/impl/src/main/java/org/opendaylight/vpnservice/impl/MappingServiceManager.java +++ b/vpnintent/impl/src/main/java/org/opendaylight/vpnservice/impl/MappingServiceManager.java @@ -12,11 +12,14 @@ import java.util.HashMap; import java.util.Map; import org.opendaylight.nic.mapping.api.IntentMappingService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; public class MappingServiceManager { + private static final Logger LOG = LoggerFactory.getLogger(MappingServiceManager.class); private IntentMappingService intentMappingService; private String IP_PREFIX_PROPERTY = "ip_prefix"; private String SWITCH_PORT_ID_PROPERTY = "switch_port"; @@ -79,6 +82,7 @@ public class MappingServiceManager { intentMappingService.add(siteName, null); return true; } catch (Exception e) { + LOG.error("Error deleting from NIC's mapping service {}", e); throw e; } } diff --git a/vpnintent/impl/src/main/java/org/opendaylight/vpnservice/impl/MplsLabelManagerService.java b/vpnintent/impl/src/main/java/org/opendaylight/vpnservice/impl/MplsLabelManagerService.java index 48b4986a..f9019954 100644 --- a/vpnintent/impl/src/main/java/org/opendaylight/vpnservice/impl/MplsLabelManagerService.java +++ b/vpnintent/impl/src/main/java/org/opendaylight/vpnservice/impl/MplsLabelManagerService.java @@ -33,7 +33,7 @@ public class MplsLabelManagerService { public static final InstanceIdentifier MPLS_LABELS_IID = IidFactory.getMplsLabelsIid(); private final DataBroker dataBroker; private final Random random = new Random(); - private MdsalUtils mdsal; + private final MdsalUtils mdsal; public MplsLabelManagerService(DataBroker dataBroker) { this.dataBroker = dataBroker; -- 2.36.6