lp:~ttx/nova/diablo-rbp-merge
Created by
Thierry Carrez
and last modified
- Get this branch:
- bzr branch lp:~ttx/nova/diablo-rbp-merge
Only
Thierry Carrez
can upload to this branch. If you are
Thierry Carrez
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Soren Hansen (community): Approve
-
Diff: 20939 lines (+13771/-2577)161 files modified.mailmap (+1/-0)
Authors (+5/-0)
bin/instance-usage-audit (+2/-3)
bin/nova-ajax-console-proxy (+6/-6)
bin/nova-api (+1/-0)
bin/nova-api-ec2 (+1/-0)
bin/nova-api-os (+1/-0)
bin/nova-compute (+1/-0)
bin/nova-manage (+544/-12)
bin/nova-network (+1/-0)
bin/nova-objectstore (+1/-0)
bin/nova-scheduler (+3/-0)
bin/nova-volume (+1/-0)
bin/nova-vsa (+49/-0)
contrib/nova.sh (+1/-1)
nova/api/ec2/__init__.py (+24/-15)
nova/api/ec2/admin.py (+2/-3)
nova/api/ec2/cloud.py (+41/-22)
nova/api/openstack/common.py (+54/-28)
nova/api/openstack/contrib/createserverext.py (+22/-6)
nova/api/openstack/contrib/floating_ips.py (+12/-7)
nova/api/openstack/contrib/simple_tenant_usage.py (+236/-0)
nova/api/openstack/contrib/virtual_storage_arrays.py (+606/-0)
nova/api/openstack/contrib/volumes.py (+34/-2)
nova/api/openstack/contrib/volumetypes.py (+197/-0)
nova/api/openstack/create_instance_helper.py (+30/-21)
nova/api/openstack/schemas/v1.1/server.rng (+2/-0)
nova/api/openstack/servers.py (+63/-27)
nova/api/openstack/views/addresses.py (+0/-1)
nova/api/openstack/views/servers.py (+7/-9)
nova/compute/api.py (+134/-63)
nova/compute/manager.py (+252/-235)
nova/compute/task_states.py (+59/-0)
nova/compute/vm_states.py (+39/-0)
nova/context.py (+1/-1)
nova/db/api.py (+135/-4)
nova/db/sqlalchemy/api.py (+486/-32)
nova/db/sqlalchemy/migrate_repo/versions/016_make_quotas_key_and_value.py (+14/-4)
nova/db/sqlalchemy/migrate_repo/versions/036_change_flavor_id_in_migrations.py (+10/-6)
nova/db/sqlalchemy/migrate_repo/versions/042_add_volume_types_and_extradata.py (+115/-0)
nova/db/sqlalchemy/migrate_repo/versions/043_add_vsa_data.py (+75/-0)
nova/db/sqlalchemy/migrate_repo/versions/044_update_instance_states.py (+138/-0)
nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py (+44/-0)
nova/db/sqlalchemy/migration.py (+3/-1)
nova/db/sqlalchemy/models.py (+82/-13)
nova/exception.py (+56/-5)
nova/flags.py (+27/-2)
nova/image/glance.py (+29/-4)
nova/ipv6/account_identifier.py (+6/-1)
nova/ipv6/rfc2462.py (+3/-1)
nova/log.py (+5/-1)
nova/network/api.py (+6/-0)
nova/network/linux_net.py (+61/-4)
nova/network/manager.py (+44/-23)
nova/network/quantum/__init__.py (+16/-0)
nova/network/quantum/client.py (+307/-0)
nova/network/quantum/manager.py (+324/-0)
nova/network/quantum/melange_connection.py (+141/-0)
nova/network/quantum/melange_ipam_lib.py (+205/-0)
nova/network/quantum/nova_ipam_lib.py (+195/-0)
nova/network/quantum/quantum_connection.py (+118/-0)
nova/notifier/api.py (+29/-1)
nova/notifier/list_notifier.py (+68/-0)
nova/quota.py (+3/-2)
nova/rpc/__init__.py (+17/-26)
nova/rpc/common.py (+6/-0)
nova/rpc/impl_carrot.py (+81/-21)
nova/rpc/impl_kombu.py (+781/-0)
nova/scheduler/abstract_scheduler.py (+11/-7)
nova/scheduler/api.py (+35/-17)
nova/scheduler/base_scheduler.py (+14/-2)
nova/scheduler/driver.py (+4/-6)
nova/scheduler/host_filter.py (+6/-0)
nova/scheduler/manager.py (+6/-4)
nova/scheduler/vsa.py (+535/-0)
nova/service.py (+11/-21)
nova/test.py (+18/-0)
nova/tests/api/ec2/__init__.py (+19/-0)
nova/tests/api/ec2/test_middleware.py (+45/-0)
nova/tests/api/openstack/contrib/test_createserverext.py (+126/-17)
nova/tests/api/openstack/contrib/test_floating_ips.py (+213/-26)
nova/tests/api/openstack/contrib/test_security_groups.py (+36/-36)
nova/tests/api/openstack/contrib/test_simple_tenant_usage.py (+172/-0)
nova/tests/api/openstack/contrib/test_vsa.py (+450/-0)
nova/tests/api/openstack/fakes.py (+9/-2)
nova/tests/api/openstack/test_extensions.py (+3/-0)
nova/tests/api/openstack/test_server_actions.py (+22/-33)
nova/tests/api/openstack/test_servers.py (+205/-47)
nova/tests/api/openstack/test_volume_types.py (+171/-0)
nova/tests/api/openstack/test_volume_types_extra_specs.py (+181/-0)
nova/tests/image/test_glance.py (+47/-6)
nova/tests/integrated/test_servers.py (+25/-12)
nova/tests/integrated/test_volumes.py (+17/-0)
nova/tests/monkey_patch_example/__init__.py (+33/-0)
nova/tests/monkey_patch_example/example_a.py (+29/-0)
nova/tests/monkey_patch_example/example_b.py (+30/-0)
nova/tests/notifier/__init__.py (+16/-0)
nova/tests/notifier/test_list_notifier.py (+88/-0)
nova/tests/scheduler/test_abstract_scheduler.py (+55/-0)
nova/tests/scheduler/test_scheduler.py (+106/-9)
nova/tests/scheduler/test_vsa_scheduler.py (+641/-0)
nova/tests/test_adminapi.py (+0/-2)
nova/tests/test_cloud.py (+15/-16)
nova/tests/test_compute.py (+34/-17)
nova/tests/test_context.py (+33/-0)
nova/tests/test_db_api.py (+3/-1)
nova/tests/test_instance_types.py (+66/-2)
nova/tests/test_ipv6.py (+38/-0)
nova/tests/test_libvirt.py (+6/-4)
nova/tests/test_linux_net.py (+347/-0)
nova/tests/test_network.py (+78/-3)
nova/tests/test_notifier.py (+21/-0)
nova/tests/test_nova_manage.py (+154/-0)
nova/tests/test_quantum.py (+323/-0)
nova/tests/test_rpc.py (+6/-158)
nova/tests/test_rpc_amqp.py (+0/-88)
nova/tests/test_rpc_carrot.py (+45/-0)
nova/tests/test_rpc_common.py (+189/-0)
nova/tests/test_rpc_kombu.py (+110/-0)
nova/tests/test_test.py (+2/-3)
nova/tests/test_test_utils.py (+41/-0)
nova/tests/test_utils.py (+45/-0)
nova/tests/test_versions.py (+61/-0)
nova/tests/test_virt_drivers.py (+489/-0)
nova/tests/test_volume_types.py (+207/-0)
nova/tests/test_volume_types_extra_specs.py (+132/-0)
nova/tests/test_vsa.py (+182/-0)
nova/tests/test_vsa_volumes.py (+136/-0)
nova/tests/test_xenapi.py (+1/-38)
nova/tests/utils.py (+68/-0)
nova/tests/vmwareapi/db_fakes.py (+4/-1)
nova/tests/xenapi/stubs.py (+4/-0)
nova/utils.py (+50/-0)
nova/virt/driver.py (+7/-11)
nova/virt/fake.py (+11/-2)
nova/virt/libvirt.xml.template (+3/-1)
nova/virt/libvirt/connection.py (+5/-0)
nova/virt/libvirt/vif.py (+1/-1)
nova/virt/xenapi/fake.py (+3/-0)
nova/virt/xenapi/vmops.py (+10/-3)
nova/volume/api.py (+88/-6)
nova/volume/driver.py (+272/-0)
nova/volume/manager.py (+78/-0)
nova/volume/volume_types.py (+166/-0)
nova/vsa/__init__.py (+18/-0)
nova/vsa/api.py (+411/-0)
nova/vsa/connection.py (+25/-0)
nova/vsa/fake.py (+22/-0)
nova/vsa/manager.py (+179/-0)
nova/vsa/utils.py (+80/-0)
po/cs.po (+4/-22)
po/de.po (+4/-40)
po/es.po (+4/-480)
po/it.po (+1/-1)
po/ja.po (+4/-475)
po/pt_BR.po (+20/-167)
po/ru.po (+4/-122)
po/tl.po (+4/-9)
po/uk.po (+4/-38)
run_tests.sh (+10/-8)
tools/pip-requires (+1/-0)
Branch information
Recent revisions
- 1151. By Thierry Carrez
-
Fix default hostname generator so that it won't use underscores, and use minus signs instead.
- 1147. By Vish Ishaya
-
Adds a use_deprecated_auth flag to make sure creds generated using nova-manage commands will work with noauth.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~hudson-openstack/nova/trunk