diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-20 19:17:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-20 19:17:49 +0000 |
| commit | fd1aa4613b9a644ad2d702ac2d15cf12cef589c5 (patch) | |
| tree | cbca6eb11bbbc4bade06d669ce63eeeddebd5fb4 | |
| parent | 2f14816aa2a55d686f043d18299500190adf98c6 (diff) | |
| parent | e9a5dfed06bd78f22eaf2edccb4856a5b48cce6a (diff) | |
Merge "nova/network: pass network_uuid to linuxnet_interface_driver and vif driver"
| -rw-r--r-- | nova/network/manager.py | 1 | ||||
| -rw-r--r-- | nova/network/quantum/manager.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index 4146fd516..5e9035a12 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -903,6 +903,7 @@ class NetworkManager(manager.SchedulerDependentManager): network, network['host']) info = { + 'net_uuid': network['uuid'], 'label': network['label'], 'gateway': network['gateway'], 'dhcp_server': dhcp_server, diff --git a/nova/network/quantum/manager.py b/nova/network/quantum/manager.py index cdfb48e77..4e3459011 100644 --- a/nova/network/quantum/manager.py +++ b/nova/network/quantum/manager.py @@ -458,6 +458,7 @@ class QuantumManager(manager.FlatManager): q_tenant_id = project_id or FLAGS.quantum_default_tenant_id info = { + 'net_uuid': net_id, 'label': self.q_conn.get_network_name(q_tenant_id, net_id), 'gateway': v4_subnet['gateway'], 'dhcp_server': v4_subnet['gateway'], |