OpenStack Compute (nova)

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

  1. pylinting
  2. Merge into trunk
Proposed by Trey Morris
Status: Merged
Approved by: Eric Day
Approved revision: 443
Merged at revision: 452
Proposed branch: lp:~tr3buchet/nova/pylinting
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 72 lines (+12/-7)
3 files modified
Authors (+1/-0)
nova/api/ec2/cloud.py (+0/-1)
nova/compute/api.py (+11/-6)
To merge this branch: bzr merge lp:~tr3buchet/nova/pylinting
Reviewer Review Type Date Requested Status
Trey Morris (community) Needs Resubmitting
Matt Dietz (community) Approve
Eric Day (community) Approve
Michael Gundlach (community) Approve
Review via email: mp+42906@code.launchpad.net

Description of the change

some pylint caught changes to compute

To post a comment you must log in.
Revision history for this message
Michael Gundlach (gundlach) wrote :

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

review: Approve
Revision history for this message
Michael Gundlach (gundlach) wrote :

adding eday to requested reviewers so he can chime in

Revision history for this message
Eric Day (eday) wrote :

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
Revision history for this message
OpenStack Infra (hudson-openstack) wrote :

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

text conflict in nova/compute/api.py

Revision history for this message
Trey Morris (tr3buchet) wrote :

fixed conflict with eday's branch

review: Needs Resubmitting
Revision history for this message
Matt Dietz (cerberus) wrote :

lgtm.

review: Approve
Revision history for this message
OpenStack Infra (hudson-openstack) wrote :
Download full text (14.4 KiB)

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 updated
443. By Trey Morris

added to Authors

Revision history for this message
Trey Morris (tr3buchet) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Authors'
--- Authors 2010-12-07 21:29:14 +0000
+++ Authors 2010-12-08 23:50:09 +0000
@@ -23,6 +23,7 @@
23Ryan Lucio <rlucio@internap.com>23Ryan Lucio <rlucio@internap.com>
24Soren Hansen <soren.hansen@rackspace.com>24Soren Hansen <soren.hansen@rackspace.com>
25Todd Willey <todd@ansolabs.com>25Todd Willey <todd@ansolabs.com>
26Trey Morris <trey.morris@rackspace.com>
26Vishvananda Ishaya <vishvananda@gmail.com>27Vishvananda Ishaya <vishvananda@gmail.com>
27Youcef Laribi <Youcef.Laribi@eu.citrix.com>28Youcef Laribi <Youcef.Laribi@eu.citrix.com>
28Zhixue Wu <Zhixue.Wu@citrix.com>29Zhixue Wu <Zhixue.Wu@citrix.com>
2930
=== 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 @@
753 ramdisk_id=kwargs.get('ramdisk_id'),753 ramdisk_id=kwargs.get('ramdisk_id'),
754 display_name=kwargs.get('display_name'),754 display_name=kwargs.get('display_name'),
755 description=kwargs.get('display_description'),755 description=kwargs.get('display_description'),
756 user_data=kwargs.get('user_data', ''),
757 key_name=kwargs.get('key_name'),756 key_name=kwargs.get('key_name'),
758 security_group=kwargs.get('security_group'),757 security_group=kwargs.get('security_group'),
759 generate_hostname=internal_id_to_ec2_id)758 generate_hostname=internal_id_to_ec2_id)
760759
=== 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 @@
5555
56 def create_instances(self, context, instance_type, image_id, min_count=1,56 def create_instances(self, context, instance_type, image_id, min_count=1,
57 max_count=1, kernel_id=None, ramdisk_id=None,57 max_count=1, kernel_id=None, ramdisk_id=None,
58 display_name='', description='', user_data='',58 display_name='', description='', key_name=None,
59 key_name=None, key_data=None,59 key_data=None, security_group='default',
60 security_group='default',
61 generate_hostname=generate_default_hostname):60 generate_hostname=generate_default_hostname):
62 """Create the number of instances requested if quote and61 """Create the number of instances requested if quote and
63 other arguments check out ok."""62 other arguments check out ok."""
@@ -158,8 +157,8 @@
158 {"method": "setup_fixed_ip",157 {"method": "setup_fixed_ip",
159 "args": {"address": address}})158 "args": {"address": address}})
160159
161 logging.debug("Casting to scheduler for %s/%s's instance %s" %160 logging.debug("Casting to scheduler for %s/%s's instance %s",
162 (context.project_id, context.user_id, instance_id))161 context.project_id, context.user_id, instance_id)
163 rpc.cast(context,162 rpc.cast(context,
164 FLAGS.scheduler_topic,163 FLAGS.scheduler_topic,
165 {"method": "run_instance",164 {"method": "run_instance",
@@ -169,6 +168,12 @@
169 return instances168 return instances
170169
171 def ensure_default_security_group(self, context):170 def ensure_default_security_group(self, context):
171 """ Create security group for the security context if it
172 does not already exist
173
174 :param context: the security context
175
176 """
172 try:177 try:
173 db.security_group_get_by_name(context, context.project_id,178 db.security_group_get_by_name(context, context.project_id,
174 'default')179 'default')
@@ -177,7 +182,7 @@
177 'description': 'default',182 'description': 'default',
178 'user_id': context.user_id,183 'user_id': context.user_id,
179 'project_id': context.project_id}184 'project_id': context.project_id}
180 group = db.security_group_create(context, values)185 db.security_group_create(context, values)
181186
182 def update_instance(self, context, instance_id, **kwargs):187 def update_instance(self, context, instance_id, **kwargs):
183 """Updates the instance in the datastore.188 """Updates the instance in the datastore.