diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-01-06 04:55:16 -0400 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-01-06 04:55:16 -0400 |
| commit | 457e19826cfdb7f8f324180e42d8df79da48cfc6 (patch) | |
| tree | b8ed7b9c86eb4fee6694507dad493d1a6eec8b95 /nova/compute | |
| parent | 114577d4f4ed1ca173dadf47d4bf3a5a05c449a2 (diff) | |
| download | nova-457e19826cfdb7f8f324180e42d8df79da48cfc6.tar.gz nova-457e19826cfdb7f8f324180e42d8df79da48cfc6.tar.xz nova-457e19826cfdb7f8f324180e42d8df79da48cfc6.zip | |
renamed sharedipgroups to shared_ip_groups and fixed tests for display_name
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 252f88003..912c7d93f 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -171,7 +171,8 @@ class API(base.Base): # Set sane defaults if not specified updates = dict(hostname=generate_hostname(instance_id)) - if not hasattr(instance, 'display_name'): + if (not hasattr(instance, 'display_name')) or \ + instance.display_name == None: updates['display_name'] = "Server %s" % instance_id instance = self.update(context, instance_id, **updates) |