diff options
| author | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-02-16 17:16:31 +0000 |
|---|---|---|
| committer | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-02-16 17:16:31 +0000 |
| commit | 01e340f98765cc434624b3b4da49447f950f07ae (patch) | |
| tree | 42fde93138e2ff461312b828550d88bf9ff94d50 /nova | |
| parent | 1b508d80dd76810f6183df50b9d9b324831875be (diff) | |
First commit of working code
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/network/linux_net.py | 1 | ||||
| -rw-r--r-- | nova/virt/xenapi/network_utils.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index c1cbff7d8..f5efac0ae 100644 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -291,6 +291,7 @@ def update_dhcp(context, network_id): if a dnsmasq instance is already running then send a HUP signal causing it to reload, otherwise spawn a new instance """ + LOG.debug("ENTERING update_dhcp - DHCP script:%s",FLAGS.dhcpbridge) network_ref = db.network_get(context, network_id) conffile = _dhcp_file(network_ref['bridge'], 'conf') diff --git a/nova/virt/xenapi/network_utils.py b/nova/virt/xenapi/network_utils.py index 4c2a81260..8f7806e6c 100644 --- a/nova/virt/xenapi/network_utils.py +++ b/nova/virt/xenapi/network_utils.py @@ -34,7 +34,7 @@ class NetworkHelper(HelperBase): def find_network_with_name_label(cls,session,name_label): networks = session.call_xenapi('network.get_by_name_label', name_label) if len(networks) == 1: - return networks.keys()[0] + return networks[0] elif len(networks) > 1: raise Exception(_('Found non-unique network' ' for name_label %s') % name_label) |