Bug 1948: separating features-restconf from features-mdsal

Needs to wait on merge of: https://git.opendaylight.org/gerrit/#/c/11472/

https://git.opendaylight.org/gerrit/#/c/11423/

Then the stuff below will be filled out.

1) Feature Tests Pass: https://jenkins.opendaylight.org/controller/job/controller-merge/org.opendaylight.controller$features-restconf/2850/testReport/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blob;f=features/restconf/src/main/resources/features.xml;h=4d17b48cadece860c8f25364c49e8bc4cad93b22;hb=HEAD
	a) Feature Names: Prefixed with 'odl-' : https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Feature_Naming
	b) Features Descriptions: Present https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Description
	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-toaster-ui (pulls in odl-restconf-new)
4) Integration Test Impact: All restconf tests will need to use
HTTP Basic Auth for Username and password (I believe they already
do)

Change-Id: I858abdd8f2fb6954b49451f5294ea0828bfe3169
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/features/pom.xml b/features/pom.xml
index 9930bea66655c04442ad57a3f40b9b36d9976be5..47963f18bef74dce683daa0cc1edbe182462bdd0 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -37,6 +37,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-restconf</artifactId>
+      <version>${feature.mdsal.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-adsal</artifactId>
@@ -113,6 +120,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.aaa</groupId>
+      <artifactId>features-authz</artifactId>
+      <version>0.1.0-SNAPSHOT</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.ttp</groupId>
       <artifactId>features-ttp</artifactId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index ca425f9a1b502cfbb8a78fa8c194e3316abcab34..602727d41d1794f587a7e060a40037ab10ce5ddd 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -51,6 +51,7 @@
     
     <!-- Please add new repository in an alphabetical order -->
     <repository>mvn:org.opendaylight.aaa/features-aaa/0.1.0-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.aaa/features-authz/0.1.0-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-bgp/${feature.bgp.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-adsal/${feature.adsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-adsal-compatibility/1.4.2-SNAPSHOT/xml/features</repository>
@@ -67,6 +68,7 @@
     <repository>mvn:org.opendaylight.ovsdb/features-ovs-sfc/0.0.1-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.packetcable/features-packetcable/${feature.packetcable.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.plugin2oc/features-plugin2oc/0.1-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-restconf/${feature.mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.sdninterfaceapp/features-sdninterfaceapp/1.4.2-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.sfc/features-sfc/0.0.1-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.sfc/features-sfclisp/0.0.1-SNAPSHOT/xml/features</repository>
@@ -79,6 +81,7 @@
     <!-- Please use alphabetical order to add a compbatible with all feature -->
     <feature name='odl-integration-compatible-with-all' version='${project.version}'>
         <feature version='0.1.0-SNAPSHOT'>odl-aaa-all</feature>
+        <feature version='0.1.0-SNAPSHOT'>odl-aaa-authz</feature>
         <feature version='${feature.adsal.version}'>odl-adsal-all</feature>
         <feature version='${feature.adsal.version}'>odl-adsal-compatibility</feature>
         <feature version='${feature.bgp.version}'>odl-bgpcep-all</feature>