Modifying feature install scripts

Adding a while loop around each call to the opendaylight
karaf client. If the client is not available it will try again up
to 10 times. The new version of opendaylight seems to have delays after
installing sdnc components which can cause errors for the appc components.
These script changes fix allow the install script to wait for opendaylight to
become available.

Change-Id: Ib1bf6c7880398ac2ebe81eaff987ee4921cdb420
Signed-off-by: Patrick Brady <pb071s@att.com>

diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/src/main/resources/scripts/install-feature.sh b/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/src/main/resources/scripts/install-feature.sh
index 1d769fa..aaa1911 100644 (file)
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/src/main/resources/scripts/install-feature.sh
@@ -36,5 +36,25 @@ else
        exit 1
 fi
 
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+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
+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
+done

diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/src/main/resources/scripts/install-feature.sh b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/src/main/resources/scripts/install-feature.sh
index 1d769fa..aaa1911 100644 (file)
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/src/main/resources/scripts/install-feature.sh
@@ -36,5 +36,25 @@ else
        exit 1
 fi
 
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+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
+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
+done

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/src/main/resources/scripts/install-feature.sh b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/src/main/resources/scripts/install-feature.sh
index 1d769fa..aaa1911 100644 (file)
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/src/main/resources/scripts/install-feature.sh
@@ -36,5 +36,25 @@ else
        exit 1
 fi
 
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+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
+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
+done

diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-installer/src/main/resources/scripts/install-feature.sh b/appc-adapters/appc-netconf-adapter/appc-netconf-installer/src/main/resources/scripts/install-feature.sh
index 1d769fa..aaa1911 100644 (file)
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-installer/src/main/resources/scripts/install-feature.sh
@@ -36,5 +36,25 @@ else
        exit 1
 fi
 
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+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
+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
+done

diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/src/main/resources/scripts/install-feature.sh b/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/src/main/resources/scripts/install-feature.sh
index 1d769fa..aaa1911 100644 (file)
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/src/main/resources/scripts/install-feature.sh
@@ -36,5 +36,25 @@ else
        exit 1
 fi
 
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+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
+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
+done

diff --git a/appc-asdc-listener/appc-asdc-listener-installer/src/main/resources/scripts/install-feature.sh b/appc-asdc-listener/appc-asdc-listener-installer/src/main/resources/scripts/install-feature.sh
index 1d769fa..aaa1911 100644 (file)
--- a/appc-asdc-listener/appc-asdc-listener-installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-asdc-listener/appc-asdc-listener-installer/src/main/resources/scripts/install-feature.sh
@@ -36,5 +36,25 @@ else
        exit 1
 fi
 
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+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
+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
+done

diff --git a/appc-dg-util/appc-dg-util-installer/src/main/resources/scripts/install-feature.sh b/appc-dg-util/appc-dg-util-installer/src/main/resources/scripts/install-feature.sh
index 1d769fa..aaa1911 100644 (file)
--- a/appc-dg-util/appc-dg-util-installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-dg-util/appc-dg-util-installer/src/main/resources/scripts/install-feature.sh
@@ -36,5 +36,25 @@ else
        exit 1
 fi
 
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+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
+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
+done

diff --git a/appc-dg/appc-dg-shared/appc-dg-shared-installer/src/main/resources/scripts/install-feature.sh b/appc-dg/appc-dg-shared/appc-dg-shared-installer/src/main/resources/scripts/install-feature.sh
index 1d769fa..aaa1911 100644 (file)
--- a/appc-dg/appc-dg-shared/appc-dg-shared-installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-dg/appc-dg-shared/appc-dg-shared-installer/src/main/resources/scripts/install-feature.sh
@@ -36,5 +36,25 @@ else
        exit 1
 fi
 
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+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
+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
+done

diff --git a/appc-event-listener/appc-event-listener-installer/src/main/resources/scripts/install-feature.sh b/appc-event-listener/appc-event-listener-installer/src/main/resources/scripts/install-feature.sh
index 1d769fa..aaa1911 100644 (file)
--- a/appc-event-listener/appc-event-listener-installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-event-listener/appc-event-listener-installer/src/main/resources/scripts/install-feature.sh
@@ -36,5 +36,25 @@ else
        exit 1
 fi
 
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+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
+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
+done

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 1d769fa..aaa1911 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
@@ -36,5 +36,25 @@ else
        exit 1
 fi
 
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+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
+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
+done

diff --git a/appc-provider/appc-provider-installer/src/main/resources/scripts/install-feature.sh b/appc-provider/appc-provider-installer/src/main/resources/scripts/install-feature.sh
index 1d769fa..aaa1911 100644 (file)
--- a/appc-provider/appc-provider-installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-provider/appc-provider-installer/src/main/resources/scripts/install-feature.sh
@@ -36,5 +36,25 @@ else
        exit 1
 fi
 
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+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
+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
+done