Merge into trunk : ed-leafe-authors-update : Code : OpenStack Compute (nova)

Status:	Merged
Approved by:	Soren Hansen on 2010-12-17
Approved revision:	467
Merged at revision:	467
Proposed branch:	lp://staging/~jbryce/nova/ed-leafe-authors-update
Merge into:	lp://staging/~hudson-openstack/nova/trunk
Diff against target:	19 lines (+2/-0) 1 file modified Authors (+2/-0)
To merge this branch:	bzr merge lp://staging/~jbryce/nova/ed-leafe-authors-update
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Soren Hansen (community)		Approve on 2010-12-17
Vish Ishaya (community)	2010-12-17	Approve on 2010-12-17
Review via email: mp+44107@code.staging.launchpad.net

Commit message

Adding Ed Leafe to Authors file

Description of the change

Adding Ed Leafe to Authors file so his remove-redis branch can land

Revision history for this message

Vish Ishaya (vishvananda) wrote on 2010-12-17:

#

lgtm

review: Approve

Revision history for this message

Soren Hansen (soren) wrote on 2010-12-17:

#

A bit unorthodox, but why not :)

review: Approve

Revision history for this message

OpenStack Infra (hudson-openstack) wrote on 2010-12-17:

#

Download full text (32.4 KiB)

The attempt to merge lp:~jbryce/nova/ed-leafe-authors-update 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_mana...

The attempt to merge lp:~jbryce/nova/ed-leafe-authors-update 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 ...                     [OK]
    test_no_extra_project_managers ...                                     [OK]
    test_no_extra_project_members ...                                      [OK]
    test_removing_user_role_hides_it_from_project ...                      [OK]
  AuthManagerLdapTestCase
    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 ...                     [OK]
    test_no_extra_project_managers ...                                     [OK]
    test_no_extra_project_members ...                                      [OK]
    test_removing_user_role_hides_it_from_project ...                      [OK]
nova.tests.cloud_unittest
  CloudTestCase
    test_associate_disassociate_address ...                                [OK]
    test_console_output ...                                                [OK]
    test_delete_key_pair ...                                               [OK]
    test_describe_addresses ...                                            [OK]
    test_describe_key_pairs ...                                            [OK]
    test_describe_volumes ...                                              [OK]
    test_instance_update_state ...                                         [OK]
    test_key_generation ...                                                [OK]
    test_run_instances ...                                                 [OK]
    test_update_of_instance_display_fields ...                             [OK]
    test_update_of_instance_wont_update_private_fields ...                 [OK]
    test_update_of_volume_display_fields ...                               [OK]
    test_update_of_volume_wont_update_private_fields ...                   [OK]
    test_user_editable_image_endpoint ...                                  [OK]
nova.tests.compute_unittest
  ComputeTestCase
    test_console_output ...                                                [OK]
    test_create_instance_associates_security_groups ...                    [OK]
    test_create_instance_defaults_display_name ...                         [OK]
    test_reboot ...                                                        [OK]
    test_run_instance_existing ...                                         [OK]
    test_run_terminate ...                                                 [OK]
    test_run_terminate_timestamps ...                                      [OK]
nova.tests.flags_unittest
  FlagsTestCase
    test_declare ...                                                       [OK]
    test_define ...                                                        [OK]
    test_flag_leak_left ...                                                [OK]
    test_flag_leak_right ...                                               [OK]
    test_runtime_and_unknown_flags ...                                     [OK]
nova.tests.misc_unittest
  ProjectTestCase
    test_authors_up_to_date ...                                            [OK]
nova.tests.network_unittest
  NetworkTestCase
    test_allocate_deallocate_fixed_ip ...                                  [OK]
    test_available_ips ...                                                 [OK]
    test_ips_are_reused ...                                                [OK]
    test_public_network_association ...                                    [OK]
    test_side_effects ...                                                  [OK]
    test_subnet_edge ...                                                   [OK]
    test_too_many_addresses ...                                            [OK]
    test_too_many_networks ...                                             [OK]
    test_vpn_ip_and_port_looks_valid ...                                   [OK]
nova.tests.quota_unittest
  QuotaTestCase
    test_quota_overrides ...                                               [OK]
    test_too_many_addresses ...                                            [OK]
    test_too_many_cores ...                                                [OK]
    test_too_many_gigabytes ...                                            [OK]
    test_too_many_instances ...                                            [OK]
    test_too_many_volumes ...                                              [OK]
