python-openstackclient 6.6.1__py3-none-any.whl → 7.1.0__py3-none-any.whl

openstackclient/network/v2/security_group.py

@@ -20,6 +20,7 @@ from osc_lib.command import command
 from osc_lib import utils
 from osc_lib.utils import tags as _tag
 
+from openstackclient.api import compute_v2
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import common
@@ -180,7 +181,8 @@ class CreateSecurityGroup(
 
     def take_action_compute(self, client, parsed_args):
         description = self._get_description(parsed_args)
-        obj = client.api.security_group_create(
+        obj = compute_v2.create_security_group(
+            client,
             parsed_args.name,
             description,
         )
@@ -212,7 +214,8 @@ class DeleteSecurityGroup(common.NetworkAndComputeDelete):
         client.delete_security_group(obj)
 
     def take_action_compute(self, client, parsed_args):
-        client.api.security_group_delete(self.r)
+        security_group = compute_v2.find_security_group(client, self.r)
+        compute_v2.delete_security_group(client, security_group['id'])
 
 
 # TODO(rauta): Use the SDK resource mapped attribute names once
@@ -291,10 +294,10 @@ class ListSecurityGroup(common.NetworkAndComputeLister):
         )
 
     def take_action_compute(self, client, parsed_args):
-        search = {'all_tenants': parsed_args.all_projects}
-        data = client.api.security_group_list(
+        data = compute_v2.list_security_groups(
             # TODO(dtroyer): add limit, marker
-            search_opts=search,
+            client,
+            all_projects=parsed_args.all_projects,
         )
 
         columns = (
@@ -383,20 +386,21 @@ class SetSecurityGroup(
         _tag.update_tags_for_set(client, obj, parsed_args)
 
     def take_action_compute(self, client, parsed_args):
-        data = client.api.security_group_find(parsed_args.group)
+        security_group = compute_v2.find_security_group(
+            client, parsed_args.group
+        )
 
+        params = {}
         if parsed_args.name is not None:
-            data['name'] = parsed_args.name
+            params['name'] = parsed_args.name
         if parsed_args.description is not None:
-            data['description'] = parsed_args.description
+            params['description'] = parsed_args.description
 
         # NOTE(rtheis): Previous behavior did not raise a CommandError
         # if there were no updates. Maintain this behavior and issue
         # the update.
-        client.api.security_group_set(
-            data,
-            data['name'],
-            data['description'],
+        compute_v2.update_security_group(
+            client, security_group['id'], **params
         )
 
 
@@ -422,7 +426,7 @@ class ShowSecurityGroup(common.NetworkAndComputeShowOne):
         return (display_columns, data)
 
     def take_action_compute(self, client, parsed_args):
-        obj = client.api.security_group_find(parsed_args.group)
+        obj = compute_v2.find_security_group(client, parsed_args.group)
         display_columns, property_columns = _get_columns(obj)
         data = utils.get_dict_properties(
             obj, property_columns, formatters=_formatters_compute
@@ -434,7 +438,7 @@ class UnsetSecurityGroup(command.Command):
     _description = _("Unset security group properties")
 
     def get_parser(self, prog_name):
-        parser = super(UnsetSecurityGroup, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'group',
             metavar="<group>",

openstackclient/network/v2/security_group_rule.py

@@ -20,6 +20,7 @@ from osc_lib.cli import parseractions
 from osc_lib import exceptions
 from osc_lib import utils
 
+from openstackclient.api import compute_v2
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import common
@@ -91,7 +92,7 @@ class CreateSecurityGroupRule(
                 "ending port range: 137:139. Required for IP protocols TCP "
                 "and UDP. Ignored for ICMP IP protocols."
             ),
-            **dst_port_default
+            **dst_port_default,
         )
 
         # NOTE(rtheis): Support either protocol option name for now.
@@ -125,7 +126,7 @@ class CreateSecurityGroupRule(
             metavar='<protocol>',
             type=network_utils.convert_to_lowercase,
             help=protocol_help,
-            **proto_choices
+            **proto_choices,
         )
         if not self.is_docs_build:
             protocol_group.add_argument(
@@ -133,7 +134,7 @@ class CreateSecurityGroupRule(
                 metavar='<proto>',
                 type=network_utils.convert_to_lowercase,
                 help=argparse.SUPPRESS,
-                **proto_choices
+                **proto_choices,
             )
 
         return parser
@@ -292,7 +293,7 @@ class CreateSecurityGroupRule(
         return (display_columns, data)
 
     def take_action_compute(self, client, parsed_args):
-        group = client.api.security_group_find(parsed_args.group)
+        group = compute_v2.find_security_group(client, parsed_args.group)
         protocol = network_utils.get_protocol(
             parsed_args, default_protocol='tcp'
         )
@@ -303,15 +304,16 @@ class CreateSecurityGroupRule(
 
         remote_ip = None
         if parsed_args.remote_group is not None:
-            parsed_args.remote_group = client.api.security_group_find(
-                parsed_args.remote_group,
+            parsed_args.remote_group = compute_v2.find_security_group(
+                client, parsed_args.remote_group
             )['id']
         if parsed_args.remote_ip is not None:
             remote_ip = parsed_args.remote_ip
         else:
             remote_ip = '0.0.0.0/0'
 
-        obj = client.api.security_group_rule_create(
+        obj = compute_v2.create_security_group_rule(
+            client,
             security_group_id=group['id'],
             ip_protocol=protocol,
             from_port=from_port,
@@ -343,7 +345,7 @@ class DeleteSecurityGroupRule(common.NetworkAndComputeDelete):
         client.delete_security_group_rule(obj)
 
     def take_action_compute(self, client, parsed_args):
-        client.api.security_group_rule_delete(self.r)
+        compute_v2.delete_security_group_rule(client, self.r)
 
 
 class ListSecurityGroupRule(common.NetworkAndComputeLister):
@@ -532,15 +534,16 @@ class ListSecurityGroupRule(common.NetworkAndComputeLister):
 
         rules_to_list = []
         if parsed_args.group is not None:
-            group = client.api.security_group_find(
-                parsed_args.group,
+            security_group = compute_v2.find_security_group(
+                client, parsed_args.group
             )
-            rules_to_list = group['rules']
+            rules_to_list = security_group['rules']
         else:
             columns = columns + ('parent_group_id',)
-            search = {'all_tenants': parsed_args.all_projects}
-            for group in client.api.security_group_list(search_opts=search):
-                rules_to_list.extend(group['rules'])
+            for security_group in compute_v2.list_security_groups(
+                client, all_projects=parsed_args.all_projects
+            ):
+                rules_to_list.extend(security_group['rules'])
 
         # NOTE(rtheis): Turn the raw rules into resources.
         rules = []
@@ -596,7 +599,7 @@ class ShowSecurityGroupRule(common.NetworkAndComputeShowOne):
         # the requested rule.
         obj = None
         security_group_rules = []
-        for security_group in client.api.security_group_list():
+        for security_group in compute_v2.list_security_groups(client):
             security_group_rules.extend(security_group['rules'])
         for security_group_rule in security_group_rules:
             if parsed_args.rule == str(security_group_rule.get('id')):

openstackclient/network/v2/subnet.py

@@ -46,7 +46,7 @@ def _update_arguments(obj_list, parsed_args_list, option):
 class AllocationPoolsColumn(cliff_columns.FormattableColumn):
     def human_readable(self):
         pool_formatted = [
-            '%s-%s' % (pool.get('start', ''), pool.get('end', ''))
+            '{}-{}'.format(pool.get('start', ''), pool.get('end', ''))
             for pool in self._value
         ]
         return ','.join(pool_formatted)
@@ -60,9 +60,16 @@ class HostRoutesColumn(cliff_columns.FormattableColumn):
         )
 
 
+class UnsortedListColumn(cliff_columns.FormattableColumn):
+    # format_columns.ListColumn sorts the output, but for things like
+    # DNS server addresses the order matters
+    def human_readable(self):
+        return ', '.join(self._value)
+
+
 _formatters = {
     'allocation_pools': AllocationPoolsColumn,
-    'dns_nameservers': format_columns.ListColumn,
+    'dns_nameservers': UnsortedListColumn,
     'host_routes': HostRoutesColumn,
     'service_types': format_columns.ListColumn,
     'tags': format_columns.ListColumn,
@@ -285,7 +292,7 @@ class CreateSubnet(command.ShowOne, common.NeutronCommandWithExtraArgs):
     _description = _("Create a subnet")
 
     def get_parser(self, prog_name):
-        parser = super(CreateSubnet, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'name', metavar='<name>', help=_("New subnet name")
         )
@@ -429,7 +436,7 @@ class DeleteSubnet(command.Command):
     _description = _("Delete subnet(s)")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteSubnet, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'subnet',
             metavar="<subnet>",
@@ -471,7 +478,7 @@ class ListSubnet(command.Lister):
     _description = _("List subnets")
 
     def get_parser(self, prog_name):
-        parser = super(ListSubnet, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--long',
             action='store_true',
@@ -644,7 +651,7 @@ class SetSubnet(common.NeutronCommandWithExtraArgs):
     _description = _("Set subnet properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetSubnet, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'subnet',
             metavar="<subnet>",
@@ -737,7 +744,7 @@ class ShowSubnet(command.ShowOne):
     _description = _("Display subnet details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowSubnet, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'subnet',
             metavar="<subnet>",
@@ -758,7 +765,7 @@ class UnsetSubnet(common.NeutronUnsetCommandWithExtraArgs):
     _description = _("Unset subnet properties")
 
     def get_parser(self, prog_name):
-        parser = super(UnsetSubnet, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--allocation-pool',
             metavar='start=<ip-address>,end=<ip-address>',

openstackclient/network/v2/subnet_pool.py

@@ -155,7 +155,7 @@ class CreateSubnetPool(command.ShowOne, common.NeutronCommandWithExtraArgs):
     _description = _("Create subnet pool")
 
     def get_parser(self, prog_name):
-        parser = super(CreateSubnetPool, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'name', metavar='<name>', help=_("Name of the new subnet pool")
         )
@@ -226,7 +226,7 @@ class DeleteSubnetPool(command.Command):
     _description = _("Delete subnet pool(s)")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteSubnetPool, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'subnet_pool',
             metavar='<subnet-pool>',
@@ -267,7 +267,7 @@ class ListSubnetPool(command.Lister):
     _description = _("List subnet pools")
 
     def get_parser(self, prog_name):
-        parser = super(ListSubnetPool, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--long',
             action='store_true',
@@ -393,7 +393,7 @@ class SetSubnetPool(common.NeutronCommandWithExtraArgs):
     _description = _("Set subnet pool properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetSubnetPool, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'subnet_pool',
             metavar='<subnet-pool>',
@@ -464,7 +464,7 @@ class ShowSubnetPool(command.ShowOne):
     _description = _("Display subnet pool details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowSubnetPool, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'subnet_pool',
             metavar='<subnet-pool>',
@@ -486,7 +486,7 @@ class UnsetSubnetPool(command.Command):
     _description = _("Unset subnet pool properties")
 
     def get_parser(self, prog_name):
-        parser = super(UnsetSubnetPool, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'subnet_pool',
             metavar="<subnet-pool>",

openstackclient/object/v1/account.py

@@ -24,7 +24,7 @@ class SetAccount(command.Command):
     _description = _("Set account properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetAccount, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "--property",
             metavar="<key=value>",
@@ -59,7 +59,7 @@ class UnsetAccount(command.Command):
     _description = _("Unset account properties")
 
     def get_parser(self, prog_name):
-        parser = super(UnsetAccount, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--property',
             metavar='<key>',

openstackclient/object/v1/container.py

@@ -32,7 +32,7 @@ class CreateContainer(command.Lister):
     _description = _("Create new container")
 
     def get_parser(self, prog_name):
-        parser = super(CreateContainer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--public',
             action='store_true',
@@ -85,7 +85,7 @@ class DeleteContainer(command.Command):
     _description = _("Delete container")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteContainer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--recursive',
             '-r',
@@ -121,7 +121,7 @@ class ListContainer(command.Lister):
     _description = _("List containers")
 
     def get_parser(self, prog_name):
-        parser = super(ListContainer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "--prefix",
             metavar="<prefix>",
@@ -184,7 +184,7 @@ class SaveContainer(command.Command):
     _description = _("Save container contents locally")
 
     def get_parser(self, prog_name):
-        parser = super(SaveContainer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'container',
             metavar='<container>',
@@ -202,7 +202,7 @@ class SetContainer(command.Command):
     _description = _("Set container properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetContainer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'container',
             metavar='<container>',
@@ -231,7 +231,7 @@ class ShowContainer(command.ShowOne):
     _description = _("Display container details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowContainer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'container',
             metavar='<container>',
@@ -253,7 +253,7 @@ class UnsetContainer(command.Command):
     _description = _("Unset container properties")
 
     def get_parser(self, prog_name):
-        parser = super(UnsetContainer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'container',
             metavar='<container>',

openstackclient/object/v1/object.py

@@ -34,7 +34,7 @@ class CreateObject(command.Lister):
     _description = _("Upload object to container")
 
     def get_parser(self, prog_name):
-        parser = super(CreateObject, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'container',
             metavar='<container>',
@@ -99,7 +99,7 @@ class DeleteObject(command.Command):
     _description = _("Delete object from container")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteObject, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'container',
             metavar='<container>',
@@ -125,7 +125,7 @@ class ListObject(command.Lister):
     _description = _("List objects")
 
     def get_parser(self, prog_name):
-        parser = super(ListObject, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "container",
             metavar="<container>",
@@ -208,7 +208,7 @@ class SaveObject(command.Command):
     _description = _("Save object locally")
 
     def get_parser(self, prog_name):
-        parser = super(SaveObject, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             "--file",
             metavar="<filename>",
@@ -241,7 +241,7 @@ class SetObject(command.Command):
     _description = _("Set object properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetObject, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'container',
             metavar='<container>',
@@ -276,7 +276,7 @@ class ShowObject(command.ShowOne):
     _description = _("Display object details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowObject, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'container',
             metavar='<container>',
@@ -304,7 +304,7 @@ class UnsetObject(command.Command):
     _description = _("Unset object properties")
 
     def get_parser(self, prog_name):
-        parser = super(UnsetObject, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'container',
             metavar='<container>',

openstackclient/releasenotes/notes/volume-backup-created-at-list-b49ec893ae1f6b0d.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Listing volume backups now shows the created_at column.

openstackclient/shell.py

@@ -32,7 +32,7 @@ DEFAULT_DOMAIN = 'default'
 
 class OpenStackShell(shell.OpenStackShell):
     def __init__(self):
-        super(OpenStackShell, self).__init__(
+        super().__init__(
             description=__doc__.strip(),
             version=openstackclient.__version__,
             command_manager=commandmanager.CommandManager('openstack.cli'),
@@ -49,15 +49,13 @@ class OpenStackShell(shell.OpenStackShell):
         warnings.filterwarnings('ignore', module='openstack')
 
     def build_option_parser(self, description, version):
-        parser = super(OpenStackShell, self).build_option_parser(
-            description, version
-        )
+        parser = super().build_option_parser(description, version)
         parser = clientmanager.build_plugin_option_parser(parser)
         parser = auth.build_auth_plugins_option_parser(parser)
         return parser
 
     def _final_defaults(self):
-        super(OpenStackShell, self)._final_defaults()
+        super()._final_defaults()
 
         # Set the default plugin to admin_token if endpoint and token are given
         if self.options.endpoint and self.options.token:
@@ -132,7 +130,7 @@ class OpenStackShell(shell.OpenStackShell):
         self.command_manager.add_command_group('openstack.extension')
 
     def initialize_app(self, argv):
-        super(OpenStackShell, self).initialize_app(argv)
+        super().initialize_app(argv)
 
         # Re-create the client_manager with our subclass
         self.client_manager = clientmanager.ClientManager(

openstackclient/tests/functional/base.py

@@ -137,7 +137,7 @@ class TestCase(testtools.TestCase):
 
     @classmethod
     def get_opts(cls, fields, output_format='value'):
-        return ' -f {0} {1}'.format(
+        return ' -f {} {}'.format(
             output_format, ' '.join(['-c ' + it for it in fields])
         )
 

openstackclient/tests/functional/common/test_extension.py

@@ -23,7 +23,7 @@ class ExtensionTests(base.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        super(ExtensionTests, cls).setUpClass()
+        super().setUpClass()
         cls.haz_network = cls.is_service_enabled('network')
 
     def test_extension_list_compute(self):

openstackclient/tests/functional/common/test_help.py

@@ -60,12 +60,12 @@ class HelpTests(base.TestCase):
         """Check server commands in main help message."""
         raw_output = self.openstack('help')
         for command, description in self.SERVER_COMMANDS:
-            msg = 'Command: %s not found in help output:\n%s' % (
+            msg = 'Command: {} not found in help output:\n{}'.format(
                 command,
                 raw_output,
             )
             self.assertIn(command, raw_output, msg)
-            msg = 'Description: %s not found in help output:\n%s' % (
+            msg = 'Description: {} not found in help output:\n{}'.format(
                 description,
                 raw_output,
             )

openstackclient/tests/functional/common/test_module.py

@@ -18,7 +18,7 @@ from openstackclient.tests.functional import base
 class ModuleTest(base.TestCase):
     """Functional tests for openstackclient module list output."""
 
-    CLIENTS = ['openstackclient', 'keystoneclient', 'novaclient', 'openstack']
+    CLIENTS = ['openstackclient', 'keystoneclient', 'openstack']
 
     LIBS = ['osc_lib', 'keystoneauth1']