openstack/python-openstackclient
Code Issues Proposed changes

Merge "compute: Migrate to 'compute' client alias"

Browse Source
This commit is contained in:
Zuul
2025-04-03 18:08:17 +00:00
committed by Gerrit Code Review
parent 1e8d243986 dae2539490
commit dd8e4740ec
30 changed files with 110 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/contributor/command-errors.rst
View File

@@ -41,7 +41,7 @@ opened.
## ...
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
public_key = parsed_args.public_key
if public_key:

2
openstackclient/common/availability_zone.py
View File

@@ -117,7 +117,7 @@ class ListAvailabilityZone(command.Lister):
return parser
def _get_compute_availability_zones(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
try:
data = list(compute_client.availability_zones(details=True))
except sdk_exceptions.ForbiddenException: # policy doesn't allow

2
openstackclient/common/extension.py
View File

@@ -98,7 +98,7 @@ class ListExtension(command.Lister):
LOG.warning(message)
if parsed_args.compute or show_all:
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
try:
data += compute_client.extensions()
except Exception:

2
openstackclient/common/limits.py
View File

@@ -122,7 +122,7 @@ class ShowLimits(command.Lister):
volume_limits = None
if self.app.client_manager.is_compute_endpoint_enabled():
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
compute_limits = compute_client.get_limits(
reserved=parsed_args.is_reserved, tenant_id=project_id
)

8
openstackclient/common/quota.py
View File

@@ -133,7 +133,7 @@ def get_compute_quotas(
default=False,
):
try:
client = app.client_manager.sdk_connection.compute
client = app.client_manager.compute
if default:
quota = client.get_quota_set_defaults(project_id)
else:
@@ -256,7 +256,7 @@ class ListQuota(command.Lister):
return parser
def _list_quota_compute(self, parsed_args, project_ids):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
result = []
for project_id in project_ids:
@@ -588,7 +588,7 @@ class SetQuota(common.NetDetectionMixin, command.Command):
network_kwargs = {}
if self.app.client_manager.is_compute_endpoint_enabled():
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
for k, v in COMPUTE_QUOTAS.items():
value = getattr(parsed_args, k, None)
@@ -907,7 +907,7 @@ class DeleteQuota(command.Command):
# compute quotas
if parsed_args.service in {'all', 'compute'}:
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
compute_client.revert_quota_set(project.id)
# volume quotas

8
openstackclient/compute/v2/agent.py
View File

@@ -56,7 +56,7 @@ class CreateAgent(command.ShowOne):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
# doing this since openstacksdk has decided not to support this
# deprecated command
@@ -95,7 +95,7 @@ class DeleteAgent(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
result = 0
for id in parsed_args.id:
try:
@@ -139,7 +139,7 @@ class ListAgent(command.Lister):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
columns = (
"Agent ID",
"Hypervisor",
@@ -194,7 +194,7 @@ class SetAgent(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
response = compute_client.get('/os-agents', microversion='2.1')
sdk_exceptions.raise_from_response(response)

18
openstackclient/compute/v2/aggregate.py
View File

@@ -68,7 +68,7 @@ class AddAggregateHost(command.ShowOne):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
aggregate = compute_client.find_aggregate(
parsed_args.aggregate, ignore_missing=False
@@ -111,7 +111,7 @@ class CreateAggregate(command.ShowOne):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
attrs = {'name': parsed_args.name}
@@ -147,7 +147,7 @@ class DeleteAggregate(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
result = 0
for a in parsed_args.aggregate:
try:
@@ -190,7 +190,7 @@ class ListAggregate(command.Lister):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
aggregates = list(compute_client.aggregates())
@@ -252,7 +252,7 @@ class RemoveAggregateHost(command.ShowOne):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
aggregate = compute_client.find_aggregate(
parsed_args.aggregate, ignore_missing=False
@@ -309,7 +309,7 @@ class SetAggregate(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
aggregate = compute_client.find_aggregate(
parsed_args.aggregate, ignore_missing=False
)
@@ -354,7 +354,7 @@ class ShowAggregate(command.ShowOne):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
aggregate = compute_client.find_aggregate(
parsed_args.aggregate, ignore_missing=False
)
@@ -394,7 +394,7 @@ class UnsetAggregate(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
aggregate = compute_client.find_aggregate(
parsed_args.aggregate, ignore_missing=False
)
@@ -429,7 +429,7 @@ class CacheImageForAggregate(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
if not sdk_utils.supports_microversion(compute_client, '2.81'):
msg = _(

4
openstackclient/compute/v2/console.py
View File

@@ -55,7 +55,7 @@ class ShowConsoleLog(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server = compute_client.find_server(
name_or_id=parsed_args.server, ignore_missing=False
@@ -130,7 +130,7 @@ class ShowConsoleURL(command.ShowOne):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server = compute_client.find_server(
parsed_args.server, ignore_missing=False
)

12
openstackclient/compute/v2/flavor.py
View File

@@ -149,7 +149,7 @@ class CreateFlavor(command.ShowOne):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
identity_client = self.app.client_manager.identity
if parsed_args.project and parsed_args.public:
@@ -223,7 +223,7 @@ class DeleteFlavor(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
result = 0
for f in parsed_args.flavor:
try:
@@ -296,7 +296,7 @@ class ListFlavor(command.Lister):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
# is_public is ternary - None means give all flavors,
# True is public only and False is private only
# By default Nova assumes True and gives admins public flavors
@@ -418,7 +418,7 @@ class SetFlavor(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
identity_client = self.app.client_manager.identity
try:
@@ -497,7 +497,7 @@ class ShowFlavor(command.ShowOne):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
flavor = compute_client.find_flavor(
parsed_args.flavor, get_extra_specs=True, ignore_missing=False
)
@@ -565,7 +565,7 @@ class UnsetFlavor(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
identity_client = self.app.client_manager.identity
try:

6
openstackclient/compute/v2/host.py
View File

@@ -35,7 +35,7 @@ class ListHost(command.Lister):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
self.log.warning(
"API has been deprecated; "
@@ -83,7 +83,7 @@ class SetHost(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
self.log.warning(
"API has been deprecated; "
@@ -121,7 +121,7 @@ class ShowHost(command.Lister):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
self.log.warning(
"API has been deprecated; "

4
openstackclient/compute/v2/hypervisor.py
View File

@@ -90,7 +90,7 @@ class ListHypervisor(command.Lister):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
list_opts = {}
@@ -170,7 +170,7 @@ class ShowHypervisor(command.ShowOne):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
hypervisor_id = compute_client.find_hypervisor(
parsed_args.hypervisor, ignore_missing=False, details=False

2
openstackclient/compute/v2/hypervisor_stats.py
View File

@@ -42,7 +42,7 @@ class ShowHypervisorStats(command.ShowOne):
def take_action(self, parsed_args):
# The command is deprecated since it is being dropped in Nova.
self.log.warning(_("This command is deprecated."))
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
# We do API request directly cause this deprecated method is not and
# will not be supported by OpenStackSDK.
response = compute_client.get(

8
openstackclient/compute/v2/keypair.py
View File

@@ -120,7 +120,7 @@ class CreateKeypair(command.ShowOne):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
identity_client = self.app.client_manager.identity
kwargs = {'name': parsed_args.name}
@@ -228,7 +228,7 @@ class DeleteKeypair(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
identity_client = self.app.client_manager.identity
kwargs = {}
@@ -298,7 +298,7 @@ class ListKeypair(command.Lister):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
identity_client = self.app.client_manager.identity
kwargs = {}
@@ -409,7 +409,7 @@ class ShowKeypair(command.ShowOne):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
identity_client = self.app.client_manager.identity
kwargs = {}

78
openstackclient/compute/v2/server.py
View File

@@ -358,7 +358,7 @@ class AddFixedIP(command.ShowOne):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server = compute_client.find_server(
parsed_args.server, ignore_missing=False
)
@@ -452,7 +452,7 @@ class AddFloatingIP(network_common.NetworkAndComputeCommand):
return parser
def take_action_network(self, client, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
attrs = {}
obj = client.find_ip(
@@ -545,7 +545,7 @@ class AddPort(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server = compute_client.find_server(
parsed_args.server, ignore_missing=False
@@ -599,7 +599,7 @@ class AddNetwork(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server = compute_client.find_server(
parsed_args.server, ignore_missing=False
@@ -650,7 +650,7 @@ class AddServerSecurityGroup(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server = compute_client.find_server(
parsed_args.server, ignore_missing=False
@@ -752,7 +752,7 @@ with status ``SHELVED`` or ``SHELVED_OFFLOADED``."""
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
volume_client = self.app.client_manager.sdk_connection.volume
server = compute_client.find_server(
@@ -1517,7 +1517,7 @@ class CreateServer(command.ShowOne):
self.app.stdout.write(f'\rProgress: {progress}')
self.app.stdout.flush()
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
volume_client = self.app.client_manager.volume
image_client = self.app.client_manager.image
@@ -2157,7 +2157,7 @@ class CreateServerDump(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
for name_or_id in parsed_args.server:
server = compute_client.find_server(name_or_id)
server.trigger_crash_dump(compute_client)
@@ -2201,7 +2201,7 @@ class DeleteServer(command.Command):
self.app.stdout.write(f'\rProgress: {progress}')
self.app.stdout.flush()
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
for server in parsed_args.server:
server_obj = compute_client.find_server(
server,
@@ -2609,7 +2609,7 @@ class ListServer(command.Lister):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
identity_client = self.app.client_manager.identity
image_client = self.app.client_manager.image
@@ -3085,7 +3085,7 @@ A non-admin user will not be able to execute actions."""
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
kwargs = {}
if parsed_args.reason:
@@ -3209,7 +3209,7 @@ revert to release the new server and restart the old one."""
self.app.stdout.write(f'\rProgress: {progress}')
self.app.stdout.flush()
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server = compute_client.find_server(
parsed_args.server, ignore_missing=False
@@ -3312,7 +3312,7 @@ class PauseServer(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
for server in parsed_args.server:
server_id = compute_client.find_server(
server,
@@ -3361,7 +3361,7 @@ class RebootServer(command.Command):
self.app.stdout.write(f'\rProgress: {progress}')
self.app.stdout.flush()
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server_id = compute_client.find_server(
parsed_args.server,
ignore_missing=False,
@@ -3566,7 +3566,7 @@ class RebuildServer(command.ShowOne):
self.app.stdout.write(f'\rProgress: {progress}')
self.app.stdout.flush()
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
image_client = self.app.client_manager.image
server = compute_client.find_server(
@@ -3827,7 +3827,7 @@ host."""
self.app.stdout.write(f'\rProgress: {progress}')
self.app.stdout.flush()
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
image_client = self.app.client_manager.image
if parsed_args.host:
@@ -3892,7 +3892,7 @@ class RemoveFixedIP(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server = compute_client.find_server(
parsed_args.server, ignore_missing=False
@@ -3951,7 +3951,7 @@ class RemovePort(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server = compute_client.find_server(
parsed_args.server, ignore_missing=False
@@ -3990,7 +3990,7 @@ class RemoveNetwork(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server = compute_client.find_server(
parsed_args.server, ignore_missing=False
@@ -4034,7 +4034,7 @@ class RemoveServerSecurityGroup(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server = compute_client.find_server(
parsed_args.server, ignore_missing=False
@@ -4104,7 +4104,7 @@ volume from a server with status ``SHELVED`` or ``SHELVED_OFFLOADED``."""
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
volume_client = self.app.client_manager.sdk_connection.volume
server = compute_client.find_server(
@@ -4157,7 +4157,7 @@ server booted from a volume."""
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
image_client = self.app.client_manager.image
image_ref = None
@@ -4229,7 +4229,7 @@ release the new server and restart the old one."""
self.app.stdout.write(f'\rProgress: {progress}')
self.app.stdout.flush()
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server = compute_client.find_server(
parsed_args.server, ignore_missing=False
)
@@ -4291,7 +4291,7 @@ Confirm (verify) success of resize operation and release the old server."""
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server = compute_client.find_server(
parsed_args.server, ignore_missing=False
)
@@ -4339,7 +4339,7 @@ one."""
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server = compute_client.find_server(
parsed_args.server, ignore_missing=False
)
@@ -4383,7 +4383,7 @@ class RestoreServer(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
for server in parsed_args.server:
server_id = compute_client.find_server(
server,
@@ -4406,7 +4406,7 @@ class ResumeServer(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
for server in parsed_args.server:
server_id = compute_client.find_server(
server,
@@ -4506,7 +4506,7 @@ class SetServer(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server = compute_client.find_server(
parsed_args.server, ignore_missing=False
)
@@ -4624,7 +4624,7 @@ class ShelveServer(command.Command):
self.app.stdout.write(f'\rProgress: {progress}')
self.app.stdout.flush()
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server_ids = []
for server in parsed_args.servers:
@@ -4719,7 +4719,7 @@ information for the server."""
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
image_client = self.app.client_manager.image
server = compute_client.find_server(
@@ -4849,7 +4849,7 @@ class SshServer(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server = compute_client.find_server(
parsed_args.server, ignore_missing=False
@@ -4935,7 +4935,7 @@ class StartServer(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
for server in parsed_args.server:
server_id = compute_client.find_server(
server,
@@ -4970,7 +4970,7 @@ class StopServer(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
for server in parsed_args.server:
server_id = compute_client.find_server(
server,
@@ -4995,7 +4995,7 @@ class SuspendServer(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
for server in parsed_args.server:
server_id = compute_client.find_server(
server,
@@ -5018,7 +5018,7 @@ class UnlockServer(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
for server in parsed_args.server:
server_id = compute_client.find_server(
server,
@@ -5041,7 +5041,7 @@ class UnpauseServer(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
for server in parsed_args.server:
server_id = compute_client.find_server(
server,
@@ -5063,7 +5063,7 @@ class UnrescueServer(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server = compute_client.find_server(
parsed_args.server, ignore_missing=False
)
@@ -5130,7 +5130,7 @@ class UnsetServer(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server = compute_client.find_server(
parsed_args.server, ignore_missing=False
@@ -5221,7 +5221,7 @@ class UnshelveServer(command.Command):
self.app.stdout.write(f'\rProgress: {progress}')
self.app.stdout.flush()
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
kwargs = {}
if parsed_args.availability_zone:

2
openstackclient/compute/v2/server_backup.py
View File

@@ -71,7 +71,7 @@ class CreateServerBackup(command.ShowOne):
self.app.stderr.write(f'\rProgress: {progress}')
self.app.stderr.flush()
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server = compute_client.find_server(
parsed_args.server, ignore_missing=False

4
openstackclient/compute/v2/server_event.py
View File

@@ -139,7 +139,7 @@ class ListServerEvent(command.Lister):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
kwargs = {}
@@ -266,7 +266,7 @@ class ShowServerEvent(command.ShowOne):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
try:
server_id = compute_client.find_server(

8
openstackclient/compute/v2/server_group.py
View File

@@ -93,7 +93,7 @@ class CreateServerGroup(command.ShowOne):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
if parsed_args.policy in ('soft-affinity', 'soft-anti-affinity'):
if not sdk_utils.supports_microversion(compute_client, '2.15'):
@@ -153,7 +153,7 @@ class DeleteServerGroup(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
result = 0
for group in parsed_args.server_group:
try:
@@ -197,7 +197,7 @@ class ListServerGroup(command.Lister):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
kwargs = {}
@@ -264,7 +264,7 @@ class ShowServerGroup(command.ShowOne):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
group = compute_client.find_server_group(
parsed_args.server_group, ignore_missing=False
)

2
openstackclient/compute/v2/server_image.py
View File

@@ -72,7 +72,7 @@ class CreateServerImage(command.ShowOne):
self.app.stdout.write(f'\rProgress: {progress}')
self.app.stdout.flush()
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
image_client = self.app.client_manager.image
server = compute_client.find_server(

8
openstackclient/compute/v2/server_migration.py
View File

@@ -154,7 +154,7 @@ class ListMigration(command.Lister):
)
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
identity_client = self.app.client_manager.identity
search_opts = {}
@@ -289,7 +289,7 @@ class ShowMigration(command.ShowOne):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
if not sdk_utils.supports_microversion(compute_client, '2.24'):
msg = _(
@@ -404,7 +404,7 @@ class AbortMigration(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
if not sdk_utils.supports_microversion(compute_client, '2.24'):
msg = _(
@@ -469,7 +469,7 @@ class ForceCompleteMigration(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
if not sdk_utils.supports_microversion(compute_client, '2.22'):
msg = _(

4
openstackclient/compute/v2/server_volume.py
View File

@@ -34,7 +34,7 @@ class ListServerVolume(command.Lister):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server = compute_client.find_server(
parsed_args.server,
@@ -114,7 +114,7 @@ class SetServerVolume(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
volume_client = self.app.client_manager.sdk_connection.volume
if parsed_args.delete_on_termination is not None:

6
openstackclient/compute/v2/service.py
View File

@@ -52,7 +52,7 @@ class DeleteService(command.Command):
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
result = 0
for s in parsed_args.service:
try:
@@ -108,7 +108,7 @@ deployment."""
return parser
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
columns: tuple[str, ...] = (
"id",
"binary",
@@ -221,7 +221,7 @@ class SetService(command.Command):
return services[0]
def take_action(self, parsed_args):
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
if (
parsed_args.enable or not parsed_args.disable

4
openstackclient/compute/v2/usage.py
View File

@@ -135,7 +135,7 @@ class ListUsage(command.Lister):
else:
return project
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
columns = (
"project_id",
"server_usages",
@@ -234,7 +234,7 @@ class ShowUsage(command.ShowOne):
def take_action(self, parsed_args):
identity_client = self.app.client_manager.identity
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
date_cli_format = "%Y-%m-%d"
now = datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None)

6
openstackclient/network/common.py
View File

@@ -167,7 +167,7 @@ class NetDetectionMixin(metaclass=abc.ABCMeta):
)
elif self.is_nova_network:
return self.take_action_compute(
self.app.client_manager.sdk_connection.compute, parsed_args
self.app.client_manager.compute, parsed_args
)
def take_action_network(self, client, parsed_args):
@@ -216,7 +216,7 @@ class NetworkAndComputeDelete(NetworkAndComputeCommand, metaclass=abc.ABCMeta):
)
else:
self.take_action_compute(
self.app.client_manager.sdk_connection.compute,
self.app.client_manager.compute,
parsed_args,
)
except Exception as e:
@@ -274,7 +274,7 @@ class NetworkAndComputeShowOne(
)
else:
return self.take_action_compute(
self.app.client_manager.sdk_connection.compute, parsed_args
self.app.client_manager.compute, parsed_args
)
except openstack.exceptions.HttpException as exc:
msg = _("Error while executing command: %s") % exc.message

2
openstackclient/network/v2/port.py
View File

@@ -903,7 +903,7 @@ class ListPort(command.Lister):
)
filters['device_id'] = _router.id
if parsed_args.server:
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
server = compute_client.find_server(
parsed_args.server,
ignore_missing=False,

8
openstackclient/tests/unit/compute/v2/fakes.py
View File

@@ -100,12 +100,8 @@ class FakeClientMixin:
# TODO(stephenfin): Rename to 'compute_client' once all commands are
# migrated to SDK
self.app.client_manager.sdk_connection.compute = mock.Mock(
_proxy.Proxy
)
self.compute_sdk_client = (
self.app.client_manager.sdk_connection.compute
)
self.app.client_manager.compute = mock.Mock(_proxy.Proxy)
self.compute_sdk_client = self.app.client_manager.compute
self.set_compute_api_version() # default to the lowest
def set_compute_api_version(self, version: str = '2.1'):

4
openstackclient/tests/unit/network/test_common.py
View File

@@ -132,8 +132,8 @@ class TestNetworkAndCompute(utils.TestCommand):
return_value='take_action_network'
)
self.app.client_manager.sdk_connection.compute = mock.Mock()
self.compute_client = self.app.client_manager.sdk_connection.compute
self.app.client_manager.compute = mock.Mock()
self.compute_client = self.app.client_manager.compute
self.compute_client.compute_action = mock.Mock(
return_value='take_action_compute'
)

8
openstackclient/tests/unit/volume/v3/fakes.py
View File

@@ -131,12 +131,8 @@ class TestVolume(
# openstackclient.tests.unit.compute.v2.fakes.FakeClientMixin
# TODO(stephenfin): Rename to 'compute_client' once all commands are
# migrated to SDK
self.app.client_manager.sdk_connection.compute = mock.Mock(
_compute_proxy.Proxy
)
self.compute_sdk_client = (
self.app.client_manager.sdk_connection.compute
)
self.app.client_manager.compute = mock.Mock(_compute_proxy.Proxy)
self.compute_sdk_client = self.app.client_manager.compute
# avoid circular imports by defining this manually rather than using
# openstackclient.tests.unit.image.v2.fakes.FakeClientMixin

2
openstackclient/volume/v2/volume.py
View File

@@ -503,7 +503,7 @@ class ListVolume(command.Lister):
server_cache = {}
if do_server_list:
try:
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
for s in compute_client.servers():
server_cache[s.id] = s
except sdk_exceptions.SDKException: # noqa: S110

2
openstackclient/volume/v3/volume.py
View File

@@ -519,7 +519,7 @@ class ListVolume(command.Lister):
server_cache = {}
if do_server_list:
try:
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
for s in compute_client.servers():
server_cache[s.id] = s
except sdk_exceptions.SDKException: # noqa: S110

2
openstackclient/volume/v3/volume_attachment.py
View File

@@ -172,7 +172,7 @@ class CreateVolumeAttachment(command.ShowOne):
def take_action(self, parsed_args):
volume_client = self.app.client_manager.sdk_connection.volume
compute_client = self.app.client_manager.sdk_connection.compute
compute_client = self.app.client_manager.compute
if not sdk_utils.supports_microversion(volume_client, '3.27'):
msg = _(