lp:~jk0/nova/lp833205

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~hudson-openstack/nova/trunk at revision 1547

Devin Carlen (community): Approve on 2011-09-09

Brian Waldon (community): Approve on 2011-09-09

Diff: 213 lines (+39/-22)

12 files modified

nova/api/openstack/servers.py (+2/-3)
nova/compute/api.py (+3/-2)
nova/compute/manager.py (+2/-2)
nova/tests/test_compute.py (+14/-5)
nova/tests/test_virt_drivers.py (+2/-1)
nova/tests/test_vmwareapi.py (+2/-1)
nova/virt/driver.py (+2/-1)
nova/virt/fake.py (+1/-1)
nova/virt/hyperv.py (+1/-1)
nova/virt/vmwareapi_conn.py (+1/-1)
nova/virt/xenapi/vmops.py (+7/-2)
nova/virt/xenapi_conn.py (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #833205: instance reboot types are not supported

Wishlist

Fix Released

Link a bug report

Related blueprints

1536. By Josh Kearney on 2011-09-09

Merged trunk.

1535. By Josh Kearney on 2011-09-09

Merged trunk.

1534. By Josh Kearney on 2011-09-08

Merged trunk.

1533. By Josh Kearney on 2011-09-08

First pass at adding reboot_type to reboot codepath.

1532. By dan wendlandt on 2011-09-08

This code contains contains a new NetworkManager class that can leverage Quantum + Melange.

Thierry suggested that I merge prop this to get feedback, even though it is too late to get a branch of this size in for D-4. Feedback will help determine whether we can get this code in during the Diablo time frame or not. This branch was developed stacked on top of the melange branch, which is still not merged, but I am merge-propping it without that branch so that the diff is correct.

The vast majority of the code is in nova/network/quantum and is only invoked if the network manager is set to nova.network.quantum.QuantumManager

In addition to implementing networks with Quantum instead of the linux bridge, the QuantumManager also provides a new, more flexible model of associating vNICs with networks. It supports the creation of networks that are specific to a project and networks that are "global". When a VM is created, it gets a vNIC for each project network, as well as each global network. For example, this could support giving a VM a "public" vNIC on a shared network and a "private" vNIC on a tenant-specific network.

The branch also implements Tushar's 'os-create-server-ext' extension, so that the server create API call can indicate the set of networks the VM should be attached to (if this extension is used, it replaces the above mechanism for determining vNICs).

QuantumManager can use either the traditional IPAM functionality in nova DB (i.e., the networks, fixed_ips tables) or melange. Similar to FlatManager, QuantumManager does not currently support DHCP, gateway/NAT, or floating IPs.

This branch requires additional testing before it is really ready for merge, but we thought it would be best to merge prop as soon as possible to identify any significant concerns people had.

1531. By Brian Lamar on 2011-09-07

Fixes a case where if a VIF is returned with a NULL network it might not be able to be deleted. Added test case for that fix.

1530. By Josh Kearney on 2011-09-07

Set flat_injected to False by default.

1529. By Édouard Thuleau on 2011-09-07

An AMI image without ramdisk image should start.

It's possible with EC2 API but it fails with OS API.
This patch corrects that by returns 'None' value if AMI image doesn't contain 'ramdisk_id' metadata.

1528. By Anthony Young on 2011-09-06

At present, the os servers.detail api does not return server.user_id or server.tenant_id. This is problematic, since the servers.detail api defaults to returning all servers for all users of a tenant, which makes it impossible to tell which user is associated with which server.

Similarly, when admin users access servers.list, all instances for all tenants are returned. Without a tenant_id field, administrators can't sift through the server list very easily.

This merge request does the following:

* add user_id and tenant_id to servers.detail
* makes it possible for admins to filter with the term 'tenant_id' (rather than project_id)

1527. By Kevin L. Mitchell on 2011-09-06

Micro-fix; "exception" was misspelled as "exceptions"