Platform hardening for appc-metric

Issue-ID: APPC-305
Change-Id: I4183e2a723fa50ff1398f584a77c1234d28e8340
Signed-off-by: Skip Wonnell <skip@att.com>

diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/onap/appc/metricservice/MetricService.java b/appc-metric/appc-metric-bundle/src/main/java/org/onap/appc/metricservice/MetricService.java
index 65ff72d..bf423ee 100644 (file)
--- a/appc-metric/appc-metric-bundle/src/main/java/org/onap/appc/metricservice/MetricService.java
+++ b/appc-metric/appc-metric-bundle/src/main/java/org/onap/appc/metricservice/MetricService.java
@@ -34,7 +34,7 @@ public interface MetricService {
 
     /**
      * This API will be used to get the Map of all the registered Registry for the Metric Service
-     * @return Map<String,MetricRegistry> where String will be the name of the Metric Registry
+     * @return Map<String,MetricRegistry> where String will be the name of the Metric Registry
      * and MetricRegistry will be the actual object for that Registry
      */
     Map<String,MetricRegistry> getAllRegistry();

diff --git a/appc-metric/appc-metric-installer/src/main/resources/scripts/install-feature.sh b/appc-metric/appc-metric-installer/src/main/resources/scripts/install-feature.sh
index 13d41ca..d3596c6 100644 (file)
--- a/appc-metric/appc-metric-installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-metric/appc-metric-installer/src/main/resources/scripts/install-feature.sh
@@ -33,31 +33,31 @@ REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip
 
 if [ -f ${REPOZIP} ]
 then
-       unzip -n -d ${ODL_HOME} ${REPOZIP}
+    unzip -n -d ${ODL_HOME} ${REPOZIP}
 else
-       echo "ERROR : repo zip ($REPOZIP) not found"
-       exit 1
+    echo "ERROR : repo zip ($REPOZIP) not found"
+    exit 1
 fi
 
 COUNT=0
 while [ $COUNT -lt 10 ]; do
-       ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr
-       cat /tmp/installErr
-       if grep -q 'Failed to get the session' /tmp/installErr; then
-               sleep 10
-       else
-               let COUNT=10
-       fi
-       let COUNT=COUNT+1
+    ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr
+    cat /tmp/installErr
+    if grep -q 'Failed to get the session' /tmp/installErr; then
+        sleep 10
+    else
+        let COUNT=10
+    fi
+    let COUNT=COUNT+1
 done
 COUNT=0
 while [ $COUNT -lt 10 ]; do
-       ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot} 2> /tmp/installErr
-               cat /tmp/installErr
-       if grep -q 'Failed to get the session' /tmp/installErr; then
-               sleep 10
-       else
-               let COUNT=10
-       fi
-       let COUNT=COUNT+1
+    ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot} 2> /tmp/installErr
+        cat /tmp/installErr
+    if grep -q 'Failed to get the session' /tmp/installErr; then
+        sleep 10
+    else
+        let COUNT=10
+    fi
+    let COUNT=COUNT+1
 done