diff options
| author | Chris Behrens <cbehrens@codestud.com> | 2011-06-29 12:23:26 -0700 |
|---|---|---|
| committer | Chris Behrens <cbehrens@codestud.com> | 2011-06-29 12:23:26 -0700 |
| commit | 851802e772095b646a7570bf0cc0c6d32be4643c (patch) | |
| tree | 96ccd72a48cae858f3d35b18d06500c26adf8fe8 /nova | |
| parent | 6af4a9ded53efe4ca5c3aad1f3a621cc73513fb0 (diff) | |
Fixed indentation issues
Fixed min/max_count checking issues
Fixed a wrongly log message when zone aware scheduler finds no suitable hosts
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/openstack/create_instance_helper.py | 11 | ||||
| -rw-r--r-- | nova/api/openstack/servers.py | 12 | ||||
| -rw-r--r-- | nova/compute/api.py | 13 | ||||
| -rw-r--r-- | nova/scheduler/zone_aware_scheduler.py | 2 |
4 files changed, 23 insertions, 15 deletions
diff --git a/nova/api/openstack/create_instance_helper.py b/nova/api/openstack/create_instance_helper.py index 4c6cc0f83..2cc38911a 100644 --- a/nova/api/openstack/create_instance_helper.py +++ b/nova/api/openstack/create_instance_helper.py @@ -116,9 +116,16 @@ class CreateInstanceHelper(object): reservation_id = body['server'].get('reservation_id') min_count = body['server'].get('min_count') max_count = body['server'].get('max_count') - if min_count: + # min_count and max_count are optional. If they exist, they come + # in as strings. We want to default 'min_count' to 1, and default + # 'max_count' to be 'min_count'. + if not min_count: + min_count = 1 + else: min_count = int(min_count) - if max_count: + if not max_count: + max_count = min_count + else: max_count = int(max_count) if min_count > max_count: min_count = max_count diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index decbfd6e6..66ef97af0 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -83,11 +83,11 @@ class Controller(object): recurse_zones = query_str.get('recurse_zones') recurse_zones = recurse_zones and True or False instance_list = self.compute_api.get_all( - req.environ['nova.context'], - reservation_id=reservation_id, - project_id=project_id, - fixed_ip=fixed_ip, - recurse_zones=recurse_zones) + req.environ['nova.context'], + reservation_id=reservation_id, + project_id=project_id, + fixed_ip=fixed_ip, + recurse_zones=recurse_zones) limited_list = self._limit_items(instance_list, req) builder = self._get_view_builder(req) servers = [builder.build(inst, is_detail)['server'] @@ -120,7 +120,7 @@ class Controller(object): result = None try: extra_values, instances = self.helper.create_instance( - req, body, self.compute_api.create) + req, body, self.compute_api.create) except faults.Fault, f: return f diff --git a/nova/compute/api.py b/nova/compute/api.py index 1092ec727..92b87e75c 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -657,12 +657,13 @@ class API(base.Base): return instances admin_context = context.elevated() - children = scheduler_api.call_zone_method(admin_context, "list", - novaclient_collection_name="servers", - reservation_id=reservation_id, - project_id=project_id, - fixed_ip=fixed_ip, - recurse_zones=True) + children = scheduler_api.call_zone_method(admin_context, + "list", + novaclient_collection_name="servers", + reservation_id=reservation_id, + project_id=project_id, + fixed_ip=fixed_ip, + recurse_zones=True) for zone, servers in children: for server in servers: diff --git a/nova/scheduler/zone_aware_scheduler.py b/nova/scheduler/zone_aware_scheduler.py index 2e6662a79..9e4fc47d1 100644 --- a/nova/scheduler/zone_aware_scheduler.py +++ b/nova/scheduler/zone_aware_scheduler.py @@ -245,7 +245,7 @@ class ZoneAwareScheduler(driver.Scheduler): # may have been consumed from a previous build.. host_list = self.filter_hosts(topic, request_spec, host_list) if not host_list: - LOG.warn(_("Ran out of available hosts after weighing " + LOG.warn(_("Filter returned no hosts after processing " "%(i)d of %(num_instances)d instances") % locals()) break |