Adding eman features

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/job/eman-merge-boron/2/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=eman.git;a=blob;f=features/src/main/features/features.xml;
	a) Feature Names: Prefixed with 'odl-' : odl-eman
	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-eman
	b) feature:install odl-eman, odl-integration-compatible-with-all
4) Integration Test Impact - none

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

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 1b851ff8e7e033caa66664cbf924adaa5f2150d2..613a3dfb2855f8219ccaa83a4e99b46def6cbba6 100644 (file)
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -183,6 +183,13 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.eman</groupId>
+            <artifactId>eman-features</artifactId>
+            <version>${feature.eman.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.faas</groupId>
             <artifactId>features-faas</artifactId>

diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index f2b90341658992451b79ff6ef00077e9e8985da6..3ebf40019050fc89aceee97b250c0fc3c2d0f292 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.didm/features-didm-hp/${didm.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.didm/features-didm-ovs/${didm.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.dlux/features-dlux/${feature.dlux.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.eman/eman-features/${feature.eman.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.faas/features-faas/${feature.faas.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.genius/genius-features/${feature.genius.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.groupbasedpolicy/features-groupbasedpolicy/${feature.groupbasedpolicy.version}/xml/features</repository>

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 28b99010433c24b1008ac0be8a31fafd964cfa75..4cde1cbe99931779d2e0efb491fa3cb14e1efea1 100644 (file)
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -83,6 +83,9 @@
         <feature version='${feature.circuitsw.version}'>odl-circuitsw-switch-ui</feature>
         <feature version='${feature.dlux.version}'>odl-dlux-core</feature>
         <feature version='${project.version}'>odl-distribution-version</feature>
+        <feature version='${feature.eman.version}'>odl-eman</feature>
+        <feature version='${feature.eman.version}'>odl-eman-rest</feature>
+        <feature version='${feature.eman.version}'>odl-eman-ui</feature>
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-msmr</feature>
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-ui</feature>
         <feature version='${feature.benchmark.version}'>odl-mdsal-benchmark</feature>

diff --git a/pom.xml b/pom.xml
index 360f3f452300005b1ff0e61d8281f0bc7237b9d5..dcf5a2d5df6d29dec6ae86f8d42f5d8989054b0c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,7 @@
         <feature.controller.config.version>0.5.0-SNAPSHOT</feature.controller.config.version>
         <feature.controller.extras.version>1.7.0-SNAPSHOT</feature.controller.extras.version>
         <feature.dlux.version>0.4.0-SNAPSHOT</feature.dlux.version>
+        <feature.eman.version>1.0.0-SNAPSHOT</feature.eman.version>
         <feature.faas.version>1.1.0-SNAPSHOT</feature.faas.version>
         <feature.flow.version>1.4.0-SNAPSHOT</feature.flow.version>
         <feature.genius.version>0.1.0-SNAPSHOT</feature.genius.version>