Merge "Add OSC plugin for openstack cluster receiver show"

senlinclient/osc/v1/receiver.py

@@ -13,8 +13,12 @@
 """Clustering v1 receiver action implementations"""
 
 import logging
+import six
 
 from cliff import lister
+from cliff import show
+from openstack import exceptions as sdk_exc
+from openstackclient.common import exceptions as exc
 from openstackclient.common import utils
 
 from senlinclient.common.i18n import _
@@ -101,3 +105,40 @@ class ListReceiver(lister.Lister):
             (utils.get_item_properties(r, columns, formatters=formatters)
              for r in receivers)
         )
+
+
+class ShowReceiver(show.ShowOne):
+    """Show the receiver details."""
+
+    log = logging.getLogger(__name__ + ".ShowReceiver")
+
+    def get_parser(self, prog_name):
+        parser = super(ShowReceiver, self).get_parser(prog_name)
+        parser.add_argument(
+            'receiver',
+            metavar='<receiver>',
+            help=_('Name or ID of the receiver to show')
+        )
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug("take_action(%s)", parsed_args)
+
+        senlin_client = self.app.client_manager.clustering
+        return _show_receiver(senlin_client, parsed_args.receiver)
+
+
+def _show_receiver(senlin_client, receiver_id):
+    try:
+        receiver = senlin_client.get_receiver(receiver_id)
+    except sdk_exc.ResourceNotFound:
+        raise exc.CommandError(_('Receiver not found: %s') % receiver_id)
+
+    formatters = {
+        'actor': senlin_utils.json_formatter,
+        'params': senlin_utils.json_formatter,
+        'channel': senlin_utils.json_formatter,
+    }
+    columns = list(six.iterkeys(receiver))
+    return columns, utils.get_dict_properties(receiver.to_dict(), columns,
+                                              formatters=formatters)

senlinclient/tests/unit/osc/v1/test_receiver.py

@@ -15,6 +15,7 @@ import mock
 
 from openstack.cluster.v1 import receiver as sdk_receiver
 from openstack import exceptions as sdk_exc
+from openstackclient.common import exceptions as exc
 
 from senlinclient.osc.v1 import receiver as osc_receiver
 from senlinclient.tests.unit.osc.v1 import fakes
@@ -139,3 +140,50 @@ class TestReceiverList(TestReceiver):
         columns, data = self.cmd.take_action(parsed_args)
         self.mock_client.receivers.assert_called_with(**kwargs)
         self.assertEqual(self.columns, columns)
+
+
+class TestReceiverShow(TestReceiver):
+    get_response = {"receiver": {
+        "action": "CLUSTER_SCALE_OUT",
+        "actor": {
+            "trust_id": [
+                "6dc6d336e3fc4c0a951b5698cd1236d9"
+            ]
+        },
+        "channel": {
+            "alarm_url": "http://node1:8778/v1/webhooks/e03dd2e5-8f2e-4ec1-"
+                         "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"
+    }}
+
+    def setUp(self):
+        super(TestReceiverShow, self).setUp()
+        self.cmd = osc_receiver.ShowReceiver(self.app, None)
+        self.mock_client.get_receiver = mock.Mock(
+            return_value=sdk_receiver.Receiver(None, self.get_response))
+
+    def test_receiver_show(self):
+        arglist = ['my_receiver']
+        parsed_args = self.check_parser(self.cmd, arglist, [])
+        self.cmd.take_action(parsed_args)
+        self.mock_client.get_receiver.assert_called_with('my_receiver')
+
+    def test_receiver_show_not_found(self):
+        arglist = ['my_receiver']
+        parsed_args = self.check_parser(self.cmd, arglist, [])
+        self.mock_client.get_receiver.side_effect = sdk_exc.ResourceNotFound()
+        error = self.assertRaises(exc.CommandError, self.cmd.take_action,
+                                  parsed_args)
+        self.assertEqual('Receiver not found: my_receiver', str(error))

setup.cfg

@@ -68,6 +68,7 @@ openstack.clustering.v1 =
     cluster_profile_type_show = senlinclient.osc.v1.profile_type:ProfileTypeShow
     cluster_profile_update = senlinclient.osc.v1.profile:UpdateProfile
     cluster_receiver_list = senlinclient.osc.v1.receiver:ListReceiver
+    cluster_receiver_show = senlinclient.osc.v1.receiver:ShowReceiver
 
 [global]
 setup-hooks =