Merge lp:~gundlach/nova/server-display-name into lp:~hudson-openstack/nova/trunk

[Michael Gundlach]

Guarantee that the OpenStack API's Server-related responses will always contain a "name" value. And get rid of a redundant field in models.py.

[Michael Gundlach (gundlach)]

Guarantee that the OpenStack API's Server-related responses will always contain a "name" value. And get rid of a redundant field in models.py.

[Todd Willey (xtoddx)]

LGTM. And when I say 'G', I mean 'GREAT'.

review: Approve

[Soren Hansen (soren)]

Yup, great stuff!

review: Approve

[OpenStack Infra (hudson-openstack)]

The attempt to merge lp:~gundlach/nova/server-display-name into lp:nova failed. Below is the output from the failed tests.

nova.tests.access_unittest
  AccessTestCase
    test_001_allow_all ... [OK]
    test_002_allow_none ... [OK]
    test_003_allow_project_manager ... [OK]
    test_004_allow_sys_and_net ... [OK]
nova.tests.api_unittest
  ApiEc2TestCase
    test_authorize_revoke_security_group_cidr ... [OK]
    test_authorize_revoke_security_group_foreign_group ... [OK]
    test_create_delete_security_group ... [OK]
    test_describe_instances ... [OK]
    test_get_all_key_pairs ... [OK]
    test_get_all_security_groups ... [OK]
  XmlConversionTestCase
    test_number_conversion ... [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]
    test_adding_role_to_project_is_ignored_unless_added_to_user ... [OK]
    test_can_add_and_remove_user_role ... [OK]
    test_can_add_remove_user_with_role ... [OK]
    test_can_add_user_to_project ... [OK]
    test_can_create_and_get_project ... [OK]
    test_can_create_and_get_project_with_attributes ... [OK]
    test_can_create_project_with_manager ... [OK]
    test_can_delete_project ... [OK]
    test_can_delete_user ... [OK]
    test_can_generate_x509 ... [OK]
    test_can_list_project_roles ... [OK]
    test_can_list_projects ... [OK]
    test_can_list_user_roles ... [OK]
    test_can_list_users ... [OK]
    test_can_modify_project ... [OK]
    test_can_modify_users ... [OK]
    test_can_remove_project_role_but_keep_user_role ... [OK]
    test_can_remove_user_from_project ... [OK]
    test_can_remove_user_roles ... [OK]
    test_can_retrieve_project_by_user ... [OK]
    test_create_and_find_user ... [OK]
    test_create_and_find_with_properties ... [OK]
    test_create_project_assigns_manage...

[OpenStack Infra (hudson-openstack)]

The attempt to merge lp:~gundlach/nova/server-display-name into lp:nova failed. Below is the output from the failed tests.

nova/compute/manager.py:109:38: E201 whitespace after '{'
                                    { 'display_name': display_name })
                                     ^
    Avoid extraneous whitespace in the following situations:

    - Immediately inside parentheses, brackets or braces.

    - Immediately before a comma, semicolon, or colon.

    Okay: spam(ham[1], {eggs: 2})
    E201: spam( ham[1], {eggs: 2})
    E201: spam(ham[ 1], {eggs: 2})
    E201: spam(ham[1], { eggs: 2})
    E202: spam(ham[1], {eggs: 2} )
    E202: spam(ham[1 ], {eggs: 2})
    E202: spam(ham[1], {eggs: 2 })

    E203: if x == 4: print x, y; x, y = y , x
    E203: if x == 4: print x, y ; x, y = y, x
    E203: if x == 4 : print x, y; x, y = y, x

[lp:~gundlach/nova/server-display-name]

436. By Michael Gundlach on 2010-12-01

Going for a record commits per line changes ratio

=== modified file 'nova/api/openstack/servers.py'
--- nova/api/openstack/servers.py	2010-10-27 18:55:01 +0000
+++ nova/api/openstack/servers.py	2010-12-01 22:05:45 +0000
@@ -63,7 +63,7 @@
     inst_dict = {}
 
     mapped_keys = dict(status='state', imageId='image_id',
-        flavorId='instance_type', name='server_name', id='id')
+        flavorId='instance_type', name='display_name', id='id')
 
     for k, v in mapped_keys.iteritems():
         inst_dict[k] = inst[v]
@@ -78,7 +78,7 @@
 
 def _entity_inst(inst):
     """ Filters all model attributes save for id and name """
-    return dict(server=dict(id=inst['id'], name=inst['server_name']))
+    return dict(server=dict(id=inst['id'], name=inst['display_name']))
 
 
 class Controller(wsgi.Controller):
@@ -213,7 +213,6 @@
         if not image:
             raise Exception("Image not found")
 
-        inst['server_name'] = env['server']['name']
         inst['image_id'] = image_id
         inst['user_id'] = user_id
         inst['launch_time'] = ltime

=== modified file 'nova/compute/manager.py'
--- nova/compute/manager.py	2010-11-29 12:14:26 +0000
+++ nova/compute/manager.py	2010-12-01 22:05:45 +0000
@@ -101,6 +101,12 @@
         """
         instance_ref = self.db.instance_create(context, kwargs)
         inst_id = instance_ref['id']
+        # Set sane defaults if not specified
+        if 'display_name' not in kwargs:
+            display_name = "Server %s" % instance_ref['internal_id']
+            instance_ref['display_name'] = display_name
+            self.db.instance_update(context, inst_id,
+                                    {'display_name': display_name})
 
         elevated = context.elevated()
         if not security_groups:

=== modified file 'nova/db/sqlalchemy/api.py'
--- nova/db/sqlalchemy/api.py	2010-11-18 20:04:38 +0000
+++ nova/db/sqlalchemy/api.py	2010-12-01 22:05:45 +0000
@@ -530,6 +530,12 @@
 #functions between the two of them as well.
 @require_context
 def instance_create(context, values):
+    """Create a new Instance record in the database.
+
+    context - request context object
+    values - dict containing column values.
+             'internal_id' is auto-generated and should not be specified.
+    """
     instance_ref = models.Instance()
     instance_ref.update(values)
 

=== modified file 'nova/db/sqlalchemy/models.py'
--- nova/db/sqlalchemy/models.py	2010-11-03 22:06:00 +0000
+++ nova/db/sqlalchemy/models.py	2010-12-01 22:05:45 +0000
@@ -178,8 +178,6 @@
     kernel_id = Column(String(255))
     ramdisk_id = Column(String(255))
 
-    server_name = Column(String(255))
-
 #    image_id = Column(Integer, ForeignKey('images.id'), nullable=True)
 #    kernel_id = Column(Integer, ForeignKey('images.id'), nullable=True)
 #    ramdisk_id = Column(Integer, ForeignKey('images.id'), nullable=True)
@@ -212,6 +210,7 @@
     launched_at = Column(DateTime)
     terminated_at = Column(DateTime)
 
+    # User editable field for display in user-facing UIs
     display_name = Column(String(255))
     display_description = Column(String(255))
 

=== modified file 'nova/tests/api/openstack/test_servers.py'
--- nova/tests/api/openstack/test_servers.py	2010-11-02 19:02:42 +0000
+++ nova/tests/api/openstack/test_servers.py	2010-12-01 22:05:45 +0000
@@ -44,7 +44,7 @@
 
 
 def stub_instance(id, user_id=1):
-    return Instance(id=id, state=0, image_id=10, server_name='server%s' % id,
+    return Instance(id=id, state=0, image_id=10, display_name='server%s' % id,
                     user_id=user_id)