Manage Ims service dependencies

Change-Id: I6647d9acfabd2ce2d12ff2f30393c2de8f6165ff
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 68b2a9ac43003840ae0b88bf3b2cd6c1fc10db21)

diff --git a/functest_kubernetes/ims/astaire-depl.yaml b/functest_kubernetes/ims/astaire-depl.yaml
index 288f6ab..28f70cc 100644 (file)
--- a/functest_kubernetes/ims/astaire-depl.yaml
+++ b/functest_kubernetes/ims/astaire-depl.yaml
@@ -13,6 +13,10 @@ spec:
         service: astaire
     spec:
       terminationGracePeriodSeconds: 120
+      initContainers:
+        - name: wait-on-etcd
+          image: busybox:1.28
+          command: ['sh', '-c', 'until nslookup etcd; do echo waiting for etcd to start ...; sleep 2; done']
       containers:
       - image: "ollivier/clearwater-astaire:latest"
         imagePullPolicy: Always

diff --git a/functest_kubernetes/ims/bono-depl.yaml b/functest_kubernetes/ims/bono-depl.yaml
index a6fe2f9..8df33bc 100644 (file)
--- a/functest_kubernetes/ims/bono-depl.yaml
+++ b/functest_kubernetes/ims/bono-depl.yaml
@@ -13,6 +13,10 @@ spec:
         service: bono
         snmp: enabled
     spec:
+      initContainers:
+        - name: wait-on-sprout
+          image: busybox:1.28
+          command: ['sh', '-c', 'until nslookup sprout; do echo waiting for sprout to start ...; sleep 2; done']
       containers:
       - image: "ollivier/clearwater-bono:latest"
         imagePullPolicy: Always

diff --git a/functest_kubernetes/ims/cassandra-depl.yaml b/functest_kubernetes/ims/cassandra-depl.yaml
index 053bd3f..4e415ad 100644 (file)
--- a/functest_kubernetes/ims/cassandra-depl.yaml
+++ b/functest_kubernetes/ims/cassandra-depl.yaml
@@ -12,6 +12,16 @@ spec:
       labels:
         service: cassandra
     spec:
+      initContainers:
+        - name: wait-on-etcd
+          image: busybox:1.28
+          command: ['sh', '-c', 'until nslookup etcd; do echo waiting for etcd to start ...; sleep 2; done']
+        - name: wait-on-astaire
+          image: busybox:1.28
+          command: ['sh', '-c', 'until nslookup astaire; do echo waiting for astaire to start ...; sleep 2; done']
+        - name: wait-on-chronos
+          image: busybox:1.28
+          command: ['sh', '-c', 'until nslookup chronos; do echo waiting for chronos to start ...; sleep 2; done']
       containers:
       - image: "ollivier/clearwater-cassandra:latest"
         imagePullPolicy: Always

diff --git a/functest_kubernetes/ims/chronos-depl.yaml b/functest_kubernetes/ims/chronos-depl.yaml
index e5ec00c..fd891f1 100644 (file)
--- a/functest_kubernetes/ims/chronos-depl.yaml
+++ b/functest_kubernetes/ims/chronos-depl.yaml
@@ -15,6 +15,10 @@ spec:
         service: chronos
     spec:
       terminationGracePeriodSeconds: 120
+      initContainers:
+        - name: wait-on-etcd
+          image: busybox:1.28
+          command: ['sh', '-c', 'until nslookup etcd; do echo waiting for etcd to start ...; sleep 2; done']
       containers:
       - image: "ollivier/clearwater-chronos:latest"
         imagePullPolicy: Always

diff --git a/functest_kubernetes/ims/ellis-depl.yaml b/functest_kubernetes/ims/ellis-depl.yaml
index 694c813..166774b 100644 (file)
--- a/functest_kubernetes/ims/ellis-depl.yaml
+++ b/functest_kubernetes/ims/ellis-depl.yaml
@@ -12,6 +12,10 @@ spec:
       labels:
         service: ellis
     spec:
+      initContainers:
+        - name: wait-on-cassandra
+          image: busybox:1.28
+          command: ['sh', '-c', 'until nslookup cassandra; do echo waiting for cassandra to start ...; sleep 2; done']
       containers:
       - image: "ollivier/clearwater-ellis:latest"
         imagePullPolicy: Always

