Add services dependency to ranger and ranger-agent helm test

Change-Id: Iaf049c4fe4b86aea31cba896015b73c495c71d0a

ranger-agent/templates/bin/_ranger-agent-test.py.tpl

@@ -42,10 +42,12 @@ def get_token():
     }
 
     try:
-        resp = requests.post(url, data=json.dumps(data), headers=headers)
+        resp = requests.post(
+            url, data=json.dumps(data), headers=headers, timeout=100)
 
         if resp.status_code != 201:
-            sys.stderr.write("Failed to get token for region\n")
+            sys.stderr.write("Failed to get token for region: %s - %s\n" %
+                             (resp.status_code, resp.text,))
             sys.exit(1)
         token = resp.headers['x-subject-token']
         return token
@@ -92,7 +94,8 @@ def notify_ranger_agent_api(uuid):
         try:
             resp = requests.post(url,
                                  files=files,
-                                 headers=headers)
+                                 headers=headers,
+                                 timeout=100)
             if resp.status_code != 200:
                 message = 'failure respond code [%d] received.' % (
                     resp.status_code)
@@ -122,11 +125,12 @@ def validate_resource_status(uuid):
     expected_code = os.environ['END_STATUS_KEY']
     exit_code = 1
 
+    url = "{}?Id={}".format(url, uuid)
     # Retry up to 5 times
     for i in range(5):
         time.sleep(15)
         try:
-            resp = requests.get('%s?Id=%s' % (url, uuid))
+            resp = requests.get(url, timeout=100)
             if resp.status_code != 200:
                 sys.stderr.write("Unexpected status code received: %s\n" %
                                  resp.status_code)

ranger-agent/templates/pod-test.yaml

@@ -29,6 +29,7 @@ metadata:
   name: "{{$envAll.Release.Name}}-test"
   annotations:
     "helm.sh/hook": test-success
+    {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
   labels:
 {{ tuple $envAll "ranger-agent" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:

ranger-agent/values.yaml

@@ -120,6 +120,14 @@ dependencies:
       services:
         - service: oslo_messaging
           endpoint: internal
+    tests:
+      services:
+        - service: identity
+          endpoint: internal
+        - service: orchestration
+          endpoint: internal
+        - service: ranger-agent
+          endpoint: internal
 
 network:
   api:

ranger/templates/pod-test.yaml

@@ -29,6 +29,7 @@ metadata:
   name: "{{$envAll.Release.Name}}-test"
   annotations:
     "helm.sh/hook": test-success
+    {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
   labels:
 {{ tuple $envAll "ranger" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:

ranger/values.yaml

@@ -73,6 +73,22 @@ dependencies:
       services:
         - service: oslo_db
           endpoint: internal
+    tests:
+      services:
+        - service: cms
+          endpoint: internal
+        - service: fms
+          endpoint: internal
+        - service: ims
+          endpoint: internal
+        - service: rds
+          endpoint: internal
+        - service: rms
+          endpoint: internal
+        - service: audit
+          endpoint: internal
+        - service: uuid
+          endpoint: internal
 
 pod:
   security_context: