Merge changes I8490a721,I71941875

* changes:
  Bug 3166 ui-backend introduced
  Moved util methods from PolicyResolver

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 344b199449270321788cc0ab599af915ab65b904..d859cae995a45b8b7a993fe6001ffa7f4eb34cbc 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -34,6 +34,7 @@
     <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
     <openflowplugin.version>0.1.0-SNAPSHOT</openflowplugin.version>
     <neutron.version>0.5.0-SNAPSHOT</neutron.version>
+    <ovsdb.southbound.version>1.1.0-SNAPSHOT</ovsdb.southbound.version>
   </properties>
 
   <dependencyManagement>
@@ -265,4 +266,3 @@
     <tag>HEAD</tag>
   </scm>
 </project>
-

diff --git a/features/pom.xml b/features/pom.xml
index 117edf6fc3ce8a547c42d860e2d340665a3a499c..b203d0d6b036285a2ad9a17ce4c1c502c021c976 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -77,6 +77,13 @@
       <version>${neutron.version}</version>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>southbound-features</artifactId>
+      <version>${ovsdb.southbound.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
 
     <!-- gbp dependencies -->
     <dependency>
@@ -225,4 +232,3 @@
     <url>https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=summary</url>
   </scm>
 </project>
-

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index f38a307e3d1bbe538379810915db9e86fac99916..e16767b8ef2330578917bd520ab09eaeff421872 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -18,6 +18,7 @@
     <!-- Repos needed by the OpenFlow Overlay renderer -->
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/${openflowplugin.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.ovsdb/southbound-features/${ovsdb.southbound.version}/xml/features</repository>
 
     <!-- Repos needed by the Neutron Mapper -->
     <repository>mvn:org.opendaylight.neutron/features-neutron/${neutron.version}/xml/features</repository>
@@ -43,6 +44,7 @@
         <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
         <feature version="${openflowplugin.version}">odl-openflowplugin-flow-services</feature>
         <feature version='${openflowplugin.version}'>odl-openflowplugin-nxm-extensions</feature>
+        <feature version='${ovsdb.southbound.version}'>odl-ovsdb-southbound-impl</feature>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/ofoverlay-renderer/${project.version}</bundle>
         <configfile finalname="${config.configfile.directory}/${config.groupbasedpolicy.ofoverlayconfigfile}">mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-ofoverlay-config/${project.version}/xml/config</configfile>
     </feature>
@@ -101,4 +103,3 @@
         <configfile finalname="${config.configfile.directory}/${config.groupbasedpolicy.uibackendconfigfile}">mvn:org.opendaylight.groupbasedpolicy/ui-backend-config/${project.version}/xml/config</configfile>
     </feature>
 </features>
-