Removing Open_vSwitch static Typed table classes from Library and its dependencies

Change-Id: I866545a6d03a1d0821ff1bcaabdc6af8e35e86dc
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

diff --git a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/library/OvsdbLibraryIT.java b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/library/OvsdbLibraryIT.java
index 82820a6fb2938b74fefabdae2433ae01b088ebbd..e9e0c893ef42d4b53c7195d7138a691831654569 100644 (file)
--- a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/library/OvsdbLibraryIT.java
+++ b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/library/OvsdbLibraryIT.java
@@ -112,6 +112,7 @@ public class OvsdbLibraryIT extends OvsdbIntegrationTestBase {
         }
         if (debugit) {
             log.debug("Do some debugging because some bundle is unresolved");
+            Thread.sleep(600000);
         }
 
         // Assert if true, if false we are good to go!

diff --git a/neutron/pom.xml b/neutron/pom.xml
index 7ca87b07c817ffb854f730d14f11a144621c14cf..d03127462eda6cbb3fee39c1a7d16ddf7e0fe610 100644 (file)
--- a/neutron/pom.xml
+++ b/neutron/pom.xml
@@ -138,7 +138,6 @@
               org.opendaylight.controller.sal.action,
               org.opendaylight.ovsdb.plugin,
               org.opendaylight.ovsdb.lib.notation,
-              org.opendaylight.ovsdb.lib.table,
               org.opendaylight.controller.sal.binding.api,
               org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819,
               org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes,

diff --git a/northbound/pom.xml b/northbound/pom.xml
index 1695d346285dcdf05897d144e194df6cf6120c5c..975af94e70ad5eb1f94dc4b67207c4e4fa45a548 100644 (file)
--- a/northbound/pom.xml
+++ b/northbound/pom.xml
@@ -86,10 +86,8 @@
               org.opendaylight.controller.sal.authorization,
               org.opendaylight.ovsdb.plugin,
               org.opendaylight.ovsdb.lib,
-              org.opendaylight.ovsdb.lib.table,
               org.opendaylight.ovsdb.lib.jsonrpc,
               org.opendaylight.ovsdb.lib.notation,
-              org.opendaylight.ovsdb.lib.database,
               org.opendaylight.ovsdb.lib.operations,
               org.opendaylight.ovsdb.lib.message,
               org.opendaylight.ovsdb.lib.schema,

diff --git a/plugin/pom.xml b/plugin/pom.xml
index 827088885b782a35ec9519cb43704b729d3b8865..ea24726103672819ec688be4ab84ba2049666414 100755 (executable)
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -162,9 +162,7 @@
                             org.opendaylight.controller.sal.connection,
                             org.opendaylight.controller.clustering.services,
                             org.opendaylight.controller.sal.networkconfig.bridgedomain,
-                            org.opendaylight.ovsdb.lib.table,
                             org.opendaylight.ovsdb.lib.notation,
-                            org.opendaylight.ovsdb.lib.database,
                             org.opendaylight.ovsdb.lib.operations,
                             org.opendaylight.ovsdb.lib.message,
                             org.opendaylight.ovsdb.schema.openvswitch,

diff --git a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java
index d4a074ada5dab994fd70697dbe0fc7ae8a5ec921..7c06c79a5ce91aa71e0923f69cc6a7f9ca50263a 100644 (file)
--- a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java
+++ b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java
@@ -23,7 +23,6 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutionException;
 
-import com.google.common.collect.ImmutableSet;
 import org.eclipse.osgi.framework.console.CommandInterpreter;
 import org.eclipse.osgi.framework.console.CommandProvider;
 import org.opendaylight.controller.clustering.services.IClusterGlobalServices;
@@ -35,7 +34,6 @@ import org.opendaylight.controller.sal.networkconfig.bridgedomain.IPluginInBridg
 import org.opendaylight.controller.sal.utils.Status;
 import org.opendaylight.controller.sal.utils.StatusCode;
 import org.opendaylight.ovsdb.lib.OvsdbClient;
-import org.opendaylight.ovsdb.lib.database.OvsdbType;
 import org.opendaylight.ovsdb.lib.notation.Column;
 import org.opendaylight.ovsdb.lib.notation.Mutator;
 import org.opendaylight.ovsdb.lib.notation.OvsDBSet;
@@ -61,6 +59,7 @@ import org.osgi.framework.FrameworkUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
 
 public class ConfigurationService implements IPluginInBridgeDomainConfigService, OVSDBConfigService,
@@ -931,7 +930,7 @@ public class ConfigurationService implements IPluginInBridgeDomainConfigService,
 
         if (type != null) {
             logger.debug("Port type : " + type);
-            if (type.equalsIgnoreCase(OvsdbType.PortType.VLAN.name())) {
+            if (type.equalsIgnoreCase(OvsVswitchdSchemaConstants.PortType.VLAN.name())) {
                 tags = new HashSet<BigInteger>();
                 tags.add(BigInteger.valueOf(Integer.parseInt((String)configs.get(ConfigConstants.VLAN))));
             }
@@ -972,12 +971,12 @@ public class ConfigurationService implements IPluginInBridgeDomainConfigService,
 
         if (type != null) {
             logger.debug("Interface type : " + type);
-            if (type.equalsIgnoreCase(OvsdbType.PortType.TUNNEL.name())) {
+            if (type.equalsIgnoreCase(OvsVswitchdSchemaConstants.PortType.TUNNEL.name())) {
                 interfaceRow.setType((String)configs.get(ConfigConstants.TUNNEL_TYPE));
                 if (options == null) options = new HashMap<String, String>();
                 options.put("remote_ip", (String)configs.get(ConfigConstants.DEST_IP));
-            } else if (type.equalsIgnoreCase(OvsdbType.PortType.PATCH.name()) ||
-                       type.equalsIgnoreCase(OvsdbType.PortType.INTERNAL.name())) {
+            } else if (type.equalsIgnoreCase(OvsVswitchdSchemaConstants.PortType.PATCH.name()) ||
+                       type.equalsIgnoreCase(OvsVswitchdSchemaConstants.PortType.INTERNAL.name())) {
                 interfaceRow.setType(type.toLowerCase());
             }
         }

diff --git a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/OvsVswitchdSchemaConstants.java b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/OvsVswitchdSchemaConstants.java
index 0383bc822f97dedb4570cd9a1763197230ada911..2547103273a44f1f3ee8b4181c63939a10e38f77 100644 (file)
--- a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/OvsVswitchdSchemaConstants.java
+++ b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/OvsVswitchdSchemaConstants.java
@@ -40,4 +40,24 @@ public class OvsVswitchdSchemaConstants {
         if (autoConfigureController && databaseName.equals(DATABASE_NAME) && tableName.equals("Bridge")) return true;
         return false;
     }
+
+    public enum PortType {
+        VLAN("vlan"),
+        TUNNEL("Tunnel"),
+        BONDING("Bonding"),
+        PATCH("patch"),
+        INTERNAL("internal");
+
+        private PortType(String name) {
+            this.name = name;
+        }
+
+        private String name;
+
+        @Override
+        public String toString() {
+            return name;
+        }
+    }
+
 }