Merge lp:~gundlach/nova/lp659330 into lp:~hudson-openstack/nova/trunk

[Michael Gundlach]

Make Instance.name a string again instead of an integer.

Prefix it with some characters for good measure in case any code consumes .name and can't handle strings of the form /[0-9]+/.

[Chuck Short (zulcss)]

+1 from me.

[Rick Clark (dendrobates)]

I'm getting dizzy. lgtm

review: Approve

[OpenStack Infra (hudson-openstack)]

The attempt to merge lp:~gundlach/nova/lp659330 into lp:nova failed. Below is the output from the failed tests.

nova.tests.access_unittest
  AccessTestCase
    test_001_allow_all ... [OK]
/var/lib/hudson/src/nova/hudson/nova/db/sqlalchemy/api.py:42: DeprecationWarning: Use of empty request context is deprecated
    test_002_allow_none ... [OK]
/var/lib/hudson/src/nova/hudson/nova/db/sqlalchemy/api.py:42: DeprecationWarning: Use of empty request context is deprecated
    test_003_allow_project_manager ... [OK]
/var/lib/hudson/src/nova/hudson/nova/db/sqlalchemy/api.py:42: DeprecationWarning: Use of empty request context is deprecated
    test_004_allow_sys_and_net ... [OK]
/var/lib/hudson/src/nova/hudson/nova/db/sqlalchemy/api.py:42: DeprecationWarning: Use of empty request context is deprecated
nova.tests.api_unittest
  ApiEc2TestCase
    test_describe_instances ... /var/lib/hudson/src/nova/hudson/nova/db/sqlalchemy/api.py:42: DeprecationWarning: Use of empty request context is deprecated
                                           [OK]
    test_get_all_key_pairs ... /var/lib/hudson/src/nova/hudson/nova/db/sqlalchemy/api.py:42: DeprecationWarning: Use of empty request context is deprecated
                                            [OK]
nova.tests.auth_unittest
  AuthManagerDbTestCase
    test_004_signature_is_valid ... [OK]
    test_005_can_get_credentials ... [OK]
    test_add_user_role_doesnt_infect_project_roles ... [OK]
/var/lib/hudson/src/nova/hudson/nova/db/sqlalchemy/api.py:42: DeprecationWarning: Use of empty request context is deprecated
    test_adding_role_to_project_is_ignored_unless_added_to_user ... [OK]
/var/lib/hudson/src/nova/hudson/nova/db/sqlalchemy/api.py:42: DeprecationWarning: Use of empty request context is deprecated
    test_can_add_and_remove_user_role ... [OK]
/var/lib/hudson/src/nova/hudson/nova/db/sqlalchemy/api.py:42: DeprecationWarning: Use of empty request context is deprecated
    test_can_add_remove_user_with_role ... [OK]
/var/lib/hudson/src/nova/hudson/nova/db/sqlalchemy/api.py:42: DeprecationWarning: Use of empty request context is deprecated
    test_can_add_user_to_project ... [OK]
/var/lib/hudson/src/nova/hudson/nova/db/sqlalchemy/api.py:42: DeprecationWarning: Use of empty request context is deprecated
    test_can_create_and_get_project ... [OK]
/var/lib/hudson/src/nova/hudson/nova/db/sqlalchemy/api.py:42: DeprecationWarning: Use of empty request context is deprecated
    test_can_create_and_get_project_with_attributes ... [OK]
/var/lib/hudson/src/nova/hudson/nova/db/sqlalchemy/api.py:42: DeprecationWarning: Use of empty request context is deprecated
    test_can_create_project_with_manager ... [OK]
/var/lib/hudson/src/nova/hudson/nova/db/sqlalche...

[lp:~gundlach/nova/lp659330]

343. By Michael Gundlach on 2010-10-12

Now that the ec2 id is not the same as the name of the instance, don't compare internal_id [nee ec2_id] to instance names provided by the virtualization driver. Compare names directly instead.

=== modified file 'nova/compute/manager.py'
--- nova/compute/manager.py	2010-10-04 17:52:08 +0000
+++ nova/compute/manager.py	2010-10-12 17:44:41 +0000
@@ -67,7 +67,7 @@
     def run_instance(self, context, instance_id, **_kwargs):
         """Launch a new instance with specified options."""
         instance_ref = self.db.instance_get(context, instance_id)
-        if instance_ref['internal_id'] in self.driver.list_instances():
+        if instance_ref['name'] in self.driver.list_instances():
             raise exception.Error("Instance has already been created")
         logging.debug("instance %s: starting...", instance_id)
         project_id = instance_ref['project_id']

=== modified file 'nova/db/sqlalchemy/models.py'
--- nova/db/sqlalchemy/models.py	2010-10-05 14:55:31 +0000
+++ nova/db/sqlalchemy/models.py	2010-10-12 17:44:41 +0000
@@ -169,7 +169,7 @@
 
     @property
     def name(self):
-        return self.internal_id
+        return "instance-%d" % self.internal_id
 
     image_id = Column(String(255))
     kernel_id = Column(String(255))