X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fsdnc%2Fsrc%2Fmain%2Fscripts%2FinstallFeatures.sh;h=ac38568df9229e178c48a1749ba550860a4d6fbf;hb=refs%2Fheads%2Fmaster;hp=08814bb95223cba1eb2514b87fdc7f5d738d4c4c;hpb=65265300192d56bd2217a8ecc979f6828f56cc4a;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 08814bb9..ac38568d
--- a/installation/sdnc/src/main/scripts/installFeatures.sh
+++ b/installation/sdnc/src/main/scripts/installFeatures.sh
@@ -24,88 +24,35 @@
 ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
 ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
 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_SLI_CORE_FEATURES=" \
- core-utils \
- dblib \
- filters \
- sli \
- sliPluginUtils \
- sliapi"
+CCSDK_EXTRAS=" \
+   ansible-adapter \
+   lcm \
+   netbox-client"
 
-CCSDK_SLI_ADAPTORS_FEATURES=" \
-  aai-service \
-  mdsal-resource \
-  resource-assignment \
-  sql-resource"
-
-CCSDK_SLI_NORTHBOUND_FEATURES=" \
-  asdcApi \
- dataChange"
 
 SDNC_NORTHBOUND_FEATURES=" \
+  generic-resource-api \
   vnfapi \
   vnftools"
 
-CCSDK_SLI_PLUGINS_FEATURES=" \
-  properties-node \
-  restapi-call-node"
-
-CCSDK_SLI_CORE_VERSION=${SDNC_CORE_VERSION:-0.0.1-SNAPSHOT}
-CCSDK_SLI_ADAPTORS_VERSION=${SDNC_ADAPTORS_VERSION:-0.0.1-SNAPSHOT}
-CCSDK_SLI_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-0.0.1-SNAPSHOT}
-CCSDK_SLI_PLUGINS_VERSION=${SDNC_PLUGINS_VERSION:-0.0.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
-
-
-echo "Installing CCSDK SLI core"
-for feature in ${CCSDK_SLI_CORE_FEATURES}
-do
-  if [ -f ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ]
-  then
-    ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh
-  else
-    echo "No installer found for feature sdnc-${feature}"
-  fi
-done
-
-echo "Installing CCSDK SLI adaptors"
-for feature in ${CCSDK_SLI_ADAPTORS_FEATURES}
-do
-  if [ -f ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ]
-  then
-    ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh
-  else
-    echo "No installer found for feature sdnc-${feature}"
-  fi
-done
 
-echo "Installing CCSDK SLI northbound"
-for feature in ${CCSDK_SLI_NORTHBOUND_FEATURES}
-do
-  if [ -f ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ]
-  then
-    ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh
-  else
-    echo "No installer found for feature sdnc-${feature}"
-  fi
-done
+# Install CCSDK features
+${CCSDK_HOME}/bin/installCcsdkFeatures.sh
 
-echo "Installing CCSDK SLI plugins"
-for feature in ${CCSDK_SLI_PLUGINS_FEATURES}
+# Install CCSDK extras, used by SDNC but not APP-C
+echo "Installing CCSDK extras"
+for feature in ${CCSDK_EXTRAS}
 do
-  if [ -f ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ]
-  then
-    ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh
-  else
-    echo "No installer found for feature sdnc-${feature}"
-  fi
+	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