Merge "Set/Delete metadata on all instances of a host."

novaclient/tests/v1_1/fakes.py

@@ -398,6 +398,30 @@ class FakeHTTPClient(base_client.HTTPClient):
     def get_servers_1234_diagnostics(self, **kw):
         return (200, {}, {'data': 'Fake diagnostics'})
 
+    def post_servers_uuid1_metadata(self, **kw):
+        return (204, {}, {'metadata': {'key1': 'val1'}})
+
+    def post_servers_uuid2_metadata(self, **kw):
+        return (204, {}, {'metadata': {'key1': 'val1'}})
+
+    def post_servers_uuid3_metadata(self, **kw):
+        return (204, {}, {'metadata': {'key1': 'val1'}})
+
+    def post_servers_uuid4_metadata(self, **kw):
+        return (204, {}, {'metadata': {'key1': 'val1'}})
+
+    def delete_servers_uuid1_metadata_key1(self, **kw):
+        return (200, {}, {'data': 'Fake diagnostics'})
+
+    def delete_servers_uuid2_metadata_key1(self, **kw):
+        return (200, {}, {'data': 'Fake diagnostics'})
+
+    def delete_servers_uuid3_metadata_key1(self, **kw):
+        return (200, {}, {'data': 'Fake diagnostics'})
+
+    def delete_servers_uuid4_metadata_key1(self, **kw):
+        return (200, {}, {'data': 'Fake diagnostics'})
+
     #
     # Server Addresses
     #
@@ -1476,6 +1500,10 @@ class FakeHTTPClient(base_client.HTTPClient):
                             ]}
                     ]})
 
+    def get_os_hypervisors_hyper_no_servers_servers(self, **kw):
+        return (200, {}, {'hypervisors':
+                          [{'id': 1234, 'hypervisor_hostname': 'hyper1'}]})
+
     def get_os_hypervisors_1234(self, **kw):
         return (200, {}, {'hypervisor':
                           {'id': 1234,

novaclient/tests/v1_1/test_shell.py

@@ -656,6 +656,32 @@ class ShellTest(utils.TestCase):
         self.assert_called('DELETE', '/servers/1234/metadata/key1')
         self.assert_called('DELETE', '/servers/1234/metadata/key2', pos=-2)
 
+    def test_set_host_meta(self):
+        self.run_command('host-meta hyper set key1=val1 key2=val2')
+        self.assert_called('GET', '/os-hypervisors/hyper/servers', pos=0)
+        self.assert_called('POST', '/servers/uuid1/metadata',
+                           {'metadata': {'key1': 'val1', 'key2': 'val2'}},
+                           pos=1)
+        self.assert_called('POST', '/servers/uuid2/metadata',
+                           {'metadata': {'key1': 'val1', 'key2': 'val2'}},
+                           pos=2)
+        self.assert_called('POST', '/servers/uuid3/metadata',
+                           {'metadata': {'key1': 'val1', 'key2': 'val2'}},
+                           pos=3)
+        self.assert_called('POST', '/servers/uuid4/metadata',
+                           {'metadata': {'key1': 'val1', 'key2': 'val2'}},
+                           pos=4)
+
+    def test_set_host_meta_with_no_servers(self):
+        self.run_command('host-meta hyper_no_servers set key1=val1 key2=val2')
+        self.assert_called('GET', '/os-hypervisors/hyper_no_servers/servers')
+
+    def test_delete_host_meta(self):
+        self.run_command('host-meta hyper delete key1')
+        self.assert_called('GET', '/os-hypervisors/hyper/servers', pos=0)
+        self.assert_called('DELETE', '/servers/uuid1/metadata/key1', pos=1)
+        self.assert_called('DELETE', '/servers/uuid2/metadata/key1', pos=2)
+
     def test_dns_create(self):
         self.run_command('dns-create 192.168.1.1 testname testdomain')
         self.assert_called('PUT',

novaclient/v1_1/contrib/metadata_extensions.py

@@ -0,0 +1,43 @@
+# Copyright 2013 Rackspace Hosting
+# All Rights Reserved.
+#
+#    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.
+
+from novaclient import utils
+from novaclient.v1_1 import shell
+
+
+@utils.arg('host',
+           metavar='<host>',
+           help='Name of host.')
+@utils.arg('action',
+           metavar='<action>',
+           choices=['set', 'delete'],
+           help="Actions: 'set' or 'delete'")
+@utils.arg('metadata',
+           metavar='<key=value>',
+           nargs='+',
+           action='append',
+           default=[],
+           help='Metadata to set or delete (only key is necessary on delete)')
+def do_host_meta(cs, args):
+    """Set or Delete metadata on all instances of a host."""
+    hypervisors = cs.hypervisors.search(args.host, servers=True)
+    for hyper in hypervisors:
+        metadata = shell._extract_metadata(args)
+        if hasattr(hyper, 'servers'):
+            for server in hyper.servers:
+                if args.action == 'set':
+                    cs.servers.set_meta(server['uuid'], metadata)
+                elif args.action == 'delete':
+                    cs.servers.delete_meta(server['uuid'], metadata.keys())