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 49e0289a4a85f9818f7d403cea49f4870f176d5c..05132fb3dd524ea3d65b9051667bb9b5b1c9885f 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -66,7 +66,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <bundle>mvn:org.opendaylight.vpnservice/elanmanager-api/${elanmgr.version}</bundle>
     <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 0a344c687e6b935b05b59a0be6f598ef204e7b79..a447680c5d61c0ebd95e6a5af0fe796ea8cbb4b3 100644 (file)
--- a/vpnintent/impl/pom.xml
+++ b/vpnintent/impl/pom.xml
@@ -26,11 +26,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.vpnservice</groupId>
-      <artifactId>mdsalutil-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>vpnintent-api</artifactId>
@@ -43,6 +38,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>
@@ -73,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 a1c64e306f95173b2bd00f0f2eac4f4b5161af2e..dd7d0e005a5d83d6e044b6152813e655d71b3423 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 8478c814d145e0e0acf2850e4f9354f369c45951..4c48d81549d96bed278626a4b507c49552dd77af 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 db9628bbad2faec5af1c54ad072f02e697f4cd40..18c43167a62347aeab6d85f8a00de3fad196275c 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;