Restconf-nb-rfc4080 to be in boot up feature 14/83014/5
authorjanani b <janani.b@huawei.com>
Fri, 22 Mar 2019 09:07:52 +0000 (14:37 +0530)
committerDan Timoney <dtimoney@att.com>
Mon, 25 Mar 2019 16:55:17 +0000 (16:55 +0000)
Adding ODL dependency required for RestconfClient in the boot features

Issue-ID: CCSDK-1045

Change-Id: I7f850cf9b6ef3ac489fc8daaaee17af47f2263ba
Signed-off-by: janani b <janani.b@huawei.com>
odlsli/odlsli-alpine/pom.xml
odlsli/odlsli-alpine/src/main/docker/Dockerfile
odlsli/odlsli-alpine/src/main/resources/install_ccsdk.yml
odlsli/odlsli-ubuntu/pom.xml
odlsli/src/main/resources/install_ccsdk.yml

index 14af773..833d8ae 100644 (file)
@@ -32,7 +32,7 @@
                <docker.push.phase>deploy</docker.push.phase>
                <docker.verbose>true</docker.verbose>
                <ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key>
-               <odl.features.extra>odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all</odl.features.extra>
+               <odl.features.extra>odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs, odl-daexim-all, odl-restconf-nb-rfc8040</odl.features.extra>
            <!-- 
                <ccsdk.odl.features>ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all</ccsdk.odl.features>
                -->
index 9d8b379..c2206ea 100644 (file)
@@ -23,7 +23,7 @@ RUN rsync -a /tmp/system $ODL_HOME && rm -rf /tmp/system
 # Add CCSDK repositories to boot repositories
 RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig
 #RUN sed -i -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
-RUN sed -i -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO},${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
+RUN sed -i -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
 RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,${ODL_BOOT_FEATURES_EXTRA}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
 
 # Create odl user
index c478bfe..e09eceb 100644 (file)
@@ -9,6 +9,7 @@
           - odl-mdsal-all
           - odl-mdsal-apidocs
           - odl-daexim-all
+          - odl-restconf-nb-rfc8040
           - ccsdk-sli-core-all
           - ccsdk-sli-adaptors-all
           - ccsdk-sli-northbound-all
index 3dd9ed9..56cf108 100644 (file)
@@ -32,7 +32,7 @@
                <docker.push.phase>deploy</docker.push.phase>
                <docker.verbose>true</docker.verbose>
                <ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key>
-               <odl.features.extra>odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all</odl.features.extra>
+               <odl.features.extra>odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs, odl-daexim-all,odl-restconf-nb-rfc8040</odl.features.extra>
                <ccsdk.odl.features>ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all</ccsdk.odl.features>
                <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra>
        </properties>
index c478bfe..e09eceb 100644 (file)
@@ -9,6 +9,7 @@
           - odl-mdsal-all
           - odl-mdsal-apidocs
           - odl-daexim-all
+          - odl-restconf-nb-rfc8040
           - ccsdk-sli-core-all
           - ccsdk-sli-adaptors-all
           - ccsdk-sli-northbound-all

© 2017 ONAP. Copyright © The Linux Foundation ®. All Rights Reserved.
The Linux Foundation has registered trademarks and uses trademarks.
For a list of trademarks of The Linux Foundation, please see our Trademark Usage page.
Linux is a registered trademark of Linus Torvalds.
Privacy Policy and Terms of Use