Use NXMs defined in openflowplugin.

Group Based Policy was using Nicira extensions defined in
the OVSDB project. These extensions have migrated to the
OpenFlow plugin. This patch removes the reference to the
OVSDB project, and adds the reference to the OpenFlow plugin
project.

Change-Id: I27845139039e70eae4f976eddbc495a83759aa0d
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

diff --git a/features/pom.xml b/features/pom.xml
index af256a0722a9cad82a913098afcfe97844e7e87d..862ff199ff13856b35809f461a12a3e3ca94c799 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -74,9 +74,9 @@
       <type>zip</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>features-openflow-nxm</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>features-openflowplugin-extension</artifactId>
+      <version>${openflowplugin.distribution.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -87,6 +87,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+<!--
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>features-openflow-nxm</artifactId>
@@ -94,6 +95,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+-->
   </dependencies>
   <build>
     <resources>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 65320418950be2ea9b2886f15f4b52c956bcd6e0..73ead5efaa70c699cd128fc2719ad944f39a63b6 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -13,13 +13,13 @@
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflowplugin.distribution.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.ovsdb/features-openflow-nxm/${openflowplugin.distribution.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/${openflowplugin.distribution.version}/xml/features</repository>
     <feature name='odl-groupbasedpolicy-ofoverlay' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: OpenFlow Overlay '>
         <feature version="${mdsal.version}">odl-mdsal-broker</feature>
         <feature version='${yangtools.version}'>odl-yangtools-binding</feature>
         <feature version='${yangtools.version}'>odl-yangtools-models</feature>
         <feature version="${openflowplugin.distribution.version}">odl-openflowplugin-flow-services</feature>
-        <feature version='${openflowplugin.distribution.version}'>odl-openflow-nxm-extensions</feature>
+        <feature version='${openflowplugin.distribution.version}'>odl-openflowplugin-nxm-extensions</feature>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy/${project.version}</bundle>
         <bundle start="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
         <bundle start="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>

diff --git a/groupbasedpolicy-ofoverlay-config/pom.xml b/groupbasedpolicy-ofoverlay-config/pom.xml
index f67dd878a1a18e9d3d535e15bb9699cb13475c90..e4b035ac213d85d63ef556657051f58e471f5047 100644 (file)
--- a/groupbasedpolicy-ofoverlay-config/pom.xml
+++ b/groupbasedpolicy-ofoverlay-config/pom.xml
@@ -39,21 +39,6 @@
                     <type>xml</type>
                     <classifier>config</classifier>
                   </artifact>
-                  <artifact>
-                    <file>${project.build.directory}/classes/initial/43-openflowjava-nx-api-config.xml</file>
-                    <type>xml</type>
-                    <classifier>config-nx-api</classifier>
-                  </artifact>
-                  <artifact>
-                    <file>${project.build.directory}/classes/initial/44-nicira-extension.xml</file>
-                    <type>xml</type>
-                    <classifier>config-nx-ext</classifier>
-                  </artifact>
-                  <artifact>
-                    <file>${project.build.directory}/classes/initial/44-openflowjava-nx-config.xml</file>
-                    <type>xml</type>
-                    <classifier>config-nx-cfg</classifier>
-                  </artifact>
                 </artifacts>
               </configuration>
             </execution>

diff --git a/groupbasedpolicy-ofoverlay-config/src/main/resources/initial/43-openflowjava-nx-api-config.xml b/groupbasedpolicy-ofoverlay-config/src/main/resources/initial/43-openflowjava-nx-api-config.xml
deleted file mode 100644 (file)
index 1964e4d..0000000
--- a/groupbasedpolicy-ofoverlay-config/src/main/resources/initial/43-openflowjava-nx-api-config.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<snapshot>
-  <required-capabilities>
-    <capability>urn:opendaylight:params:xml:ns:yang:openflowplugin:ofjava:nx:api:config?module=openflowjava-nx-api-config&amp;revision=2014-07-11</capability>
-  </required-capabilities>
-
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflowplugin:ofjava:nx:api:config">prefix:openflowjava-extension-nicira-api</type>
-          <name>openflowjava-extension-nx-api-bundle</name>
-          <openflow-switch-connection-provider>
-            <type xmlns:ofSwitch="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider">ofSwitch:openflow-switch-connection-provider</type>
-            <name>openflow-switch-connection-provider-legacy</name>
-          </openflow-switch-connection-provider>
-          <openflow-switch-connection-provider>
-            <type xmlns:ofSwitch="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider">ofSwitch:openflow-switch-connection-provider</type>
-            <name>openflow-switch-connection-provider-default</name>
-          </openflow-switch-connection-provider>
-        </module>
-      </modules>
-
-      <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <service>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflowplugin:ofjava:nx:api:config">prefix:nicira-extension-codec-registrator</type>
-          <instance>
-            <name>openflowjava-nicira-ext-registrator</name>
-            <provider>/modules/module[type='openflowjava-extension-nicira-api'][name='openflowjava-extension-nx-api-bundle']</provider>
-          </instance>
-        </service>
-      </services>
-    </data>
-
-  </configuration>
-</snapshot>

diff --git a/groupbasedpolicy-ofoverlay-config/src/main/resources/initial/44-nicira-extension.xml b/groupbasedpolicy-ofoverlay-config/src/main/resources/initial/44-nicira-extension.xml
deleted file mode 100644 (file)
index a5338c0..0000000
--- a/groupbasedpolicy-ofoverlay-config/src/main/resources/initial/44-nicira-extension.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<snapshot>
-  <required-capabilities>
-  <capability>urn:opendaylight:params:xml:ns:yang:openflowplugin:nx:config:impl?module=nicira-extension-impl&amp;revision=2014-07-11</capability>
-    <!-- openflowplugin -->
-    <capability>urn:opendaylight:params:xml:ns:yang:openflow:common:config?module=openflow-provider&amp;revision=2014-03-26</capability>
-  </required-capabilities>
-
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflowplugin:nx:config:impl">prefix:nicira-extension-provider-impl</type>
-          <name>nicira-extension-provider-default-impl</name>
-
-          <openflow-plugin-provider>
-            <type xmlns:opfprov="urn:opendaylight:params:xml:ns:yang:openflow:common:config">opfprov:openflow-provider</type>
-            <name>openflow-provider</name>
-          </openflow-plugin-provider>
-        </module>
-      </modules>
-    </data>
-
-  </configuration>
-</snapshot>

diff --git a/groupbasedpolicy-ofoverlay-config/src/main/resources/initial/44-openflowjava-nx-config.xml b/groupbasedpolicy-ofoverlay-config/src/main/resources/initial/44-openflowjava-nx-config.xml
deleted file mode 100644 (file)
index 756bd15..0000000
--- a/groupbasedpolicy-ofoverlay-config/src/main/resources/initial/44-openflowjava-nx-config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<snapshot>
-  <required-capabilities>
-    <capability>urn:opendaylight:params:xml:ns:yang:openflowplugin:ofjava:nx:config?module=openflowjava-nx-config&amp;revision=2014-07-11</capability>
-  </required-capabilities>
-
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflowplugin:ofjava:nx:config">prefix:openflowjava-extension-nicira</type>
-          <name>openflow-nx-bundle</name>
-          <nicira-extension-codec-registrator>
-            <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflowplugin:ofjava:nx:api:config">prefix:nicira-extension-codec-registrator</type>
-            <name>openflowjava-nicira-ext-registrator</name>
-          </nicira-extension-codec-registrator>
-        </module>
-      </modules>
-    </data>
-
-  </configuration>
-</snapshot>