9137cc304d
This required https://review.openstack.org/26323 in keystoneclient, merged long ago... Also adds some tests for 'volume create' Change-Id: I55bededbc20b5dcf2833c59eb2b6b069703d8a9a
270 lines
8.4 KiB
Python
270 lines
8.4 KiB
Python
# Copyright 2013 Nebula Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
|
|
import copy
|
|
|
|
from openstackclient.tests import fakes
|
|
from openstackclient.tests.identity.v2_0 import fakes as identity_fakes
|
|
from openstackclient.tests.volume.v1 import fakes as volume_fakes
|
|
from openstackclient.tests.volume.v1 import test_volume
|
|
from openstackclient.volume.v1 import volume
|
|
|
|
|
|
class TestVolume(test_volume.TestVolumev1):
|
|
|
|
def setUp(self):
|
|
super(TestVolume, self).setUp()
|
|
|
|
# Get a shortcut to the VolumeManager Mock
|
|
self.volumes_mock = self.app.client_manager.volume.volumes
|
|
self.volumes_mock.reset_mock()
|
|
|
|
# Get a shortcut to the TenantManager Mock
|
|
self.projects_mock = self.app.client_manager.identity.tenants
|
|
self.projects_mock.reset_mock()
|
|
|
|
# Get a shortcut to the UserManager Mock
|
|
self.users_mock = self.app.client_manager.identity.users
|
|
self.users_mock.reset_mock()
|
|
|
|
|
|
# TODO(dtroyer): The volume create tests are incomplete, only the minimal
|
|
# options and the options that require additional processing
|
|
# are implemented at this time.
|
|
|
|
class TestVolumeCreate(TestVolume):
|
|
|
|
def setUp(self):
|
|
super(TestVolumeCreate, self).setUp()
|
|
|
|
self.volumes_mock.create.return_value = fakes.FakeResource(
|
|
None,
|
|
copy.deepcopy(volume_fakes.VOLUME),
|
|
loaded=True,
|
|
)
|
|
|
|
# Get the command object to test
|
|
self.cmd = volume.CreateVolume(self.app, None)
|
|
|
|
def test_volume_create_min_options(self):
|
|
arglist = [
|
|
'--size', str(volume_fakes.volume_size),
|
|
volume_fakes.volume_name,
|
|
]
|
|
verifylist = [
|
|
('size', volume_fakes.volume_size),
|
|
('name', volume_fakes.volume_name),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# DisplayCommandBase.take_action() returns two tuples
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# Set expected values
|
|
#kwargs = {
|
|
# 'metadata': volume_fakes.volume_metadata,
|
|
#}
|
|
# VolumeManager.create(size, snapshot_id=, source_volid=,
|
|
# display_name=, display_description=,
|
|
# volume_type=, user_id=,
|
|
# project_id=, availability_zone=,
|
|
# metadata=, imageRef=)
|
|
self.volumes_mock.create.assert_called_with(
|
|
volume_fakes.volume_size,
|
|
None,
|
|
None,
|
|
volume_fakes.volume_name,
|
|
None,
|
|
None,
|
|
None,
|
|
None,
|
|
None,
|
|
None,
|
|
None,
|
|
)
|
|
|
|
collist = (
|
|
'attach_status',
|
|
'display_description',
|
|
'display_name',
|
|
'id',
|
|
'properties',
|
|
'size',
|
|
'status',
|
|
)
|
|
self.assertEqual(columns, collist)
|
|
datalist = (
|
|
'detatched',
|
|
volume_fakes.volume_description,
|
|
volume_fakes.volume_name,
|
|
volume_fakes.volume_id,
|
|
'',
|
|
volume_fakes.volume_size,
|
|
'',
|
|
)
|
|
self.assertEqual(data, datalist)
|
|
|
|
def test_volume_create_user_project_id(self):
|
|
# Return a project
|
|
self.projects_mock.get.return_value = fakes.FakeResource(
|
|
None,
|
|
copy.deepcopy(identity_fakes.PROJECT),
|
|
loaded=True,
|
|
)
|
|
# Return a user
|
|
self.users_mock.get.return_value = fakes.FakeResource(
|
|
None,
|
|
copy.deepcopy(identity_fakes.USER),
|
|
loaded=True,
|
|
)
|
|
|
|
arglist = [
|
|
'--size', str(volume_fakes.volume_size),
|
|
'--project', identity_fakes.project_id,
|
|
'--user', identity_fakes.user_id,
|
|
volume_fakes.volume_name,
|
|
]
|
|
verifylist = [
|
|
('size', volume_fakes.volume_size),
|
|
('project', identity_fakes.project_id),
|
|
('user', identity_fakes.user_id),
|
|
('name', volume_fakes.volume_name),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# DisplayCommandBase.take_action() returns two tuples
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# Set expected values
|
|
#kwargs = {
|
|
# 'metadata': volume_fakes.volume_metadata,
|
|
#}
|
|
# VolumeManager.create(size, snapshot_id=, source_volid=,
|
|
# display_name=, display_description=,
|
|
# volume_type=, user_id=,
|
|
# project_id=, availability_zone=,
|
|
# metadata=, imageRef=)
|
|
self.volumes_mock.create.assert_called_with(
|
|
volume_fakes.volume_size,
|
|
None,
|
|
None,
|
|
volume_fakes.volume_name,
|
|
#volume_fakes.volume_description,
|
|
None,
|
|
None,
|
|
identity_fakes.user_id,
|
|
identity_fakes.project_id,
|
|
None,
|
|
None,
|
|
None,
|
|
)
|
|
|
|
collist = (
|
|
'attach_status',
|
|
'display_description',
|
|
'display_name',
|
|
'id',
|
|
'properties',
|
|
'size',
|
|
'status',
|
|
)
|
|
self.assertEqual(columns, collist)
|
|
datalist = (
|
|
'detatched',
|
|
volume_fakes.volume_description,
|
|
volume_fakes.volume_name,
|
|
volume_fakes.volume_id,
|
|
'',
|
|
volume_fakes.volume_size,
|
|
'',
|
|
)
|
|
self.assertEqual(data, datalist)
|
|
|
|
def test_volume_create_user_project_name(self):
|
|
# Return a project
|
|
self.projects_mock.get.return_value = fakes.FakeResource(
|
|
None,
|
|
copy.deepcopy(identity_fakes.PROJECT),
|
|
loaded=True,
|
|
)
|
|
# Return a user
|
|
self.users_mock.get.return_value = fakes.FakeResource(
|
|
None,
|
|
copy.deepcopy(identity_fakes.USER),
|
|
loaded=True,
|
|
)
|
|
|
|
arglist = [
|
|
'--size', str(volume_fakes.volume_size),
|
|
'--project', identity_fakes.project_name,
|
|
'--user', identity_fakes.user_name,
|
|
volume_fakes.volume_name,
|
|
]
|
|
verifylist = [
|
|
('size', volume_fakes.volume_size),
|
|
('project', identity_fakes.project_name),
|
|
('user', identity_fakes.user_name),
|
|
('name', volume_fakes.volume_name),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# DisplayCommandBase.take_action() returns two tuples
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# Set expected values
|
|
#kwargs = {
|
|
# 'metadata': volume_fakes.volume_metadata,
|
|
#}
|
|
# VolumeManager.create(size, snapshot_id=, source_volid=,
|
|
# display_name=, display_description=,
|
|
# volume_type=, user_id=,
|
|
# project_id=, availability_zone=,
|
|
# metadata=, imageRef=)
|
|
self.volumes_mock.create.assert_called_with(
|
|
volume_fakes.volume_size,
|
|
None,
|
|
None,
|
|
volume_fakes.volume_name,
|
|
#volume_fakes.volume_description,
|
|
None,
|
|
None,
|
|
identity_fakes.user_id,
|
|
identity_fakes.project_id,
|
|
None,
|
|
None,
|
|
None,
|
|
)
|
|
|
|
collist = (
|
|
'attach_status',
|
|
'display_description',
|
|
'display_name',
|
|
'id',
|
|
'properties',
|
|
'size',
|
|
'status',
|
|
)
|
|
self.assertEqual(columns, collist)
|
|
datalist = (
|
|
'detatched',
|
|
volume_fakes.volume_description,
|
|
volume_fakes.volume_name,
|
|
volume_fakes.volume_id,
|
|
'',
|
|
volume_fakes.volume_size,
|
|
'',
|
|
)
|
|
self.assertEqual(data, datalist)
|