Addding Natapp features

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/view/natapp/job/natapp-merge-boron/org.opendaylight.natapp$natapp-features/
2) Features Comply with Guidelines: https://jenkins.opendaylight.org/releng/view/natapp/job/natapp-merge-boron/org.opendaylight.natapp$natapp-features/lastSuccessfulBuild/artifact/org.opendaylight.natapp/natapp-features/0.1.0-SNAPSHOT/natapp-features-0.1.0-SNAPSHOT-features.xml
	a) Feature Names (prefixed with 'odl-'): odl-natapp
	b) Features Descriptions: "OpenDaylight :: natapp"
	c) Features Start-Levels: NA
3) Features Tested: Features have been tested for functionality with
	a) feature:install odl-natapp
	b) feature:install odl-natapp, odl-integration-compatible-with-all
4) Integration Test Impact: Nil

Change-Id: Iac1024220c575854451b5d8b91c42a01a2691a78
Signed-off-by: Thomas Lee S <thomaslee.s@tcs.com>

diff --git a/features-index/pom.xml b/features-index/pom.xml
index cf74dc82a3782cab79ed26ebcb5fe5a9d63127e4..5cd7f0d3c68b370c27b421d5f26420daca27aa08 100644 (file)
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -210,6 +210,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.natapp</groupId>
+      <artifactId>natapp-features</artifactId>
+      <version>${feature.natapp.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.nemo</groupId>
       <artifactId>nemo-features</artifactId>

diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index 041440ba3bf8b21d533a331ca4c6508c01d894bc..06f672f2da29a9a6a03e3220614cfca6d889f5b1 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.l2switch/features-l2switch/${feature.l2switch.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.lacp/features-lacp/${feature.lacp.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.lispflowmapping/features-lispflowmapping/${feature.lispflowmapping.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.natapp/natapp-features/${feature.natapp.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.nemo/nemo-features/${feature.nemo.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.netconf/features-netconf/${feature.netconf.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.netconf/features-netconf-connector/${feature.netconf.version}/xml/features</repository>

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 5ac364f029ec0658b758824a9805919278b9038e..26b31c7856b1d79f7fdef312cf01fc7d295efae1 100644 (file)
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -87,6 +87,8 @@
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-ui</feature>
         <feature version='${feature.benchmark.version}'>odl-mdsal-benchmark</feature>
         <feature version='${feature.mdsal.version}'>odl-mdsal-broker</feature>
+        <feature version='${feature.natapp.version}'>odl-natapp-api</feature>
+        <feature version='${feature.natapp.version}'>odl-natapp</feature>
         <feature version='${feature.nemo.version}'>odl-nemo-engine</feature>
         <feature version='${feature.nemo.version}'>odl-nemo-engine-rest</feature>
         <feature version='${feature.nemo.version}'>odl-nemo-engine-ui</feature>

diff --git a/pom.xml b/pom.xml
index 18ed79d01b4aee7b66bbc27365cd201c455d10b8..84b589c6f9e6daaadd51fb26535d6920a6c9f820 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,7 @@
     <feature.lacp.version>1.2.0-SNAPSHOT</feature.lacp.version>
     <feature.lispflowmapping.version>1.4.0-SNAPSHOT</feature.lispflowmapping.version>
     <feature.mdsal.version>1.4.0-SNAPSHOT</feature.mdsal.version>
+    <feature.natapp.version>0.1.0-SNAPSHOT</feature.natapp.version>
     <feature.nemo.version>1.1.0-SNAPSHOT</feature.nemo.version>
     <feature.netconf.version>1.1.0-SNAPSHOT</feature.netconf.version>
     <feature.netide.version>0.2.0-SNAPSHOT</feature.netide.version>