From 8bd0296224b70e318e208a4570b4acaa599f62c8 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Fri, 17 Jun 2011 18:26:31 +0400 Subject: Made hostname independent from ec2 id. Add generation of hostnames based on display name. --- nova/compute/api.py | 24 +++++++++++++++++++++--- nova/compute/manager.py | 6 +++--- 2 files changed, 24 insertions(+), 6 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index e2c4cf8d7..844192404 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -47,9 +47,25 @@ flags.DEFINE_integer('find_host_timeout', 30, 'Timeout after NN seconds when looking for a host.') -def generate_default_hostname(instance_id): +def generate_default_hostname(instance): """Default function to generate a hostname given an instance reference.""" - return str(instance_id) + display_name = instance['display_name'] + if display_name is None: + return 'server_%d' % (instance['id'],) + table = '' + deletions = '' + for i in xrange(256): + c = chr(i) + if ('a' <= c <= 'z') or ('0' <= c <= '9') or (c == '-'): + table += c + elif c == ' ': + table += '_' + elif ('A' <= c <= 'Z'): + table += c.lower() + else: + table += '\0' + deletions += c + return display_name.encode('latin-1', 'ignore').translate(table, deletions) class API(base.Base): @@ -256,10 +272,12 @@ class API(base.Base): security_group_id) # Set sane defaults if not specified - updates = dict(hostname=self.hostname_factory(instance_id)) + updates = {} if (not hasattr(instance, 'display_name') or instance.display_name is None): updates['display_name'] = "Server %s" % instance_id + instance['display_name'] = updates['display_name'] + updates['hostname'] = self.hostname_factory(instance) instance = self.update(context, instance_id, **updates) diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 245958de7..e84c434d2 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -933,7 +933,7 @@ class ComputeManager(manager.SchedulerDependentManager): # Getting instance info instance_ref = self.db.instance_get(context, instance_id) - ec2_id = instance_ref['hostname'] + hostname = instance_ref['hostname'] # Getting fixed ips fixed_ip = self.db.instance_get_fixed_address(context, instance_id) @@ -942,7 +942,7 @@ class ComputeManager(manager.SchedulerDependentManager): # If any volume is mounted, prepare here. if not instance_ref['volumes']: - LOG.info(_("%s has no volume."), ec2_id) + LOG.info(_("%s has no volume."), hostname) else: for v in instance_ref['volumes']: self.volume_manager.setup_compute_volume(context, v['id']) @@ -965,7 +965,7 @@ class ComputeManager(manager.SchedulerDependentManager): raise else: LOG.warn(_("setup_compute_network() failed %(cnt)d." - "Retry up to %(max_retry)d for %(ec2_id)s.") + "Retry up to %(max_retry)d for %(hostname)s.") % locals()) time.sleep(1) -- cgit From 0d426ae8d0fe4e697648e58d1791e1c40b78deab Mon Sep 17 00:00:00 2001 From: Sandy Walsh Date: Mon, 20 Jun 2011 16:56:59 -0700 Subject: fix lp 798361 --- nova/compute/api.py | 55 +++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index e6cffb6b3..cb73af94c 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -200,18 +200,7 @@ class API(base.Base): if ramdisk_id: image_service.show(context, ramdisk_id) - if security_group is None: - security_group = ['default'] - if not type(security_group) is list: - security_group = [security_group] - - security_groups = [] self.ensure_default_security_group(context) - for security_group_name in security_group: - group = db.security_group_get_by_name(context, - context.project_id, - security_group_name) - security_groups.append(group['id']) if key_data is None and key_name: key_pair = db.key_pair_get(context, context.user_id, key_name) @@ -245,15 +234,19 @@ class API(base.Base): 'os_type': os_type, 'vm_mode': vm_mode} - return (num_instances, base_options, security_groups) + return (num_instances, base_options) def create_db_entry_for_new_instance(self, context, base_options, - security_groups, block_device_mapping, num=1): + security_group, block_device_mapping, num=1): """Create an entry in the DB for this new instance, - including any related table updates (such as security - groups, MAC address, etc). This will called by create() - in the majority of situations, but all-at-once style - Schedulers may initiate the call.""" + including any related table updates (such as security group, + MAC address, etc). + + This will called by create() in the majority of situations, + but create_all_at_once() style Schedulers may initiate the call. + If you are changing this method, be sure to update both + call paths. + """ instance = dict(mac_address=utils.generate_mac(), launch_index=num, **base_options) @@ -261,13 +254,24 @@ class API(base.Base): instance_id = instance['id'] elevated = context.elevated() - if not security_groups: - security_groups = [] + if security_group is None: + security_group = ['default'] + if not type(security_group) is list: + security_group = [security_group] + + security_groups = [] + for security_group_name in security_group: + group = db.security_group_get_by_name(context, + context.project_id, + security_group_name) + security_groups.append(group['id']) + for security_group_id in security_groups: self.db.instance_add_security_group(elevated, instance_id, security_group_id) - + + block_device_mapping = block_device_mapping or [] # NOTE(yamahata) # tell vm driver to attach volume at boot time by updating # BlockDeviceMapping @@ -339,12 +343,11 @@ class API(base.Base): key_name=None, key_data=None, security_group='default', availability_zone=None, user_data=None, metadata={}, injected_files=None, admin_password=None, zone_blob=None, - reservation_id=None): + reservation_id=None, block_device_mapping=None): """Provision the instances by passing the whole request to the Scheduler for execution. Returns a Reservation ID related to the creation of all of these instances.""" - num_instances, base_options, security_groups = \ - self._check_create_parameters( + num_instances, base_options = self._check_create_parameters( context, instance_type, image_href, kernel_id, ramdisk_id, min_count, max_count, @@ -379,8 +382,7 @@ class API(base.Base): Returns a list of instance dicts. """ - num_instances, base_options, security_groups = \ - self._check_create_parameters( + num_instances, base_options = self._check_create_parameters( context, instance_type, image_href, kernel_id, ramdisk_id, min_count, max_count, @@ -390,12 +392,11 @@ class API(base.Base): injected_files, admin_password, zone_blob, reservation_id) - block_device_mapping = block_device_mapping or [] instances = [] LOG.debug(_("Going to run %s instances..."), num_instances) for num in range(num_instances): instance = self.create_db_entry_for_new_instance(context, - base_options, security_groups, + base_options, security_group, block_device_mapping, num=num) instances.append(instance) instance_id = instance['id'] -- cgit From 2d74b48984783ae09c2f29bf5c6fa0f81e6d32c2 Mon Sep 17 00:00:00 2001 From: Sandy Walsh Date: Mon, 20 Jun 2011 17:21:22 -0700 Subject: trunk merge --- nova/compute/api.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index cb73af94c..0791bab51 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -379,6 +379,9 @@ class API(base.Base): Scheduler drivers, but may remove the effectiveness of the more complicated drivers. + NOTE: If you change this method, be sure to change + create_all_at_once() at the same time! + Returns a list of instance dicts. """ -- cgit From d99b17895747959e332e5645aedd0a2ddc0e21da Mon Sep 17 00:00:00 2001 From: Sandy Walsh Date: Tue, 21 Jun 2011 12:19:01 -0700 Subject: pep8 --- nova/compute/api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index 0791bab51..1c001a8fc 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -241,7 +241,7 @@ class API(base.Base): """Create an entry in the DB for this new instance, including any related table updates (such as security group, MAC address, etc). - + This will called by create() in the majority of situations, but create_all_at_once() style Schedulers may initiate the call. If you are changing this method, be sure to update both @@ -270,7 +270,7 @@ class API(base.Base): self.db.instance_add_security_group(elevated, instance_id, security_group_id) - + block_device_mapping = block_device_mapping or [] # NOTE(yamahata) # tell vm driver to attach volume at boot time by updating -- cgit From 1f99e500a99a4d66639f04f2c723058c4d1dfc1d Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Wed, 22 Jun 2011 13:45:24 -0700 Subject: Check API request for min_count/max_count for number of instances to build --- nova/compute/api.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index a7ea88d51..44e11d187 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -143,7 +143,7 @@ class API(base.Base): def _check_create_parameters(self, context, instance_type, image_href, kernel_id=None, ramdisk_id=None, - min_count=1, max_count=1, + min_count=None, max_count=None, display_name='', display_description='', key_name=None, key_data=None, security_group='default', availability_zone=None, user_data=None, metadata={}, @@ -154,6 +154,10 @@ class API(base.Base): if not instance_type: instance_type = instance_types.get_default_instance_type() + if not min_count: + min_count = 1 + if not max_count: + max_count = min_count num_instances = quota.allowed_instances(context, max_count, instance_type) @@ -338,7 +342,7 @@ class API(base.Base): def create_all_at_once(self, context, instance_type, image_href, kernel_id=None, ramdisk_id=None, - min_count=1, max_count=1, + min_count=None, max_count=None, display_name='', display_description='', key_name=None, key_data=None, security_group='default', availability_zone=None, user_data=None, metadata={}, @@ -368,7 +372,7 @@ class API(base.Base): def create(self, context, instance_type, image_href, kernel_id=None, ramdisk_id=None, - min_count=1, max_count=1, + min_count=None, max_count=None, display_name='', display_description='', key_name=None, key_data=None, security_group='default', availability_zone=None, user_data=None, metadata={}, -- cgit From b9a861d72f1a98510dd4b68e547b434388ab9a64 Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Thu, 23 Jun 2011 05:20:50 -0700 Subject: add support for compute_api.get_all() recursing zones for more than just reservation_id --- nova/compute/api.py | 66 +++++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 32 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index a7ea88d51..9db83d65f 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -603,50 +603,52 @@ class API(base.Base): """ return self.get(context, instance_id) - def get_all_across_zones(self, context, reservation_id): - """Get all instances with this reservation_id, across - all available Zones (if any). - """ - context = context.elevated() - instances = self.db.instance_get_all_by_reservation( - context, reservation_id) - - children = scheduler_api.call_zone_method(context, "list", - novaclient_collection_name="servers", - reservation_id=reservation_id) - - for zone, servers in children: - for server in servers: - # Results are ready to send to user. No need to scrub. - server._info['_is_precooked'] = True - instances.append(server._info) - return instances - def get_all(self, context, project_id=None, reservation_id=None, - fixed_ip=None): + fixed_ip=None, recurse_zones=False): """Get all instances filtered by one of the given parameters. If there is no filter and the context is an admin, it will retreive all instances in the system. """ - if reservation_id is not None: - return self.get_all_across_zones(context, reservation_id) + admin_context = context.elevated() - if fixed_ip is not None: - return self.db.fixed_ip_get_instance(context, fixed_ip) - - if project_id or not context.is_admin: + if reservation_id is not None: + recurse_zones = True + instances = self.db.instance_get_all_by_reservation( + context, reservation_id) + elif fixed_ip is not None: + instances = self.db.fixed_ip_get_instance(context, fixed_ip) + elif project_id or not context.is_admin: if not context.project: - return self.db.instance_get_all_by_user( + instances = self.db.instance_get_all_by_user( context, context.user_id) + else: + if project_id is None: + project_id = context.project_id + instances = self.db.instance_get_all_by_project( + context, project_id) + else: + instances = self.db.instance_get_all(context) + + if not isinstance(instances, list): + instances = [instances] - if project_id is None: - project_id = context.project_id + if not recurse_zones: + return instances - return self.db.instance_get_all_by_project( - context, project_id) + 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) - return self.db.instance_get_all(context) + for zone, servers in children: + for server in servers: + # Results are ready to send to user. No need to scrub. + server._info['_is_precooked'] = True + instances.append(server._info) + return instances def _cast_compute_message(self, method, context, instance_id, host=None, params=None): -- cgit From 1aa7e746d5918f2a664da1937183b66fe31f6bd4 Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Thu, 23 Jun 2011 05:35:04 -0700 Subject: typo --- nova/compute/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index 9db83d65f..1b3997db7 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -640,7 +640,7 @@ class API(base.Base): novaclient_collection_name="servers", reservation_id=reservation_id, project_id=project_id, - fixed_ip=fixed_ip + fixed_ip=fixed_ip, recurse_zones=True) for zone, servers in children: -- cgit From 07404e266a4a6b690c62624a9a5e47d60cab7d5b Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Thu, 23 Jun 2011 06:33:25 -0700 Subject: fixes for recurse_zones and None instances with compute's get_all --- nova/compute/api.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index 1b3997db7..e31edf7bb 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -610,7 +610,6 @@ class API(base.Base): If there is no filter and the context is an admin, it will retreive all instances in the system. """ - admin_context = context.elevated() if reservation_id is not None: recurse_zones = True @@ -630,12 +629,15 @@ class API(base.Base): else: instances = self.db.instance_get_all(context) - if not isinstance(instances, list): + if instances is None: + instances = [] + elif not isinstance(instances, list): instances = [instances] if not recurse_zones: return instances + admin_context = context.elevated() children = scheduler_api.call_zone_method(admin_context, "list", novaclient_collection_name="servers", reservation_id=reservation_id, -- cgit From b637dee5a5c48f86f6b8b12b3b374344b4ffc5b7 Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Thu, 23 Jun 2011 07:15:20 -0700 Subject: handle errors for listing an instance by IP address --- nova/compute/api.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index 02963068a..31333ad18 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -620,7 +620,12 @@ class API(base.Base): instances = self.db.instance_get_all_by_reservation( context, reservation_id) elif fixed_ip is not None: - instances = self.db.fixed_ip_get_instance(context, fixed_ip) + try: + instances = self.db.fixed_ip_get_instance(context, fixed_ip) + except exception.FloatingIpNotFound, e: + if not recurse_zones: + raise + instances = None elif project_id or not context.is_admin: if not context.project: instances = self.db.instance_get_all_by_user( -- cgit From d1adc2d969570049921370450e942e349deed840 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Wed, 29 Jun 2011 13:17:16 +0400 Subject: Remove unnessesary (and possibly failing) encoding. --- nova/compute/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index 844192404..16ae07272 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -65,7 +65,7 @@ def generate_default_hostname(instance): else: table += '\0' deletions += c - return display_name.encode('latin-1', 'ignore').translate(table, deletions) + return display_name.translate(table, deletions) class API(base.Base): -- cgit From c8d27dd68d449df77106c9cdf45b63c25fcb18ca Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Wed, 29 Jun 2011 14:07:59 +0400 Subject: Brought back that encode under condition. --- nova/compute/api.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index 16ae07272..aa62e72cd 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -65,6 +65,8 @@ def generate_default_hostname(instance): else: table += '\0' deletions += c + if isinstance(display_name, unicode): + display_name = display_name.encode('latin-1', 'ignore') return display_name.translate(table, deletions) -- cgit From 291df3a09a9970ad9ab0b236c93afe4d2a46920e Mon Sep 17 00:00:00 2001 From: Sandy Walsh Date: Wed, 29 Jun 2011 09:29:07 -0700 Subject: removed extra stubout, switched to isinstance and catching explicit exception --- nova/compute/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index b8c76c2f9..39ba06380 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -260,7 +260,7 @@ class API(base.Base): elevated = context.elevated() if security_group is None: security_group = ['default'] - if not type(security_group) is list: + if not isinstance(security_group, list): security_group = [security_group] security_groups = [] -- cgit From 851802e772095b646a7570bf0cc0c6d32be4643c Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Wed, 29 Jun 2011 12:23:26 -0700 Subject: Fixed indentation issues Fixed min/max_count checking issues Fixed a wrongly log message when zone aware scheduler finds no suitable hosts --- nova/compute/api.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'nova/compute') 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: -- cgit From e06542ed504847efbff8c59905c75ef99c512ecc Mon Sep 17 00:00:00 2001 From: Sandy Walsh Date: Thu, 30 Jun 2011 11:02:57 -0700 Subject: blah --- nova/compute/manager.py | 1 - 1 file changed, 1 deletion(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 98e02f5b2..af1226d1a 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -49,7 +49,6 @@ from nova import flags from nova import log as logging from nova import manager from nova import network -from nova import notifier from nova import rpc from nova import utils from nova import volume -- cgit