Fixed features-netconf to use feature test and correct versions

Previous patches were assuming that single feature test was working
for features-netconf, which is was not - test was commented out
due to controller - aaa - netconf cycle dance.

- Reenabled single feature test
- fixed version of odl-netconf-mdsal

Change-Id: I47f5a52b96b07f94e8823968b90934b435aa5a2b
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index 5431973946daeddec3274aed36c20e64f3a537c0..836a703906a438411543b7e6b4f976ff529c2440 100644 (file)
--- a/features/netconf/pom.xml
+++ b/features/netconf/pom.xml
@@ -244,22 +244,22 @@
           </execution>
         </executions>
       </plugin>
-      <!-- FIXME uncomment after merge -->
-      <!--<plugin>-->
-        <!--<groupId>org.apache.maven.plugins</groupId>-->
-        <!--<artifactId>maven-surefire-plugin</artifactId>-->
-        <!--<version>${surefire.version}</version>-->
-        <!--<configuration>-->
-          <!--<systemPropertyVariables>-->
-            <!--<karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>-->
-            <!--<karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>-->
-            <!--<karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>-->
-          <!--</systemPropertyVariables>-->
-          <!--<dependenciesToScan>-->
-            <!--<dependency>org.opendaylight.odlparent:features-test</dependency>-->
-          <!--</dependenciesToScan>-->
-        <!--</configuration>-->
-      <!--</plugin>-->
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${surefire.version}</version>
+        <configuration>
+          <systemPropertyVariables>
+            <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
+            <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
+            <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
+          </systemPropertyVariables>
+          <dependenciesToScan>
+            <dependency>org.opendaylight.odlparent:features-test</dependency>
+          </dependenciesToScan>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <scm>

diff --git a/features/netconf/src/main/resources/features.xml b/features/netconf/src/main/resources/features.xml
index 13794e789b4eb83716e20839fe1ee773d934161f..68ab14c8ebcce6e652f790ac4cd7f77fb94b0524 100644 (file)
--- a/features/netconf/src/main/resources/features.xml
+++ b/features/netconf/src/main/resources/features.xml
@@ -132,14 +132,14 @@
     <bundle>mvn:org.opendaylight.netconf/netconf-tcp/${project.version}</bundle>
   </feature>
 
-  <feature name='odl-netconf-mdsal' version='${mdsal.version}' description="OpenDaylight :: Netconf :: Mdsal">
+  <feature name='odl-netconf-mdsal' version='${controller.mdsal.version}' description="OpenDaylight :: Netconf :: Mdsal">
     <feature version='${config.version}'>odl-config-all</feature>
     <feature version='${config.version}'>odl-config-netty</feature>
     <feature version='${project.version}'>odl-netconf-all</feature>
     <feature version='${project.version}'>odl-netconf-tcp</feature>
     <feature version='${project.version}'>odl-netconf-ssh</feature>
     <feature version='${project.version}'>odl-netconf-client</feature>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+    <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
     <bundle>mvn:org.opendaylight.netconf/mdsal-netconf-connector/${project.version}</bundle>
     <bundle>mvn:org.opendaylight.netconf/mdsal-netconf-monitoring/${project.version}</bundle>
     <configfile finalname='${config.configfile.directory}/${config.netconf.mdsal.configfile}'>mvn:org.opendaylight.netconf/netconf-mdsal-config/${project.version}/xml/config</configfile>