Normalize Bundle Naming

Remove underscores and capitals from bundle names.
Remove duplicated "ovsdb" in bundle names.

This produces the following bundles:
- org.opendaylight.ovsdb.library-1.0.0-SNAPSHOT.jar
- org.opendaylight.ovsdb.neutron-0.7.0-SNAPSHOT.jar
- org.opendaylight.ovsdb.northbound-0.6.0-SNAPSHOT.jar
- org.opendaylight.ovsdb.plugin-1.0.0-SNAPSHOT.jar
- org.opendaylight.ovsdb.schema.hardwarevtep-1.0.0-SNAPSHOT.jar
- org.opendaylight.ovsdb.schema.openvswitch-1.0.0-SNAPSHOT.jar

This is consistent with the existing bundle naming in Nexus

This commit also fixes import issues with Eclipse...

Change-Id: Ie693bab44e9452d1f09c71181f3ccac87471fbbb
Signed-off-by: Dave Tucker <djt@redhat.com>

diff --git a/commons/integrationtest/pom.xml b/commons/integrationtest/pom.xml
index b993701755e44e6151c7881b94d9ce1ff4bb503e..b470c9a35e48052791eba6b0133d917fb9d5d191 100644 (file)
--- a/commons/integrationtest/pom.xml
+++ b/commons/integrationtest/pom.xml
@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.ovsdb</groupId>
-    <artifactId>ovsdb_commons</artifactId>
+    <artifactId>commons</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
-  <artifactId>ovsdb_commons_integrationtest</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <artifactId>commons.integrationtest</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -17,8 +17,8 @@
     <ovsdb.library.version>1.0.0-SNAPSHOT</ovsdb.library.version>
     <ovsdb.plugin.version>1.0.0-SNAPSHOT</ovsdb.plugin.version>
     <ovsdb.northbound.version>0.6.0-SNAPSHOT</ovsdb.northbound.version>
-    <schema.Open_vSwitch.version>1.0.0-SNAPSHOT</schema.Open_vSwitch.version>
-    <schema.hardware_vtep.version>1.0.0-SNAPSHOT</schema.hardware_vtep.version>
+    <schema.openvswitch.version>1.0.0-SNAPSHOT</schema.openvswitch.version>
+    <schema.hardwarevtep.version>1.0.0-SNAPSHOT</schema.hardwarevtep.version>
   </properties>
 
   <dependencies>
