openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Make tripleoclient compatible with cliff-3.4.0"

This commit is contained in:
Zuul 2020-09-28 20:07:52 +00:00 committed by Gerrit Code Review
parent 04e9966b7f a8831c6000
commit 3344c4ae4f
7 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py
View File

@ -1507,7 +1507,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# assuming heat deploy consumed a 3m out of total 451m timeout
with mock.patch('time.time', side_effect=[0, 1585820346, 1585820526]):
with mock.patch('time.time', side_effect=[1585820346, 1585820526]):
self.cmd.take_action(parsed_args)
self.assertIn(
[mock.call(mock.ANY, mock.ANY, 'overcloud', mock.ANY,

4
tripleoclient/v1/overcloud_admin.py
View File

@ -25,8 +25,6 @@ from tripleoclient import utils as oooutils
from tripleoclient.workflows import deployment
CONF = cfg.CONF
logging.register_options(CONF)
logging.setup(CONF, '')
class Authorize(command.Command):
@ -75,6 +73,8 @@ class Authorize(command.Command):
return parser
def take_action(self, parsed_args):
logging.register_options(CONF)
logging.setup(CONF, '')
self.log.debug("take_action({})".format(parsed_args))
clients = self.app.client_manager

4
tripleoclient/v1/overcloud_external_update.py
View File

@ -28,8 +28,6 @@ from tripleoclient.workflows import deployment
CONF = cfg.CONF
logging.register_options(CONF)
logging.setup(CONF, '')
class ExternalUpdateRun(command.Command):
@ -112,6 +110,8 @@ class ExternalUpdateRun(command.Command):
return parser
def take_action(self, parsed_args):
logging.register_options(CONF)
logging.setup(CONF, '')
self.log.debug("take_action(%s)" % parsed_args)
oooutils.ensure_run_as_normal_user()

4
tripleoclient/v1/overcloud_external_upgrade.py
View File

@ -27,8 +27,6 @@ from tripleoclient.workflows import deployment
CONF = cfg.CONF
logging.register_options(CONF)
logging.setup(CONF, '')
class ExternalUpgradeRun(command.Command):
@ -112,6 +110,8 @@ class ExternalUpgradeRun(command.Command):
return parser
def take_action(self, parsed_args):
logging.register_options(CONF)
logging.setup(CONF, '')
self.log.debug("take_action(%s)" % parsed_args)
oooutils.ensure_run_as_normal_user()

8
tripleoclient/v1/overcloud_update.py
View File

@ -29,8 +29,6 @@ from tripleoclient.workflows import package_update
CONF = cfg.CONF
logging.register_options(CONF)
logging.setup(CONF, '')
class UpdatePrepare(DeployOvercloud):
@ -54,6 +52,8 @@ class UpdatePrepare(DeployOvercloud):
return parser
def take_action(self, parsed_args):
logging.register_options(CONF)
logging.setup(CONF, '')
self.log.debug("take_action(%s)" % parsed_args)
oooutils.ensure_run_as_normal_user()
@ -172,6 +172,8 @@ class UpdateRun(command.Command):
return parser
def take_action(self, parsed_args):
logging.register_options(CONF)
logging.setup(CONF, '')
self.log.debug("take_action(%s)" % parsed_args)
oooutils.ensure_run_as_normal_user()
@ -237,6 +239,8 @@ class UpdateConverge(DeployOvercloud):
return parser
def take_action(self, parsed_args):
logging.register_options(CONF)
logging.setup(CONF, '')
self.log.debug("take_action(%s)" % parsed_args)
oooutils.ensure_run_as_normal_user()

6
tripleoclient/v1/overcloud_upgrade.py
View File

@ -28,8 +28,6 @@ from tripleoclient.workflows import deployment
from tripleoclient.workflows import parameters
CONF = cfg.CONF
logging.register_options(CONF)
logging.setup(CONF, '')
class UpgradePrepare(DeployOvercloud):
@ -59,6 +57,8 @@ class UpgradePrepare(DeployOvercloud):
return parser
def take_action(self, parsed_args):
logging.register_options(CONF)
logging.setup(CONF, '')
self.log.debug("take_action(%s)" % parsed_args)
oooutils.ensure_run_as_normal_user()
@ -207,6 +207,8 @@ class UpgradeRun(command.Command):
return parser
def take_action(self, parsed_args):
logging.register_options(CONF)
logging.setup(CONF, '')
self.log.debug("take_action(%s)" % parsed_args)
oooutils.ensure_run_as_normal_user()

4
tripleoclient/v1/tripleo_upgrade.py
View File

@ -21,8 +21,6 @@ from tripleoclient import utils
from tripleoclient.v1.tripleo_deploy import Deploy
CONF = cfg.CONF
logging.register_options(CONF)
logging.setup(CONF, '')
class Upgrade(Deploy):
@ -31,6 +29,8 @@ class Upgrade(Deploy):
log = logging.getLogger(__name__ + ".Upgrade")
def take_action(self, parsed_args):
logging.register_options(CONF)
logging.setup(CONF, '')
self.log.debug("take_action(%s)" % parsed_args)
if (not parsed_args.yes
and not utils.prompt_user_for_confirmation(