Merge lp:~tpatil/nova/os-availability-zone into lp:~hudson-openstack/nova/trunk

[Tushar Patil]

Currently OS API doesn't accept availability zone parameter so there is no way to instruct scheduler (SimpleScheduler) to launch VM instance on specific host of specified zone.

Now changes have been made in the create_instance_helper to read the availability zone and pass it to the compute create API. Any OS extensions can take a advantage of it.
Also changes have been made in the nova-manage ServiceCommands class to expose zone information to the admin users. Only admin users will be allowed to launch VM instance on specific host.

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Jesse Andrews (anotherjesse)]

lgtm

review: Approve

=== modified file 'bin/nova-manage'
--- bin/nova-manage	2011-08-09 15:41:55 +0000
+++ bin/nova-manage	2011-08-11 18:30:27 +0000
@@ -882,6 +882,14 @@
             services = [s for s in services if s['host'] == host]
         if service:
             services = [s for s in services if s['binary'] == service]
+        print_format = "%-16s %-36s %-16s %-10s %-5s %-10s"
+        print print_format % (
+                    _('Binary'),
+                    _('Host'),
+                    _('Zone'),
+                    _('Status'),
+                    _('State'),
+                    _('Updated_At'))
         for svc in services:
             delta = now - (svc['updated_at'] or svc['created_at'])
             alive = (delta.seconds <= 15)
@@ -889,9 +897,9 @@
             active = 'enabled'
             if svc['disabled']:
                 active = 'disabled'
-            print "%-10s %-10s %-8s %s %s" % (svc['host'], svc['binary'],
-                                              active, art,
-                                              svc['updated_at'])
+            print print_format % (svc['binary'], svc['host'],
+                                  svc['availability_zone'], active, art,
+                                  svc['updated_at'])
 
     @args('--host', dest='host', metavar='<host>', help='Host')
     @args('--service', dest='service', metavar='<service>',

=== modified file 'nova/api/openstack/create_instance_helper.py'
--- nova/api/openstack/create_instance_helper.py	2011-08-09 22:46:57 +0000
+++ nova/api/openstack/create_instance_helper.py	2011-08-11 18:30:27 +0000
@@ -122,6 +122,7 @@
             raise exc.HTTPBadRequest(explanation=msg)
 
         zone_blob = server_dict.get('blob')
+        availability_zone = server_dict.get('availability_zone')
         name = server_dict['name']
         self._validate_server_name(name)
         name = name.strip()
@@ -161,7 +162,8 @@
                                   zone_blob=zone_blob,
                                   reservation_id=reservation_id,
                                   min_count=min_count,
-                                  max_count=max_count))
+                                  max_count=max_count,
+                                  availability_zone=availability_zone))
         except quota.QuotaError as error:
             self._handle_quota_error(error)
         except exception.ImageNotFound as error: