Add OSC commands for volume target
This patch adds the following commands for volume target. - openstack baremetal volume target create - openstack baremetal volume target show - openstack baremetal volume target list - openstack baremetal volume target delete - openstack baremetal volume target set - openstack baremetal volume target unset Change-Id: I55707f86d64cab6c6c702281823d7b0388e11747 Partial-Bug: 1526231
This commit is contained in:
Hironori Shiina
parent
26441c51f3
commit
15dc9cf958
|
|
@ -0,0 +1,412 @@
|
|||
# Copyright 2017 FUJITSU LIMITED
|
||||
#
|
||||
# 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 itertools
|
||||
import logging
|
||||
|
||||
from osc_lib.command import command
|
||||
from osc_lib import utils as oscutils
|
||||
|
||||
from ironicclient.common.i18n import _
|
||||
from ironicclient.common import utils
|
||||
from ironicclient import exc
|
||||
from ironicclient.v1 import resource_fields as res_fields
|
||||
|
||||
|
||||
class CreateBaremetalVolumeTarget(command.ShowOne):
|
||||
"""Create a new baremetal volume target."""
|
||||
|
||||
log = logging.getLogger(__name__ + ".CreateBaremetalVolumeTarget")
|
||||
|
||||
def get_parser(self, prog_name):
|
||||
parser = super(CreateBaremetalVolumeTarget, self).get_parser(prog_name)
|
||||
|
||||
parser.add_argument(
|
||||
'--node',
|
||||
dest='node_uuid',
|
||||
metavar='<node>',
|
||||
required=True,
|
||||
help=_('UUID of the node that this volume target belongs to.'))
|
||||
parser.add_argument(
|
||||
'--type',
|
||||
dest='volume_type',
|
||||
metavar="<volume type>",
|
||||
required=True,
|
||||
help=_("Type of the volume target, e.g. 'iscsi', 'fibre_channel', "
|
||||
"'rbd'."))
|
||||
parser.add_argument(
|
||||
'--property',
|
||||
dest='properties',
|
||||
metavar="<key=value>",
|
||||
action='append',
|
||||
help=_("Key/value property related to the type of this volume "
|
||||
"target. Can be specified multiple times."
|
||||
))
|
||||
parser.add_argument(
|
||||
'--boot-index',
|
||||
dest='boot_index',
|
||||
metavar="<boot index>",
|
||||
type=int,
|
||||
required=True,
|
||||
help=_("Boot index of the volume target."))
|
||||
parser.add_argument(
|
||||
'--volume-id',
|
||||
dest='volume_id',
|
||||
metavar="<volume id>",
|
||||
required=True,
|
||||
help=_("ID of the volume associated with this target."))
|
||||
parser.add_argument(
|
||||
'--uuid',
|
||||
dest='uuid',
|
||||
metavar='<uuid>',
|
||||
help=_("UUID of the volume target."))
|
||||
parser.add_argument(
|
||||
'--extra',
|
||||
dest='extra',
|
||||
metavar="<key=value>",
|
||||
action='append',
|
||||
help=_("Record arbitrary key/value metadata. "
|
||||
"Can be specified multiple times."))
|
||||
|
||||
return parser
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
self.log.debug("take_action(%s)" % parsed_args)
|
||||
baremetal_client = self.app.client_manager.baremetal
|
||||
|
||||
if parsed_args.boot_index < 0:
|
||||
raise exc.CommandError(
|
||||
_('Expected non-negative --boot-index, got %s') %
|
||||
parsed_args.boot_index)
|
||||
|
||||
field_list = ['extra', 'volume_type', 'properties',
|
||||
'boot_index', 'node_uuid', 'volume_id', 'uuid']
|
||||
fields = dict((k, v) for (k, v) in vars(parsed_args).items()
|
||||
if k in field_list and v is not None)
|
||||
fields = utils.args_array_to_dict(fields, 'properties')
|
||||
fields = utils.args_array_to_dict(fields, 'extra')
|
||||
volume_target = baremetal_client.volume_target.create(**fields)
|
||||
|
||||
data = dict([(f, getattr(volume_target, f, '')) for f in
|
||||
res_fields.VOLUME_TARGET_DETAILED_RESOURCE.fields])
|
||||
return self.dict2columns(data)
|
||||
|
||||
|
||||
class ShowBaremetalVolumeTarget(command.ShowOne):
|
||||
"""Show baremetal volume target details."""
|
||||
|
||||
log = logging.getLogger(__name__ + ".ShowBaremetalVolumeTarget")
|
||||
|
||||
def get_parser(self, prog_name):
|
||||
parser = super(ShowBaremetalVolumeTarget, self).get_parser(prog_name)
|
||||
|
||||
parser.add_argument(
|
||||
'volume_target',
|
||||
metavar='<id>',
|
||||
help=_("UUID of the volume target."))
|
||||
parser.add_argument(
|
||||
'--fields',
|
||||
nargs='+',
|
||||
dest='fields',
|
||||
metavar='<field>',
|
||||
action='append',
|
||||
default=[],
|
||||
choices=res_fields.VOLUME_TARGET_DETAILED_RESOURCE.fields,
|
||||
help=_("One or more volume target fields. Only these fields will "
|
||||
"be fetched from the server."))
|
||||
return parser
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
self.log.debug("take_action(%s)", parsed_args)
|
||||
|
||||
baremetal_client = self.app.client_manager.baremetal
|
||||
fields = list(itertools.chain.from_iterable(parsed_args.fields))
|
||||
fields = fields if fields else None
|
||||
|
||||
volume_target = baremetal_client.volume_target.get(
|
||||
parsed_args.volume_target, fields=fields)._info
|
||||
|
||||
volume_target.pop("links", None)
|
||||
return zip(*sorted(volume_target.items()))
|
||||
|
||||
|
||||
class ListBaremetalVolumeTarget(command.Lister):
|
||||
"""List baremetal volume targets."""
|
||||
|
||||
log = logging.getLogger(__name__ + ".ListBaremetalVolumeTarget")
|
||||
|
||||
def get_parser(self, prog_name):
|
||||
parser = super(ListBaremetalVolumeTarget, self).get_parser(prog_name)
|
||||
|
||||
parser.add_argument(
|
||||
'--node',
|
||||
dest='node',
|
||||
metavar='<node>',
|
||||
help=_("Only list volume targts of this node (name or UUID)."))
|
||||
parser.add_argument(
|
||||
'--limit',
|
||||
dest='limit',
|
||||
metavar='<limit>',
|
||||
type=int,
|
||||
help=_('Maximum number of volume targets to return per request, '
|
||||
'0 for no limit. Default is the maximum number used '
|
||||
'by the Baremetal API Service.'))
|
||||
parser.add_argument(
|
||||
'--marker',
|
||||
dest='marker',
|
||||
metavar='<volume target>',
|
||||
help=_('Volume target UUID (for example, of the last '
|
||||
'volume target in the list from a previous request). '
|
||||
'Returns the list of volume targets after this UUID.'))
|
||||
parser.add_argument(
|
||||
'--sort',
|
||||
dest='sort',
|
||||
metavar='<key>[:<direction>]',
|
||||
help=_('Sort output by specified volume target fields and '
|
||||
'directions (asc or desc) (default:asc). Multiple fields '
|
||||
'and directions can be specified, separated by comma.'))
|
||||
|
||||
display_group = parser.add_mutually_exclusive_group(required=False)
|
||||
display_group.add_argument(
|
||||
'--long',
|
||||
dest='detail',
|
||||
action='store_true',
|
||||
default=False,
|
||||
help=_("Show detailed information about volume targets."))
|
||||
display_group.add_argument(
|
||||
'--fields',
|
||||
nargs='+',
|
||||
dest='fields',
|
||||
metavar='<field>',
|
||||
action='append',
|
||||
default=[],
|
||||
choices=res_fields.VOLUME_TARGET_DETAILED_RESOURCE.fields,
|
||||
help=_("One or more volume target fields. Only these fields will "
|
||||
"be fetched from the server. Can not be used when "
|
||||
"'--long' is specified."))
|
||||
return parser
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
self.log.debug("take_action(%s)" % parsed_args)
|
||||
client = self.app.client_manager.baremetal
|
||||
|
||||
columns = res_fields.VOLUME_TARGET_RESOURCE.fields
|
||||
labels = res_fields.VOLUME_TARGET_RESOURCE.labels
|
||||
|
||||
params = {}
|
||||
if parsed_args.limit is not None and parsed_args.limit < 0:
|
||||
raise exc.CommandError(
|
||||
_('Expected non-negative --limit, got %s') %
|
||||
parsed_args.limit)
|
||||
params['limit'] = parsed_args.limit
|
||||
params['marker'] = parsed_args.marker
|
||||
if parsed_args.node is not None:
|
||||
params['node'] = parsed_args.node
|
||||
|
||||
if parsed_args.detail:
|
||||
params['detail'] = parsed_args.detail
|
||||
columns = res_fields.VOLUME_TARGET_DETAILED_RESOURCE.fields
|
||||
labels = res_fields.VOLUME_TARGET_DETAILED_RESOURCE.labels
|
||||
elif parsed_args.fields:
|
||||
params['detail'] = False
|
||||
fields = itertools.chain.from_iterable(parsed_args.fields)
|
||||
resource = res_fields.Resource(list(fields))
|
||||
columns = resource.fields
|
||||
labels = resource.labels
|
||||
params['fields'] = columns
|
||||
|
||||
self.log.debug("params(%s)" % params)
|
||||
data = client.volume_target.list(**params)
|
||||
|
||||
data = oscutils.sort_items(data, parsed_args.sort)
|
||||
|
||||
return (labels,
|
||||
(oscutils.get_item_properties(s, columns, formatters={
|
||||
'Properties': oscutils.format_dict},) for s in data))
|
||||
|
||||
|
||||
class DeleteBaremetalVolumeTarget(command.Command):
|
||||
"""Unregister baremetal volume target(s)."""
|
||||
|
||||
log = logging.getLogger(__name__ + ".DeleteBaremetalVolumeTarget")
|
||||
|
||||
def get_parser(self, prog_name):
|
||||
parser = (
|
||||
super(DeleteBaremetalVolumeTarget, self).get_parser(prog_name))
|
||||
parser.add_argument(
|
||||
'volume_targets',
|
||||
metavar='<volume target>',
|
||||
nargs='+',
|
||||
help=_("UUID(s) of the volume target(s) to delete."))
|
||||
|
||||
return parser
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
self.log.debug("take_action(%s)", parsed_args)
|
||||
|
||||
baremetal_client = self.app.client_manager.baremetal
|
||||
|
||||
failures = []
|
||||
for volume_target in parsed_args.volume_targets:
|
||||
try:
|
||||
baremetal_client.volume_target.delete(volume_target)
|
||||
print(_('Deleted volume target %s') % volume_target)
|
||||
except exc.ClientException as e:
|
||||
failures.append(_("Failed to delete volume target "
|
||||
"%(volume_target)s: %(error)s")
|
||||
% {'volume_target': volume_target,
|
||||
'error': e})
|
||||
|
||||
if failures:
|
||||
raise exc.ClientException("\n".join(failures))
|
||||
|
||||
|
||||
class SetBaremetalVolumeTarget(command.Command):
|
||||
"""Set baremetal volume target properties."""
|
||||
|
||||
log = logging.getLogger(__name__ + ".SetBaremetalVolumeTarget")
|
||||
|
||||
def get_parser(self, prog_name):
|
||||
parser = (
|
||||
super(SetBaremetalVolumeTarget, self).get_parser(prog_name))
|
||||
|
||||
parser.add_argument(
|
||||
'volume_target',
|
||||
metavar='<volume target>',
|
||||
help=_("UUID of the volume target."))
|
||||
parser.add_argument(
|
||||
'--node',
|
||||
dest='node_uuid',
|
||||
metavar='<node>',
|
||||
help=_('UUID of the node that this volume target belongs to.'))
|
||||
parser.add_argument(
|
||||
'--type',
|
||||
dest='volume_type',
|
||||
metavar="<volume type>",
|
||||
help=_("Type of the volume target, e.g. 'iscsi', 'fibre_channel', "
|
||||
"'rbd'."))
|
||||
parser.add_argument(
|
||||
'--property',
|
||||
dest='properties',
|
||||
metavar="<key=value>",
|
||||
action='append',
|
||||
help=_("Key/value property related to the type of this volume "
|
||||
"target. Can be specified multiple times."))
|
||||
parser.add_argument(
|
||||
'--boot-index',
|
||||
dest='boot_index',
|
||||
metavar="<boot index>",
|
||||
type=int,
|
||||
help=_("Boot index of the volume target."))
|
||||
parser.add_argument(
|
||||
'--volume-id',
|
||||
dest='volume_id',
|
||||
metavar="<volume id>",
|
||||
help=_("ID of the volume associated with this target."))
|
||||
parser.add_argument(
|
||||
'--extra',
|
||||
dest='extra',
|
||||
metavar="<key=value>",
|
||||
action='append',
|
||||
help=_("Record arbitrary key/value metadata. "
|
||||
"Can be specified multiple times."))
|
||||
|
||||
return parser
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
self.log.debug("take_action(%s)", parsed_args)
|
||||
|
||||
baremetal_client = self.app.client_manager.baremetal
|
||||
|
||||
if parsed_args.boot_index is not None and parsed_args.boot_index < 0:
|
||||
raise exc.CommandError(
|
||||
_('Expected non-negative --boot-index, got %s') %
|
||||
parsed_args.boot_index)
|
||||
|
||||
properties = []
|
||||
if parsed_args.node_uuid:
|
||||
properties.extend(utils.args_array_to_patch(
|
||||
'add', ["node_uuid=%s" % parsed_args.node_uuid]))
|
||||
if parsed_args.volume_type:
|
||||
properties.extend(utils.args_array_to_patch(
|
||||
'add', ["volume_type=%s" % parsed_args.volume_type]))
|
||||
if parsed_args.boot_index:
|
||||
properties.extend(utils.args_array_to_patch(
|
||||
'add', ["boot_index=%s" % parsed_args.boot_index]))
|
||||
if parsed_args.volume_id:
|
||||
properties.extend(utils.args_array_to_patch(
|
||||
'add', ["volume_id=%s" % parsed_args.volume_id]))
|
||||
|
||||
if parsed_args.properties:
|
||||
properties.extend(utils.args_array_to_patch(
|
||||
'add', ["properties/" + x for x in parsed_args.properties]))
|
||||
if parsed_args.extra:
|
||||
properties.extend(utils.args_array_to_patch(
|
||||
'add', ["extra/" + x for x in parsed_args.extra]))
|
||||
|
||||
if properties:
|
||||
baremetal_client.volume_target.update(
|
||||
parsed_args.volume_target, properties)
|
||||
else:
|
||||
self.log.warning("Please specify what to set.")
|
||||
|
||||
|
||||
class UnsetBaremetalVolumeTarget(command.Command):
|
||||
"""Unset baremetal volume target properties."""
|
||||
log = logging.getLogger(__name__ + "UnsetBaremetalVolumeTarget")
|
||||
|
||||
def get_parser(self, prog_name):
|
||||
parser = (
|
||||
super(UnsetBaremetalVolumeTarget, self).get_parser(prog_name))
|
||||
|
||||
parser.add_argument(
|
||||
'volume_target',
|
||||
metavar='<volume target>',
|
||||
help=_("UUID of the volume target."))
|
||||
parser.add_argument(
|
||||
'--extra',
|
||||
dest='extra',
|
||||
metavar="<key>",
|
||||
action='append',
|
||||
help=_('Extra to unset (repeat option to unset multiple extras)'))
|
||||
parser.add_argument(
|
||||
"--property",
|
||||
dest='properties',
|
||||
metavar="<key>",
|
||||
action='append',
|
||||
help='Property to unset on this baremetal volume target '
|
||||
'(repeat option to unset multiple properties).',
|
||||
)
|
||||
|
||||
return parser
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
self.log.debug("take_action(%s)", parsed_args)
|
||||
|
||||
baremetal_client = self.app.client_manager.baremetal
|
||||
|
||||
properties = []
|
||||
if parsed_args.extra:
|
||||
properties.extend(utils.args_array_to_patch('remove',
|
||||
['extra/' + x for x in parsed_args.extra]))
|
||||
if parsed_args.properties:
|
||||
properties.extend(utils.args_array_to_patch(
|
||||
'remove', ['properties/' + x for x in parsed_args.properties]))
|
||||
|
||||
if properties:
|
||||
baremetal_client.volume_target.update(
|
||||
parsed_args.volume_target, properties)
|
||||
else:
|
||||
self.log.warning("Please specify what to unset.")
|
||||
|
|
@ -146,6 +146,24 @@ VOLUME_CONNECTOR = {
|
|||
'extra': baremetal_volume_connector_extra,
|
||||
}
|
||||
|
||||
baremetal_volume_target_uuid = 'vvv-tttttt-vvvv'
|
||||
baremetal_volume_target_volume_type = 'iscsi'
|
||||
baremetal_volume_target_boot_index = 0
|
||||
baremetal_volume_target_volume_id = 'vvv-tttttt-iii'
|
||||
baremetal_volume_target_extra = {'key1': 'value1',
|
||||
'key2': 'value2'}
|
||||
baremetal_volume_target_properties = {'key11': 'value11',
|
||||
'key22': 'value22'}
|
||||
VOLUME_TARGET = {
|
||||
'uuid': baremetal_volume_target_uuid,
|
||||
'node_uuid': baremetal_uuid,
|
||||
'volume_type': baremetal_volume_target_volume_type,
|
||||
'boot_index': baremetal_volume_target_boot_index,
|
||||
'volume_id': baremetal_volume_target_volume_id,
|
||||
'extra': baremetal_volume_target_extra,
|
||||
'properties': baremetal_volume_target_properties,
|
||||
}
|
||||
|
||||
|
||||
class TestBaremetal(utils.TestCommand):
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,977 @@
|
|||
# Copyright 2017 FUJITSU LIMITED
|
||||
#
|
||||
# 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
|
||||
|
||||
import mock
|
||||
from osc_lib.tests import utils as osctestutils
|
||||
|
||||
from ironicclient import exc
|
||||
from ironicclient.osc.v1 import baremetal_volume_target as bm_vol_target
|
||||
from ironicclient.tests.unit.osc.v1 import fakes as baremetal_fakes
|
||||
|
||||
|
||||
class TestBaremetalVolumeTarget(baremetal_fakes.TestBaremetal):
|
||||
|
||||
def setUp(self):
|
||||
super(TestBaremetalVolumeTarget, self).setUp()
|
||||
|
||||
self.baremetal_mock = self.app.client_manager.baremetal
|
||||
self.baremetal_mock.reset_mock()
|
||||
|
||||
|
||||
class TestCreateBaremetalVolumeTarget(TestBaremetalVolumeTarget):
|
||||
|
||||
def setUp(self):
|
||||
super(TestCreateBaremetalVolumeTarget, self).setUp()
|
||||
|
||||
self.baremetal_mock.volume_target.create.return_value = (
|
||||
baremetal_fakes.FakeBaremetalResource(
|
||||
None,
|
||||
copy.deepcopy(baremetal_fakes.VOLUME_TARGET),
|
||||
loaded=True,
|
||||
))
|
||||
|
||||
# Get the command object to test
|
||||
self.cmd = (
|
||||
bm_vol_target.CreateBaremetalVolumeTarget(self.app, None))
|
||||
|
||||
def test_baremetal_volume_target_create(self):
|
||||
arglist = [
|
||||
'--node', baremetal_fakes.baremetal_uuid,
|
||||
'--type',
|
||||
baremetal_fakes.baremetal_volume_target_volume_type,
|
||||
'--boot-index',
|
||||
baremetal_fakes.baremetal_volume_target_boot_index,
|
||||
'--volume-id',
|
||||
baremetal_fakes.baremetal_volume_target_volume_id,
|
||||
'--uuid', baremetal_fakes.baremetal_volume_target_uuid,
|
||||
]
|
||||
|
||||
verifylist = [
|
||||
('node_uuid', baremetal_fakes.baremetal_uuid),
|
||||
('volume_type',
|
||||
baremetal_fakes.baremetal_volume_target_volume_type),
|
||||
('boot_index',
|
||||
baremetal_fakes.baremetal_volume_target_boot_index),
|
||||
('volume_id',
|
||||
baremetal_fakes.baremetal_volume_target_volume_id),
|
||||
('uuid', baremetal_fakes.baremetal_volume_target_uuid),
|
||||
]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
args = {
|
||||
'node_uuid': baremetal_fakes.baremetal_uuid,
|
||||
'volume_type':
|
||||
baremetal_fakes.baremetal_volume_target_volume_type,
|
||||
'boot_index':
|
||||
baremetal_fakes.baremetal_volume_target_boot_index,
|
||||
'volume_id':
|
||||
baremetal_fakes.baremetal_volume_target_volume_id,
|
||||
'uuid': baremetal_fakes.baremetal_volume_target_uuid,
|
||||
}
|
||||
|
||||
self.baremetal_mock.volume_target.create.assert_called_once_with(
|
||||
**args)
|
||||
|
||||
def test_baremetal_volume_target_create_without_uuid(self):
|
||||
arglist = [
|
||||
'--node', baremetal_fakes.baremetal_uuid,
|
||||
'--type',
|
||||
baremetal_fakes.baremetal_volume_target_volume_type,
|
||||
'--boot-index',
|
||||
baremetal_fakes.baremetal_volume_target_boot_index,
|
||||
'--volume-id',
|
||||
baremetal_fakes.baremetal_volume_target_volume_id,
|
||||
]
|
||||
|
||||
verifylist = [
|
||||
('node_uuid', baremetal_fakes.baremetal_uuid),
|
||||
('volume_type',
|
||||
baremetal_fakes.baremetal_volume_target_volume_type),
|
||||
('boot_index',
|
||||
baremetal_fakes.baremetal_volume_target_boot_index),
|
||||
('volume_id',
|
||||
baremetal_fakes.baremetal_volume_target_volume_id),
|
||||
]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
args = {
|
||||
'node_uuid': baremetal_fakes.baremetal_uuid,
|
||||
'volume_type':
|
||||
baremetal_fakes.baremetal_volume_target_volume_type,
|
||||
'boot_index':
|
||||
baremetal_fakes.baremetal_volume_target_boot_index,
|
||||
'volume_id':
|
||||
baremetal_fakes.baremetal_volume_target_volume_id,
|
||||
}
|
||||
|
||||
self.baremetal_mock.volume_target.create.assert_called_once_with(
|
||||
**args)
|
||||
|
||||
def test_baremetal_volume_target_create_extras(self):
|
||||
arglist = [
|
||||
'--node', baremetal_fakes.baremetal_uuid,
|
||||
'--type',
|
||||
baremetal_fakes.baremetal_volume_target_volume_type,
|
||||
'--boot-index',
|
||||
baremetal_fakes.baremetal_volume_target_boot_index,
|
||||
'--volume-id',
|
||||
baremetal_fakes.baremetal_volume_target_volume_id,
|
||||
'--extra', 'key1=value1',
|
||||
'--extra', 'key2=value2',
|
||||
]
|
||||
|
||||
verifylist = [
|
||||
('node_uuid', baremetal_fakes.baremetal_uuid),
|
||||
('volume_type',
|
||||
baremetal_fakes.baremetal_volume_target_volume_type),
|
||||
('boot_index',
|
||||
baremetal_fakes.baremetal_volume_target_boot_index),
|
||||
('volume_id',
|
||||
baremetal_fakes.baremetal_volume_target_volume_id),
|
||||
('extra', ['key1=value1', 'key2=value2'])
|
||||
]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
args = {
|
||||
'node_uuid': baremetal_fakes.baremetal_uuid,
|
||||
'volume_type':
|
||||
baremetal_fakes.baremetal_volume_target_volume_type,
|
||||
'boot_index':
|
||||
baremetal_fakes.baremetal_volume_target_boot_index,
|
||||
'volume_id':
|
||||
baremetal_fakes.baremetal_volume_target_volume_id,
|
||||
'extra': baremetal_fakes.baremetal_volume_target_extra,
|
||||
}
|
||||
|
||||
self.baremetal_mock.volume_target.create.assert_called_once_with(
|
||||
**args)
|
||||
|
||||
def _test_baremetal_volume_target_missing_param(self, missing):
|
||||
argdict = {
|
||||
'--node': baremetal_fakes.baremetal_uuid,
|
||||
'--type':
|
||||
baremetal_fakes.baremetal_volume_target_volume_type,
|
||||
'--boot-index':
|
||||
baremetal_fakes.baremetal_volume_target_boot_index,
|
||||
'--volume-id':
|
||||
baremetal_fakes.baremetal_volume_target_volume_id,
|
||||
'--uuid': baremetal_fakes.baremetal_volume_target_uuid,
|
||||
}
|
||||
|
||||
arglist = []
|
||||
for k, v in argdict.items():
|
||||
if k not in missing:
|
||||
arglist += [k, v]
|
||||
verifylist = None
|
||||
|
||||
self.assertRaises(osctestutils.ParserException,
|
||||
self.check_parser,
|
||||
self.cmd, arglist, verifylist)
|
||||
|
||||
def test_baremetal_volume_target_create_missing_node(self):
|
||||
self._test_baremetal_volume_target_missing_param(['--node'])
|
||||
|
||||
def test_baremetal_volume_target_create_missing_type(self):
|
||||
self._test_baremetal_volume_target_missing_param(['--type'])
|
||||
|
||||
def test_baremetal_volume_target_create_missing_boot_index(self):
|
||||
self._test_baremetal_volume_target_missing_param(['--boot-index'])
|
||||
|
||||
def test_baremetal_volume_target_create_missing_volume_id(self):
|
||||
self._test_baremetal_volume_target_missing_param(['--volume-id'])
|
||||
|
||||
def test_baremetal_volume_target_create_invalid_boot_index(self):
|
||||
arglist = [
|
||||
'--node', baremetal_fakes.baremetal_uuid,
|
||||
'--type',
|
||||
baremetal_fakes.baremetal_volume_target_volume_type,
|
||||
'--boot-index', 'string',
|
||||
'--volume-id',
|
||||
baremetal_fakes.baremetal_volume_target_volume_id,
|
||||
]
|
||||
verifylist = None
|
||||
|
||||
self.assertRaises(osctestutils.ParserException,
|
||||
self.check_parser,
|
||||
self.cmd, arglist, verifylist)
|
||||
|
||||
def test_baremetal_volume_target_create_negative_boot_index(self):
|
||||
arglist = [
|
||||
'--node', baremetal_fakes.baremetal_uuid,
|
||||
'--type',
|
||||
baremetal_fakes.baremetal_volume_target_volume_type,
|
||||
'--boot-index', '-1',
|
||||
'--volume-id',
|
||||
baremetal_fakes.baremetal_volume_target_volume_id,
|
||||
]
|
||||
|
||||
verifylist = [
|
||||
('node_uuid', baremetal_fakes.baremetal_uuid),
|
||||
('volume_type',
|
||||
baremetal_fakes.baremetal_volume_target_volume_type),
|
||||
('boot_index', -1),
|
||||
('volume_id',
|
||||
baremetal_fakes.baremetal_volume_target_volume_id),
|
||||
]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.assertRaises(exc.CommandError, self.cmd.take_action, parsed_args)
|
||||
|
||||
|
||||
class TestShowBaremetalVolumeTarget(TestBaremetalVolumeTarget):
|
||||
|
||||
def setUp(self):
|
||||
super(TestShowBaremetalVolumeTarget, self).setUp()
|
||||
|
||||
self.baremetal_mock.volume_target.get.return_value = (
|
||||
baremetal_fakes.FakeBaremetalResource(
|
||||
None,
|
||||
copy.deepcopy(baremetal_fakes.VOLUME_TARGET),
|
||||
loaded=True))
|
||||
|
||||
self.cmd = (
|
||||
bm_vol_target.ShowBaremetalVolumeTarget(self.app, None))
|
||||
|
||||
def test_baremetal_volume_target_show(self):
|
||||
arglist = ['vvv-tttttt-vvvv']
|
||||
verifylist = [('volume_target',
|
||||
baremetal_fakes.baremetal_volume_target_uuid)]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
args = ['vvv-tttttt-vvvv']
|
||||
self.baremetal_mock.volume_target.get.assert_called_once_with(
|
||||
*args, fields=None)
|
||||
collist = ('boot_index', 'extra', 'node_uuid', 'properties', 'uuid',
|
||||
'volume_id', 'volume_type')
|
||||
self.assertEqual(collist, columns)
|
||||
|
||||
datalist = (
|
||||
baremetal_fakes.baremetal_volume_target_boot_index,
|
||||
baremetal_fakes.baremetal_volume_target_extra,
|
||||
baremetal_fakes.baremetal_uuid,
|
||||
baremetal_fakes.baremetal_volume_target_properties,
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
baremetal_fakes.baremetal_volume_target_volume_id,
|
||||
baremetal_fakes.baremetal_volume_target_volume_type,
|
||||
)
|
||||
self.assertEqual(datalist, tuple(data))
|
||||
|
||||
def test_baremetal_volume_target_show_no_options(self):
|
||||
arglist = []
|
||||
verifylist = []
|
||||
self.assertRaises(osctestutils.ParserException,
|
||||
self.check_parser,
|
||||
self.cmd, arglist, verifylist)
|
||||
|
||||
def test_baremetal_volume_target_show_fields(self):
|
||||
arglist = ['vvv-tttttt-vvvv', '--fields', 'uuid', 'volume_id']
|
||||
verifylist = [('fields', [['uuid', 'volume_id']]),
|
||||
('volume_target',
|
||||
baremetal_fakes.baremetal_volume_target_uuid)]
|
||||
|
||||
fake_vt = copy.deepcopy(baremetal_fakes.VOLUME_TARGET)
|
||||
fake_vt.pop('node_uuid')
|
||||
fake_vt.pop('volume_type')
|
||||
fake_vt.pop('boot_index')
|
||||
fake_vt.pop('extra')
|
||||
fake_vt.pop('properties')
|
||||
self.baremetal_mock.volume_target.get.return_value = (
|
||||
baremetal_fakes.FakeBaremetalResource(
|
||||
None,
|
||||
fake_vt,
|
||||
loaded=True))
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
args = ['vvv-tttttt-vvvv']
|
||||
fields = ['uuid', 'volume_id']
|
||||
self.baremetal_mock.volume_target.get.assert_called_once_with(
|
||||
*args, fields=fields)
|
||||
collist = ('uuid', 'volume_id')
|
||||
self.assertEqual(collist, columns)
|
||||
|
||||
datalist = (
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
baremetal_fakes.baremetal_volume_target_volume_id,
|
||||
)
|
||||
self.assertEqual(datalist, tuple(data))
|
||||
|
||||
def test_baremetal_volume_target_show_fields_multiple(self):
|
||||
arglist = ['vvv-tttttt-vvvv', '--fields', 'uuid', 'volume_id',
|
||||
'--fields', 'volume_type']
|
||||
verifylist = [('fields', [['uuid', 'volume_id'], ['volume_type']]),
|
||||
('volume_target',
|
||||
baremetal_fakes.baremetal_volume_target_uuid)]
|
||||
|
||||
fake_vt = copy.deepcopy(baremetal_fakes.VOLUME_TARGET)
|
||||
fake_vt.pop('node_uuid')
|
||||
fake_vt.pop('boot_index')
|
||||
fake_vt.pop('extra')
|
||||
fake_vt.pop('properties')
|
||||
self.baremetal_mock.volume_target.get.return_value = (
|
||||
baremetal_fakes.FakeBaremetalResource(
|
||||
None,
|
||||
fake_vt,
|
||||
loaded=True))
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
args = ['vvv-tttttt-vvvv']
|
||||
fields = ['uuid', 'volume_id', 'volume_type']
|
||||
self.baremetal_mock.volume_target.get.assert_called_once_with(
|
||||
*args, fields=fields)
|
||||
collist = ('uuid', 'volume_id', 'volume_type')
|
||||
self.assertEqual(collist, columns)
|
||||
|
||||
datalist = (
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
baremetal_fakes.baremetal_volume_target_volume_id,
|
||||
baremetal_fakes.baremetal_volume_target_volume_type,
|
||||
)
|
||||
self.assertEqual(datalist, tuple(data))
|
||||
|
||||
def test_baremetal_volume_target_show_invalid_fields(self):
|
||||
arglist = ['vvv-tttttt-vvvv', '--fields', 'uuid', 'invalid']
|
||||
verifylist = None
|
||||
|
||||
self.assertRaises(osctestutils.ParserException,
|
||||
self.check_parser,
|
||||
self.cmd, arglist, verifylist)
|
||||
|
||||
|
||||
class TestListBaremetalVolumeTarget(TestBaremetalVolumeTarget):
|
||||
def setUp(self):
|
||||
super(TestListBaremetalVolumeTarget, self).setUp()
|
||||
|
||||
self.baremetal_mock.volume_target.list.return_value = [
|
||||
baremetal_fakes.FakeBaremetalResource(
|
||||
None,
|
||||
copy.deepcopy(baremetal_fakes.VOLUME_TARGET),
|
||||
loaded=True)
|
||||
]
|
||||
self.cmd = (
|
||||
bm_vol_target.ListBaremetalVolumeTarget(self.app, None))
|
||||
|
||||
def test_baremetal_volume_target_list(self):
|
||||
arglist = []
|
||||
verifylist = []
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
kwargs = {
|
||||
'marker': None,
|
||||
'limit': None}
|
||||
self.baremetal_mock.volume_target.list.assert_called_once_with(
|
||||
**kwargs)
|
||||
|
||||
collist = (
|
||||
"UUID",
|
||||
"Node UUID",
|
||||
"Driver Volume Type",
|
||||
"Boot Index",
|
||||
"Volume ID")
|
||||
self.assertEqual(collist, columns)
|
||||
|
||||
datalist = ((baremetal_fakes.baremetal_volume_target_uuid,
|
||||
baremetal_fakes.baremetal_uuid,
|
||||
baremetal_fakes.baremetal_volume_target_volume_type,
|
||||
baremetal_fakes.baremetal_volume_target_boot_index,
|
||||
baremetal_fakes.baremetal_volume_target_volume_id),)
|
||||
self.assertEqual(datalist, tuple(data))
|
||||
|
||||
def test_baremetal_volume_target_list_node(self):
|
||||
arglist = ['--node', baremetal_fakes.baremetal_uuid]
|
||||
verifylist = [('node', baremetal_fakes.baremetal_uuid)]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
kwargs = {
|
||||
'node': baremetal_fakes.baremetal_uuid,
|
||||
'marker': None,
|
||||
'limit': None}
|
||||
self.baremetal_mock.volume_target.list.assert_called_once_with(
|
||||
**kwargs)
|
||||
|
||||
collist = (
|
||||
"UUID",
|
||||
"Node UUID",
|
||||
"Driver Volume Type",
|
||||
"Boot Index",
|
||||
"Volume ID")
|
||||
self.assertEqual(collist, columns)
|
||||
|
||||
datalist = ((baremetal_fakes.baremetal_volume_target_uuid,
|
||||
baremetal_fakes.baremetal_uuid,
|
||||
baremetal_fakes.baremetal_volume_target_volume_type,
|
||||
baremetal_fakes.baremetal_volume_target_boot_index,
|
||||
baremetal_fakes.baremetal_volume_target_volume_id),)
|
||||
self.assertEqual(datalist, tuple(data))
|
||||
|
||||
def test_baremetal_volume_target_list_long(self):
|
||||
arglist = ['--long']
|
||||
verifylist = [('detail', True)]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
kwargs = {
|
||||
'detail': True,
|
||||
'marker': None,
|
||||
'limit': None,
|
||||
}
|
||||
self.baremetal_mock.volume_target.list.assert_called_with(**kwargs)
|
||||
|
||||
collist = ('UUID', 'Node UUID', 'Driver Volume Type', 'Properties',
|
||||
'Boot Index', 'Extra', 'Volume ID', 'Created At',
|
||||
'Updated At')
|
||||
self.assertEqual(collist, columns)
|
||||
|
||||
datalist = ((baremetal_fakes.baremetal_volume_target_uuid,
|
||||
baremetal_fakes.baremetal_uuid,
|
||||
baremetal_fakes.baremetal_volume_target_volume_type,
|
||||
baremetal_fakes.baremetal_volume_target_properties,
|
||||
baremetal_fakes.baremetal_volume_target_boot_index,
|
||||
baremetal_fakes.baremetal_volume_target_extra,
|
||||
baremetal_fakes.baremetal_volume_target_volume_id,
|
||||
'',
|
||||
''),)
|
||||
self.assertEqual(datalist, tuple(data))
|
||||
|
||||
def test_baremetal_volume_target_list_fields(self):
|
||||
arglist = ['--fields', 'uuid', 'boot_index']
|
||||
verifylist = [('fields', [['uuid', 'boot_index']])]
|
||||
|
||||
fake_vt = copy.deepcopy(baremetal_fakes.VOLUME_TARGET)
|
||||
fake_vt.pop('volume_type')
|
||||
fake_vt.pop('extra')
|
||||
fake_vt.pop('properties')
|
||||
fake_vt.pop('volume_id')
|
||||
fake_vt.pop('node_uuid')
|
||||
self.baremetal_mock.volume_target.list.return_value = [
|
||||
baremetal_fakes.FakeBaremetalResource(
|
||||
None,
|
||||
fake_vt,
|
||||
loaded=True)
|
||||
]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
kwargs = {
|
||||
'detail': False,
|
||||
'marker': None,
|
||||
'limit': None,
|
||||
'fields': ('uuid', 'boot_index')
|
||||
}
|
||||
self.baremetal_mock.volume_target.list.assert_called_with(**kwargs)
|
||||
|
||||
collist = ('UUID', 'Boot Index')
|
||||
self.assertEqual(collist, columns)
|
||||
|
||||
datalist = ((baremetal_fakes.baremetal_volume_target_uuid,
|
||||
baremetal_fakes.baremetal_volume_target_boot_index),)
|
||||
self.assertEqual(datalist, tuple(data))
|
||||
|
||||
def test_baremetal_volume_target_list_fields_multiple(self):
|
||||
arglist = ['--fields', 'uuid', 'boot_index', '--fields', 'extra']
|
||||
verifylist = [('fields', [['uuid', 'boot_index'], ['extra']])]
|
||||
|
||||
fake_vt = copy.deepcopy(baremetal_fakes.VOLUME_TARGET)
|
||||
fake_vt.pop('volume_type')
|
||||
fake_vt.pop('properties')
|
||||
fake_vt.pop('volume_id')
|
||||
fake_vt.pop('node_uuid')
|
||||
self.baremetal_mock.volume_target.list.return_value = [
|
||||
baremetal_fakes.FakeBaremetalResource(
|
||||
None,
|
||||
fake_vt,
|
||||
loaded=True)
|
||||
]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
kwargs = {
|
||||
'detail': False,
|
||||
'marker': None,
|
||||
'limit': None,
|
||||
'fields': ('uuid', 'boot_index', 'extra')
|
||||
}
|
||||
self.baremetal_mock.volume_target.list.assert_called_with(**kwargs)
|
||||
|
||||
collist = ('UUID', 'Boot Index', 'Extra')
|
||||
self.assertEqual(collist, columns)
|
||||
|
||||
datalist = ((baremetal_fakes.baremetal_volume_target_uuid,
|
||||
baremetal_fakes.baremetal_volume_target_boot_index,
|
||||
baremetal_fakes.baremetal_volume_target_extra),)
|
||||
self.assertEqual(datalist, tuple(data))
|
||||
|
||||
def test_baremetal_volume_target_list_invalid_fields(self):
|
||||
arglist = ['--fields', 'uuid', 'invalid']
|
||||
verifylist = [('fields', [['uuid', 'invalid']])]
|
||||
self.assertRaises(osctestutils.ParserException,
|
||||
self.check_parser,
|
||||
self.cmd, arglist, verifylist)
|
||||
|
||||
def test_baremetal_volume_target_list_marker(self):
|
||||
arglist = ['--marker', baremetal_fakes.baremetal_volume_target_uuid]
|
||||
verifylist = [
|
||||
('marker', baremetal_fakes.baremetal_volume_target_uuid)]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
kwargs = {
|
||||
'marker': baremetal_fakes.baremetal_volume_target_uuid,
|
||||
'limit': None}
|
||||
self.baremetal_mock.volume_target.list.assert_called_once_with(
|
||||
**kwargs)
|
||||
|
||||
def test_baremetal_volume_target_list_limit(self):
|
||||
arglist = ['--limit', '10']
|
||||
verifylist = [('limit', 10)]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
kwargs = {
|
||||
'marker': None,
|
||||
'limit': 10}
|
||||
self.baremetal_mock.volume_target.list.assert_called_once_with(
|
||||
**kwargs)
|
||||
|
||||
def test_baremetal_volume_target_list_sort(self):
|
||||
arglist = ['--sort', 'boot_index']
|
||||
verifylist = [('sort', 'boot_index')]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
kwargs = {
|
||||
'marker': None,
|
||||
'limit': None}
|
||||
self.baremetal_mock.volume_target.list.assert_called_once_with(
|
||||
**kwargs)
|
||||
|
||||
def test_baremetal_volume_target_list_sort_desc(self):
|
||||
arglist = ['--sort', 'boot_index:desc']
|
||||
verifylist = [('sort', 'boot_index:desc')]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
kwargs = {
|
||||
'marker': None,
|
||||
'limit': None}
|
||||
self.baremetal_mock.volume_target.list.assert_called_once_with(
|
||||
**kwargs)
|
||||
|
||||
def test_baremetal_volume_target_list_exclusive_options(self):
|
||||
arglist = ['--fields', 'uuid', '--long']
|
||||
self.assertRaises(osctestutils.ParserException,
|
||||
self.check_parser,
|
||||
self.cmd, arglist, [])
|
||||
|
||||
def test_baremetal_volume_target_list_negative_limit(self):
|
||||
arglist = ['--limit', '-1']
|
||||
verifylist = [('limit', -1)]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.assertRaises(exc.CommandError,
|
||||
self.cmd.take_action,
|
||||
parsed_args)
|
||||
|
||||
|
||||
class TestDeleteBaremetalVolumeTarget(TestBaremetalVolumeTarget):
|
||||
|
||||
def setUp(self):
|
||||
super(TestDeleteBaremetalVolumeTarget, self).setUp()
|
||||
|
||||
self.cmd = bm_vol_target.DeleteBaremetalVolumeTarget(self.app, None)
|
||||
|
||||
def test_baremetal_volume_target_delete(self):
|
||||
arglist = [baremetal_fakes.baremetal_volume_target_uuid]
|
||||
verifylist = [('volume_targets',
|
||||
[baremetal_fakes.baremetal_volume_target_uuid])]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
self.baremetal_mock.volume_target.delete.assert_called_with(
|
||||
baremetal_fakes.baremetal_volume_target_uuid)
|
||||
|
||||
def test_baremetal_volume_target_delete_multiple(self):
|
||||
fake_volume_target_uuid2 = 'vvv-tttttt-tttt'
|
||||
arglist = [baremetal_fakes.baremetal_volume_target_uuid,
|
||||
fake_volume_target_uuid2]
|
||||
verifylist = [('volume_targets',
|
||||
[baremetal_fakes.baremetal_volume_target_uuid,
|
||||
fake_volume_target_uuid2])]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
self.baremetal_mock.volume_target.delete.has_calls(
|
||||
[mock.call(baremetal_fakes.baremetal_volume_target_uuid),
|
||||
mock.call(fake_volume_target_uuid2)])
|
||||
self.assertEqual(
|
||||
2, self.baremetal_mock.volume_target.delete.call_count)
|
||||
|
||||
def test_baremetal_volume_target_delete_no_options(self):
|
||||
arglist = []
|
||||
verifylist = []
|
||||
self.assertRaises(osctestutils.ParserException,
|
||||
self.check_parser,
|
||||
self.cmd, arglist, verifylist)
|
||||
|
||||
def test_baremetal_volume_target_delete_error(self):
|
||||
arglist = [baremetal_fakes.baremetal_volume_target_uuid]
|
||||
verifylist = [('volume_targets',
|
||||
[baremetal_fakes.baremetal_volume_target_uuid])]
|
||||
|
||||
self.baremetal_mock.volume_target.delete.side_effect = (
|
||||
exc.NotFound())
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.assertRaises(exc.ClientException,
|
||||
self.cmd.take_action,
|
||||
parsed_args)
|
||||
self.baremetal_mock.volume_target.delete.assert_called_with(
|
||||
baremetal_fakes.baremetal_volume_target_uuid)
|
||||
|
||||
def test_baremetal_volume_target_delete_multiple_error(self):
|
||||
fake_volume_target_uuid2 = 'vvv-tttttt-tttt'
|
||||
arglist = [baremetal_fakes.baremetal_volume_target_uuid,
|
||||
fake_volume_target_uuid2]
|
||||
verifylist = [('volume_targets',
|
||||
[baremetal_fakes.baremetal_volume_target_uuid,
|
||||
fake_volume_target_uuid2])]
|
||||
|
||||
self.baremetal_mock.volume_target.delete.side_effect = [
|
||||
None, exc.NotFound()]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.assertRaises(exc.ClientException,
|
||||
self.cmd.take_action,
|
||||
parsed_args)
|
||||
|
||||
self.baremetal_mock.volume_target.delete.has_calls(
|
||||
[mock.call(baremetal_fakes.baremetal_volume_target_uuid),
|
||||
mock.call(fake_volume_target_uuid2)])
|
||||
self.assertEqual(
|
||||
2, self.baremetal_mock.volume_target.delete.call_count)
|
||||
|
||||
|
||||
class TestSetBaremetalVolumeTarget(TestBaremetalVolumeTarget):
|
||||
def setUp(self):
|
||||
super(TestSetBaremetalVolumeTarget, self).setUp()
|
||||
|
||||
self.cmd = (
|
||||
bm_vol_target.SetBaremetalVolumeTarget(self.app, None))
|
||||
|
||||
def test_baremetal_volume_target_set_node_uuid(self):
|
||||
new_node_uuid = 'xxx-xxxxxx-zzzz'
|
||||
arglist = [
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
'--node', new_node_uuid]
|
||||
verifylist = [
|
||||
('volume_target',
|
||||
baremetal_fakes.baremetal_volume_target_uuid),
|
||||
('node_uuid', new_node_uuid)]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
self.baremetal_mock.volume_target.update.assert_called_once_with(
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
[{'path': '/node_uuid', 'value': new_node_uuid, 'op': 'add'}])
|
||||
|
||||
def test_baremetal_volume_target_set_volume_type(self):
|
||||
new_type = 'fibre_channel'
|
||||
arglist = [
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
'--type', new_type]
|
||||
verifylist = [
|
||||
('volume_target',
|
||||
baremetal_fakes.baremetal_volume_target_uuid),
|
||||
('volume_type', new_type)]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
self.baremetal_mock.volume_target.update.assert_called_once_with(
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
[{'path': '/volume_type', 'value': new_type, 'op': 'add'}])
|
||||
|
||||
def test_baremetal_volume_target_set_boot_index(self):
|
||||
new_boot_idx = '3'
|
||||
arglist = [
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
'--boot-index', new_boot_idx]
|
||||
verifylist = [
|
||||
('volume_target',
|
||||
baremetal_fakes.baremetal_volume_target_uuid),
|
||||
('boot_index', int(new_boot_idx))]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
self.baremetal_mock.volume_target.update.assert_called_once_with(
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
[{'path': '/boot_index', 'value': int(new_boot_idx), 'op': 'add'}])
|
||||
|
||||
def test_baremetal_volume_target_set_negative_boot_index(self):
|
||||
new_boot_idx = '-3'
|
||||
arglist = [
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
'--boot-index', new_boot_idx]
|
||||
verifylist = [
|
||||
('volume_target',
|
||||
baremetal_fakes.baremetal_volume_target_uuid),
|
||||
('boot_index', int(new_boot_idx))]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.assertRaises(exc.CommandError, self.cmd.take_action, parsed_args)
|
||||
|
||||
def test_baremetal_volume_target_set_invalid_boot_index(self):
|
||||
new_boot_idx = 'string'
|
||||
arglist = [
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
'--boot-index', new_boot_idx]
|
||||
verifylist = None
|
||||
|
||||
self.assertRaises(osctestutils.ParserException,
|
||||
self.check_parser,
|
||||
self.cmd, arglist, verifylist)
|
||||
|
||||
def test_baremetal_volume_target_set_volume_id(self):
|
||||
new_volume_id = 'new-volume-id'
|
||||
arglist = [
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
'--volume-id', new_volume_id]
|
||||
verifylist = [
|
||||
('volume_target',
|
||||
baremetal_fakes.baremetal_volume_target_uuid),
|
||||
('volume_id', new_volume_id)]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
self.baremetal_mock.volume_target.update.assert_called_once_with(
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
[{'path': '/volume_id', 'value': new_volume_id, 'op': 'add'}])
|
||||
|
||||
def test_baremetal_volume_target_set_volume_type_and_volume_id(self):
|
||||
new_volume_type = 'fibre_channel'
|
||||
new_volume_id = 'new-volume-id'
|
||||
arglist = [
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
'--type', new_volume_type,
|
||||
'--volume-id', new_volume_id]
|
||||
verifylist = [
|
||||
('volume_target',
|
||||
baremetal_fakes.baremetal_volume_target_uuid),
|
||||
('volume_type', new_volume_type),
|
||||
('volume_id', new_volume_id)]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
self.baremetal_mock.volume_target.update.assert_called_once_with(
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
[{'path': '/volume_type', 'value': new_volume_type, 'op': 'add'},
|
||||
{'path': '/volume_id', 'value': new_volume_id, 'op': 'add'}])
|
||||
|
||||
def test_baremetal_volume_target_set_extra(self):
|
||||
arglist = [
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
'--extra', 'foo=bar']
|
||||
verifylist = [
|
||||
('volume_target',
|
||||
baremetal_fakes.baremetal_volume_target_uuid),
|
||||
('extra', ['foo=bar'])]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
self.baremetal_mock.volume_target.update.assert_called_once_with(
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
[{'path': '/extra/foo', 'value': 'bar', 'op': 'add'}])
|
||||
|
||||
def test_baremetal_volume_target_set_multiple_extras(self):
|
||||
arglist = [
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
'--extra', 'key1=val1', '--extra', 'key2=val2']
|
||||
verifylist = [
|
||||
('volume_target',
|
||||
baremetal_fakes.baremetal_volume_target_uuid),
|
||||
('extra', ['key1=val1', 'key2=val2'])]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
self.baremetal_mock.volume_target.update.assert_called_once_with(
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
[{'path': '/extra/key1', 'value': 'val1', 'op': 'add'},
|
||||
{'path': '/extra/key2', 'value': 'val2', 'op': 'add'}])
|
||||
|
||||
def test_baremetal_volume_target_set_property(self):
|
||||
arglist = [
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
'--property', 'foo=bar']
|
||||
verifylist = [
|
||||
('volume_target',
|
||||
baremetal_fakes.baremetal_volume_target_uuid),
|
||||
('properties', ['foo=bar'])]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
self.baremetal_mock.volume_target.update.assert_called_once_with(
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
[{'path': '/properties/foo', 'value': 'bar', 'op': 'add'}])
|
||||
|
||||
def test_baremetal_volume_target_set_multiple_properties(self):
|
||||
arglist = [
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
'--property', 'key1=val1', '--property', 'key2=val2']
|
||||
verifylist = [
|
||||
('volume_target',
|
||||
baremetal_fakes.baremetal_volume_target_uuid),
|
||||
('properties', ['key1=val1', 'key2=val2'])]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
self.baremetal_mock.volume_target.update.assert_called_once_with(
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
[{'path': '/properties/key1', 'value': 'val1', 'op': 'add'},
|
||||
{'path': '/properties/key2', 'value': 'val2', 'op': 'add'}])
|
||||
|
||||
def test_baremetal_volume_target_set_no_options(self):
|
||||
arglist = []
|
||||
verifylist = []
|
||||
self.assertRaises(osctestutils.ParserException,
|
||||
self.check_parser,
|
||||
self.cmd, arglist, verifylist)
|
||||
|
||||
def test_baremetal_volume_target_set_no_property(self):
|
||||
arglist = [baremetal_fakes.baremetal_volume_target_uuid]
|
||||
verifylist = [('volume_target',
|
||||
baremetal_fakes.baremetal_volume_target_uuid)]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
self.baremetal_mock.volume_target.update.assert_not_called()
|
||||
|
||||
|
||||
class TestUnsetBaremetalVolumeTarget(TestBaremetalVolumeTarget):
|
||||
def setUp(self):
|
||||
super(TestUnsetBaremetalVolumeTarget, self).setUp()
|
||||
|
||||
self.cmd = bm_vol_target.UnsetBaremetalVolumeTarget(self.app, None)
|
||||
|
||||
def test_baremetal_volume_target_unset_extra(self):
|
||||
arglist = [baremetal_fakes.baremetal_volume_target_uuid,
|
||||
'--extra', 'key1']
|
||||
verifylist = [('volume_target',
|
||||
baremetal_fakes.baremetal_volume_target_uuid),
|
||||
('extra', ['key1'])]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
self.baremetal_mock.volume_target.update.assert_called_once_with(
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
[{'path': '/extra/key1', 'op': 'remove'}])
|
||||
|
||||
def test_baremetal_volume_target_unset_multiple_extras(self):
|
||||
arglist = [baremetal_fakes.baremetal_volume_target_uuid,
|
||||
'--extra', 'key1', '--extra', 'key2']
|
||||
verifylist = [('volume_target',
|
||||
baremetal_fakes.baremetal_volume_target_uuid),
|
||||
('extra', ['key1', 'key2'])]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
self.baremetal_mock.volume_target.update.assert_called_once_with(
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
[{'path': '/extra/key1', 'op': 'remove'},
|
||||
{'path': '/extra/key2', 'op': 'remove'}])
|
||||
|
||||
def test_baremetal_volume_target_unset_property(self):
|
||||
arglist = [baremetal_fakes.baremetal_volume_target_uuid,
|
||||
'--property', 'key11']
|
||||
verifylist = [('volume_target',
|
||||
baremetal_fakes.baremetal_volume_target_uuid),
|
||||
('properties', ['key11'])]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
self.baremetal_mock.volume_target.update.assert_called_once_with(
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
[{'path': '/properties/key11', 'op': 'remove'}])
|
||||
|
||||
def test_baremetal_volume_target_unset_multiple_properties(self):
|
||||
arglist = [baremetal_fakes.baremetal_volume_target_uuid,
|
||||
'--property', 'key11', '--property', 'key22']
|
||||
verifylist = [('volume_target',
|
||||
baremetal_fakes.baremetal_volume_target_uuid),
|
||||
('properties', ['key11', 'key22'])]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
self.baremetal_mock.volume_target.update.assert_called_once_with(
|
||||
baremetal_fakes.baremetal_volume_target_uuid,
|
||||
[{'path': '/properties/key11', 'op': 'remove'},
|
||||
{'path': '/properties/key22', 'op': 'remove'}])
|
||||
|
||||
def test_baremetal_volume_target_unset_no_options(self):
|
||||
arglist = []
|
||||
verifylist = []
|
||||
self.assertRaises(osctestutils.ParserException,
|
||||
self.check_parser,
|
||||
self.cmd, arglist, verifylist)
|
||||
|
||||
def test_baremetal_volume_target_unset_no_property(self):
|
||||
arglist = [baremetal_fakes.baremetal_volume_target_uuid]
|
||||
verifylist = [('volume_target',
|
||||
baremetal_fakes.baremetal_volume_target_uuid)]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
self.baremetal_mock.volume_target.update.assert_not_called()
|
||||
|
|
@ -34,6 +34,7 @@ class Resource(object):
|
|||
'address': 'Address',
|
||||
'async': 'Async',
|
||||
'attach': 'Response is attachment',
|
||||
'boot_index': 'Boot Index',
|
||||
'chassis_uuid': 'Chassis UUID',
|
||||
'clean_step': 'Clean Step',
|
||||
'console_enabled': 'Console Enabled',
|
||||
|
|
@ -87,6 +88,8 @@ class Resource(object):
|
|||
'type': 'Type',
|
||||
'updated_at': 'Updated At',
|
||||
'uuid': 'UUID',
|
||||
'volume_id': 'Volume ID',
|
||||
'volume_type': 'Driver Volume Type',
|
||||
'local_link_connection': 'Local Link Connection',
|
||||
'pxe_enabled': 'PXE boot enabled',
|
||||
'portgroup_uuid': 'Portgroup UUID',
|
||||
|
|
@ -368,3 +371,33 @@ VOLUME_CONNECTOR_RESOURCE = Resource(
|
|||
],
|
||||
sort_excluded=['node_uuid']
|
||||
)
|
||||
|
||||
# Volume targets
|
||||
VOLUME_TARGET_DETAILED_RESOURCE = Resource(
|
||||
['uuid',
|
||||
'node_uuid',
|
||||
'volume_type',
|
||||
'properties',
|
||||
'boot_index',
|
||||
'extra',
|
||||
'volume_id',
|
||||
'created_at',
|
||||
'updated_at',
|
||||
],
|
||||
sort_excluded=[
|
||||
# The server cannot sort on "node_uuid" because it isn't a column in
|
||||
# the "volume_targets" database table. "node_id" is stored, but it
|
||||
# is internal to ironic. See bug #1443003 for more details.
|
||||
'node_uuid',
|
||||
'extra',
|
||||
'properties'
|
||||
])
|
||||
VOLUME_TARGET_RESOURCE = Resource(
|
||||
['uuid',
|
||||
'node_uuid',
|
||||
'volume_type',
|
||||
'boot_index',
|
||||
'volume_id',
|
||||
],
|
||||
sort_excluded=['node_uuid']
|
||||
)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
---
|
||||
features:
|
||||
- |
|
||||
Adds OpenStackClient commands for volume target:
|
||||
|
||||
* ``openstack baremetal volume target create``
|
||||
* ``openstack baremetal volume target list``
|
||||
* ``openstack baremetal volume target show``
|
||||
* ``openstack baremetal volume target set``
|
||||
* ``openstack baremetal volume target unset``
|
||||
* ``openstack baremetal volume target delete``
|
||||
|
|
@ -92,6 +92,12 @@ openstack.baremetal.v1 =
|
|||
baremetal_volume_connector_set = ironicclient.osc.v1.baremetal_volume_connector:SetBaremetalVolumeConnector
|
||||
baremetal_volume_connector_show = ironicclient.osc.v1.baremetal_volume_connector:ShowBaremetalVolumeConnector
|
||||
baremetal_volume_connector_unset = ironicclient.osc.v1.baremetal_volume_connector:UnsetBaremetalVolumeConnector
|
||||
baremetal_volume_target_create = ironicclient.osc.v1.baremetal_volume_target:CreateBaremetalVolumeTarget
|
||||
baremetal_volume_target_delete = ironicclient.osc.v1.baremetal_volume_target:DeleteBaremetalVolumeTarget
|
||||
baremetal_volume_target_list = ironicclient.osc.v1.baremetal_volume_target:ListBaremetalVolumeTarget
|
||||
baremetal_volume_target_set = ironicclient.osc.v1.baremetal_volume_target:SetBaremetalVolumeTarget
|
||||
baremetal_volume_target_show = ironicclient.osc.v1.baremetal_volume_target:ShowBaremetalVolumeTarget
|
||||
baremetal_volume_target_unset = ironicclient.osc.v1.baremetal_volume_target:UnsetBaremetalVolumeTarget
|
||||
baremetal_set = ironicclient.osc.v1.baremetal_node:SetBaremetal
|
||||
baremetal_show = ironicclient.osc.v1.baremetal_node:ShowBaremetal
|
||||
baremetal_unset = ironicclient.osc.v1.baremetal_node:UnsetBaremetal
|
||||
|
|
|
|||
Loading…
Reference in New Issue