From 7b4cdaee7823fb642002f31939056dff65d282f2 Mon Sep 17 00:00:00 2001 From: Dmitry Sutyagin Date: Mon, 19 Sep 2016 18:13:24 +0300 Subject: [PATCH] Remove: fuelclient support in Fuel 9.1+ fuelclient is hard to support because it's code changes rapidly Will use API and CLI for now Change-Id: Ie55f6bf821104d0df992e7981736bf23ceb8a28e --- timmy/nodes.py | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/timmy/nodes.py b/timmy/nodes.py index 12c85c2..e505ff4 100644 --- a/timmy/nodes.py +++ b/timmy/nodes.py @@ -34,15 +34,13 @@ from copy import deepcopy try: import fuelclient if hasattr(fuelclient, 'connect'): - # fuel > 9.0.1 - from fuelclient import connect as FuelClient - FUEL_10 = True + # fuel > 9.0.1 - drop support, use API and CLI instead + FuelClient = None else: import fuelclient.client if type(fuelclient.client.APIClient) is fuelclient.client.Client: # fuel 9.0.1 and below from fuelclient.client import Client as FuelClient - FUEL_10 = False else: FuelClient = None except: @@ -558,25 +556,14 @@ class NodeManager(object): os.environ['https_proxy'] = '' os.environ['http_proxy'] = '' self.logger.info('Setup fuelclient instance') - if FUEL_10: - args = {'host': self.conf['fuel_ip'], - 'port': self.conf['fuel_api_port']} - if self.conf['fuel_user']: - args['os_username'] = self.conf['fuel_user'] - if self.conf['fuel_pass']: - args['os_password'] = self.conf['fuel_pass'] - if self.conf['fuel_tenant']: - args['os_tenant_name'] = self.conf['fuel_tenant'] - self.fuelclient = FuelClient(**args) - else: - self.fuelclient = FuelClient() - if self.conf['fuel_user']: - self.fuelclient.username = self.conf['fuel_user'] - if self.conf['fuel_pass']: - self.fuelclient.password = self.conf['fuel_pass'] - if self.conf['fuel_tenant']: - self.fuelclient.tenant_name = self.conf['fuel_tenant'] - # self.fuelclient.debug_mode(True) + self.fuelclient = FuelClient() + if self.conf['fuel_user']: + self.fuelclient.username = self.conf['fuel_user'] + if self.conf['fuel_pass']: + self.fuelclient.password = self.conf['fuel_pass'] + if self.conf['fuel_tenant']: + self.fuelclient.tenant_name = self.conf['fuel_tenant'] + # self.fuelclient.debug_mode(True) except Exception as e: self.logger.info('Failed to setup fuelclient instance:%s' % e, exc_info=True)