x/cloudcafe
Code Issues Proposed changes

Added default volume type dataset

Browse Source 
* Creates dataset for configured default volume type

Change-Id: I653d89454027379a3cea61472dbc5c10dcb2d975
This commit is contained in:
Jose Idar
2014-09-30 17:39:17 -05:00
parent 71fbeb4742
commit c10d231ff5
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
cloudcafe/blockstorage/datasets.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
from cafe.drivers.unittest.datasets import DatasetList
from cafe.drivers.unittest.datasets import DatasetList, _Dataset
from cafe.drivers.unittest.decorators import memoized
from cloudcafe.common.datasets import ModelBasedDatasetToolkit
@@ -34,6 +34,30 @@ class BlockstorageDatasets(ModelBasedDatasetToolkit):
return cls._get_model_list(
cls._volumes.client.list_all_volume_types, 'volume_types')
@classmethod
def default_volume_type_model(cls):
default_volume_type = None
for vtype in cls._get_volume_types():
if (vtype.id_ == cls._volumes.config.default_volume_type
or vtype.name == cls._volumes.config.default_volume_type):
return vtype
raise Exception("Unable to get configured default volume type")
@classmethod
def default_volume_type(cls):
vol_type = cls.default_volume_type_model()
dataset = _Dataset(
name=vol_type.name,
data_dict={
'volume_type_name': vol_type.name,
'volume_type_id': vol_type.id_})
dataset_list = DatasetList()
dataset_list.append(dataset)
return dataset_list
@classmethod
@memoized
def volume_types(
@@ -66,8 +90,8 @@ class BlockstorageDatasets(ModelBasedDatasetToolkit):
pre-configured image and volume_type filters.
"""
volume_type_filter = cls.volumes.config.volume_type_filter
volume_type_filter_mode = cls.volumes.config.volume_type_filter_mode
volume_type_filter = cls._volumes.config.volume_type_filter
volume_type_filter_mode = cls._volumes.config.volume_type_filter_mode
return cls.volume_types(
max_datasets=max_datasets, randomize=randomize,
model_filter=volume_type_filter,