From ebfad587b32e31bc08e2e78f36b0b40131745a1e Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh@jk0.org>
Date: Mon, 11 Mar 2013 18:07:48 -0500
Subject: [PATCH] Added compute hypervisor support.
Change-Id: Ib8109550b06d152773394a1d15f6202b9f9b029c
---
openstackclient/compute/v2/hypervisor.py | 84 ++++++++++++++++++++++++
setup.py | 4 ++
2 files changed, 88 insertions(+)
create mode 100644 openstackclient/compute/v2/hypervisor.py
diff --git a/openstackclient/compute/v2/hypervisor.py b/openstackclient/compute/v2/hypervisor.py
new file mode 100644
index 0000000000..35866aecea
--- /dev/null
+++ b/openstackclient/compute/v2/hypervisor.py
@@ -0,0 +1,84 @@
+# Copyright 2013 OpenStack, LLC.
+#
+# 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.
+#
+
+"""Hypervisor action implementations"""
+
+import logging
+
+from cliff import lister
+from cliff import show
+
+from openstackclient.common import utils
+
+
+class ListHypervisor(lister.Lister):
+ """List hypervisor command"""
+
+ api = "compute"
+ log = logging.getLogger(__name__ + ".ListHypervisor")
+
+ def get_parser(self, prog_name):
+ parser = super(ListHypervisor, self).get_parser(prog_name)
+ parser.add_argument(
+ "--matching",
+ metavar="<hostname>",
+ help="List hypervisors with hostnames matching the given"
+ " substring")
+ return parser
+
+ def take_action(self, parsed_args):
+ self.log.debug("take_action(%s)" % parsed_args)
+ compute_client = self.app.client_manager.compute
+ columns = (
+ "ID",
+ "Hypervisor Hostname"
+ )
+
+ if parsed_args.matching:
+ data = compute_client.hypervisors.search(parsed_args.matching)
+ else:
+ data = compute_client.hypervisors.list()
+
+ return (columns,
+ (utils.get_item_properties(
+ s, columns,
+ ) for s in data))
+
+
+class ShowHypervisor(show.ShowOne):
+ """Show hypervisor command"""
+
+ api = "compute"
+ log = logging.getLogger(__name__ + ".ShowHypervisor")
+
+ def get_parser(self, prog_name):
+ parser = super(ShowHypervisor, self).get_parser(prog_name)
+ parser.add_argument(
+ "id",
+ metavar="<id>",
+ help="ID of the hypervisor to display")
+ return parser
+
+ def take_action(self, parsed_args):
+ self.log.debug("take_action(%s)" % parsed_args)
+ compute_client = self.app.client_manager.compute
+ hypervisor = utils.find_resource(compute_client.hypervisors,
+ parsed_args.id)._info.copy()
+
+ hypervisor["service_id"] = hypervisor["service"]["id"]
+ hypervisor["service_host"] = hypervisor["service"]["host"]
+ del hypervisor["service"]
+
+ return zip(*sorted(hypervisor.iteritems()))
diff --git a/setup.py b/setup.py
index 57ee32b469..54976f1aa8 100644
--- a/setup.py
+++ b/setup.py
@@ -148,6 +148,8 @@ setuptools.setup(
'list_agent=openstackclient.compute.v2.agent:ListAgent',
'list_flavor=openstackclient.compute.v2.flavor:ListFlavor',
'list_host=openstackclient.compute.v2.host:ListHost',
+ 'list_hypervisor=' +
+ 'openstackclient.compute.v2.hypervisor:ListHypervisor',
'list_server=openstackclient.compute.v2.server:ListServer',
'list_compute-service=' +
'openstackclient.compute.v2.service:ListService',
@@ -160,6 +162,8 @@ setuptools.setup(
'openstackclient.compute.v2.service:SetService',
'show_flavor=openstackclient.compute.v2.flavor:ShowFlavor',
'show_host=openstackclient.compute.v2.host:ShowHost',
+ 'show_hypervisor=' +
+ 'openstackclient.compute.v2.hypervisor:ShowHypervisor',
'show_server=openstackclient.compute.v2.server:ShowServer',
'suspend_server=openstackclient.compute.v2.server:SuspendServer',
'unpause_server=openstackclient.compute.v2.server:UnpauseServer',