From ac8b4ce4ac03ef884fde4fed5be00e3f5b42df8e Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh@jk0.org>
Date: Tue, 19 Feb 2013 12:38:22 -0600
Subject: [PATCH] Added compute agent support.
Change-Id: I818a2ea51a773f50da385cbdd71771a4ac923bd7
---
openstackclient/compute/v2/agent.py | 168 ++++++++++++++++++++++++++++
setup.py | 4 +
2 files changed, 172 insertions(+)
create mode 100644 openstackclient/compute/v2/agent.py
diff --git a/openstackclient/compute/v2/agent.py b/openstackclient/compute/v2/agent.py
new file mode 100644
index 0000000000..2af701a6fc
--- /dev/null
+++ b/openstackclient/compute/v2/agent.py
@@ -0,0 +1,168 @@
+# 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.
+#
+
+"""Agent action implementations"""
+
+import logging
+
+from cliff import command
+from cliff import lister
+from cliff import show
+
+from novaclient.v1_1 import agents
+from openstackclient.common import utils
+
+
+class CreateAgent(show.ShowOne):
+ """Create agent command"""
+
+ api = "compute"
+ log = logging.getLogger(__name__ + ".CreateAgent")
+
+ def get_parser(self, prog_name):
+ parser = super(CreateAgent, self).get_parser(prog_name)
+ parser.add_argument(
+ "os",
+ metavar="<os>",
+ help="Type of OS")
+ parser.add_argument(
+ "architecture",
+ metavar="<architecture>",
+ help="Type of architecture")
+ parser.add_argument(
+ "version",
+ metavar="<version>",
+ help="Version")
+ parser.add_argument(
+ "url",
+ metavar="<url>",
+ help="URL")
+ parser.add_argument(
+ "md5hash",
+ metavar="<md5hash>",
+ help="MD5 hash")
+ parser.add_argument(
+ "hypervisor",
+ metavar="<hypervisor>",
+ help="Type of hypervisor",
+ default="xen")
+ return parser
+
+ def take_action(self, parsed_args):
+ self.log.debug("take_action(%s)" % parsed_args)
+ compute_client = self.app.client_manager.compute
+ args = (
+ parsed_args.os,
+ parsed_args.architecture,
+ parsed_args.version,
+ parsed_args.url,
+ parsed_args.md5hash,
+ parsed_args.hypervisor
+ )
+ agent = compute_client.agents.create(*args)._info.copy()
+ return zip(*sorted(agent.iteritems()))
+
+
+class DeleteAgent(command.Command):
+ """Delete agent command"""
+
+ api = "compute"
+ log = logging.getLogger(__name__ + ".DeleteAgent")
+
+ def get_parser(self, prog_name):
+ parser = super(DeleteAgent, self).get_parser(prog_name)
+ parser.add_argument(
+ "id",
+ metavar="<id>",
+ help="ID of agent to delete")
+ return parser
+
+ def take_action(self, parsed_args):
+ self.log.debug("take_action(%s)" % parsed_args)
+ compute_client = self.app.client_manager.compute
+ compute_client.agents.delete(parsed_args.id)
+ return
+
+
+class ListAgent(lister.Lister):
+ """List agent command"""
+
+ api = "compute"
+ log = logging.getLogger(__name__ + ".ListAgent")
+
+ def get_parser(self, prog_name):
+ parser = super(ListAgent, self).get_parser(prog_name)
+ parser.add_argument(
+ "--hypervisor",
+ metavar="<hypervisor>",
+ help="Type of hypervisor")
+ return parser
+
+ def take_action(self, parsed_args):
+ self.log.debug("take_action(%s)" % parsed_args)
+ compute_client = self.app.client_manager.compute
+ columns = (
+ "Agent_ID",
+ "Hypervisor",
+ "OS",
+ "Architecture",
+ "Version",
+ "Md5Hash",
+ "URL"
+ )
+ data = compute_client.agents.list(parsed_args.hypervisor)
+ return (columns,
+ (utils.get_item_properties(
+ s, columns,
+ ) for s in data))
+
+
+class SetAgent(show.ShowOne):
+ """Set agent command"""
+
+ api = "compute"
+ log = logging.getLogger(__name__ + ".SetAgent")
+
+ def get_parser(self, prog_name):
+ parser = super(SetAgent, self).get_parser(prog_name)
+ parser.add_argument(
+ "id",
+ metavar="<id>",
+ help="ID of the agent build")
+ parser.add_argument(
+ "version",
+ metavar="<version>",
+ help="Version of the agent")
+ parser.add_argument(
+ "url",
+ metavar="<url>",
+ help="URL")
+ parser.add_argument(
+ "md5hash",
+ metavar="<md5hash>",
+ help="MD5 hash")
+ return parser
+
+ def take_action(self, parsed_args):
+ self.log.debug("take_action(%s)" % parsed_args)
+ compute_client = self.app.client_manager.compute
+ args = (
+ parsed_args.id,
+ parsed_args.version,
+ parsed_args.url,
+ parsed_args.md5hash
+ )
+ agent = compute_client.agents.update(*args)._info.copy()
+ return zip(*sorted(agent.iteritems()))
diff --git a/setup.py b/setup.py
index 0eda4b8bb9..2e1b914f67 100644
--- a/setup.py
+++ b/setup.py
@@ -124,13 +124,17 @@ setuptools.setup(
'save_image=openstackclient.image.v2.image:SaveImage',
],
'openstack.compute.v2': [
+ 'create_agent=openstackclient.compute.v2.agent:CreateAgent',
'create_server=openstackclient.compute.v2.server:CreateServer',
+ 'delete_agent=openstackclient.compute.v2.agent:DeleteAgent',
'delete_server=openstackclient.compute.v2.server:DeleteServer',
+ 'list_agent=openstackclient.compute.v2.agent:ListAgent',
'list_server=openstackclient.compute.v2.server:ListServer',
'pause_server=openstackclient.compute.v2.server:PauseServer',
'reboot_server=openstackclient.compute.v2.server:RebootServer',
'rebuild_server=openstackclient.compute.v2.server:RebuildServer',
'resume_server=openstackclient.compute.v2.server:ResumeServer',
+ 'set_agent=openstackclient.compute.v2.agent:SetAgent',
'show_server=openstackclient.compute.v2.server:ShowServer',
'suspend_server=openstackclient.compute.v2.server:SuspendServer',
'unpause_server=openstackclient.compute.v2.server:UnpauseServer',