nova.tests.rpc_unittest
  RpcTestCase
    test_call_exception ...                                                [OK]
    test_call_succeed ...                                                  [OK]
    test_context_passed ...                                                [OK]
nova.tests.scheduler_unittest
  SchedulerTestCase
    test_fallback ...                                                      [OK]
    test_named_method ...                                                  [OK]
  SimpleDriverTestCase
    test_hosts_are_up ...                                                  [OK]
    test_least_busy_host_gets_instance ...                                 [OK]
    test_least_busy_host_gets_volume ...                                   [OK]
    test_too_many_cores ...                                                [OK]
    test_too_many_gigabytes ...                                            [OK]
nova.tests.service_unittest
  ServiceManagerTestCase
    test_attribute_error_for_no_manager ...                                [OK]
    test_message_gets_to_manager ...                                       [OK]
    test_override_manager_method ...                                       [OK]
  ServiceTestCase
    test_create ...                                                        [OK]
    test_report_state_newly_connected ...                                  [OK]
    test_report_state_newly_disconnected ...                               [OK]
    test_report_state_no_service ...                                       [OK]
nova.tests.twistd_unittest
  TwistdTestCase
    test_basic ...                                                         [OK]
    test_help ...                                                          [OK]
    test_logfile ...                                                       [OK]
nova.tests.virt_unittest
  LibvirtConnTestCase
    test_get_uri_and_template ...                                          [OK]
  NWFilterTestCase
    test_cidr_rule_nwfilter_xml ...                                        [OK]
    test_creates_base_rule_first ...                                       [OK]
nova.tests.volume_unittest
  VolumeTestCase
    test_concurrent_volumes_get_different_targets ...                      [OK]
    test_create_delete_volume ...                                          [OK]
    test_multi_node ...                                                    [OK]
    test_run_attach_detach_volume ...                                      [OK]
    test_too_big_volume ...                                                [OK]
    test_too_many_volumes ...                                              [OK]

-------------------------------------------------------------------------------
Ran 140 tests in 140.087s