@@ -68,28 +68,28 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb_library</artifactId>
+      <artifactId>library</artifactId>
       <version>${ovsdb.library.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb_plugin</artifactId>
+      <artifactId>plugin</artifactId>
       <version>${ovsdb.plugin.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb_northbound</artifactId>
+      <artifactId>northbound</artifactId>
       <version>${ovsdb.northbound.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb_schema.Open_vSwitch</artifactId>
-      <version>${schema.Open_vSwitch.version}</version>
+      <artifactId>schema.openvswitch</artifactId>
+      <version>${schema.openvswitch.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb_schema.hardware_vtep</artifactId>
-      <version>${schema.hardware_vtep.version}</version>
+      <artifactId>schema.hardwarevtep</artifactId>
+      <version>${schema.hardwarevtep.version}</version>
     </dependency>
 
     <!-- Add Pax Exam -->

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 226ef4e734d2a6cf57bc01fdb587bf292de3b9e5..2498a8f2a95e6228e2f11f9987b98bb3f49e0270 100755 (executable)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -7,7 +7,7 @@
     <version>1.4.2-SNAPSHOT</version>
   </parent>
   <groupId>org.opendaylight.ovsdb</groupId>
-  <artifactId>ovsdb_commons</artifactId>
+  <artifactId>commons</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <prerequisites>

diff --git a/distribution/opendaylight/pom.xml b/distribution/opendaylight/pom.xml
index 84b880de882061152dc881e8673fd808bebd31d5..7e6a4263fd1db264cbebcd3f682deee4a212d3cb 100755 (executable)
--- a/distribution/opendaylight/pom.xml
+++ b/distribution/opendaylight/pom.xml
@@ -7,14 +7,14 @@ see https://git.opendaylight.org/gerrit/#/c/390/
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.ovsdb</groupId>
-    <artifactId>ovsdb_commons</artifactId>
+    <artifactId>commons</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../commons/parent/</relativePath>
   </parent>
 
   <artifactId>distribution.ovsdb</artifactId>
   <packaging>pom</packaging>
-  <name>ovsdb Distribution</name>
+  <name>distribution</name>
   <dependencies>
     <!-- openflowjava -->
     <dependency>
@@ -55,32 +55,32 @@ see https://git.opendaylight.org/gerrit/#/c/390/
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb_library</artifactId>
+      <artifactId>library</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb_neutron</artifactId>
+      <artifactId>neutron</artifactId>
       <version>0.7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb_northbound</artifactId>
+      <artifactId>northbound</artifactId>
       <version>0.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb_plugin</artifactId>
+      <artifactId>plugin</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb_schema.Open_vSwitch</artifactId>
+      <artifactId>schema.openvswitch</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb_schema.hardware_vtep</artifactId>
+      <artifactId>schema.hardwarevtep</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>

diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index 2c6febce5d329fa6f5b19a83371b9bbd03ffa066..d3f5be3488fe63e37b25724c54531cec8b960700 100644 (file)
--- a/integrationtest/pom.xml
+++ b/integrationtest/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.ovsdb</groupId>
-    <artifactId>ovsdb_commons_integrationtest</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <artifactId>commons.integrationtest</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../commons/integrationtest</relativePath>
   </parent>
 
-  <artifactId>ovsdb_integrationtest</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <artifactId>integrationtest</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <dependencies>
@@ -622,6 +622,38 @@
     </dependency>
   </dependencies>
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>${lifecycle.mapping.version}</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.servicemix.tooling</groupId>
+                    <artifactId>depends-maven-plugin</artifactId>
+                    <executions>
+                      <execution>
+                        <id>generate-depends-file</id>
+                        <goals>
+                          <goal>generate-depends-file</goal>
+                        </goals>
+                      </execution>
+                    </executions>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore/>
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>

diff --git a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java
index 39d5893ac58b6bb8f6ba55a2c6db3927b54cee91..288888dc936008a661ee3a477a73264d07836ad9 100644 (file)
--- a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java
+++ b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java
@@ -184,14 +184,14 @@ public class ConfigurationBundles {
                 mavenBundle("com.fasterxml.jackson.core", "jackson-databind").versionAsInProject(),
                 mavenBundle("javax.portlet", "portlet-api").versionAsInProject(),
                 mavenBundle("com.google.guava", "guava").versionAsInProject(),
-                mavenBundle("org.opendaylight.ovsdb", "ovsdb_library").versionAsInProject()
+                mavenBundle("org.opendaylight.ovsdb", "library").versionAsInProject()
         );
     }
 
     public static Option ovsdbDefaultSchemaBundles() {
         return new DefaultCompositeOption(
-                mavenBundle("org.opendaylight.ovsdb", "ovsdb_schema.Open_vSwitch").versionAsInProject(),
-                mavenBundle("org.opendaylight.ovsdb", "ovsdb_schema.hardware_vtep").versionAsInProject()
+                mavenBundle("org.opendaylight.ovsdb", "schema.openvswitch").versionAsInProject(),
+                mavenBundle("org.opendaylight.ovsdb", "schema.hardwarevtep").versionAsInProject()
         );
     }
 

diff --git a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/northbound/OvsdbNorthboundIT.java b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/northbound/OvsdbNorthboundIT.java
index 6be61b2366dc6534f6ad4424b116ca860d05235a..7a9cb0680d82b4dcb03914dbbc6688e724a6bba5 100644 (file)
--- a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/northbound/OvsdbNorthboundIT.java
+++ b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/northbound/OvsdbNorthboundIT.java
@@ -291,8 +291,8 @@ public class OvsdbNorthboundIT extends OvsdbIntegrationTestBase {
                 ConfigurationBundles.controllerNorthboundBundles(),
                 ConfigurationBundles.ovsdbLibraryBundles(),
                 ConfigurationBundles.ovsdbDefaultSchemaBundles(),
-                mavenBundle("org.opendaylight.ovsdb", "ovsdb_plugin").versionAsInProject(),
-                mavenBundle("org.opendaylight.ovsdb", "ovsdb_northbound").versionAsInProject(),
+                mavenBundle("org.opendaylight.ovsdb", "plugin").versionAsInProject(),
+                mavenBundle("org.opendaylight.ovsdb", "northbound").versionAsInProject(),
                 junitBundles()
         );
     }

diff --git a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/plugin/OvsdbPluginIT.java b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/plugin/OvsdbPluginIT.java
index c7752677771be83389227df95351fc597efe92b6..29c45c6648fc0f3e09443c91ae2c37e5e486af13 100644 (file)
--- a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/plugin/OvsdbPluginIT.java
+++ b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/plugin/OvsdbPluginIT.java
@@ -82,7 +82,7 @@ public class OvsdbPluginIT extends OvsdbIntegrationTestBase {
             ConfigurationBundles.controllerBundles(),
             ConfigurationBundles.ovsdbLibraryBundles(),
             ConfigurationBundles.ovsdbDefaultSchemaBundles(),
-            mavenBundle("org.opendaylight.ovsdb", "ovsdb_plugin").versionAsInProject(),
+            mavenBundle("org.opendaylight.ovsdb", "plugin").versionAsInProject(),
             junitBundles()
         );
     }

diff --git a/library/pom.xml b/library/pom.xml
index c40eedeb9c9248438d17f070018dbf0d569c894f..1332513afd9f451a1a3cddb26bed6dfca1dabf97 100755 (executable)
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -3,11 +3,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.ovsdb</groupId>
-    <artifactId>ovsdb_commons</artifactId>
+    <artifactId>commons</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <relativePath>../commons/parent</relativePath>
   </parent>
-  <artifactId>ovsdb_library</artifactId>
+  <artifactId>library</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 

diff --git a/neutron/pom.xml b/neutron/pom.xml
index d03127462eda6cbb3fee39c1a7d16ddf7e0fe610..81b794727862e8278a752068320fbf651cca41e1 100644 (file)
--- a/neutron/pom.xml
+++ b/neutron/pom.xml
@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.ovsdb</groupId>
-    <artifactId>ovsdb_commons</artifactId>
+    <artifactId>commons</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <relativePath>../commons/parent</relativePath>
   </parent>
 
-  <artifactId>ovsdb_neutron</artifactId>
+  <artifactId>neutron</artifactId>
   <version>0.7.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
@@ -77,17 +77,17 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb_library</artifactId>
+      <artifactId>library</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb_plugin</artifactId>
+      <artifactId>plugin</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb_schema.Open_vSwitch</artifactId>
+      <artifactId>schema.openvswitch</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>

diff --git a/northbound/pom.xml b/northbound/pom.xml
index 975af94e70ad5eb1f94dc4b67207c4e4fa45a548..db3d00c3a2506c994627fb72188f4b803fe8d6c3 100644 (file)
--- a/northbound/pom.xml
+++ b/northbound/pom.xml
@@ -3,11 +3,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.ovsdb</groupId>
-    <artifactId>ovsdb_commons</artifactId>
+    <artifactId>commons</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <relativePath>../commons/parent</relativePath>
   </parent>
-  <artifactId>ovsdb_northbound</artifactId>
+  <artifactId>northbound</artifactId>
   <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
@@ -46,12 +46,12 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb_library</artifactId>
+      <artifactId>library</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb_plugin</artifactId>
+      <artifactId>plugin</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>

diff --git a/plugin/pom.xml b/plugin/pom.xml
index ea24726103672819ec688be4ab84ba2049666414..2601813aaa5a1f8354400c157993e24b3ad5326d 100755 (executable)
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -3,11 +3,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.ovsdb</groupId>
-    <artifactId>ovsdb_commons</artifactId>
+    <artifactId>commons</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <relativePath>../commons/parent</relativePath>
   </parent>
-  <artifactId>ovsdb_plugin</artifactId>
+  <artifactId>plugin</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
@@ -15,8 +15,8 @@
     <!-- used for filtering the integration test resource -->
     <skip.integrationtest>true</skip.integrationtest>
     <ovsdb.library.version>1.0.0-SNAPSHOT</ovsdb.library.version>
-    <schema.Open_vSwitch.version>1.0.0-SNAPSHOT</schema.Open_vSwitch.version>
-    <schema.hardware_vtep.version>1.0.0-SNAPSHOT</schema.hardware_vtep.version>
+    <schema.openvswitch.version>1.0.0-SNAPSHOT</schema.openvswitch.version>
+    <schema.hardwarevtep.version>1.0.0-SNAPSHOT</schema.hardwarevtep.version>
   </properties>
   <dependencies>
     <dependency>
@@ -115,18 +115,18 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb_library</artifactId>
+      <artifactId>library</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb_schema.Open_vSwitch</artifactId>
-      <version>${schema.Open_vSwitch.version}</version>
+      <artifactId>schema.openvswitch</artifactId>
+      <version>${schema.openvswitch.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb_schema.hardware_vtep</artifactId>
-      <version>${schema.hardware_vtep.version}</version>
+      <artifactId>schema.hardwarevtep</artifactId>
+      <version>${schema.hardwarevtep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

diff --git a/pom.xml b/pom.xml
index bf1db3bb8a40f9519fda62c293df9a2d235d42df..76d3b0d52d81485c174411d8b8091e603105478e 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -4,12 +4,12 @@
 
   <parent>
     <groupId>org.opendaylight.ovsdb</groupId>
-    <artifactId>ovsdb_commons</artifactId>
+    <artifactId>commons</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <relativePath>commons/parent</relativePath>
   </parent>
   <groupId>org.opendaylight.ovsdb</groupId>
-  <artifactId>ovsdb_project</artifactId>
+  <artifactId>ovsdb</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <prerequisites>
@@ -17,8 +17,8 @@
   </prerequisites>
   <modules>
     <module>library</module>
-    <module>schemas/Open_vSwitch</module>
-    <module>schemas/hardware_vtep</module>
+    <module>schemas/openvswitch</module>
+    <module>schemas/hardwarevtep</module>
     <module>plugin</module>
     <module>commons/parent</module>
     <module>commons/integrationtest</module>

diff --git a/schemas/hardware_vtep/pom.xml b/schemas/hardwarevtep/pom.xml
similarity index 97%
rename from schemas/hardware_vtep/pom.xml
rename to schemas/hardwarevtep/pom.xml
index 05a8a59ab1edfb1ee9c96252d8dfc4004089207a..721d10153f6fa5f090c2edd6baa4be65c8d1c6d0 100755 (executable)
--- a/schemas/hardware_vtep/pom.xml
+++ b/schemas/hardwarevtep/pom.xml
@@ -3,11 +3,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.ovsdb</groupId>
-    <artifactId>ovsdb_commons</artifactId>
+    <artifactId>commons</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../commons/parent</relativePath>
   </parent>
-  <artifactId>ovsdb_schema.hardware_vtep</artifactId>
+  <artifactId>schema.hardwarevtep</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
@@ -91,7 +91,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb_library</artifactId>
+      <artifactId>library</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>

diff --git a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/ArpSourcesLocal.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/ArpSourcesLocal.java
similarity index 100%
rename from schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/ArpSourcesLocal.java
rename to schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/ArpSourcesLocal.java

diff --git a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/ArpSourcesRemote.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/ArpSourcesRemote.java
similarity index 100%
rename from schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/ArpSourcesRemote.java
rename to schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/ArpSourcesRemote.java

diff --git a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/Global.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/Global.java
similarity index 100%
rename from schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/Global.java
rename to schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/Global.java

diff --git a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalBindingStats.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalBindingStats.java
similarity index 100%
rename from schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalBindingStats.java
rename to schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalBindingStats.java

diff --git a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalRouter.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalRouter.java
similarity index 100%
rename from schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalRouter.java
rename to schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalRouter.java

diff --git a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalSwitch.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalSwitch.java
similarity index 100%
rename from schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalSwitch.java
rename to schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalSwitch.java

diff --git a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/Manager.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/Manager.java
similarity index 100%
rename from schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/Manager.java
rename to schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/Manager.java

diff --git a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/McastMacsLocal.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/McastMacsLocal.java
similarity index 100%
rename from schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/McastMacsLocal.java
rename to schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/McastMacsLocal.java

diff --git a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/McastMacsRemote.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/McastMacsRemote.java
similarity index 100%
rename from schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/McastMacsRemote.java
rename to schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/McastMacsRemote.java

diff --git a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalLocator.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalLocator.java
similarity index 100%
rename from schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalLocator.java
rename to schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalLocator.java

diff --git a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalLocatorSet.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalLocatorSet.java
similarity index 100%
rename from schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalLocatorSet.java
rename to schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalLocatorSet.java

diff --git a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalPort.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalPort.java
similarity index 100%
rename from schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalPort.java
rename to schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalPort.java

diff --git a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalSwitch.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalSwitch.java
similarity index 100%
rename from schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalSwitch.java
rename to schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalSwitch.java

diff --git a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/Tunnel.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/Tunnel.java
similarity index 100%
rename from schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/Tunnel.java
rename to schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/Tunnel.java

diff --git a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/UcastMacsLocal.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/UcastMacsLocal.java
similarity index 100%
rename from schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/UcastMacsLocal.java
rename to schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/UcastMacsLocal.java

diff --git a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/UcastMacsRemote.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/UcastMacsRemote.java
similarity index 100%
rename from schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/UcastMacsRemote.java
rename to schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/UcastMacsRemote.java

diff --git a/schemas/hardware_vtep/src/test/java/org/opendaylight/ovsdb/schema/hardwarevtep/HardwareVtepSchemaSuiteIT.java b/schemas/hardwarevtep/src/test/java/org/opendaylight/ovsdb/schema/hardwarevtep/HardwareVtepSchemaSuiteIT.java
similarity index 100%
rename from schemas/hardware_vtep/src/test/java/org/opendaylight/ovsdb/schema/hardwarevtep/HardwareVtepSchemaSuiteIT.java
rename to schemas/hardwarevtep/src/test/java/org/opendaylight/ovsdb/schema/hardwarevtep/HardwareVtepSchemaSuiteIT.java

diff --git a/schemas/hardware_vtep/src/test/java/org/opendaylight/ovsdb/schema/hardwarevtep/HardwareVtepSchemaTestBase.java b/schemas/hardwarevtep/src/test/java/org/opendaylight/ovsdb/schema/hardwarevtep/HardwareVtepSchemaTestBase.java
similarity index 100%
rename from schemas/hardware_vtep/src/test/java/org/opendaylight/ovsdb/schema/hardwarevtep/HardwareVtepSchemaTestBase.java
rename to schemas/hardwarevtep/src/test/java/org/opendaylight/ovsdb/schema/hardwarevtep/HardwareVtepSchemaTestBase.java

diff --git a/schemas/hardware_vtep/src/test/java/org/opendaylight/ovsdb/schema/hardwarevtep/ManagerTestCases.java b/schemas/hardwarevtep/src/test/java/org/opendaylight/ovsdb/schema/hardwarevtep/ManagerTestCases.java
similarity index 100%
rename from schemas/hardware_vtep/src/test/java/org/opendaylight/ovsdb/schema/hardwarevtep/ManagerTestCases.java
rename to schemas/hardwarevtep/src/test/java/org/opendaylight/ovsdb/schema/hardwarevtep/ManagerTestCases.java

diff --git a/schemas/hardware_vtep/src/test/java/org/opendaylight/ovsdb/schema/hardwarevtep/MonitorTestCases.java b/schemas/hardwarevtep/src/test/java/org/opendaylight/ovsdb/schema/hardwarevtep/MonitorTestCases.java
similarity index 100%
rename from schemas/hardware_vtep/src/test/java/org/opendaylight/ovsdb/schema/hardwarevtep/MonitorTestCases.java
rename to schemas/hardwarevtep/src/test/java/org/opendaylight/ovsdb/schema/hardwarevtep/MonitorTestCases.java

diff --git a/schemas/hardware_vtep/src/test/java/org/opendaylight/ovsdb/schema/hardwarevtep/OvsdbTestBase.java b/schemas/hardwarevtep/src/test/java/org/opendaylight/ovsdb/schema/hardwarevtep/OvsdbTestBase.java
similarity index 100%
rename from schemas/hardware_vtep/src/test/java/org/opendaylight/ovsdb/schema/hardwarevtep/OvsdbTestBase.java
rename to schemas/hardwarevtep/src/test/java/org/opendaylight/ovsdb/schema/hardwarevtep/OvsdbTestBase.java

diff --git a/schemas/Open_vSwitch/src/test/resources/logback.xml b/schemas/hardwarevtep/src/test/resources/logback.xml
similarity index 100%
rename from schemas/Open_vSwitch/src/test/resources/logback.xml
rename to schemas/hardwarevtep/src/test/resources/logback.xml

diff --git a/schemas/Open_vSwitch/pom.xml b/schemas/openvswitch/pom.xml
similarity index 97%
rename from schemas/Open_vSwitch/pom.xml
rename to schemas/openvswitch/pom.xml
index 8a6b60303a77efcaad9e1f71d9787df5896c4dec..6652a907af96e59f10a21799400de31594cbde8c 100755 (executable)
--- a/schemas/Open_vSwitch/pom.xml
+++ b/schemas/openvswitch/pom.xml
@@ -3,11 +3,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.ovsdb</groupId>
-    <artifactId>ovsdb_commons</artifactId>
+    <artifactId>commons</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../commons/parent</relativePath>
   </parent>
-  <artifactId>ovsdb_schema.Open_vSwitch</artifactId>
+  <artifactId>schema.openvswitch</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
@@ -91,7 +91,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb_library</artifactId>
+      <artifactId>library</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Bridge.java b/schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Bridge.java
similarity index 100%
rename from schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Bridge.java
rename to schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Bridge.java

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Capability.java b/schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Capability.java
similarity index 100%
rename from schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Capability.java
rename to schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Capability.java

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Controller.java b/schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Controller.java
similarity index 100%
rename from schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Controller.java
rename to schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Controller.java

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/FlowSampleCollectorSet.java b/schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/FlowSampleCollectorSet.java
similarity index 100%
rename from schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/FlowSampleCollectorSet.java
rename to schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/FlowSampleCollectorSet.java

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/FlowTable.java b/schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/FlowTable.java
similarity index 100%
rename from schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/FlowTable.java
rename to schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/FlowTable.java

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/IPFIX.java b/schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/IPFIX.java
similarity index 100%
rename from schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/IPFIX.java
rename to schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/IPFIX.java

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Interface.java b/schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Interface.java
similarity index 100%
rename from schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Interface.java
rename to schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Interface.java

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Manager.java b/schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Manager.java
similarity index 100%
rename from schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Manager.java
rename to schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Manager.java

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Mirror.java b/schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Mirror.java
similarity index 100%
rename from schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Mirror.java
rename to schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Mirror.java

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/NetFlow.java b/schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/NetFlow.java
similarity index 100%
rename from schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/NetFlow.java
rename to schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/NetFlow.java

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVSwitch.java b/schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVSwitch.java
similarity index 100%
rename from schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVSwitch.java
rename to schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVSwitch.java

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Port.java b/schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Port.java
similarity index 100%
rename from schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Port.java
rename to schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Port.java

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Qos.java b/schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Qos.java
similarity index 100%
rename from schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Qos.java
rename to schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Qos.java

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Queue.java b/schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Queue.java
similarity index 100%
rename from schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Queue.java
rename to schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Queue.java

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/SFlow.java b/schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/SFlow.java
similarity index 100%
rename from schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/SFlow.java
rename to schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/SFlow.java

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/SSL.java b/schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/SSL.java
similarity index 100%
rename from schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/SSL.java
rename to schemas/openvswitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/SSL.java

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/BridgeTestCases.java b/schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/BridgeTestCases.java
similarity index 100%
rename from schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/BridgeTestCases.java
rename to schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/BridgeTestCases.java

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/ControllerTestCases.java b/schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/ControllerTestCases.java
similarity index 100%
rename from schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/ControllerTestCases.java
rename to schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/ControllerTestCases.java

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowSampleCollectorSetTestCases.java b/schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowSampleCollectorSetTestCases.java
similarity index 100%
rename from schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowSampleCollectorSetTestCases.java
rename to schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowSampleCollectorSetTestCases.java

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowTableTestCases.java b/schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowTableTestCases.java
similarity index 100%
rename from schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowTableTestCases.java
rename to schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowTableTestCases.java

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/IpfixTestCases.java b/schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/IpfixTestCases.java
similarity index 100%
rename from schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/IpfixTestCases.java
rename to schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/IpfixTestCases.java

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/ManagerTestCases.java b/schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/ManagerTestCases.java
similarity index 100%
rename from schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/ManagerTestCases.java
rename to schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/ManagerTestCases.java

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/MirrorTestCases.java b/schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/MirrorTestCases.java
similarity index 100%
rename from schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/MirrorTestCases.java
rename to schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/MirrorTestCases.java

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/MonitorTestCases.java b/schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/MonitorTestCases.java
similarity index 100%
rename from schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/MonitorTestCases.java
rename to schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/MonitorTestCases.java

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/NetflowTestCases.java b/schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/NetflowTestCases.java
similarity index 100%
rename from schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/NetflowTestCases.java
rename to schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/NetflowTestCases.java

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVswitchSchemaSuiteIT.java b/schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVswitchSchemaSuiteIT.java
similarity index 100%
rename from schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVswitchSchemaSuiteIT.java
rename to schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVswitchSchemaSuiteIT.java

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVswitchSchemaTestBase.java b/schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVswitchSchemaTestBase.java
similarity index 100%
rename from schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVswitchSchemaTestBase.java
rename to schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVswitchSchemaTestBase.java

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/PortAndInterfaceTestCases.java b/schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/PortAndInterfaceTestCases.java
similarity index 100%
rename from schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/PortAndInterfaceTestCases.java
rename to schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/PortAndInterfaceTestCases.java

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/QosTestCases.java b/schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/QosTestCases.java
similarity index 100%
rename from schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/QosTestCases.java
rename to schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/QosTestCases.java

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/QueueTestCases.java b/schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/QueueTestCases.java
similarity index 100%
rename from schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/QueueTestCases.java
rename to schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/QueueTestCases.java

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/SflowTestCases.java b/schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/SflowTestCases.java
similarity index 100%
rename from schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/SflowTestCases.java
rename to schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/SflowTestCases.java

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/SslTestCases.java b/schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/SslTestCases.java
similarity index 100%
rename from schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/SslTestCases.java
rename to schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/SslTestCases.java

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/TearDown.java b/schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/TearDown.java
similarity index 100%
rename from schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/TearDown.java
rename to schemas/openvswitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/TearDown.java

diff --git a/schemas/hardware_vtep/src/test/resources/logback.xml b/schemas/openvswitch/src/test/resources/logback.xml
similarity index 100%
rename from schemas/hardware_vtep/src/test/resources/logback.xml
rename to schemas/openvswitch/src/test/resources/logback.xml