X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fsdnc%2Fsrc%2Fmain%2Fscripts%2FinstallFeatures.sh;h=1fe1081976775cd743e27b0dc641410a678bd201;hb=f685f0a4491f2adfc498977c404b6c1f93f16717;hp=56a5fe57543d70d8e107f7c96521d73ae0a96a8b;hpb=e391e1e3ca8ea5385bb1f77ed7c4c83935451575;p=sdnc%2Foam.git

diff --git a/installation/sdnc/src/main/scripts/installFeatures.sh b/installation/sdnc/src/main/scripts/installFeatures.sh
old mode 100644
new mode 100755
index 56a5fe57..1fe10819
--- a/installation/sdnc/src/main/scripts/installFeatures.sh
+++ b/installation/sdnc/src/main/scripts/installFeatures.sh
@@ -23,24 +23,40 @@
 
 ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
 ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
-SDNC_HOME=${SDNC_HOME:-/opt/openecomp/sdnc}
+SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
+CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk}
+CCSDK_FEATURE_DIR=${CCSDK_FEATURE_DIR:-${CCSDK_HOME}/features}
 SDNC_FEATURE_DIR=${SDNC_FEATURE_DIR:-${SDNC_HOME}/features}
 
+CCSDK_EXTRAS=" \
+   ansible-adapter \
+   lcm \
+   netbox-client"
+
+
 
 SDNC_NORTHBOUND_FEATURES=" \
+  generic-resource-api \
   vnfapi \
   vnftools"
 
 
+SDNC_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-1.3.1-SNAPSHOT}
 
-SDNC_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-1.2.0-SNAPSHOT}
-
-echo "Enabling core features"
-${ODL_HOME}/bin/client -u karaf feature:install odl-mdsal-all
-${ODL_HOME}/bin/client -u karaf feature:install odl-mdsal-apidocs
-${ODL_HOME}/bin/client -u karaf feature:install odl-restconf-all
-
+# Install CCSDK features
+${CCSDK_HOME}/bin/installCcsdkFeatures.sh
 
+# Install CCSDK extras, used by SDNC but not APP-C
+echo "Installing CCSDK extras"
+for feature in ${CCSDK_EXTRAS}
+do
+	if [ -f ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh ]
+	then
+		${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh
+    else
+    	     echo "No installer found for ${feature}"
+    fi
+done
 
 
 echo "Installing SDN-C northbound"