diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-10-31 18:39:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-10-31 18:39:18 +0000 |
| commit | 99bbd37037a15a07a47a4dc482306bea7dcf4193 (patch) | |
| tree | 3de2efb05fcea713cded19740b4ab75ba089b141 | |
| parent | 5b8133a83939fd552b569c4b034cef43907ea1ce (diff) | |
| parent | 606827f92e74d8ff5ae13e3210abedd511fd4518 (diff) | |
| download | nova-99bbd37037a15a07a47a4dc482306bea7dcf4193.tar.gz nova-99bbd37037a15a07a47a4dc482306bea7dcf4193.tar.xz nova-99bbd37037a15a07a47a4dc482306bea7dcf4193.zip | |
Merge "Make sure networks returned from get_instance_nw_info have a label"
| -rw-r--r-- | nova/network/quantum/manager.py | 2 | ||||
| -rw-r--r-- | nova/network/quantum/quantum_connection.py | 4 | ||||
| -rw-r--r-- | nova/tests/test_quantum.py | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/nova/network/quantum/manager.py b/nova/network/quantum/manager.py index 23a9aba0d..404578474 100644 --- a/nova/network/quantum/manager.py +++ b/nova/network/quantum/manager.py @@ -241,7 +241,9 @@ class QuantumManager(manager.FlatManager): 'injected': True, 'multi_host': False} + q_tenant_id = project_id or FLAGS.quantum_default_tenant_id info = { + 'label': self.q_conn.get_network_name(q_tenant_id, net_id), 'gateway': v4_subnet['gateway'], 'dhcp_server': v4_subnet['gateway'], 'broadcast': v4_subnet['broadcast'], diff --git a/nova/network/quantum/quantum_connection.py b/nova/network/quantum/quantum_connection.py index 21917653c..ce07bc1ab 100644 --- a/nova/network/quantum/quantum_connection.py +++ b/nova/network/quantum/quantum_connection.py @@ -60,6 +60,10 @@ class QuantumClientConnection(object): resdict = self.client.create_network(data, tenant=tenant_id) return resdict["network"]["id"] + def get_network_name(self, tenant_id, network_id): + net = self.client.show_network_details(network_id, tenant=tenant_id) + return net["network"]["name"] + def delete_network(self, tenant_id, net_id): """Deletes Quantum network with specified UUID.""" self.client.delete_network(net_id, tenant=tenant_id) diff --git a/nova/tests/test_quantum.py b/nova/tests/test_quantum.py index 29d604e06..1a199131d 100644 --- a/nova/tests/test_quantum.py +++ b/nova/tests/test_quantum.py @@ -61,6 +61,9 @@ class FakeQuantumClientConnection(object): except KeyError: return False + def get_network_name(self, tenant_id, net_id): + return self.nets[net_id]['net-name'] + def _confirm_not_attached(self, interface_id): for n in self.nets.values(): for p in n['ports'].values(): |