Merge lp:~chmouel/nova/lp688032 into lp:~hudson-openstack/nova/trunk

[Chmouel Boudjnah]

Fix exception throwing with wrong instance type.

[Soren Hansen (soren)]

2010/12/9 Chmouel Boudjnah <email address hidden>:
> === modified file 'nova/compute/instance_types.py'
> --- nova/compute/instance_types.py      2010-11-24 22:52:10 +0000
> +++ nova/compute/instance_types.py      2010-12-09 13:48:57 +0000
> @@ -22,6 +22,7 @@
>  """
>
>  from nova import flags
> +from nova.exception import ApiError
>
>  FLAGS = flags.FLAGS
>  INSTANCE_TYPES = {
> @@ -37,8 +38,7 @@
>     if instance_type is None:
>         return FLAGS.default_instance_type
>     if instance_type not in INSTANCE_TYPES:
> -        raise exception.ApiError("Unknown instance type: %s",
> -                                 instance_type)
> +        raise ApiError("Unknown instance type: %s" % instance_type)
>     return instance_type

Please just do "from nova import exception". We generally don't import
classes, only modules.

--
Soren Hansen
Ubuntu Developer    http://www.ubuntu.com/
OpenStack Developer http://www.openstack.org/

[Jay Pipes (jaypipes)]

Agreed with Soren. Just do the import. We can get this merged quickly after that.. :)

review: Needs Fixing

[Chmouel Boudjnah (chmouel)]

yeah i have fixed it in my branch, how do i request for merging again ?

On 11 Dec 2010, at 20:54, Jay Pipes wrote:

> Review: Needs Fixing
> Agreed with Soren. Just do the import. We can get this merged quickly after that.. :)
> --
> https://code.launchpad.net/~chmouel/nova/lp688032/+merge/43211
> You are the owner of lp:~chmouel/nova/lp688032.

[Soren Hansen (soren)]

No need to submit again. Lgtm.

review: Approve

[Jay Pipes (jaypipes)]

Chmouel, did you bzr push that branch again? I don't see the change...

[Soren Hansen (soren)]

Den 12/12/2010 16.46 skrev "Jay Pipes" <email address hidden>:
> Chmouel, did you bzr push that branch again? I don't see the change...

What do you mean? do you not see it when you look at the diff on launchpad
or just that you didn't get an email with the new diff?

[Jay Pipes (jaypipes)]

Oh, duh. I saw the two changed areas in the diff and assumed the patch had not been pushed... you know what they say about assumptions... ;)

review: Approve

[OpenStack Infra (hudson-openstack)]

The attempt to merge lp:~chmouel/nova/lp688032 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_members...

[Jay Pipes (jaypipes)]

Chmouel, looks like you need to add your name to the AUTHORS file :) Welcome aboard!

[lp:~chmouel/nova/lp688032]

455. By Chmouel Boudjnah on 2010-12-13

Add myself.

[Chmouel Boudjnah (chmouel)]

hey hey great :-), I have just pushed the change to the author file to my
branch and it should pick up.

Chmouel.

On 13 December 2010 16:13, Jay Pipes <email address hidden> wrote:

> Chmouel, looks like you need to add your name to the AUTHORS file :)
> Welcome aboard!
> --
> https://code.launchpad.net/~chmouel/nova/lp688032/+merge/43211
> You are the owner of lp:~chmouel/nova/lp688032.
>

=== modified file 'Authors'
--- Authors	2010-12-09 14:22:50 +0000
+++ Authors	2010-12-13 18:58:26 +0000
@@ -3,6 +3,7 @@
 Anthony Young <[e-mail]>
 Armando Migliaccio <[e-mail]>
 Chris Behrens <[e-mail]>
+Chmouel Boudjnah <[e-mail]>
 Dean Troyer <[e-mail]>
 Devin Carlen <[e-mail]>
 Eric Day <[e-mail]>

=== modified file 'nova/compute/instance_types.py'
--- nova/compute/instance_types.py	2010-11-24 22:52:10 +0000
+++ nova/compute/instance_types.py	2010-12-13 18:58:26 +0000
@@ -22,6 +22,7 @@
 """
 
 from nova import flags
+from nova import exception
 
 FLAGS = flags.FLAGS
 INSTANCE_TYPES = {
@@ -37,8 +38,7 @@
     if instance_type is None:
         return FLAGS.default_instance_type
     if instance_type not in INSTANCE_TYPES:
-        raise exception.ApiError("Unknown instance type: %s",
-                                 instance_type)
+        raise exception.ApiError("Unknown instance type: %s" % instance_type)
     return instance_type