diff options
author | Trey Morris <trey.morris@rackspace.com> | 2011-03-16 12:50:11 -0500 |
---|---|---|
committer | Trey Morris <trey.morris@rackspace.com> | 2011-03-16 12:50:11 -0500 |
commit | d418926b514372f0f48922024e600bafcc657fd9 (patch) | |
tree | de043fb1b11d3d4f654d64ad35cebb00c70a4579 | |
parent | 5379f3654e04a0443f3237623f772a17f13e9d90 (diff) | |
download | nova-d418926b514372f0f48922024e600bafcc657fd9.tar.gz nova-d418926b514372f0f48922024e600bafcc657fd9.tar.xz nova-d418926b514372f0f48922024e600bafcc657fd9.zip |
forgot to return network info - teehee
-rw-r--r-- | nova/virt/xenapi/vmops.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 485dd41ca..27f9a3a17 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -697,7 +697,7 @@ class VMOps(object): def _get_network_info(self, instance, networks, IPs): """creates network info list for instance""" - tuple_list = [] + network_info = [] for network in networks: network_IPs = [ip for ip in IPs if ip.network_id == network.id] @@ -714,8 +714,6 @@ class VMOps(object): "gateway": ip6.gatewayV6, "enabled": "1"} - mac_id = instance.mac_address.replace(':', '') - location = 'vm-data/networking/%s' % mac_id info = { 'label': network['label'], 'gateway': network['gateway'], @@ -723,7 +721,8 @@ class VMOps(object): 'dns': [network['dns']], 'ips': [ip_dict(ip) for ip in network_IPs], 'ip6s': [ip6_dict(ip) for ip in network_IPs]} - tuple_list.append((network, info)) + network_info.append((network, info)) + return network_info def inject_network_info(self, vm_ref, network_info): """ @@ -752,7 +751,7 @@ class VMOps(object): self._session.get_xenapi().VM.get_record(vm_ref) device = 0 - for (network, info) in networks: + for (network, info) in network_info: mac_address = info['mac'] bridge = network['bridge'] network_ref = \ |