Merge "volume: Migrate 'volume type *' to SDK"

Author: Zuul

openstackclient/tests/functional/volume/v3/test_volume_type.py

@@ -138,6 +138,7 @@ def test_multi_delete(self):
     def test_encryption_type(self):
         name = uuid.uuid4().hex
         encryption_type = uuid.uuid4().hex
+
         # test create new encryption type
         cmd_output = self.openstack(
             'volume type create '
@@ -155,6 +156,7 @@ def test_encryption_type(self):
         }
         for attr, value in expected.items():
             self.assertEqual(value, cmd_output['encryption'][attr])
+
         # test show encryption type
         cmd_output = self.openstack(
             'volume type show --encryption-type ' + encryption_type,
@@ -168,6 +170,7 @@ def test_encryption_type(self):
         }
         for attr, value in expected.items():
             self.assertEqual(value, cmd_output['encryption'][attr])
+
         # test list encryption type
         cmd_output = self.openstack(
             'volume type list --encryption-type',
@@ -184,6 +187,7 @@ def test_encryption_type(self):
         }
         for attr, value in expected.items():
             self.assertEqual(value, encryption_output[attr])
+
         # test set existing encryption type
         raw_output = self.openstack(
             'volume type set '
@@ -203,6 +207,7 @@ def test_encryption_type(self):
         }
         for attr, value in expected.items():
             self.assertEqual(value, cmd_output['encryption'][attr])
+
         # test set new encryption type
         cmd_output = self.openstack(
             'volume type create --private ' + name,
@@ -235,6 +240,7 @@ def test_encryption_type(self):
         }
         for attr, value in expected.items():
             self.assertEqual(value, cmd_output['encryption'][attr])
+
         # test unset encryption type
         raw_output = self.openstack(
             'volume type unset --encryption-type ' + name
@@ -245,6 +251,7 @@ def test_encryption_type(self):
             parse_output=True,
         )
         self.assertEqual({}, cmd_output['encryption'])
+
         # test delete encryption type
         raw_output = self.openstack('volume type delete ' + encryption_type)
         self.assertEqual('', raw_output)

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

@@ -50,14 +50,8 @@ def __init__(self, **kwargs):
         self.services.resource_class = fakes.FakeResource(None, {})
         self.transfers = mock.Mock()
         self.transfers.resource_class = fakes.FakeResource(None, {})
-        self.volume_encryption_types = mock.Mock()
-        self.volume_encryption_types.resource_class = fakes.FakeResource(
-            None, {}
-        )
         self.volume_snapshots = mock.Mock()
         self.volume_snapshots.resource_class = fakes.FakeResource(None, {})
-        self.volume_type_access = mock.Mock()
-        self.volume_type_access.resource_class = fakes.FakeResource(None, {})
         self.volume_types = mock.Mock()
         self.volume_types.resource_class = fakes.FakeResource(None, {})
         self.volumes = mock.Mock()
@@ -179,31 +173,6 @@ def get_transfers(transfers=None, count=2):
     return mock.Mock(side_effect=transfers)
 
 
-def create_one_type_access(attrs=None):
-    """Create a fake volume type access for project.
-
-    :param dict attrs:
-        A dictionary with all attributes
-    :return:
-        A FakeResource object, with  Volume_type_ID and Project_ID.
-    """
-    if attrs is None:
-        attrs = {}
-
-    # Set default attributes.
-    type_access_attrs = {
-        'volume_type_id': 'volume-type-id-' + uuid.uuid4().hex,
-        'project_id': 'project-id-' + uuid.uuid4().hex,
-    }
-
-    # Overwrite default attributes.
-    type_access_attrs.update(attrs)
-
-    type_access = fakes.FakeResource(None, type_access_attrs, loaded=True)
-
-    return type_access
-
-
 def create_one_service(attrs=None):
     """Create a fake service.
 
@@ -788,69 +757,3 @@ def create_one_volume_type(attrs=None, methods=None):
         info=copy.deepcopy(volume_type_info), methods=methods, loaded=True
     )
     return volume_type
-
-
-def create_volume_types(attrs=None, count=2):
-    """Create multiple fake volume_types.
-
-    :param dict attrs:
-        A dictionary with all attributes
-    :param int count:
-        The number of types to fake
-    :return:
-        A list of FakeResource objects faking the types
-    """
-    volume_types = []
-    for i in range(0, count):
-        volume_type = create_one_volume_type(attrs)
-        volume_types.append(volume_type)
-
-    return volume_types
-
-
-def get_volume_types(volume_types=None, count=2):
-    """Get an iterable MagicMock object with a list of faked volume types.
-
-    If volume_types list is provided, then initialize the Mock object with
-    the list. Otherwise create one.
-
-    :param List volume_types:
-        A list of FakeResource objects faking volume types
-    :param Integer count:
-        The number of volume types to be faked
-    :return
-        An iterable Mock object with side_effect set to a list of faked
-        volume types
-    """
-    if volume_types is None:
-        volume_types = create_volume_types(count)
-
-    return mock.Mock(side_effect=volume_types)
-
-
-def create_one_encryption_volume_type(attrs=None):
-    """Create a fake encryption volume type.
-
-    :param dict attrs:
-        A dictionary with all attributes
-    :return:
-        A FakeResource object with volume_type_id etc.
-    """
-    attrs = attrs or {}
-
-    # Set default attributes.
-    encryption_info = {
-        "volume_type_id": 'type-id-' + uuid.uuid4().hex,
-        'provider': 'LuksEncryptor',
-        'cipher': None,
-        'key_size': None,
-        'control_location': 'front-end',
-    }
-
-    # Overwrite default attributes.
-    encryption_info.update(attrs)
-
-    encryption_type = fakes.FakeResource(
-        info=copy.deepcopy(encryption_info), loaded=True
-    )
-    return encryption_type