Add commands for aggregate node actions
Partially Implements: bp node-aggregate Change-Id: I733f5158997cd0764048471b5cae5c97fe40c4dc
This commit is contained in:
liusheng
parent
7cd9c8a88c
commit
60c25a50be
@ -226,3 +226,81 @@ class UnsetAggregate(command.Command):
|
||||
"path": "/metadata/%s" % key})
|
||||
if updates:
|
||||
bc_client.aggregate.update(aggregate, updates)
|
||||
|
||||
|
||||
class AggregateAddNode(command.Command):
|
||||
"""Add a node for a specified node aggregate"""
|
||||
|
||||
def get_parser(self, prog_name):
|
||||
parser = super(AggregateAddNode, self).get_parser(prog_name)
|
||||
parser.add_argument(
|
||||
"aggregate",
|
||||
metavar="<aggregate>",
|
||||
help=_("Aggregate to add nodes (name or UUID)")
|
||||
)
|
||||
parser.add_argument(
|
||||
"node",
|
||||
metavar="<node>",
|
||||
help=_("Name of baremetal node")
|
||||
)
|
||||
return parser
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
bc_client = self.app.client_manager.baremetal_compute
|
||||
aggregate = utils.find_resource(
|
||||
bc_client.aggregate,
|
||||
parsed_args.aggregate,
|
||||
)
|
||||
bc_client.aggregate_node.add_node(aggregate.uuid,
|
||||
parsed_args.node)
|
||||
|
||||
|
||||
class AggregateListNode(command.Lister):
|
||||
"""List all baremetal nodes names of a specified node aggregate"""
|
||||
|
||||
def get_parser(self, prog_name):
|
||||
parser = super(AggregateListNode, self).get_parser(prog_name)
|
||||
parser.add_argument(
|
||||
"aggregate",
|
||||
metavar="<aggregate>",
|
||||
help=_("Aggregate to list its nodes (name or UUID)")
|
||||
)
|
||||
return parser
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
bc_client = self.app.client_manager.baremetal_compute
|
||||
aggregate = utils.find_resource(
|
||||
bc_client.aggregate,
|
||||
parsed_args.aggregate,
|
||||
)
|
||||
data = bc_client.aggregate_node.list_node(aggregate.uuid)
|
||||
|
||||
return (('Node',),
|
||||
tuple((d,) for d in data))
|
||||
|
||||
|
||||
class AggregateRemoveNode(command.Command):
|
||||
"""Remove a node for a specified node aggregate"""
|
||||
|
||||
def get_parser(self, prog_name):
|
||||
parser = super(AggregateRemoveNode, self).get_parser(prog_name)
|
||||
parser.add_argument(
|
||||
"aggregate",
|
||||
metavar="<aggregate>",
|
||||
help=_("Aggregate to delete its node (name or UUID)")
|
||||
)
|
||||
parser.add_argument(
|
||||
"node",
|
||||
metavar="<node>",
|
||||
help=_("Name of baremetal node")
|
||||
)
|
||||
return parser
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
bc_client = self.app.client_manager.baremetal_compute
|
||||
aggregate = utils.find_resource(
|
||||
bc_client.aggregate,
|
||||
parsed_args.aggregate,
|
||||
)
|
||||
bc_client.aggregate_node.remove_node(aggregate.uuid,
|
||||
parsed_args.node)
|
||||
|
||||
@ -72,6 +72,8 @@ class FakeBaremetalComputeV1Client(object):
|
||||
self.aggregate = aggregate.AggregateManager(self.fake_http_client)
|
||||
self.server_group = server_group.ServerGroupManager(
|
||||
self.fake_http_client)
|
||||
self.aggregate_node = aggregate.AggregateNodeManager(
|
||||
self.fake_http_client)
|
||||
|
||||
|
||||
class FakeHTTPClient(object):
|
||||
|
||||
@ -222,3 +222,72 @@ class TestAggregateUnset(TestAggregateBase):
|
||||
]
|
||||
mock_update.assert_called_once_with(expected_url,
|
||||
data=expected_args)
|
||||
|
||||
|
||||
@mock.patch.object(utils, 'find_resource')
|
||||
@mock.patch.object(aggregate_mgr.AggregateNodeManager, '_list')
|
||||
class TestAggregateListNode(TestAggregateBase):
|
||||
def setUp(self):
|
||||
super(TestAggregateListNode, self).setUp()
|
||||
self.cmd = aggregate.AggregateListNode(self.app, None)
|
||||
self.fake_nodes = ("node-1", "node-1", "node-1")
|
||||
|
||||
def test_agg_node_list(self, mock_list, mock_find):
|
||||
mock_find.return_value = self.fake_agg
|
||||
arglist = [
|
||||
self.fake_agg.uuid,
|
||||
]
|
||||
verifylist = [
|
||||
('aggregate', self.fake_agg.uuid),
|
||||
]
|
||||
mock_list.return_value = [self.fake_nodes]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
url = '/aggregates/%s/nodes' % self.fake_agg.uuid
|
||||
mock_list.assert_called_once_with(url, response_key='nodes')
|
||||
self.assertEqual(('Node',), columns)
|
||||
self.assertEqual(((("node-1", "node-1", "node-1"),),), data)
|
||||
|
||||
|
||||
@mock.patch.object(utils, 'find_resource')
|
||||
@mock.patch.object(aggregate_mgr.AggregateNodeManager, '_create')
|
||||
class TestAggregateAddNode(TestAggregateBase):
|
||||
def setUp(self):
|
||||
super(TestAggregateAddNode, self).setUp()
|
||||
self.cmd = aggregate.AggregateAddNode(self.app, None)
|
||||
|
||||
def test_agg_node_add(self, mock_create, mock_find):
|
||||
mock_find.return_value = self.fake_agg
|
||||
arglist = [
|
||||
self.fake_agg.uuid, 'node-1',
|
||||
]
|
||||
verifylist = [
|
||||
('aggregate', self.fake_agg.uuid),
|
||||
('node', 'node-1'),
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
url = '/aggregates/%s/nodes' % self.fake_agg.uuid
|
||||
mock_create.assert_called_once_with(url, data={'node': 'node-1'})
|
||||
|
||||
|
||||
@mock.patch.object(utils, 'find_resource')
|
||||
@mock.patch.object(aggregate_mgr.AggregateNodeManager, '_delete')
|
||||
class TestAggregateRemoveNode(TestAggregateBase):
|
||||
def setUp(self):
|
||||
super(TestAggregateRemoveNode, self).setUp()
|
||||
self.cmd = aggregate.AggregateRemoveNode(self.app, None)
|
||||
|
||||
def test_agg_node_remove(self, mock_delete, mock_find):
|
||||
mock_find.return_value = self.fake_agg
|
||||
arglist = [
|
||||
self.fake_agg.uuid, 'node-1',
|
||||
]
|
||||
verifylist = [
|
||||
('aggregate', self.fake_agg.uuid),
|
||||
('node', 'node-1'),
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
url = '/aggregates/%s/nodes/node-1' % self.fake_agg.uuid
|
||||
mock_delete.assert_called_once_with(url)
|
||||
|
||||
@ -45,3 +45,24 @@ class AggregateManager(base.ManagerWithFind):
|
||||
def update(self, aggregate, updates):
|
||||
url = '/aggregates/%s' % base.getid(aggregate)
|
||||
return self._update(url, data=updates)
|
||||
|
||||
|
||||
class AggregateNode(base.Resource):
|
||||
pass
|
||||
|
||||
|
||||
class AggregateNodeManager(base.Manager):
|
||||
resource_class = AggregateNode
|
||||
|
||||
def add_node(self, aggregate_uuid, node):
|
||||
url = '/aggregates/%s/nodes' % aggregate_uuid
|
||||
data = {'node': node}
|
||||
return self._create(url, data=data)
|
||||
|
||||
def list_node(self, aggregate_uuid):
|
||||
url = '/aggregates/%s/nodes' % aggregate_uuid
|
||||
return self._list(url, response_key='nodes')
|
||||
|
||||
def remove_node(self, aggregate_uuid, node):
|
||||
url = '/aggregates/%s/nodes/%s' % (aggregate_uuid, node)
|
||||
return self._delete(url)
|
||||
|
||||
@ -39,3 +39,4 @@ class Client(object):
|
||||
self.node = node.NodeManager(self.http_client)
|
||||
self.aggregate = aggregate.AggregateManager(self.http_client)
|
||||
self.server_group = server_group.ServerGroupManager(self.http_client)
|
||||
self.aggregate_node = aggregate.AggregateNodeManager(self.http_client)
|
||||
|
||||
@ -67,6 +67,9 @@ openstack.baremetal_compute.v1 =
|
||||
baremetalcompute_server_group_show = moganclient.osc.v1.server_group:ShowServerGroup
|
||||
baremetalcompute_server_group_list = moganclient.osc.v1.server_group:ListServerGroup
|
||||
baremetalcompute_server_group_delete = moganclient.osc.v1.server_group:DeleteServerGroup
|
||||
baremetalcompute_aggregate_add_node = moganclient.osc.v1.aggregate:AggregateAddNode
|
||||
baremetalcompute_aggregate_list_node = moganclient.osc.v1.aggregate:AggregateListNode
|
||||
baremetalcompute_aggregate_remove_node = moganclient.osc.v1.aggregate:AggregateRemoveNode
|
||||
|
||||
[build_sphinx]
|
||||
source-dir = doc/source
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user