From 23c9faa3340f8ccf431f2d63187a0afd5f3d3a8b Mon Sep 17 00:00:00 2001
From: alexz <azvyagintsev@mirantis.com>
Date: Sun, 5 Jun 2016 16:54:02 +0300
Subject: [PATCH] temporary test-script: bugfix

Change-Id: Ifcdf8b0da8a88ab08bbad1d62b753112807572f6
---
 tools/jenkins/ugly.py | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/tools/jenkins/ugly.py b/tools/jenkins/ugly.py
index d983af1..881eef8 100755
--- a/tools/jenkins/ugly.py
+++ b/tools/jenkins/ugly.py
@@ -57,7 +57,7 @@ murano_client = None
 
 # service name , from murano-app map, and port, which should be checked
 check_map = {'org.openstack.ci_cd_pipeline_murano_app.Jenkins':
-                 {'ports': [8080, 22], 'url': 'api', 'url_port': 8080},
+                 {'ports': [8080, 22], 'url': 'api/', 'url_port': 8080},
              'org.openstack.ci_cd_pipeline_murano_app.Gerrit':
                  {'ports': [8081, 22], 'url': '#/admin/projects/',
                   'url_port': 8081},
@@ -83,9 +83,7 @@ def get_murano_client():
     except Exception as e:
         keystone = get_auth()
         murano_client = muranocl.Client('1', endpoint=murano_endpoint,
-                                        token=keystone.auth_token,
-                                        session=True
-                                        )
+                                        token=keystone.auth_token)
     return murano_client
 
 
@@ -281,16 +279,21 @@ def check_port_access(ip, port):
 
 
 def check_path(env, path, ip, port=80):
+    attempts = 5
     proto = 'http'
     if port in (443, 8443):
         proto = 'https'
-    resp = requests.get('%s://%s:%s/%s' % (proto, ip, port, path))
-    if resp.status_code == 200:
-        LOG.debug(
-            'Service path fine: %s://%s:%s/%s' % (proto, ip, port, path))
-        pass
-    else:
-        fail('Service path failed: %s://%s:%s/%s' % (proto, ip, port, path))
+    url = '%s://%s:%s/%s' % (proto, ip, port, path)
+    for i in range(attempts):
+        resp = requests.get(url)
+        i += 1
+        if resp.status_code != 200 and i >= attempts:
+            fail('Service path failed: %s Code:%s' % (url, resp.status_code))
+        elif resp.status_code == 200:
+            LOG.debug('Service path fine: %s' % url)
+            return
+        else:
+            time.sleep(5)
 
 
 def deployment_success_check(environment, ip, inst_name='jenkins', ports=[]):
@@ -387,9 +390,10 @@ if __name__ == '__main__':
                 LOG.debug('Cheking service {}'.format(app))
                 check_path(environment, check_map[app]['url'], fip_map[app],
                            port=check_map[app]['url_port'])
+        LOG.debug("Deployment finished successfully")
 
     except Exception as exc:
-            LOG.debug('Deployment error', exc)
+            LOG.exception('Deployment error %s' % exc)
             raise
     finally:
         deployment = get_last_deployment(environment)