lp:~citrix-openstack/nova/xenapi-netinject-prop
Created by
Andy Southgate
and last modified
- Get this branch:
- bzr branch lp:~citrix-openstack/nova/xenapi-netinject-prop
Members of
Citrix OpenStack development team
can upload to this branch. Log in for directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Armando Migliaccio (community): Needs Information
-
Diff: 32984 lines (+24930/-2617) (has conflicts)177 files modified.mailmap (+6/-1)
Authors (+16/-2)
MANIFEST.in (+1/-0)
bin/nova-ajax-console-proxy (+1/-1)
bin/nova-api (+1/-1)
bin/nova-dhcpbridge (+1/-1)
bin/nova-direct-api (+50/-8)
bin/nova-instancemonitor (+1/-1)
bin/nova-manage (+469/-28)
bin/nova-objectstore (+9/-6)
bin/stack (+12/-2)
contrib/boto_v6/ec2/connection.py (+100/-0)
contrib/nova.sh (+1/-0)
doc/source/_static/tweaks.css (+147/-0)
doc/source/_theme/layout.html (+10/-1)
doc/source/vmwareapi_readme.rst (+218/-0)
etc/api-paste.ini (+18/-8)
nova/api/direct.py (+50/-0)
nova/api/ec2/__init__.py (+15/-4)
nova/api/ec2/admin.py (+119/-1)
nova/api/ec2/cloud.py (+52/-9)
nova/api/openstack/__init__.py (+61/-5)
nova/api/openstack/accounts.py (+174/-85)
nova/api/openstack/auth.py (+9/-0)
nova/api/openstack/common.py (+88/-0)
nova/api/openstack/extensions.py (+369/-0)
nova/api/openstack/faults.py (+48/-3)
nova/api/openstack/flavors.py (+20/-0)
nova/api/openstack/images.py (+124/-25)
nova/api/openstack/limits.py (+358/-0)
nova/api/openstack/server_metadata.py (+78/-0)
nova/api/openstack/servers.py (+490/-97)
nova/api/openstack/users.py (+107/-0)
nova/api/openstack/views/addresses.py (+42/-0)
nova/api/openstack/views/flavors.py (+34/-0)
nova/api/openstack/views/images.py (+34/-0)
nova/api/openstack/views/servers.py (+125/-0)
nova/api/openstack/zones.py (+104/-0)
nova/auth/dbdriver.py (+2/-0)
nova/auth/fakeldap.py (+5/-5)
nova/auth/ldapdriver.py (+3/-1)
nova/auth/manager.py (+11/-2)
nova/compute/api.py (+262/-63)
nova/compute/manager.py (+503/-8)
nova/compute/power_state.py (+24/-0)
nova/console/manager.py (+1/-1)
nova/console/vmrc.py (+144/-0)
nova/console/vmrc_manager.py (+158/-0)
nova/console/xvp.py (+0/-4)
nova/crypto.py (+9/-0)
nova/db/api.py (+205/-6)
nova/db/base.py (+1/-1)
nova/db/sqlalchemy/api.py (+485/-33)
nova/db/sqlalchemy/migrate_repo/versions/008_add_instance_types.py (+90/-0)
nova/db/sqlalchemy/migrate_repo/versions/011_live_migration.py (+83/-0)
nova/db/sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py (+154/-0)
nova/db/sqlalchemy/migrate_repo/versions/013_add_flavors_to_migrations.py (+50/-0)
nova/db/sqlalchemy/models.py (+74/-14)
nova/exception.py (+1/-1)
nova/flags.py (+12/-0)
nova/image/glance.py (+172/-9)
nova/image/local.py (+33/-0)
nova/image/service.py (+88/-8)
nova/manager.py (+30/-1)
nova/network/linux_net.py (+459/-59)
nova/network/manager.py (+60/-5)
nova/network/vmwareapi_net.py (+91/-0)
nova/objectstore/handler.py (+0/-478)
nova/objectstore/s3server.py (+335/-0)
nova/objectstore/stored.py (+0/-63)
nova/quota.py (+57/-13)
nova/rpc.py (+64/-23)
nova/scheduler/api.py (+244/-0)
nova/scheduler/driver.py (+244/-0)
nova/scheduler/manager.py (+87/-8)
nova/scheduler/zone_manager.py (+179/-0)
nova/service.py (+12/-3)
nova/test.py (+117/-8)
nova/tests/api/openstack/__init__.py (+1/-1)
nova/tests/api/openstack/extensions/foxinsocks.py (+98/-0)
nova/tests/api/openstack/fakes.py (+196/-37)
nova/tests/api/openstack/test_accounts.py (+126/-0)
nova/tests/api/openstack/test_adminapi.py (+0/-1)
nova/tests/api/openstack/test_auth.py (+77/-19)
nova/tests/api/openstack/test_extensions.py (+236/-0)
nova/tests/api/openstack/test_flavors.py (+96/-3)
nova/tests/api/openstack/test_images.py (+227/-101)
nova/tests/api/openstack/test_limits.py (+513/-30)
nova/tests/api/openstack/test_server_metadata.py (+164/-0)
nova/tests/api/openstack/test_servers.py (+940/-13)
nova/tests/api/openstack/test_users.py (+162/-0)
nova/tests/api/openstack/test_zones.py (+195/-0)
nova/tests/api/test_wsgi.py (+122/-0)
nova/tests/db/fakes.py (+94/-8)
nova/tests/fake_utils.py (+106/-0)
nova/tests/hyperv_unittest.py (+1/-1)
nova/tests/image/__init__.py (+16/-0)
nova/tests/image/test_glance.py (+191/-0)
nova/tests/integrated/__init__.py (+20/-0)
nova/tests/integrated/api/__init__.py (+20/-0)
nova/tests/integrated/api/client.py (+210/-0)
nova/tests/integrated/integrated_helpers.py (+146/-0)
nova/tests/integrated/test_login.py (+79/-0)
nova/tests/network/__init__.py (+67/-0)
nova/tests/network/base.py (+154/-0)
nova/tests/test_api.py (+18/-2)
nova/tests/test_auth.py (+7/-0)
nova/tests/test_cloud.py (+21/-14)
nova/tests/test_compute.py (+392/-2)
nova/tests/test_direct.py (+28/-0)
nova/tests/test_flat_network.py (+161/-0)
nova/tests/test_localization.py (+4/-3)
nova/tests/test_middleware.py (+2/-2)
nova/tests/test_misc.py (+98/-6)
nova/tests/test_network.py (+147/-5)
nova/tests/test_objectstore.py (+50/-211)
nova/tests/test_quota.py (+97/-12)
nova/tests/test_rpc.py (+2/-2)
nova/tests/test_scheduler.py (+724/-1)
nova/tests/test_service.py (+60/-9)
nova/tests/test_test.py (+43/-0)
nova/tests/test_utils.py (+429/-174)
nova/tests/test_virt.py (+320/-9)
nova/tests/test_vlan_network.py (+242/-0)
nova/tests/test_vmwareapi.py (+252/-0)
nova/tests/test_volume.py (+196/-0)
nova/tests/test_xenapi.py (+354/-18)
nova/tests/test_zones.py (+381/-172)
nova/tests/vmwareapi/__init__.py (+21/-0)
nova/tests/vmwareapi/db_fakes.py (+109/-0)
nova/tests/vmwareapi/stubs.py (+46/-0)
nova/tests/xenapi/stubs.py (+124/-16)
nova/utils.py (+285/-7)
nova/virt/connection.py (+7/-2)
nova/virt/cpuinfo.xml.template (+9/-0)
nova/virt/disk.py (+37/-10)
nova/virt/driver.py (+234/-0)
nova/virt/fake.py (+51/-11)
nova/virt/hyperv.py (+20/-2)
nova/virt/interfaces.template (+17/-10)
nova/virt/libvirt.xml.template (+12/-9)
nova/virt/libvirt_conn.py (+773/-77)
nova/virt/vmwareapi/__init__.py (+19/-0)
nova/virt/vmwareapi/error_util.py (+96/-0)
nova/virt/vmwareapi/fake.py (+711/-0)
nova/virt/vmwareapi/io_util.py (+168/-0)
nova/virt/vmwareapi/network_utils.py (+149/-0)
nova/virt/vmwareapi/read_write_util.py (+182/-0)
nova/virt/vmwareapi/vim.py (+176/-0)
nova/virt/vmwareapi/vim_util.py (+217/-0)
nova/virt/vmwareapi/vm_util.py (+306/-0)
nova/virt/vmwareapi/vmops.py (+789/-0)
nova/virt/vmwareapi/vmware_images.py (+201/-0)
nova/virt/vmwareapi_conn.py (+375/-0)
nova/virt/xenapi/fake.py (+53/-9)
nova/virt/xenapi/vm_utils.py (+204/-15)
nova/virt/xenapi/vmops.py (+630/-58)
nova/virt/xenapi_conn.py (+98/-19)
nova/volume/api.py (+2/-1)
nova/volume/driver.py (+206/-1)
nova/volume/manager.py (+10/-3)
plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py (+81/-11)
plugins/xenserver/xenapi/etc/xapi.d/plugins/glance (+279/-0)
plugins/xenserver/xenapi/etc/xapi.d/plugins/migration (+121/-0)
po/nova.pot (+733/-365)
pylintrc (+12/-1)
run_tests.py (+2/-0)
smoketests/base.py (+37/-5)
smoketests/proxy.sh (+32/-0)
smoketests/public_network_smoketests.py (+8/-6)
smoketests/run_tests.py (+310/-0)
smoketests/test_admin.py (+0/-7)
smoketests/test_netadmin.py (+186/-0)
smoketests/test_sysadmin.py (+49/-9)
tools/esx/guest_tool.py (+345/-0)
tools/euca-get-ajax-console (+1/-1)
tools/pip-requires (+1/-0)
- Trey Morris (community): Approve
- Thierry Carrez (community): Approve (ffe)
- Sandy Walsh (community): Approve
- Rick Harris (community): Approve
-
Diff: 1060 lines (+507/-93)11 files modifiedAuthors (+1/-0)
nova/tests/db/fakes.py (+42/-32)
nova/tests/fake_utils.py (+106/-0)
nova/tests/test_xenapi.py (+139/-26)
nova/tests/xenapi/stubs.py (+8/-4)
nova/virt/disk.py (+19/-7)
nova/virt/libvirt_conn.py (+1/-3)
nova/virt/xenapi/fake.py (+31/-6)
nova/virt/xenapi/vm_utils.py (+133/-0)
nova/virt/xenapi/vmops.py (+13/-15)
nova/virt/xenapi_conn.py (+14/-0)
Related bugs
Related blueprints
Branch information
Recent revisions
- 720. By Salvatore Orlando
-
Merged with trunk
Updated net injection for xenapi reflecting recent changes for libvirt - 719. By Salvatore Orlando
-
Addressing Trey's comments.
Removed disk_get_injectables, using _get_network_info's return value.
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