Bug 5346: Add odl-config-netty to odl-netconf-client

Feature odl-netconf-client applies 01-netconf.xml config file,
which expects capabilities provided by config file 00-netty.xml
from odl-config-netty feature. But odl-config-netty is not part of
odl-config-all feature, so it needs to be specified directly.

Also, added more specific capability dependency to 01-netconf.xml
and updated dependencies for netconf features pom.xml

Change-Id: Idb8aa24e7adeecd1d6a7d9bee8fb0d8006828831
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index ac9f87ce6706ac85c706a36e038a1aced97d6f59..63a98d1135d7e79eb19ab0ab461e385ec229b11b 100644 (file)
--- a/features/netconf/pom.xml
+++ b/features/netconf/pom.xml
@@ -94,18 +94,30 @@
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.aaa</groupId>
-      <artifactId>features-aaa-shiro</artifactId>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-protocol-framework</artifactId>
+      <version>${protocol-framework.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-protocol-framework</artifactId>
-      <version>${protocol-framework.version}</version>
+      <artifactId>features-config</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-config-persister</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-config-netty</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
-      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
@@ -113,6 +125,12 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.aaa</groupId>
+      <artifactId>features-aaa-shiro</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>aaa-authn-odl-plugin</artifactId>

diff --git a/features/netconf/src/main/features/features.xml b/features/netconf/src/main/features/features.xml
index f9ef87e1cb1b925acdc37d937f7d493c307a4175..b2e51abe2e4bf209d9b0ff54ec7b9e5ffba1d63e 100644 (file)
--- a/features/netconf/src/main/features/features.xml
+++ b/features/netconf/src/main/features/features.xml
@@ -7,6 +7,7 @@
   <repository>mvn:org.opendaylight.controller/features-protocol-framework/{{VERSION}}/xml/features</repository>
   <repository>mvn:org.opendaylight.controller/features-config/{{VERSION}}/xml/features</repository>
   <repository>mvn:org.opendaylight.controller/features-config-persister/{{VERSION}}/xml/features</repository>
+  <repository>mvn:org.opendaylight.controller/features-config-netty/{{VERSION}}/xml/features</repository>
   <!-- FIXME: This introduces cycle between projects, which makes version updates
               harder. Should be moved to different.
       -->
@@ -91,6 +92,7 @@
 
   <feature name='odl-netconf-client' version='${project.version}' description="OpenDaylight :: Netconf :: Client">
     <feature version='${config.version}'>odl-config-all</feature>
+    <feature version='${config.version}'>odl-config-netty</feature>
     <feature version='${project.version}'>odl-netconf-netty-util</feature>
     <bundle>mvn:org.opendaylight.netconf/netconf-client/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netconf/netconf-config-dispatcher/{{VERSION}}</bundle>

diff --git a/opendaylight/netconf/netconf-config/src/main/resources/initial/01-netconf.xml b/opendaylight/netconf/netconf-config/src/main/resources/initial/01-netconf.xml
index 9dea26b7b90294c9b62282912e8a6082f50c5b1b..a2e8f4092243fd3a96118a2e905346d1dbad5632 100644 (file)
--- a/opendaylight/netconf/netconf-config/src/main/resources/initial/01-netconf.xml
+++ b/opendaylight/netconf/netconf-config/src/main/resources/initial/01-netconf.xml
@@ -101,6 +101,7 @@
   </configuration>
   <required-capabilities>
       <capability>urn:opendaylight:params:xml:ns:yang:controller:config:netconf:client:dispatcher?module=odl-netconfig-client-cfg&amp;revision=2014-04-08</capability>
+      <capability>urn:opendaylight:params:xml:ns:yang:controller:netty:threadgroup?module=threadgroup&amp;revision=2013-11-07</capability>
       <capability>urn:opendaylight:params:xml:ns:yang:controller:threadpool:impl?module=threadpool-impl&amp;revision=2013-04-05</capability>
       <capability>urn:opendaylight:params:xml:ns:yang:controller:threadpool:impl:flexible?module=threadpool-impl-flexible&amp;revision=2013-12-01</capability>
       <capability>urn:opendaylight:params:xml:ns:yang:controller:threadpool:impl:scheduled?module=threadpool-impl-scheduled&amp;revision=2013-12-01</capability>