Code cleanup for vpnintent module as per comments

Change-Id: I017bbdc5c8f5272e68fd9b42f56152de61ada725
Signed-off-by: Rashmi Pujar <rpujar@inocybe.com>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 74e321ffd8f92540c329e250c238c9098e060c02..0a8154c259aefda41711c991a739aeae07551e84 100644 (file)
--- 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
     <bundle>mvn:org.opendaylight.vpnservice/elanmanager-impl/${elanmgr.version}</bundle>
 
     <!--<bundle>mvn:org.opendaylight.vpnservice.third-party/org.apache.thriftlib/1.1.0-SNAPSHOT</bundle>-->
-    <!--<bundle>mvn:org.opendaylight.vpnservice.third-party/org.apache.thriftlib/1.0.1-SNAPSHOT</bundle>-->
     <bundle>wrap:mvn:org.apache.thrift/libthrift/0.9.1$overwrite=merge&amp;Bundle-Version=0.9.1&amp;Export-Package=*;-noimport:=true;version="0.9.1"</bundle>
     <!--<bundle>wrap:mvn:javax.servlet/servlet-api/2.5</bundle>-->
     <configfile finalname="lockmanager-impl-default-config.xml">mvn:org.opendaylight.vpnservice/lockmanager-impl/${lockmanager.version}/xml/config</configfile>

diff --git a/vpnintent/impl/pom.xml b/vpnintent/impl/pom.xml
index 0be7d94b299bd29ddbb97b37c3cd266a25f4f36e..f69f9c82742134e11f58da373e2bb853d7d1a16b 100644 (file)
--- 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
       <artifactId>intent-api</artifactId>
       <version>${nic.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.nic</groupId>
+      <artifactId>intent-mapping-interface</artifactId>
+      <version>${nic.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.nic</groupId>
       <artifactId>utils</artifactId>
@@ -68,11 +73,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.opendaylight.nic</groupId>
-      <artifactId>intent-mapping-interface</artifactId>
-      <version>${nic.version}</version>
-    </dependency>
   </dependencies>
 
 </project>

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 dda5447d224863684e70d5c79a4fd7a734cc0f09..5fe2466281be6eaa9c0e119a7647c8b67194f3dc 100644 (file)
--- 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> 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 e025b91706e596a6315c01ccb659d12be2ef5547..4ef274ef213573ee3e5c541a27a5e231598f86d3 100644 (file)
--- 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 48b4986af3e10d7f173ab967a422846dfc1105da..f9019954d5b1849ad87cdf423db5742177f6c87b 100644 (file)
--- 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<MplsLabels> 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;