PASSED (successes=140)

Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched GET /services/cloud
Route path: '/services/{path_info:.*}', defaults: {'controller': <nova.tests.api.fakes.APIStub object at 0x39f6450>}
Match dict: {'controller': <nova.tests.api.fakes.APIStub object at 0x39f6450>, 'sub_domain': 'ec2', 'path_info': 'cloud'}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched GET /
Route path: '/', defaults: {'controller': wsgify(nova.api.<nova.api.API object at 0x39f6f50>.ec2api_versions)}
Match dict: {'controller': wsgify(nova.api.<nova.api.API object at 0x39f6f50>.ec2api_versions), 'sub_domain': 'ec2'}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched GET /latest/
Route path: '/latest/{path_info:.*}', defaults: {'controller': <nova.api.ec2.metadatarequesthandler.MetadataRequestHandler object at 0x39e2250>}
Match dict: {'controller': <nova.api.ec2.metadatarequesthandler.MetadataRequestHandler object at 0x39e2250>, 'sub_domain': 'ec2', 'path_info': ''}
Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched GET /2009-04-04/
Route path: '/2009-04-04/{path_info:.*}', defaults: {'controller': <nova.api.ec2.metadatarequesthandler.MetadataRequestHandler object at 0x3d41590>}
Match dict: {'controller': <nova.api.ec2.metadatarequesthandler.MetadataRequestHandler object at 0x3d41590>, 'sub_domain': 'ec2', 'path_info': ''}
Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched GET /1.0/
Route path: '/1.0/{path_info:.*}', defaults: {'controller': <nova.api.ec2.metadatarequesthandler.MetadataRequestHandler object at 0x4240150>}
Match dict: {'controller': <nova.api.ec2.metadatarequesthandler.MetadataRequestHandler object at 0x4240150>, 'sub_domain': 'ec2', 'path_info': ''}
.Initialized with method overriding = True, and path info altering = True
No route matched for GET /test/cloud
.Initialized with method overriding = True, and path info altering = True
Matched GET /v1.0/cloud
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.tests.api.fakes.APIStub object at 0x3ebf090>}
Match dict: {'controller': <nova.tests.api.fakes.APIStub object at 0x3ebf090>, 'sub_domain': 'api', 'path_info': 'cloud'}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched GET /
Route path: '/', defaults: {'controller': wsgify(nova.api.<nova.api.API object at 0x4240f50>.osapi_versions)}
Match dict: {'controller': wsgify(nova.api.<nova.api.API object at 0x4240f50>.osapi_versions), 'sub_domain': 'api'}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched GET /v1.0/flavors
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x4264650>}
Match dict: {'controller': <nova.api.openstack.API object at 0x4264650>, 'sub_domain': None, 'path_info': 'flavors'}
Matched GET /flavors
Route path: '/flavors', defaults: {'action': u'index', 'controller': <nova.api.openstack.flavors.Controller object at 0x47a1110>}
Match dict: {'action': u'index', 'controller': <nova.api.openstack.flavors.Controller object at 0x47a1110>}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched GET /v1.0/flavors
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x47acc90>}
Match dict: {'controller': <nova.api.openstack.API object at 0x47acc90>, 'sub_domain': None, 'path_info': 'flavors'}
Matched GET /flavors
Route path: '/flavors', defaults: {'action': u'index', 'controller': <nova.api.openstack.flavors.Controller object at 0x4902b10>}
Match dict: {'action': u'index', 'controller': <nova.api.openstack.flavors.Controller object at 0x4902b10>}
.Initialized with method overriding = True, and path info altering = True
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched GET /v1.0/
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x4914750>}
Match dict: {'controller': <nova.api.openstack.API object at 0x4914750>, 'sub_domain': None, 'path_info': ''}
Initialized with method overriding = True, and path info altering = True
Matched GET /v1.0/fake
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x4be3050>}
Match dict: {'controller': <nova.api.openstack.API object at 0x4be3050>, 'sub_domain': None, 'path_info': 'fake'}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched GET /v1.0/
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x4be3f10>}
Match dict: {'controller': <nova.api.openstack.API object at 0x4be3f10>, 'sub_domain': None, 'path_info': ''}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched GET /v1.0/
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x4f5e510>}
Match dict: {'controller': <nova.api.openstack.API object at 0x4f5e510>, 'sub_domain': None, 'path_info': ''}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched GET /v1.0/
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x51dce90>}
Match dict: {'controller': <nova.api.openstack.API object at 0x51dce90>, 'sub_domain': None, 'path_info': ''}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched GET /v1.0/
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x5203650>}
Match dict: {'controller': <nova.api.openstack.API object at 0x5203650>, 'sub_domain': None, 'path_info': ''}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched GET /v1.0/
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x55d91d0>}
Match dict: {'controller': <nova.api.openstack.API object at 0x55d91d0>, 'sub_domain': None, 'path_info': ''}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched GET /v1.0/
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x51fa950>}
Match dict: {'controller': <nova.api.openstack.API object at 0x51fa950>, 'sub_domain': None, 'path_info': ''}
Initialized with method overriding = True, and path info altering = True
Matched POST /v1.0/fake
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x47ac690>}
Match dict: {'controller': <nova.api.openstack.API object at 0x47ac690>, 'sub_domain': None, 'path_info': 'fake'}
.....Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched GET /v1.0/flavors
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x3d38f50>}
Match dict: {'controller': <nova.api.openstack.API object at 0x3d38f50>, 'sub_domain': None, 'path_info': 'flavors'}
Matched GET /flavors
Route path: '/flavors', defaults: {'action': u'index', 'controller': <nova.api.openstack.flavors.Controller object at 0x4240990>}
Match dict: {'action': u'index', 'controller': <nova.api.openstack.flavors.Controller object at 0x4240990>}
.....Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched GET /v1.0/images/detail
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x3a693d0>}
Match dict: {'controller': <nova.api.openstack.API object at 0x3a693d0>, 'sub_domain': None, 'path_info': 'images/detail'}
Matched GET /images/detail
Route path: '/images/detail', defaults: {'action': u'detail', 'controller': <nova.api.openstack.images.Controller object at 0x3a722d0>}
Match dict: {'action': u'detail', 'controller': <nova.api.openstack.images.Controller object at 0x3a722d0>}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched GET /v1.0/images
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x3a69950>}
Match dict: {'controller': <nova.api.openstack.API object at 0x3a69950>, 'sub_domain': None, 'path_info': 'images'}
Matched GET /images
Route path: '/images', defaults: {'action': u'index', 'controller': <nova.api.openstack.images.Controller object at 0x4bb3bd0>}
Match dict: {'action': u'index', 'controller': <nova.api.openstack.images.Controller object at 0x4bb3bd0>}
........F.........Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched POST /v1.0/servers/1/backup_schedules
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x4254dd0>}
Match dict: {'controller': <nova.api.openstack.API object at 0x4254dd0>, 'sub_domain': None, 'path_info': 'servers/1/backup_schedules'}
Matched POST /servers/1/backup_schedules
Route path: '/servers/:server_id/backup_schedules', defaults: {'action': u'create', 'controller': <nova.api.openstack.backup_schedules.Controller object at 0x51f7b90>}
Match dict: {'action': u'create', 'server_id': u'1', 'controller': <nova.api.openstack.backup_schedules.Controller object at 0x51f7b90>}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched POST /v1.0/servers
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x51e3d10>}
Match dict: {'controller': <nova.api.openstack.API object at 0x51e3d10>, 'sub_domain': None, 'path_info': 'servers'}
Matched POST /servers
Route path: '/servers', defaults: {'action': u'create', 'controller': <nova.api.openstack.servers.Controller object at 0x51e3c50>}
Match dict: {'action': u'create', 'controller': <nova.api.openstack.servers.Controller object at 0x51e3c50>}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched DELETE /v1.0/servers/1/backup_schedules
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x4907250>}
Match dict: {'controller': <nova.api.openstack.API object at 0x4907250>, 'sub_domain': None, 'path_info': 'servers/1/backup_schedules'}
No route matched for DELETE /servers/1/backup_schedules
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched DELETE /v1.0/servers/1
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x4907d50>}
Match dict: {'controller': <nova.api.openstack.API object at 0x4907d50>, 'sub_domain': None, 'path_info': 'servers/1'}
Matched DELETE /servers/1
Route path: '/servers/:(id)', defaults: {'action': u'delete', 'controller': <nova.api.openstack.servers.Controller object at 0x49075d0>}
Match dict: {'action': u'delete', 'controller': <nova.api.openstack.servers.Controller object at 0x49075d0>, 'id': u'1'}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched GET /v1.0/servers/detail
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x4f45e50>}
Match dict: {'controller': <nova.api.openstack.API object at 0x4f45e50>, 'sub_domain': None, 'path_info': 'servers/detail'}
Matched GET /servers/detail
Route path: '/servers/detail', defaults: {'action': u'detail', 'controller': <nova.api.openstack.servers.Controller object at 0x4f458d0>}
Match dict: {'action': u'detail', 'controller': <nova.api.openstack.servers.Controller object at 0x4f458d0>}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched GET /v1.0/servers/1/backup_schedules
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x582f0d0>}
Match dict: {'controller': <nova.api.openstack.API object at 0x582f0d0>, 'sub_domain': None, 'path_info': 'servers/1/backup_schedules'}
Matched GET /servers/1/backup_schedules
Route path: '/servers/:server_id/backup_schedules', defaults: {'action': u'index', 'controller': <nova.api.openstack.backup_schedules.Controller object at 0x582fe90>}
Match dict: {'action': u'index', 'server_id': u'1', 'controller': <nova.api.openstack.backup_schedules.Controller object at 0x582fe90>}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched GET /v1.0/servers/1
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x584b150>}
Match dict: {'controller': <nova.api.openstack.API object at 0x584b150>, 'sub_domain': None, 'path_info': 'servers/1'}
Matched GET /servers/1
Route path: '/servers/:(id)', defaults: {'action': u'show', 'controller': <nova.api.openstack.servers.Controller object at 0x584b210>}
Match dict: {'action': u'show', 'controller': <nova.api.openstack.servers.Controller object at 0x584b210>, 'id': u'1'}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched GET /v1.0/servers
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x5b04b10>}
Match dict: {'controller': <nova.api.openstack.API object at 0x5b04b10>, 'sub_domain': None, 'path_info': 'servers'}
Matched GET /servers
Route path: '/servers', defaults: {'action': u'index', 'controller': <nova.api.openstack.servers.Controller object at 0x5b04c50>}
Match dict: {'action': u'index', 'controller': <nova.api.openstack.servers.Controller object at 0x5b04c50>}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched POST /v1.0/servers/1/action
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x5e01150>}
Match dict: {'controller': <nova.api.openstack.API object at 0x5e01150>, 'sub_domain': None, 'path_info': 'servers/1/action'}
Matched POST /servers/1/action
Route path: '/servers/:(id)/action', defaults: {'action': u'action', 'controller': <nova.api.openstack.servers.Controller object at 0x5e01210>}
Match dict: {'action': u'action', 'controller': <nova.api.openstack.servers.Controller object at 0x5e01210>, 'id': u'1'}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched POST /v1.0/servers/1/action
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x5b04c10>}
Match dict: {'controller': <nova.api.openstack.API object at 0x5b04c10>, 'sub_domain': None, 'path_info': 'servers/1/action'}
Matched POST /servers/1/action
Route path: '/servers/:(id)/action', defaults: {'action': u'action', 'controller': <nova.api.openstack.servers.Controller object at 0x5b049d0>}
Match dict: {'action': u'action', 'controller': <nova.api.openstack.servers.Controller object at 0x5b049d0>, 'id': u'1'}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched POST /v1.0/servers/1/action
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x582fe50>}
Match dict: {'controller': <nova.api.openstack.API object at 0x582fe50>, 'sub_domain': None, 'path_info': 'servers/1/action'}
Matched POST /servers/1/action
Route path: '/servers/:(id)/action', defaults: {'action': u'action', 'controller': <nova.api.openstack.servers.Controller object at 0x582fc50>}
Match dict: {'action': u'action', 'controller': <nova.api.openstack.servers.Controller object at 0x582fc50>, 'id': u'1'}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched PUT /v1.0/servers/1
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x4908290>}
Match dict: {'controller': <nova.api.openstack.API object at 0x4908290>, 'sub_domain': None, 'path_info': 'servers/1'}
Matched PUT /servers/1
Route path: '/servers/:(id)', defaults: {'action': u'update', 'controller': <nova.api.openstack.servers.Controller object at 0x4908150>}
Match dict: {'action': u'update', 'controller': <nova.api.openstack.servers.Controller object at 0x4908150>, 'id': u'1'}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched PUT /v1.0/servers/1
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x51f7650>}
Match dict: {'controller': <nova.api.openstack.API object at 0x51f7650>, 'sub_domain': None, 'path_info': 'servers/1'}
Matched PUT /servers/1
Route path: '/servers/:(id)', defaults: {'action': u'update', 'controller': <nova.api.openstack.servers.Controller object at 0x51f7cd0>}
Match dict: {'action': u'update', 'controller': <nova.api.openstack.servers.Controller object at 0x51f7cd0>, 'id': u'1'}
.Initialized with method overriding = True, and path info altering = True
Initialized with method overriding = True, and path info altering = True
Matched PUT /v1.0/servers/1
Route path: '/v1.0/{path_info:.*}', defaults: {'controller': <nova.api.openstack.API object at 0x3d20d90>}
Match dict: {'controller': <nova.api.openstack.API object at 0x3d20d90>, 'sub_domain': None, 'path_info': 'servers/1'}
Matched PUT /servers/1
Route path: '/servers/:(id)', defaults: {'action': u'update', 'controller': <nova.api.openstack.servers.Controller object at 0x3d21a10>}
Match dict: {'action': u'update', 'controller': <nova.api.openstack.servers.Controller object at 0x3d21a10>, 'id': u'1'}
.........Initialized with method overriding = True, and path info altering = True
Matched GET /tests/123
Route path: '/tests/:(id)', defaults: {'action': u'show', 'controller': <nova.tests.api.test_wsgi.Controller object at 0x4bb7890>}
Match dict: {'action': u'show', 'controller': <nova.tests.api.test_wsgi.Controller object at 0x4bb7890>, 'id': u'123'}
Initialized with method overriding = True, and path info altering = True
No route matched for GET /test/123
..Initialized with method overriding = True, and path info altering = True
Matched GET /test
Route path: '/test', defaults: {'controller': <nova.tests.api.test_wsgi.Application object at 0x47b5f90>}
Match dict: {'controller': <nova.tests.api.test_wsgi.Application object at 0x47b5f90>}
Initialized with method overriding = True, and path info altering = True
No route matched for GET /bad
.
======================================================================
FAIL: test_users_get_separate_buckets (nova.tests.api.openstack.test_ratelimiting.LimiterTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/tmpLIvNZr/nova/tests/api/openstack/test_ratelimiting.py", line 65, in test_users_get_separate_buckets
    self.exhaust('c', 0, username='alice')
  File "/tmp/tmpLIvNZr/nova/tests/api/openstack/test_ratelimiting.py", line 30, in exhaust
    self.assertAlmostEqual(when, delay, 2)
AssertionError: 719.99431204795837 != 720.0 within 2 places

----------------------------------------------------------------------
Ran 69 tests in 6.954s

FAILED (failures=1)

OpenStack Compute (nova)

Merge lp://staging/~jbryce/nova/ed-leafe-authors-update into lp://staging/~hudson-openstack/nova/trunk

Commit message

Description of the change

Preview Diff

Subscribers