X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=doctor_tests%2Fscenario%2Fmaintenance.py;h=2e40529f23cd47821bd4dbd96b2c894551f1cd8d;hb=a0528f67abe01f0bb4be3565cfef4fd049afa1fa;hp=a2129f61ce8c924b5175ece19388be85a2136ff3;hpb=e6708c869855ab69f9b53959befd82bb2f32f9ad;p=doctor.git

diff --git a/doctor_tests/scenario/maintenance.py b/doctor_tests/scenario/maintenance.py
index a2129f61..2e40529f 100644
--- a/doctor_tests/scenario/maintenance.py
+++ b/doctor_tests/scenario/maintenance.py
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2018 Nokia Corporation and others.
+# Copyright (c) 2019 Nokia Corporation and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
@@ -28,6 +28,7 @@ class Maintenance(object):
     def __init__(self, trasport_url, conf, log):
         self.conf = conf
         self.log = log
+        self.admin_session = get_session()
         self.keystone = keystone_client(
             self.conf.keystone_version, get_session())
         self.nova = nova_client(conf.nova_version, get_session())
@@ -142,22 +143,44 @@ class Maintenance(object):
                (self.conf.admin_tool.ip,
                 self.conf.admin_tool.port,
                 self.endpoint))
-
-        # let's start maintenance 20sec from now, so projects will have
-        # time to ACK to it before that
-        maintenance_at = (datetime.datetime.utcnow() +
-                          datetime.timedelta(seconds=30)
-                          ).strftime('%Y-%m-%d %H:%M:%S')
-        data = {'hosts': maintenance_hosts,
-                'state': 'MAINTENANCE',
-                'maintenance_at': maintenance_at,
-                'metadata': {'openstack_version': 'Rocky'},
-                'workflow': 'default'}
         headers = {
             'Content-Type': 'application/json',
             'Accept': 'application/json'}
-
-        ret = requests.post(url, data=json.dumps(data), headers=headers)
+        if self.conf.admin_tool.type == 'fenix':
+            headers['X-Auth-Token'] = self.admin_session.get_token()
+        self.log.info('headers %s' % headers)
+        retries = 12
+        ret = None
+        while retries > 0:
+            # let's start maintenance 20sec from now, so projects will have
+            # time to ACK to it before that
+            maintenance_at = (datetime.datetime.utcnow() +
+                              datetime.timedelta(seconds=30)
+                              ).strftime('%Y-%m-%d %H:%M:%S')
+
+            data = {'state': 'MAINTENANCE',
+                    'maintenance_at': maintenance_at,
+                    'metadata': {'openstack_version': 'Rocky'},
+                    'workflow': 'default'}
+
+            if self.conf.admin_tool.type == 'sample':
+                data['hosts'] = maintenance_hosts
+            else:
+                data['hosts'] = []
+            try:
+                ret = requests.post(url, data=json.dumps(data),
+                                    headers=headers)
+            except:
+                if retries == 0:
+                    raise Exception('admin tool did not respond in 120s')
+                else:
+                    self.log.info('admin tool not ready, retry in 10s')
+                retries = retries - 1
+                time.sleep(10)
+                continue
+            break
+        if not ret:
+            raise Exception("admin tool did not respond")
         if ret.status_code != 200:
             raise Exception(ret.text)
         return ret.json()['session_id']
@@ -174,6 +197,9 @@ class Maintenance(object):
             'Content-Type': 'application/json',
             'Accept': 'application/json'}
 
+        if self.conf.admin_tool.type == 'fenix':
+            headers['X-Auth-Token'] = self.admin_session.get_token()
+
         ret = requests.delete(url, data=None, headers=headers)
         if ret.status_code != 200:
             raise Exception(ret.text)
@@ -188,6 +214,10 @@ class Maintenance(object):
         headers = {
             'Content-Type': 'application/json',
             'Accept': 'application/json'}
+
+        if self.conf.admin_tool.type == 'fenix':
+            headers['X-Auth-Token'] = self.admin_session.get_token()
+
         ret = requests.get(url, data=None, headers=headers)
         if ret.status_code != 200:
             raise Exception(ret.text)