Merge "Add OSC plugin for openstack cluster receiver create"

This commit is contained in:
Jenkins 2016-02-28 12:37:06 +00:00 committed by Gerrit Code Review
commit 8a513f8894
3 changed files with 109 additions and 0 deletions

View File

@ -142,3 +142,58 @@ def _show_receiver(senlin_client, receiver_id):
columns = list(six.iterkeys(receiver))
return columns, utils.get_dict_properties(receiver.to_dict(), columns,
formatters=formatters)
class CreateReceiver(show.ShowOne):
"""Create a receiver."""
log = logging.getLogger(__name__ + ".CreateReceiver")
def get_parser(self, prog_name):
parser = super(CreateReceiver, self).get_parser(prog_name)
parser.add_argument(
'--type',
metavar='<type>',
default='webhook',
help=_('Type of the receiver to create')
)
parser.add_argument(
'--cluster',
metavar='<cluster>',
required=True,
help=_('Targeted cluster for this receiver')
)
parser.add_argument(
'--action',
metavar='<action>',
required=True,
help=_('Name or ID of the targeted action to be triggered')
)
parser.add_argument(
'--params',
metavar='<key1=value1;key2=value2...>',
help=_('A dictionary of parameters that will be passed to target '
'action when the receiver is triggered'),
action='append'
)
parser.add_argument(
'name',
metavar='<name>',
help=_('Name of the receiver to create')
)
return parser
def take_action(self, parsed_args):
self.log.debug("take_action(%s)", parsed_args)
senlin_client = self.app.client_manager.clustering
params = {
'name': parsed_args.name,
'type': parsed_args.type,
'cluster_id': parsed_args.cluster,
'action': parsed_args.action,
'params': senlin_utils.format_parameters(parsed_args.params)
}
receiver = senlin_client.create_receiver(**params)
return _show_receiver(senlin_client, receiver.id)

View File

@ -187,3 +187,56 @@ class TestReceiverShow(TestReceiver):
error = self.assertRaises(exc.CommandError, self.cmd.take_action,
parsed_args)
self.assertEqual('Receiver not found: my_receiver', str(error))
class TestReceiverCreate(TestReceiver):
response = {"receiver": {
"action": "CLUSTER_SCALE_OUT",
"actor": {
"trust_id": [
"6dc6d336e3fc4c0a951b5698cd1236d9"
]
},
"channel": {
"alarm_url": "http://node1:8778/v1/webhooks/e03dd2e5-8f2e-4ec"
"1-8c6a-74ba891e5422/trigger?V=1&count=1"
},
"cluster_id": "ae63a10b-4a90-452c-aef1-113a0b255ee3",
"created_at": "2015-06-27T05:09:43",
"domain": "Default",
"id": "573aa1ba-bf45-49fd-907d-6b5d6e6adfd3",
"name": "cluster_inflate",
"params": {
"count": "1"
},
"project": "6e18cc2bdbeb48a5b3cad2dc499f6804",
"type": "webhook",
"updated_at": 'null',
"user": "b4ad2d6e18cc2b9c48049f6dbe8a5b3c"
}}
args = {
"action": "CLUSTER_SCALE_OUT",
"cluster_id": "my_cluster",
"name": "my_receiver",
"params": {
"count": "1"
},
"type": "webhook"
}
def setUp(self):
super(TestReceiverCreate, self).setUp()
self.cmd = osc_receiver.CreateReceiver(self.app, None)
self.mock_client.create_receiver = mock.Mock(
return_value=sdk_receiver.Receiver(None, self.response))
self.mock_client.get_receiver = mock.Mock(
return_value=sdk_receiver.Receiver(None, self.response))
def test_receiver_create(self):
arglist = ['my_receiver', '--action', 'CLUSTER_SCALE_OUT',
'--cluster', 'my_cluster', '--params', 'count=1',
'--type', 'webhook']
parsed_args = self.check_parser(self.cmd, arglist, [])
self.cmd.take_action(parsed_args)
self.mock_client.create_receiver.assert_called_with(**self.args)

View File

@ -67,6 +67,7 @@ openstack.clustering.v1 =
cluster_profile_type_list = senlinclient.osc.v1.profile_type:ProfileTypeList
cluster_profile_type_show = senlinclient.osc.v1.profile_type:ProfileTypeShow
cluster_profile_update = senlinclient.osc.v1.profile:UpdateProfile
cluster_receiver_create = senlinclient.osc.v1.receiver:CreateReceiver
cluster_receiver_list = senlinclient.osc.v1.receiver:ListReceiver
cluster_receiver_show = senlinclient.osc.v1.receiver:ShowReceiver