python-openstackclient 6.3.0__py3-none-any.whl → 6.5.0__py3-none-any.whl

openstackclient/tests/unit/volume/v3/test_volume_message.py

@@ -27,7 +27,7 @@ class TestVolumeMessage(volume_fakes.TestVolume):
         self.projects_mock = self.app.client_manager.identity.projects
         self.projects_mock.reset_mock()
 
-        self.volume_messages_mock = self.app.client_manager.volume.messages
+        self.volume_messages_mock = self.volume_client.messages
         self.volume_messages_mock.reset_mock()
 
 
@@ -46,9 +46,7 @@ class TestVolumeMessageDelete(TestVolumeMessage):
         self.cmd = volume_message.DeleteMessage(self.app, None)
 
     def test_message_delete(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.3'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.3')
 
         arglist = [
             self.fake_messages[0].id,
@@ -66,9 +64,7 @@ class TestVolumeMessageDelete(TestVolumeMessage):
         self.assertIsNone(result)
 
     def test_message_delete_multiple_messages(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.3'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.3')
 
         arglist = [
             self.fake_messages[0].id,
@@ -88,9 +84,7 @@ class TestVolumeMessageDelete(TestVolumeMessage):
         self.assertIsNone(result)
 
     def test_message_delete_multiple_messages_with_exception(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.3'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.3')
 
         arglist = [
             self.fake_messages[0].id,
@@ -120,9 +114,7 @@ class TestVolumeMessageDelete(TestVolumeMessage):
         self.assertEqual(2, self.volume_messages_mock.delete.call_count)
 
     def test_message_delete_pre_v33(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.2'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.2')
 
         arglist = [
             self.fake_messages[0].id,
@@ -180,9 +172,7 @@ class TestVolumeMessageList(TestVolumeMessage):
         self.cmd = volume_message.ListMessages(self.app, None)
 
     def test_message_list(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.3'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.3')
 
         arglist = []
         verifylist = [
@@ -206,9 +196,7 @@ class TestVolumeMessageList(TestVolumeMessage):
         self.assertCountEqual(self.data, list(data))
 
     def test_message_list_with_options(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.3'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.3')
 
         arglist = [
             '--project',
@@ -239,9 +227,7 @@ class TestVolumeMessageList(TestVolumeMessage):
         self.assertCountEqual(self.data, list(data))
 
     def test_message_list_pre_v33(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.2'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.2')
 
         arglist = []
         verifylist = [
@@ -294,9 +280,7 @@ class TestVolumeMessageShow(TestVolumeMessage):
         self.cmd = volume_message.ShowMessage(self.app, None)
 
     def test_message_show(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.3'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.3')
 
         arglist = [self.fake_message.id]
         verifylist = [('message_id', self.fake_message.id)]
@@ -309,9 +293,7 @@ class TestVolumeMessageShow(TestVolumeMessage):
         self.assertEqual(self.data, data)
 
     def test_message_show_pre_v33(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.2'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.2')
 
         arglist = [self.fake_message.id]
         verifylist = [('message_id', self.fake_message.id)]

openstackclient/volume/v1/volume.py

@@ -26,6 +26,7 @@ from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 
+from openstackclient.common import pagination
 from openstackclient.i18n import _
 
 
@@ -372,20 +373,7 @@ class ListVolume(command.Lister):
             default=False,
             help=_('List additional fields in output'),
         )
-        parser.add_argument(
-            '--offset',
-            type=int,
-            action=parseractions.NonNegativeAction,
-            metavar='<offset>',
-            help=_('Index from which to start listing volumes'),
-        )
-        parser.add_argument(
-            '--limit',
-            type=int,
-            action=parseractions.NonNegativeAction,
-            metavar='<num-volumes>',
-            help=_('Maximum number of volumes to display'),
-        )
+        pagination.add_offset_pagination_option_to_parser(parser)
         return parser
 
     def take_action(self, parsed_args):

openstackclient/volume/v2/volume.py

@@ -26,6 +26,7 @@ from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 
+from openstackclient.common import pagination
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 
@@ -33,6 +34,29 @@ from openstackclient.identity import common as identity_common
 LOG = logging.getLogger(__name__)
 
 
+class KeyValueHintAction(argparse.Action):
+    """Uses KeyValueAction or KeyValueAppendAction based on the given key"""
+
+    APPEND_KEYS = ('same_host', 'different_host')
+
+    def __init__(self, *args, **kwargs):
+        self._key_value_action = parseractions.KeyValueAction(*args, **kwargs)
+        self._key_value_append_action = parseractions.KeyValueAppendAction(
+            *args, **kwargs
+        )
+        super().__init__(*args, **kwargs)
+
+    def __call__(self, parser, namespace, values, option_string=None):
+        if values.startswith(self.APPEND_KEYS):
+            self._key_value_append_action(
+                parser, namespace, values, option_string=option_string
+            )
+        else:
+            self._key_value_action(
+                parser, namespace, values, option_string=option_string
+            )
+
+
 class AttachmentsColumn(cliff_columns.FormattableColumn):
     """Formattable column for attachments column.
 
@@ -162,10 +186,12 @@ class CreateVolume(command.ShowOne):
         parser.add_argument(
             "--hint",
             metavar="<key=value>",
-            action=parseractions.KeyValueAction,
+            action=KeyValueHintAction,
             help=_(
-                "Arbitrary scheduler hint key-value pairs to help boot "
-                "an instance (repeat option to set multiple hints)"
+                "Arbitrary scheduler hint key-value pairs to help creating "
+                "a volume. Repeat the option to set multiple hints. "
+                "'same_host' and 'different_host' get values appended when "
+                "repeated, all other keys take the last given value"
             ),
         )
         bootable_group = parser.add_mutually_exclusive_group()
@@ -431,18 +457,7 @@ class ListVolume(command.Lister):
             default=False,
             help=_('List additional fields in output'),
         )
-        parser.add_argument(
-            '--marker',
-            metavar='<volume>',
-            help=_('The last volume ID of the previous page'),
-        )
-        parser.add_argument(
-            '--limit',
-            type=int,
-            action=parseractions.NonNegativeAction,
-            metavar='<num-volumes>',
-            help=_('Maximum number of volumes to display'),
-        )
+        pagination.add_marker_pagination_option_to_parser(parser)
         return parser
 
     def take_action(self, parsed_args):

openstackclient/volume/v2/volume_backend.py

@@ -14,6 +14,7 @@
 
 """Storage backend action implementations"""
 
+from osc_lib.cli import format_columns
 from osc_lib.command import command
 from osc_lib import utils
 
@@ -33,7 +34,7 @@ class ShowCapability(command.Lister):
         return parser
 
     def take_action(self, parsed_args):
-        volume_client = self.app.client_manager.volume
+        volume_client = self.app.client_manager.sdk_connection.volume
 
         columns = [
             'Title',
@@ -42,7 +43,7 @@ class ShowCapability(command.Lister):
             'Description',
         ]
 
-        data = volume_client.capabilities.get(parsed_args.host)
+        data = volume_client.get_capabilities(parsed_args.host)
 
         # The get capabilities API is... interesting. We only want the names of
         # the capabilities that can set for a backend through extra specs, so
@@ -83,28 +84,17 @@ class ListPool(command.Lister):
         return parser
 
     def take_action(self, parsed_args):
-        volume_client = self.app.client_manager.volume
+        volume_client = self.app.client_manager.sdk_connection.volume
 
         if parsed_args.long:
             columns = [
                 'name',
-                'storage_protocol',
-                'thick_provisioning_support',
-                'thin_provisioning_support',
-                'total_volumes',
-                'total_capacity_gb',
-                'allocated_capacity_gb',
-                'max_over_subscription_ratio',
+                'capabilities',
             ]
+
             headers = [
                 'Name',
-                'Protocol',
-                'Thick',
-                'Thin',
-                'Volumes',
-                'Capacity',
-                'Allocated',
-                'Max Over Ratio',
+                'Capabilities',
             ]
         else:
             columns = [
@@ -112,13 +102,15 @@ class ListPool(command.Lister):
             ]
             headers = columns
 
-        data = volume_client.pools.list(detailed=parsed_args.long)
+        data = volume_client.backend_pools(detailed=parsed_args.long)
+        formatters = {'capabilities': format_columns.DictColumn}
         return (
             headers,
             (
                 utils.get_item_properties(
                     s,
                     columns,
+                    formatters=formatters,
                 )
                 for s in data
             ),

openstackclient/volume/v2/volume_backup.py

@@ -26,9 +26,9 @@ from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 
+from openstackclient.common import pagination
 from openstackclient.i18n import _
 
-
 LOG = logging.getLogger(__name__)
 
 
@@ -272,18 +272,7 @@ class ListVolumeBackup(command.Lister):
                 "Filters results by the volume which they backup (name or ID)"
             ),
         )
-        parser.add_argument(
-            '--marker',
-            metavar='<volume-backup>',
-            help=_('The last backup of the previous page (name or ID)'),
-        )
-        parser.add_argument(
-            '--limit',
-            type=int,
-            action=parseractions.NonNegativeAction,
-            metavar='<num-backups>',
-            help=_('Maximum number of backups to display'),
-        )
+        pagination.add_marker_pagination_option_to_parser(parser)
         parser.add_argument(
             '--all-projects',
             action='store_true',
@@ -309,8 +298,22 @@ class ListVolumeBackup(command.Lister):
     def take_action(self, parsed_args):
         volume_client = self.app.client_manager.sdk_connection.volume
 
-        columns = ('id', 'name', 'description', 'status', 'size')
-        column_headers = ('ID', 'Name', 'Description', 'Status', 'Size')
+        columns = (
+            'id',
+            'name',
+            'description',
+            'status',
+            'size',
+            'is_incremental',
+        )
+        column_headers = (
+            'ID',
+            'Name',
+            'Description',
+            'Status',
+            'Size',
+            'Incremental',
+        )
         if parsed_args.long:
             columns += ('availability_zone', 'volume_id', 'container')
             column_headers += ('Availability Zone', 'Volume', 'Container')

openstackclient/volume/v2/volume_snapshot.py

@@ -25,6 +25,7 @@ from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 
+from openstackclient.common import pagination
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 
@@ -228,18 +229,6 @@ class ListVolumeSnapshot(command.Lister):
             default=False,
             help=_('List additional fields in output'),
         )
-        parser.add_argument(
-            '--marker',
-            metavar='<volume-snapshot>',
-            help=_('The last snapshot ID of the previous page'),
-        )
-        parser.add_argument(
-            '--limit',
-            type=int,
-            action=parseractions.NonNegativeAction,
-            metavar='<num-snapshots>',
-            help=_('Maximum number of snapshots to display'),
-        )
         parser.add_argument(
             '--name',
             metavar='<name>',
@@ -268,6 +257,7 @@ class ListVolumeSnapshot(command.Lister):
             default=None,
             help=_('Filters results by a volume (name or ID).'),
         )
+        pagination.add_marker_pagination_option_to_parser(parser)
         return parser
 
     def take_action(self, parsed_args):