Add --diagnostics to server info

Conflicts:

	kamaki/cli/commands/cyclades.py

kamaki/cli/commands/cyclades.py

@@ -289,6 +289,8 @@ class server_info(_init_cyclades, _optional_json):
         elif self['stats']:
             self._print(
                 self.client.get_server_stats(server_id), self.print_dict)
+        elif self['diagnostics']:
+            self._print(self.client.get_server_diagnostics(server_id))
         else:
             vm = self.client.get_server_details(server_id)
             uuids = self._uuids2usernames([vm['user_id'], vm['tenant_id']])

kamaki/clients/cyclades/__init__.py

@@ -121,6 +121,15 @@ class CycladesClient(CycladesRestClient, Waiter):
         r = self.servers_stats_get(server_id)
         return r.json['stats']
 
+    def get_server_diagnostics(self, server_id):
+        """
+        :param server_id: integer (str or int)
+
+        :returns: (list)
+        """
+        r = self.servers_diagnostics_get(server_id)
+        return r.json
+
     def wait_server(
             self, server_id,
             current_status='BUILD',

kamaki/clients/cyclades/rest_api.py

@@ -42,3 +42,8 @@ class CycladesRestClient(ComputeClient):
         """GET base_url/servers/<server_id>/stats"""
         path = path4url('servers', server_id, 'stats')
         return self.get(path, success=200, **kwargs)
+
+    def servers_diagnostics_get(self, server_id, **kwargs):
+        """GET base_url/servers/<server_id>/diagnostics"""
+        path = path4url('servers', server_id, 'diagnostics')
+        return self.get(path, success=200, **kwargs)

kamaki/clients/cyclades/test.py

@@ -106,6 +106,14 @@ class CycladesRestClient(TestCase):
         get.assert_called_once_with(
             '/servers/%s/stats' % server_id, success=200)
 
+    @patch('kamaki.clients.Client.get', return_value='ret')
+    def test_servers_diagnostics_get(self, get):
+        server_id = 'server id'
+        self.assertEqual(
+            self.client.servers_diagnostics_get(server_id), 'ret')
+        get.assert_called_once_with(
+            '/servers/%s/diagnostics' % server_id, success=200)
+
 
 class CycladesNetworkClient(TestCase):