Merge lp:~tr3buchet/nova/pylinting into lp:~hudson-openstack/nova/trunk

[Trey Morris]

some pylint caught changes to compute

[Michael Gundlach (gundlach)]

lgtm, though i believe eday may have addressed these in a branch he is about to merge / is merging?

review: Approve

[Michael Gundlach (gundlach)]

adding eday to requested reviewers so he can chime in

[Eric Day (eday)]

Hmm, some of this is new, but it will almost certainly conflict with my outstanding branches waiting to be reviewed. Lets not merge this until the others get in if possible.

review: Approve

[OpenStack Infra (hudson-openstack)]

Attempt to merge into lp:nova failed due to conflicts:

text conflict in nova/compute/api.py

[Trey Morris (tr3buchet)]

fixed conflict with eday's branch

review: Needs Resubmitting

[Matt Dietz (cerberus)]

lgtm.

review: Approve

[OpenStack Infra (hudson-openstack)]

The attempt to merge lp:~tr3buchet/nova/pylinting 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_manager_to_memb...

[lp:~tr3buchet/nova/pylinting]

443. By Trey Morris on 2010-12-08

added to Authors

[Trey Morris (tr3buchet)]

Added myself to authors, maybe test_authors_up_to_date won't fail if hudson runs it, but it's giving an error locally. Same as: https://bugs.launchpad.net/nova/+bug/687451

review: Needs Resubmitting

=== modified file 'Authors'
--- Authors	2010-12-07 21:29:14 +0000
+++ Authors	2010-12-08 23:50:09 +0000
@@ -23,6 +23,7 @@
 Ryan Lucio <[e-mail]>
 Soren Hansen <[e-mail]>
 Todd Willey <[e-mail]>
+Trey Morris <[e-mail]>
 Vishvananda Ishaya <[e-mail]>
 Youcef Laribi <[e-mail]>
 Zhixue Wu <[e-mail]>

=== modified file 'nova/api/ec2/cloud.py'
--- nova/api/ec2/cloud.py	2010-12-03 20:21:18 +0000
+++ nova/api/ec2/cloud.py	2010-12-08 23:50:09 +0000
@@ -753,7 +753,6 @@
             ramdisk_id=kwargs.get('ramdisk_id'),
             display_name=kwargs.get('display_name'),
             description=kwargs.get('display_description'),
-            user_data=kwargs.get('user_data', ''),
             key_name=kwargs.get('key_name'),
             security_group=kwargs.get('security_group'),
             generate_hostname=internal_id_to_ec2_id)

=== modified file 'nova/compute/api.py'
--- nova/compute/api.py	2010-12-07 18:06:49 +0000
+++ nova/compute/api.py	2010-12-08 23:50:09 +0000
@@ -55,9 +55,8 @@
 
     def create_instances(self, context, instance_type, image_id, min_count=1,
                          max_count=1, kernel_id=None, ramdisk_id=None,
-                         display_name='', description='', user_data='',
-                         key_name=None, key_data=None,
-                         security_group='default',
+                         display_name='', description='', key_name=None,
+                         key_data=None, security_group='default',
                          generate_hostname=generate_default_hostname):
         """Create the number of instances requested if quote and
         other arguments check out ok."""
@@ -158,8 +157,8 @@
                      {"method": "setup_fixed_ip",
                       "args": {"address": address}})
 
-            logging.debug("Casting to scheduler for %s/%s's instance %s" %
-                          (context.project_id, context.user_id, instance_id))
+            logging.debug("Casting to scheduler for %s/%s's instance %s",
+                          context.project_id, context.user_id, instance_id)
             rpc.cast(context,
                      FLAGS.scheduler_topic,
                      {"method": "run_instance",
@@ -169,6 +168,12 @@
         return instances
 
     def ensure_default_security_group(self, context):
+        """ Create security group for the security context if it
+        does not already exist
+
+        :param context: the security context
+
+        """
         try:
             db.security_group_get_by_name(context, context.project_id,
                                           'default')
@@ -177,7 +182,7 @@
                       'description': 'default',
                       'user_id': context.user_id,
                       'project_id': context.project_id}
-            group = db.security_group_create(context, values)
+            db.security_group_create(context, values)
 
     def update_instance(self, context, instance_id, **kwargs):
         """Updates the instance in the datastore.