Adding nemo features.

1) Feature Tests Pass: http://jenkins.opendaylight.org/releng/view/nemo/job/nemo-merge-beryllium/3/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=nemo.git;a=blob;f=nemo-features/src/main/features/features.xml;
	a) Feature Names: odl-nemo-engine-ui
	b) Features Descriptions: Present
	c) Features Start-Levels: No start-levels on <bundle> elements or <feature> elements
3) Features Tested: Features have been tested for functionality with
	a) feature:install odl-restconf-all odl-mdsal-apidocs odl-nemo-engine-ui
	b) feature:install odl-integration-compatible-with-all
4) Integration Test Impact: None

Change-Id: If4c6f6417cf73634be3b9c9676b362f432ea0ff8
Signed-off-by: A H <an.ho@huawei.com>

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 125df9594907d984648e208bd6d01e45e0b6f1eb..622f43de874a97c4806c6c219b16aaa898d5b085 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -165,6 +165,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.nemo</groupId>
+      <artifactId>nemo-features</artifactId>
+      <version>${feature.nemo.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>features-netconf</artifactId>

diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index 2cf17b5b1a338f15cf230aef0740077536bafc77..2f4ec8afeca311ccf4718012d4c23e28ae344b74 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -52,6 +52,7 @@
     <repository>mvn:org.opendaylight.l2switch/features-l2switch/0.3.0-SNAPSHOT/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.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>
     <repository>mvn:org.opendaylight.netconf/features-restconf/${feature.restconf.version}/xml/features</repository>

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index 325f26b1e936342378c06b9912c60f76bacfd4cc..8c782a76d26fb4997cdd04c1c52e350fe6176b22 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -79,6 +79,9 @@
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-neutron</feature>
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-ui</feature>
         <feature version='1.3.0-SNAPSHOT'>odl-mdsal-broker</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>
         <feature version='${feature.neutron.version}'>odl-neutron-service</feature>
         <feature version='${feature.netconf.version}'>odl-netconf-connector-ssh</feature>
         <feature version='${feature.nsf.version}'>odl-nsf-all</feature>

diff --git a/pom.xml b/pom.xml
index fda70377ab907450c5ae4756bf77f105ac3515ec..c4f053d3f4ac49d038c6152e69467be90ab778c4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,7 @@
     <feature.lacp.version>1.1.0-SNAPSHOT</feature.lacp.version>
     <feature.lispflowmapping.version>1.3.0-SNAPSHOT</feature.lispflowmapping.version>
     <feature.mdsal.version>1.3.0-SNAPSHOT</feature.mdsal.version>
+    <feature.nemo.version>1.0.0-SNAPSHOT</feature.nemo.version>
     <feature.netconf.version>1.0.0-SNAPSHOT</feature.netconf.version>
     <feature.nic.version>1.1.0-SNAPSHOT</feature.nic.version>
     <feature.nsf.version>0.6.0-SNAPSHOT</feature.nsf.version>