diff options
| author | Zuul <zuul@review.opendev.org> | 2022-05-13 16:30:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-05-13 16:30:44 +0000 |
| commit | 9b399c5528625921781470fb0c738b90eeaf6a80 (patch) | |
| tree | e92ee6f710081959b23c497870bfa8c3fe480bcf /openstackclient | |
| parent | 644106a89cd3ccc4eac92ae9bf8b5896b9ffc697 (diff) | |
| parent | afc5f997c80bb2888c8609bb78551ce5ccc11110 (diff) | |
| download | python-openstackclient-9b399c5528625921781470fb0c738b90eeaf6a80.tar.gz | |
Merge "Stop using private _is_uuid_like method"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/compute/v2/server_event.py | 6 | ||||
| -rw-r--r-- | openstackclient/image/v2/image.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/openstackclient/compute/v2/server_event.py b/openstackclient/compute/v2/server_event.py index 7ab0cd2f..ebf0d526 100644 --- a/openstackclient/compute/v2/server_event.py +++ b/openstackclient/compute/v2/server_event.py @@ -19,10 +19,10 @@ import logging import iso8601 from novaclient import api_versions -import openstack.cloud._utils from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils +from oslo_utils import uuidutils from openstackclient.i18n import _ @@ -152,7 +152,7 @@ class ListServerEvent(command.Lister): # If we fail to find the resource, it is possible the server is # deleted. Try once more using the <server> arg directly if it is a # UUID. - if openstack.cloud._utils._is_uuid_like(parsed_args.server): + if uuidutils.is_uuid_like(parsed_args.server): server_id = parsed_args.server else: raise @@ -224,7 +224,7 @@ class ShowServerEvent(command.ShowOne): # If we fail to find the resource, it is possible the server is # deleted. Try once more using the <server> arg directly if it is a # UUID. - if openstack.cloud._utils._is_uuid_like(parsed_args.server): + if uuidutils.is_uuid_like(parsed_args.server): server_id = parsed_args.server else: raise diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py index 407c1292..31a5bc4e 100644 --- a/openstackclient/image/v2/image.py +++ b/openstackclient/image/v2/image.py @@ -21,7 +21,6 @@ import logging import os import sys -import openstack.cloud._utils from openstack.image import image_signer from osc_lib.api import utils as api_utils from osc_lib.cli import format_columns @@ -29,6 +28,7 @@ from osc_lib.cli import parseractions from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils +from oslo_utils import uuidutils from openstackclient.common import progressbar from openstackclient.i18n import _ @@ -159,7 +159,7 @@ class AddProjectToImage(command.ShowOne): image_client = self.app.client_manager.image identity_client = self.app.client_manager.identity - if openstack.cloud._utils._is_uuid_like(parsed_args.project): + if uuidutils.is_uuid_like(parsed_args.project): project_id = parsed_args.project else: project_id = common.find_project( |