Merge lp://qastaging/~midokura/nova/network-service into lp://qastaging/~ntt-pf-lab/nova/network-service
Proposed by
Ryu Ishimoto
Status: | Merged |
---|---|
Merged at revision: | 773 |
Proposed branch: | lp://qastaging/~midokura/nova/network-service |
Merge into: | lp://qastaging/~ntt-pf-lab/nova/network-service |
Diff against target: |
64148 lines (+34518/-21481) 129 files modified
.bzrignore (+6/-7) Authors (+3/-0) MANIFEST.in (+1/-1) bin/nova-ajax-console-proxy (+10/-11) bin/nova-dhcpbridge (+3/-1) bin/nova-manage (+72/-80) bin/nova-vncproxy (+101/-0) doc/source/devref/zone.rst (+127/-0) doc/source/man/novamanage.rst (+10/-0) doc/source/runnova/vncconsole.rst (+76/-0) nova/CA/geninter.sh (+1/-1) nova/CA/genrootca.sh (+2/-1) nova/CA/openssl.cnf.tmpl (+5/-1) nova/adminclient.py (+0/-476) nova/api/direct.py (+5/-1) nova/api/ec2/cloud.py (+80/-27) nova/api/openstack/__init__.py (+23/-12) nova/api/openstack/accounts.py (+2/-3) nova/api/openstack/backup_schedules.py (+7/-3) nova/api/openstack/common.py (+17/-0) nova/api/openstack/consoles.py (+2/-2) nova/api/openstack/contrib/__init__.py (+22/-0) nova/api/openstack/contrib/volumes.py (+336/-0) nova/api/openstack/extensions.py (+156/-73) nova/api/openstack/faults.py (+5/-3) nova/api/openstack/flavors.py (+5/-2) nova/api/openstack/image_metadata.py (+14/-1) nova/api/openstack/images.py (+106/-213) nova/api/openstack/ips.py (+72/-0) nova/api/openstack/limits.py (+2/-2) nova/api/openstack/server_metadata.py (+2/-1) nova/api/openstack/servers.py (+88/-29) nova/api/openstack/shared_ip_groups.py (+5/-5) nova/api/openstack/users.py (+1/-2) nova/api/openstack/versions.py (+8/-2) nova/api/openstack/views/addresses.py (+8/-2) nova/api/openstack/views/images.py (+91/-11) nova/api/openstack/views/servers.py (+14/-14) nova/api/openstack/zones.py (+2/-4) nova/compute/api.py (+39/-10) nova/compute/instance_types.py (+37/-35) nova/compute/manager.py (+49/-16) nova/crypto.py (+10/-2) nova/db/api.py (+5/-0) nova/db/sqlalchemy/api.py (+25/-1) nova/db/sqlalchemy/migrate_repo/versions/014_add_instance_type_id_to_instances.py (+84/-0) nova/db/sqlalchemy/migrate_repo/versions/014_diablo.py (+0/-92) nova/db/sqlalchemy/migrate_repo/versions/015_diablo.py (+93/-0) nova/db/sqlalchemy/models.py (+7/-1) nova/image/fake.py (+113/-0) nova/image/glance.py (+15/-33) nova/image/local.py (+13/-3) nova/image/s3.py (+8/-37) nova/image/service.py (+27/-0) nova/network/api.py (+15/-0) nova/network/linux_net.py (+10/-1) nova/network/manager.py (+1/-0) nova/network/xenapi_net.py (+85/-0) nova/rpc.py (+8/-3) nova/scheduler/chance.py (+3/-1) nova/scheduler/simple.py (+9/-3) nova/scheduler/zone.py (+4/-1) nova/tests/api/openstack/extensions/__init__.py (+15/-0) nova/tests/api/openstack/test_api.py (+4/-4) nova/tests/api/openstack/test_faults.py (+106/-23) nova/tests/api/openstack/test_image_metadata.py (+39/-2) nova/tests/api/openstack/test_images.py (+463/-37) nova/tests/api/openstack/test_limits.py (+13/-5) nova/tests/api/openstack/test_servers.py (+371/-66) nova/tests/api/openstack/test_shared_ip_groups.py (+27/-3) nova/tests/api/openstack/test_versions.py (+26/-0) nova/tests/db/fakes.py (+61/-26) nova/tests/fake_utils.py (+10/-7) nova/tests/image/test_glance.py (+54/-9) nova/tests/integrated/api/client.py (+37/-3) nova/tests/integrated/integrated_helpers.py (+99/-24) nova/tests/integrated/test_extensions.py (+44/-0) nova/tests/integrated/test_login.py (+5/-16) nova/tests/integrated/test_servers.py (+184/-0) nova/tests/integrated/test_volumes.py (+295/-0) nova/tests/integrated/test_xml.py (+56/-0) nova/tests/test_auth.py (+4/-4) nova/tests/test_cloud.py (+77/-1) nova/tests/test_compute.py (+22/-9) nova/tests/test_console.py (+1/-1) nova/tests/test_instance_types.py (+5/-1) nova/tests/test_quota.py (+11/-6) nova/tests/test_scheduler.py (+1/-1) nova/tests/test_virt.py (+46/-2) nova/tests/test_volume.py (+1/-1) nova/tests/test_xenapi.py (+60/-51) nova/virt/disk.py (+35/-0) nova/virt/driver.py (+18/-9) nova/virt/fake.py (+15/-10) nova/virt/hyperv.py (+4/-0) nova/virt/libvirt.xml.template (+24/-10) nova/virt/libvirt_conn.py (+292/-70) nova/virt/vmwareapi/vim.py (+29/-25) nova/virt/vmwareapi_conn.py (+2/-1) nova/virt/xenapi/fake.py (+107/-65) nova/virt/xenapi/network_utils.py (+17/-2) nova/virt/xenapi/vm_utils.py (+29/-8) nova/virt/xenapi/vmops.py (+142/-94) nova/virt/xenapi_conn.py (+8/-1) nova/vnc/__init__.py (+34/-0) nova/vnc/auth.py (+138/-0) nova/vnc/proxy.py (+131/-0) nova/volume/driver.py (+75/-2) nova/wsgi.py (+42/-5) plugins/xenserver/xenapi/etc/xapi.d/plugins/agent (+77/-6) plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py (+19/-16) po/ast.po (+2487/-1769) po/cs.po (+2508/-1777) po/da.po (+2488/-1770) po/de.po (+2531/-1779) po/es.po (+3000/-1820) po/it.po (+2541/-1784) po/ja.po (+2989/-1791) po/pt_BR.po (+2677/-1798) po/ru.po (+2608/-1779) po/uk.po (+2522/-1775) po/zh_CN.po (+2585/-1780) setup.py (+16/-0) smoketests/test_admin.py (+1/-1) smoketests/test_sysadmin.py (+3/-2) tools/euca-get-ajax-console (+6/-0) tools/eventlet-patch (+24/-0) tools/install_venv.py (+6/-0) tools/pip-requires (+1/-0) |
To merge this branch: | bzr merge lp://qastaging/~midokura/nova/network-service |
Related bugs: | |
Related blueprints: |
Refactor Networking
(Essential)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
NTT PF Lab. | Pending | ||
Review via email:
|
Description of the change
Merged trunk
To post a comment you must log in.