Re commit ofconfig configuration

Change-Id: Ib55995d64113091ff7d9957885dee56bb44ca522
Signed-off-by: hu.rui <hu.rui2@zte.com.cn>

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 5fbb6c07c69feef340b260fb6d1ed70e746c0d70..aeac09bc9e208389e21d99c55693049650f02f7d 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -240,6 +240,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.of-config</groupId>
+      <artifactId>features-of-config</artifactId>
+      <version>${feature.of-config.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.ofextensions.circuitsw</groupId>
       <artifactId>circuitsw-features</artifactId>

diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index cd1d3201704828f759cadad7ceb4b6c9c7acebe4..86cc525b9ccc8ad49db2c2de5a5d4529030ce3ea 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -61,6 +61,7 @@
     <repository>mvn:org.opendaylight.netide/netide-features/${feature.netide.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.neutron/features-neutron/${feature.neutron.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.nic/features-nic/${feature.nic.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.of-config/features-of-config/${feature.of-config.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ofextensions.circuitsw/circuitsw-features/${feature.circuitsw.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-li/${feature.openflowplugin.version}/xml/features</repository>

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index 6235b6db928ddc3a68c2196866a94aafef2d413c..bcf5ebfff33a582b2c510908e18259a5e8f4f424 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -95,6 +95,7 @@
         <feature version='${feature.neutron.version}'>odl-neutron-service</feature>
         <feature version='${feature.netconf.version}'>odl-netconf-connector-ssh</feature>
         <feature version='${feature.netide.version}'>odl-netide-rest</feature>
+        <feature version='${feature.of-config.version}'>odl-of-config-all</feature>
         <feature version='0.7.0-SNAPSHOT'>odl-openflowjava-protocol</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-rest</feature>

diff --git a/pom.xml b/pom.xml
index 8b852ca7ca4f9c96965986350f2b4e14470094b0..c2ec06bb54bfb9ce2b287204e99dc40efa7f87c7 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
     <feature.netide.version>0.1.0-SNAPSHOT</feature.netide.version>
     <feature.nic.version>1.1.0-SNAPSHOT</feature.nic.version>
     <feature.neutron.version>0.6.0-SNAPSHOT</feature.neutron.version>
+    <feature.of-config.version>1.0.0-SNAPSHOT</feature.of-config.version>
     <feature.openflowplugin.version>0.2.0-SNAPSHOT</feature.openflowplugin.version>
     <feature.ovsdb.version>1.2.1-SNAPSHOT</feature.ovsdb.version>
     <feature.packetcable.version>1.3.0-SNAPSHOT</feature.packetcable.version>