diff --git a/functest_kubernetes/ims/homer-depl.yaml b/functest_kubernetes/ims/homer-depl.yaml
index f202eba..6f0434d 100644 (file)
--- a/functest_kubernetes/ims/homer-depl.yaml
+++ b/functest_kubernetes/ims/homer-depl.yaml
@@ -12,6 +12,10 @@ spec:
       labels:
         service: homer
     spec:
+      initContainers:
+        - name: wait-on-sprout
+          image: busybox:1.28
+          command: ['sh', '-c', 'until nslookup sprout; do echo waiting for sprout to start ...; sleep 2; done']
       containers:
       - image: "ollivier/clearwater-homer:latest"
         imagePullPolicy: Always

diff --git a/functest_kubernetes/ims/homestead-depl.yaml b/functest_kubernetes/ims/homestead-depl.yaml
index 2c44763..142a47e 100644 (file)
--- a/functest_kubernetes/ims/homestead-depl.yaml
+++ b/functest_kubernetes/ims/homestead-depl.yaml
@@ -13,6 +13,10 @@ spec:
         service: homestead
         snmp: enabled
     spec:
+      initContainers:
+        - name: wait-on-sprout
+          image: busybox:1.28
+          command: ['sh', '-c', 'until nslookup sprout; do echo waiting for sprout to start ...; sleep 2; done']
       containers:
       - image: "ollivier/clearwater-homestead:latest"
         imagePullPolicy: Always

diff --git a/functest_kubernetes/ims/homestead-prov-depl.yaml b/functest_kubernetes/ims/homestead-prov-depl.yaml
index 2e5821d..a934cb7 100644 (file)
--- a/functest_kubernetes/ims/homestead-prov-depl.yaml
+++ b/functest_kubernetes/ims/homestead-prov-depl.yaml
@@ -13,6 +13,10 @@ spec:
         service: homestead-prov
         snmp: enabled
     spec:
+      initContainers:
+        - name: wait-on-sprout
+          image: busybox:1.28
+          command: ['sh', '-c', 'until nslookup sprout; do echo waiting for sprout to start ...; sleep 2; done']
       containers:
       - image: "ollivier/clearwater-homestead-prov:latest"
         imagePullPolicy: Always

diff --git a/functest_kubernetes/ims/ims.py b/functest_kubernetes/ims/ims.py
index 19f2680..3ff2d6b 100644 (file)
--- a/functest_kubernetes/ims/ims.py
+++ b/functest_kubernetes/ims/ims.py
@@ -9,6 +9,8 @@
 
 """Deploy and test Clearwater vIMS using Kubernetes"""
 
+from __future__ import division
+
 import logging
 import time
 import re

diff --git a/functest_kubernetes/ims/ralf-depl.yaml b/functest_kubernetes/ims/ralf-depl.yaml
index 839da42..829e635 100644 (file)
--- a/functest_kubernetes/ims/ralf-depl.yaml
+++ b/functest_kubernetes/ims/ralf-depl.yaml
@@ -13,6 +13,10 @@ spec:
         service: ralf
         snmp: enabled
     spec:
+      initContainers:
+        - name: wait-on-sprout
+          image: busybox:1.28
+          command: ['sh', '-c', 'until nslookup sprout; do echo waiting for sprout to start ...; sleep 2; done']
       containers:
       - image: "ollivier/clearwater-ralf:latest"
         imagePullPolicy: Always

diff --git a/functest_kubernetes/ims/sprout-depl.yaml b/functest_kubernetes/ims/sprout-depl.yaml
index ab4d8ac..af6bc66 100644 (file)
--- a/functest_kubernetes/ims/sprout-depl.yaml
+++ b/functest_kubernetes/ims/sprout-depl.yaml
@@ -13,6 +13,10 @@ spec:
         service: sprout
         snmp: enabled
     spec:
+      initContainers:
+        - name: wait-on-cassandra
+          image: busybox:1.28
+          command: ['sh', '-c', 'until nslookup cassandra; do echo waiting for cassandra to start ...; sleep 2; done']
       containers:
       - image: "ollivier/clearwater-sprout:latest"
         imagePullPolicy: Always