lp:~tr3buchet/rackspace-nova/rs-nova
- Get this branch:
- bzr branch lp:~tr3buchet/rackspace-nova/rs-nova
Branch merges
- Ozone: Pending requested
-
Diff: 39242 lines (+20555/-7198)245 files modified.mailmap (+5/-0)
Authors (+16/-2)
MANIFEST.in (+1/-0)
bin/instance-usage-audit (+116/-0)
bin/nova-ajax-console-proxy (+3/-2)
bin/nova-api (+34/-31)
bin/nova-dhcpbridge (+9/-6)
bin/nova-direct-api (+5/-2)
bin/nova-manage (+206/-71)
bin/nova-objectstore (+5/-2)
bin/nova-vncproxy (+20/-2)
contrib/nova.sh (+13/-7)
doc/.autogenerated (+0/-283)
doc/build/html/.buildinfo (+0/-4)
doc/source/devref/distributed_scheduler.rst (+188/-0)
doc/source/devref/index.rst (+1/-0)
doc/source/devref/multinic.rst (+39/-0)
doc/source/devref/zone.rst (+5/-5)
doc/source/man/novamanage.rst (+2/-2)
doc/source/runnova/managing.users.rst (+3/-3)
nova/__init__.py (+5/-0)
nova/api/direct.py (+9/-5)
nova/api/ec2/__init__.py (+11/-0)
nova/api/ec2/admin.py (+64/-4)
nova/api/ec2/apirequest.py (+3/-75)
nova/api/ec2/cloud.py (+240/-78)
nova/api/ec2/ec2utils.py (+94/-0)
nova/api/ec2/metadatarequesthandler.py (+13/-2)
nova/api/openstack/__init__.py (+44/-49)
nova/api/openstack/accounts.py (+21/-12)
nova/api/openstack/auth.py (+12/-10)
nova/api/openstack/backup_schedules.py (+22/-12)
nova/api/openstack/common.py (+54/-51)
nova/api/openstack/consoles.py (+8/-11)
nova/api/openstack/contrib/__init__.py (+1/-1)
nova/api/openstack/contrib/flavorextraspecs.py (+126/-0)
nova/api/openstack/contrib/floating_ips.py (+173/-0)
nova/api/openstack/contrib/hosts.py (+114/-0)
nova/api/openstack/contrib/multinic.py (+125/-0)
nova/api/openstack/contrib/volumes.py (+14/-17)
nova/api/openstack/create_instance_helper.py (+354/-0)
nova/api/openstack/extensions.py (+67/-47)
nova/api/openstack/faults.py (+23/-16)
nova/api/openstack/flavors.py (+25/-15)
nova/api/openstack/image_metadata.py (+75/-13)
nova/api/openstack/images.py (+303/-60)
nova/api/openstack/ips.py (+34/-27)
nova/api/openstack/limits.py (+40/-17)
nova/api/openstack/notes.txt (+0/-3)
nova/api/openstack/ratelimiting/__init__.py (+1/-1)
nova/api/openstack/server_metadata.py (+58/-20)
nova/api/openstack/servers.py (+187/-348)
nova/api/openstack/shared_ip_groups.py (+14/-26)
nova/api/openstack/users.py (+28/-17)
nova/api/openstack/versions.py (+22/-26)
nova/api/openstack/views/addresses.py (+6/-4)
nova/api/openstack/views/flavors.py (+9/-7)
nova/api/openstack/views/images.py (+40/-27)
nova/api/openstack/views/limits.py (+23/-10)
nova/api/openstack/views/servers.py (+28/-17)
nova/api/openstack/wsgi.py (+473/-0)
nova/api/openstack/zones.py (+97/-29)
nova/auth/fakeldap.py (+24/-0)
nova/auth/ldapdriver.py (+113/-14)
nova/auth/manager.py (+19/-13)
nova/auth/novarc.template (+4/-1)
nova/compute/api.py (+502/-172)
nova/compute/instance_types.py (+1/-1)
nova/compute/manager.py (+431/-174)
nova/compute/monitor.py (+2/-1)
nova/compute/utils.py (+29/-0)
nova/console/manager.py (+2/-2)
nova/console/vmrc.py (+1/-1)
nova/console/vmrc_manager.py (+2/-2)
nova/context.py (+0/-1)
nova/crypto.py (+2/-1)
nova/db/api.py (+259/-45)
nova/db/sqlalchemy/api.py (+993/-294)
nova/db/sqlalchemy/migrate_repo/versions/016_make_quotas_key_and_value.py (+6/-6)
nova/db/sqlalchemy/migrate_repo/versions/018_rename_server_management_url.py (+5/-24)
nova/db/sqlalchemy/migrate_repo/versions/019_add_volume_snapshot_support.py (+70/-0)
nova/db/sqlalchemy/migrate_repo/versions/020_add_snapshot_id_to_volumes.py (+47/-0)
nova/db/sqlalchemy/migrate_repo/versions/021_rename_image_ids.py (+40/-0)
nova/db/sqlalchemy/migrate_repo/versions/022_set_engine_mysql_innodb.py (+65/-0)
nova/db/sqlalchemy/migrate_repo/versions/023_add_vm_mode_to_instances.py (+45/-0)
nova/db/sqlalchemy/migrate_repo/versions/024_add_block_device_mapping.py (+87/-0)
nova/db/sqlalchemy/migrate_repo/versions/025_add_uuid_to_instances.py (+43/-0)
nova/db/sqlalchemy/migrate_repo/versions/026_add_agent_table.py (+73/-0)
nova/db/sqlalchemy/migrate_repo/versions/027_add_provider_firewall_rules.py (+74/-0)
nova/db/sqlalchemy/migrate_repo/versions/028_add_instance_type_extra_specs.py (+67/-0)
nova/db/sqlalchemy/migrate_repo/versions/029_add_zone_weight_offsets.py (+38/-0)
nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py (+125/-0)
nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py (+56/-0)
nova/db/sqlalchemy/migrate_repo/versions/031_sqlite_downgrade.sql (+48/-0)
nova/db/sqlalchemy/migrate_repo/versions/031_sqlite_upgrade.sql (+48/-0)
nova/db/sqlalchemy/models.py (+172/-45)
nova/exception.py (+155/-29)
nova/fakerabbit.py (+23/-8)
nova/flags.py (+14/-6)
nova/image/__init__.py (+98/-0)
nova/image/fake.py (+89/-24)
nova/image/glance.py (+41/-12)
nova/image/local.py (+0/-165)
nova/image/s3.py (+70/-29)
nova/image/service.py (+2/-2)
nova/log.py (+21/-0)
nova/network/api.py (+82/-14)
nova/network/linux_net.py (+15/-6)
nova/network/manager.py (+558/-286)
nova/network/vmwareapi_net.py (+5/-7)
nova/network/xenapi_net.py (+6/-4)
nova/notifier/api.py (+16/-5)
nova/notifier/test_notifier.py (+28/-0)
nova/objectstore/s3server.py (+1/-1)
nova/quota.py (+78/-52)
nova/rpc.py (+215/-71)
nova/scheduler/api.py (+131/-49)
nova/scheduler/driver.py (+11/-9)
nova/scheduler/host_filter.py (+98/-37)
nova/scheduler/least_cost.py (+174/-0)
nova/scheduler/manager.py (+21/-2)
nova/scheduler/simple.py (+12/-7)
nova/scheduler/zone_aware_scheduler.py (+314/-52)
nova/scheduler/zone_manager.py (+56/-8)
nova/service.py (+142/-99)
nova/test.py (+41/-30)
nova/tests/__init__.py (+17/-9)
nova/tests/api/__init__.py (+19/-0)
nova/tests/api/openstack/__init__.py (+3/-0)
nova/tests/api/openstack/contrib/__init__.py (+15/-0)
nova/tests/api/openstack/contrib/test_floating_ips.py (+189/-0)
nova/tests/api/openstack/contrib/test_multinic_xs.py (+115/-0)
nova/tests/api/openstack/extensions/foxinsocks.py (+1/-3)
nova/tests/api/openstack/extensions/test_flavors_extra_specs.py (+198/-0)
nova/tests/api/openstack/fakes.py (+57/-17)
nova/tests/api/openstack/test_api.py (+21/-0)
nova/tests/api/openstack/test_auth.py (+65/-0)
nova/tests/api/openstack/test_common.py (+137/-83)
nova/tests/api/openstack/test_extensions.py (+15/-2)
nova/tests/api/openstack/test_flavors.py (+31/-35)
nova/tests/api/openstack/test_image_metadata.py (+161/-10)
nova/tests/api/openstack/test_images.py (+1114/-152)
nova/tests/api/openstack/test_limits.py (+140/-5)
nova/tests/api/openstack/test_server_metadata.py (+78/-2)
nova/tests/api/openstack/test_servers.py (+398/-127)
nova/tests/api/openstack/test_wsgi.py (+346/-0)
nova/tests/api/openstack/test_zones.py (+10/-6)
nova/tests/api/test_wsgi.py (+0/-189)
nova/tests/db/fakes.py (+334/-35)
nova/tests/fake_flags.py (+14/-14)
nova/tests/glance/stubs.py (+10/-9)
nova/tests/image/__init__.py (+3/-0)
nova/tests/image/test_glance.py (+2/-4)
nova/tests/integrated/__init__.py (+2/-0)
nova/tests/integrated/api/client.py (+20/-15)
nova/tests/integrated/integrated_helpers.py (+21/-23)
nova/tests/integrated/test_servers.py (+106/-0)
nova/tests/integrated/test_xml.py (+2/-2)
nova/tests/network/__init__.py (+0/-67)
nova/tests/network/base.py (+0/-155)
nova/tests/real_flags.py (+0/-26)
nova/tests/scheduler/__init__.py (+19/-0)
nova/tests/scheduler/test_host_filter.py (+240/-0)
nova/tests/scheduler/test_least_cost_scheduler.py (+145/-0)
nova/tests/scheduler/test_scheduler.py (+43/-21)
nova/tests/scheduler/test_zone_aware_scheduler.py (+245/-35)
nova/tests/test_adminapi.py (+107/-0)
nova/tests/test_api.py (+24/-1)
nova/tests/test_auth.py (+11/-0)
nova/tests/test_cloud.py (+640/-62)
nova/tests/test_compute.py (+139/-20)
nova/tests/test_console.py (+0/-3)
nova/tests/test_crypto.py (+83/-0)
nova/tests/test_direct.py (+22/-21)
nova/tests/test_exception.py (+63/-0)
nova/tests/test_flags.py (+14/-0)
nova/tests/test_flat_network.py (+0/-161)
nova/tests/test_host_filter.py (+0/-208)
nova/tests/test_hosts.py (+102/-0)
nova/tests/test_instance_types_extra_specs.py (+165/-0)
nova/tests/test_iptables_network.py (+164/-0)
nova/tests/test_libvirt.py (+380/-69)
nova/tests/test_metadata.py (+76/-0)
nova/tests/test_middleware.py (+0/-1)
nova/tests/test_misc.py (+13/-0)
nova/tests/test_network.py (+267/-160)
nova/tests/test_notifier.py (+22/-3)
nova/tests/test_objectstore.py (+7/-2)
nova/tests/test_quota.py (+83/-29)
nova/tests/test_rpc.py (+107/-11)
nova/tests/test_service.py (+83/-6)
nova/tests/test_utils.py (+31/-0)
nova/tests/test_vlan_network.py (+0/-242)
nova/tests/test_vmwareapi.py (+276/-252)
nova/tests/test_volume.py (+49/-2)
nova/tests/test_wsgi.py (+95/-0)
nova/tests/test_xenapi.py (+260/-66)
nova/tests/test_zones.py (+175/-0)
nova/tests/vmwareapi/db_fakes.py (+2/-2)
nova/tests/xenapi/stubs.py (+67/-22)
nova/twistd.py (+3/-3)
nova/utils.py (+106/-21)
nova/virt/connection.py (+1/-1)
nova/virt/driver.py (+16/-4)
nova/virt/fake.py (+63/-1)
nova/virt/hyperv.py (+12/-3)
nova/virt/images.py (+4/-12)
nova/virt/libvirt.xml.template (+10/-1)
nova/virt/libvirt/connection.py (+132/-731)
nova/virt/libvirt/firewall.py (+820/-0)
nova/virt/libvirt/netutils.py (+102/-0)
nova/virt/vmwareapi/vm_util.py (+5/-1)
nova/virt/vmwareapi/vmops.py (+19/-13)
nova/virt/vmwareapi/vmware_images.py (+7/-15)
nova/virt/vmwareapi_conn.py (+5/-1)
nova/virt/xenapi/fake.py (+8/-8)
nova/virt/xenapi/vm_utils.py (+183/-85)
nova/virt/xenapi/vmops.py (+304/-113)
nova/virt/xenapi/volume_utils.py (+22/-21)
nova/virt/xenapi_conn.py (+10/-6)
nova/vnc/__init__.py (+2/-0)
nova/volume/api.py (+68/-4)
nova/volume/driver.py (+116/-28)
nova/volume/manager.py (+58/-5)
nova/wsgi.py (+144/-333)
plugins/xenserver/networking/etc/init.d/openvswitch-nova (+96/-0)
plugins/xenserver/networking/etc/sysconfig/openvswitch-nova (+1/-0)
plugins/xenserver/networking/etc/udev/rules.d/xen-openvswitch-nova.rules (+3/-0)
plugins/xenserver/networking/etc/xensource/scripts/novalib.py (+40/-0)
plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_base_flows.py (+62/-0)
plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py (+180/-0)
plugins/xenserver/networking/etc/xensource/scripts/vif_5.6-fp1.patch (+1/-5)
plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py (+11/-19)
plugins/xenserver/xenapi/contrib/build-rpm.sh (+20/-0)
plugins/xenserver/xenapi/contrib/rpmbuild/SPECS/openstack-xen-plugins.spec (+37/-0)
plugins/xenserver/xenapi/etc/xapi.d/plugins/agent (+34/-2)
plugins/xenserver/xenapi/etc/xapi.d/plugins/glance (+74/-28)
plugins/xenserver/xenapi/etc/xapi.d/plugins/migration (+1/-1)
plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost (+44/-7)
run_tests.py (+79/-20)
run_tests.sh (+25/-8)
tools/clean-vlans (+3/-3)
tools/install_venv.py (+1/-1)
tools/nova-debug (+13/-8)
tools/pip-requires (+6/-7)
Branch information
Recent revisions
- 1099. By <email address hidden>
-
fixing glance plugin bug and setting the plugin to use /v1 of the glance api
- 1095. By Rick Harris
-
This is the groundwork for the upcoming distributed scheduler changes. Nothing is actually wired up here, so it shouldn't break any existing code (and all tests pass).
The goals were to:
1. Define the basic distributed scheduler communication mechanism:
a. call_zone_method - how each zone can communicate with its childrenb. encrypted child-blobs - how child zones an securely and statelessly report back weight and build-plan info
2. Put in hooks for advanced-filtering (hard-requirements, capabilities) as well as preferences (least-
cost-scheduling ) 3. Create a base set of dist-scheduler tests that we can extend as we add more functionality.
Next up will be to:
1. Add in a filtering driver
2. Add in a cost-scheduler driver
- 1094. By William Wolf
-
Get rid of old virt/images.py functions that are no longer needed. Checked for any loose calls to these functions and found none. All tests pass for me.
- 1093. By Dan Prince
-
Update OSAPI v1.1 extensions so that it supports RequestExtensions. ResponseExtensions were removed since the new RequestExtension covers both use cases. This branch also removes some of the odd serialization code in the RequestExtensio
nController that converted dictionary objects into webob objects. RequestExtension handlers should now always return proper webob objects. - 1092. By John Tran
-
Added an EC2 API endpoint that'll allow import of public key. Prior, api only allowed generation of new keys.
- 1091. By Anthony Young
-
This fix ensures that kpartx -d is called in the event that tune2fs fails during key injection, as it does when trying to inject a key into a windows instance. Bug #760921 is a symptom of this issue, as if kpartx -d is not called then partitions remain mapped that prevent the underlying nbd from being reused.
Couldn't think of a good way to regression test for this - any ideas?
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:rackspace-nova