Merge lp:~vishvananda/nova/lp831995 into lp:~hudson-openstack/nova/trunk

[Vish Ishaya]

Adds a use_deprecated_auth flag to make sure creds generated using nova-manage commands will work with noauth.

[Brian Lamar (blamar)]

This makes sense to me and works in my test environment when mixing/matching both APIs.

review: Approve

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[OpenStack Infra (hudson-openstack)]

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

CreateserverextTest
    test_create_instance_with_duplicate_networks OK 0.20
    test_create_instance_with_duplicate_networks_xml OK 0.19
    test_create_instance_with_network_empty_fixed_ip OK 0.31
    test_create_instance_with_network_empty_fixed_ip_xml OK 0.18
    test_create_instance_with_network_invalid_id OK 0.18
    test_create_instance_with_network_invalid_id_xml OK 0.18
    test_create_instance_with_network_no_fixed_ip OK 0.20
    test_create_instance_with_network_no_fixed_ip_xml OK 0.36
    test_create_instance_with_network_no_id OK 0.18
    test_create_instance_with_network_no_id_xml OK 0.18
    test_create_instance_with_network_non_string_fixed_ip OK 0.18
    test_create_instance_with_no_networks OK 0.33
    test_create_instance_with_no_networks_xml OK 0.19
    test_create_instance_with_one_network OK 0.19
    test_create_instance_with_one_network_xml OK 0.20
    test_create_instance_with_two_networks OK 0.34
    test_create_instance_with_two_networks_xml OK 0.20
FloatingIpTest
    test_add_floating_ip_to_instance OK 0.19
    test_bad_address_param_in_add_floating_ip OK 0.20
    test_bad_address_param_in_remove_floating_ip OK 0.33
    test_floating_ip_allocate OK 0.20
    test_floating_ip_release OK 0.20
    test_floating_ip_show OK 0.20
    test_floating_ips_list OK 0.33
    test_missing_dict_param_in_add_floating_ip OK 0.20
    test_missing_dict_param_in_remove_floating_ip OK 0.20
    test_remove_floating_ip_from_instance OK 0.20
    test_translate_floating_ip_view OK 0.04
    test_translate_floating_ip_view_dict OK 0.02
KeypairsTest
    test_keypair_create OK 0.33
    test_keypair_delete OK 0.39
    test_keypair_import OK 0.23
    test_keypair_list OK 0.20
FixedIpTest
    test_add_fixed_ip OK 0.19
    test_add_fixed_ip_no_network OK 0.38
    test_remove_fixed_ip OK 0.18
    test_remove_fixed_ip_no_address OK 0.18
QuotaSetsTest
    test_format_quota_set OK 0.00
    test_quotas_defaults OK 0.19
    test_quotas_show_as_admin OK 0.33
    test_quotas_show_as_unauthorized_user OK 0.18
    test_quotas_u...

[Vish Ishaya (vishvananda)]

sigh, functional tests without unit tests. My bad. The flag is now set for the one test that needs it.

=== modified file 'nova/auth/manager.py'
--- nova/auth/manager.py	2011-08-22 21:26:41 +0000
+++ nova/auth/manager.py	2011-08-23 20:46:28 +0000
@@ -41,10 +41,13 @@
 
 
 FLAGS = flags.FLAGS
+flags.DEFINE_bool('use_deprecated_auth',
+                  False,
+                  'This flag must be set to use old style auth')
+
 flags.DEFINE_list('allowed_roles',
                   ['cloudadmin', 'itsec', 'sysadmin', 'netadmin', 'developer'],
                   'Allowed roles for project')
-
 # NOTE(vish): a user with one of these roles will be a superuser and
 #             have access to all api commands
 flags.DEFINE_list('superuser_roles', ['cloudadmin'],
@@ -814,7 +817,13 @@
             s3_host = host
             ec2_host = host
         rc = open(FLAGS.credentials_template).read()
-        rc = rc % {'access': user.access,
+        # NOTE(vish): Deprecated auth uses an access key, no auth uses a
+        #             the user_id in place of it.
+        if FLAGS.use_deprecated_auth:
+            access = user.access
+        else:
+            access = user.id
+        rc = rc % {'access': access,
                    'project': pid,
                    'secret': user.secret,
                    'ec2': '%s://%s:%s%s' % (FLAGS.ec2_scheme,

=== modified file 'nova/tests/test_auth.py'
--- nova/tests/test_auth.py	2011-08-09 22:46:57 +0000
+++ nova/tests/test_auth.py	2011-08-23 20:46:28 +0000
@@ -147,6 +147,7 @@
                         '/services/Cloud'))
 
     def test_can_get_credentials(self):
+        self.flags(use_deprecated_auth=True)
         st = {'access': 'access', 'secret': 'secret'}
         with user_and_project_generator(self.manager, user_state=st) as (u, p):
             credentials = self.manager.get_environment_rc(u, p)