Closing keystone sessions after done with them.
[snaps.git] / snaps / openstack / create_volume_type.py
index a60bb1e..9a45561 100644 (file)
 
 import logging
 
-import enum
 from cinderclient.exceptions import NotFound
-from neutronclient.common.utils import str2bool
 
+from snaps.config.volume_type import (
+    VolumeTypeConfig,  VolumeTypeEncryptionConfig)
 from snaps.openstack.openstack_creator import OpenStackVolumeObject
 from snaps.openstack.utils import cinder_utils
 
@@ -56,7 +56,7 @@ class OpenStackVolumeType(OpenStackVolumeObject):
 
         return self.__volume_type
 
-    def create(self, block=False):
+    def create(self):
         """
         Creates the volume in OpenStack if it does not already exist and
         returns the domain Volume object
@@ -87,6 +87,8 @@ class OpenStackVolumeType(OpenStackVolumeObject):
 
         self.__volume_type = None
 
+        super(self.__class__, self).clean()
+
     def get_volume_type(self):
         """
         Returns the domain Volume object as it was populated when create() was
@@ -96,134 +98,32 @@ class OpenStackVolumeType(OpenStackVolumeObject):
         return self.__volume_type
 
 
-class VolumeTypeSettings:
-    def __init__(self, **kwargs):
-        """
-        Constructor
-        :param name: the volume's name (required)
-        :param description: the volume's name (optional)
-        :param encryption: VolumeTypeEncryptionSettings (optional)
-        :param qos_spec_name: name of the QoS Spec to associate (optional)
-        :param public: When True, an image will be created with public
-                       visibility (default - False)
-
-        TODO - Implement project_access parameter that will associate this
-        VolumeType to a list of project names
-        """
-
-        self.name = kwargs.get('name')
-        self.description = kwargs.get('description')
-        self.qos_spec_name = kwargs.get('qos_spec_name')
-
-        if 'encryption' in kwargs:
-            if isinstance(kwargs['encryption'], dict):
-                self.encryption = VolumeTypeEncryptionSettings(
-                    **kwargs['encryption'])
-            elif isinstance(kwargs['encryption'],
-                            VolumeTypeEncryptionSettings):
-                self.encryption = kwargs['encryption']
-        else:
-            self.encryption = None
-
-        if 'public' in kwargs:
-            if isinstance(kwargs['public'], str):
-                self.public = str2bool(kwargs['public'])
-            else:
-                self.public = kwargs['public']
-        else:
-            self.public = False
-
-        if not self.name:
-            raise VolumeTypeSettingsError("The attribute name is required")
-
-    def __eq__(self, other):
-        return (self.name == other.name
-                and self.description == other.description
-                and self.qos_spec_name == other.qos_spec_name
-                and self.encryption == other.encryption
-                and self.public == other.public)
-
-
-class ControlLocation(enum.Enum):
+class VolumeTypeSettings(VolumeTypeConfig):
     """
-    QoS Specification consumer types
+    Class to hold the configuration settings required for creating OpenStack
+    Volume Type objects
+    deprecated
     """
-    front_end = 'front-end'
-    back_end = 'back-end'
 
-
-class VolumeTypeEncryptionSettings:
     def __init__(self, **kwargs):
-        """
-        Constructor
-        :param name: the volume's name (required)
-        :param provider_class: the volume's provider class (e.g. LuksEncryptor)
-        :param control_location: the notional service where encryption is
-                                 performed (e.g., front-end=Nova). The default
-                                 value is 'front-end.'
-        :param cipher: the encryption algorithm/mode to use
-                       (e.g., aes-xts-plain64). If the field is left empty,
-                       the provider default will be used
-        :param key_size: the size of the encryption key, in bits
-                         (e.g., 128, 256). If the field is left empty, the
-                         provider default will be used
-        """
+        from warnings import warn
+        warn('Use snaps.config.volume_type.VolumeTypeConfig instead',
+             DeprecationWarning)
+        super(self.__class__, self).__init__(**kwargs)
 
-        self.name = kwargs.get('name')
-        self.provider_class = kwargs.get('provider_class')
-        self.control_location = kwargs.get('control_location')
-        if kwargs.get('control_location'):
-            self.control_location = map_control_location(
-                kwargs['control_location'])
-        else:
-            self.control_location = None
-
-        self.cipher = kwargs.get('cipher')
-        self.key_size = kwargs.get('key_size')
-
-        if (not self.name or not self.provider_class
-                or not self.control_location):
-            raise VolumeTypeSettingsError(
-                'The attributes name, provider_class, and control_location '
-                'are required')
-
-    def __eq__(self, other):
-        return (self.name == other.name
-                and self.provider_class == other.provider_class
-                and self.control_location == other.control_location
-                and self.cipher == other.cipher
-                and self.key_size == other.key_size)
-
-
-def map_control_location(control_location):
-    """
-    Takes a the protocol value maps it to the Consumer enum. When None return
-    None
-    :param control_location: the value to map to the Enum
-    :return: a ControlLocation enum object
-    :raise: Exception if control_location parameter is invalid
-    """
-    if not control_location:
-        return None
-    elif isinstance(control_location, ControlLocation):
-        return control_location
-    else:
-        proto_str = str(control_location)
-        if proto_str == 'front-end':
-            return ControlLocation.front_end
-        elif proto_str == 'back-end':
-            return ControlLocation.back_end
-        else:
-            raise VolumeTypeSettingsError('Invalid Consumer - ' + proto_str)
-
-
-class VolumeTypeSettingsError(Exception):
+
+class VolumeTypeEncryptionSettings(VolumeTypeEncryptionConfig):
     """
-    Exception to be thrown when an volume settings are incorrect
+    Class to hold the configuration settings required for creating OpenStack
+    Volume Type Encryption objects
+    deprecated
     """
 
-    def __init__(self, message):
-        Exception.__init__(self, message)
+    def __init__(self, **kwargs):
+        from warnings import warn
+        warn('Use snaps.config.volume_type.VolumeTypeEncryptionConfig instead',
+             DeprecationWarning)
+        super(self.__class__, self).__init__(**kwargs)
 
 
 class VolumeTypeCreationError(Exception):