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

openstackclient/tests/unit/volume/v2/test_volume_type.py

@@ -15,7 +15,6 @@
 from unittest import mock
 from unittest.mock import call
 
-from cinderclient import api_versions
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 from osc_lib import utils
@@ -41,7 +40,7 @@ class TestType(volume_fakes.TestVolume):
         )
         self.volume_encryption_types_mock.reset_mock()
 
-        self.projects_mock = self.app.client_manager.identity.projects
+        self.projects_mock = self.identity_client.projects
         self.projects_mock.reset_mock()
 
 
@@ -333,7 +332,7 @@ class TestTypeList(TestType):
         "Name",
         "Is Public",
     ]
-    columns_long = columns + ["Description", "Properties"]
+    columns_long = columns + ["Description"]
     data_with_default_type = [(volume_types[0].id, volume_types[0].name, True)]
     data = []
     for t in volume_types:
@@ -352,7 +351,6 @@ class TestTypeList(TestType):
                 t.name,
                 t.is_public,
                 t.description,
-                format_columns.DictColumn(t.extra_specs),
             )
         )
 
@@ -374,9 +372,7 @@ class TestTypeList(TestType):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
-        self.volume_types_mock.list.assert_called_once_with(
-            search_opts={}, is_public=None
-        )
+        self.volume_types_mock.list.assert_called_once_with(is_public=None)
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, list(data))
 
@@ -393,9 +389,7 @@ class TestTypeList(TestType):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
-        self.volume_types_mock.list.assert_called_once_with(
-            search_opts={}, is_public=True
-        )
+        self.volume_types_mock.list.assert_called_once_with(is_public=True)
         self.assertEqual(self.columns_long, columns)
         self.assertCountEqual(self.data_long, list(data))
 
@@ -411,9 +405,7 @@ class TestTypeList(TestType):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
-        self.volume_types_mock.list.assert_called_once_with(
-            search_opts={}, is_public=False
-        )
+        self.volume_types_mock.list.assert_called_once_with(is_public=False)
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, list(data))
 
@@ -434,77 +426,6 @@ class TestTypeList(TestType):
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data_with_default_type, list(data))
 
-    def test_type_list_with_properties(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.52'
-        )
-
-        arglist = [
-            "--property",
-            "foo=bar",
-            "--multiattach",
-            "--cacheable",
-            "--replicated",
-            "--availability-zone",
-            "az1",
-        ]
-        verifylist = [
-            ("encryption_type", False),
-            ("long", False),
-            ("is_public", None),
-            ("default", False),
-            ("properties", {"foo": "bar"}),
-            ("multiattach", True),
-            ("cacheable", True),
-            ("replicated", True),
-            ("availability_zones", ["az1"]),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        columns, data = self.cmd.take_action(parsed_args)
-        self.volume_types_mock.list.assert_called_once_with(
-            search_opts={
-                "extra_specs": {
-                    "foo": "bar",
-                    "multiattach": "<is> True",
-                    "cacheable": "<is> True",
-                    "replication_enabled": "<is> True",
-                    "RESKEY:availability_zones": "az1",
-                }
-            },
-            is_public=None,
-        )
-        self.assertEqual(self.columns, columns)
-        self.assertCountEqual(self.data, list(data))
-
-    def test_type_list_with_properties_pre_v352(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.51'
-        )
-
-        arglist = [
-            "--property",
-            "foo=bar",
-        ]
-        verifylist = [
-            ("encryption_type", False),
-            ("long", False),
-            ("is_public", None),
-            ("default", False),
-            ("properties", {"foo": "bar"}),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        exc = self.assertRaises(
-            exceptions.CommandError,
-            self.cmd.take_action,
-            parsed_args,
-        )
-        self.assertIn(
-            '--os-volume-api-version 3.52 or greater is required',
-            str(exc),
-        )
-
     def test_type_list_with_encryption(self):
         encryption_type = volume_fakes.create_one_encryption_volume_type(
             attrs={'volume_type_id': self.volume_types[0].id},
@@ -550,9 +471,7 @@ class TestTypeList(TestType):
 
         columns, data = self.cmd.take_action(parsed_args)
         self.volume_encryption_types_mock.list.assert_called_once_with()
-        self.volume_types_mock.list.assert_called_once_with(
-            search_opts={}, is_public=None
-        )
+        self.volume_types_mock.list.assert_called_once_with(is_public=None)
         self.assertEqual(encryption_columns, columns)
         self.assertCountEqual(encryption_data, list(data))