Josh's networking refactor, modified to work with projects

nova/compute/linux_net.py

@@ -1,25 +1,11 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright [2010] [Anso Labs, LLC]
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
 
 import logging
-import os
 import signal
+import os
+import nova.utils
 import subprocess
 
-from nova import utils
-
 # todo(ja): does the definition of network_path belong here?
 
 from nova import flags
@@ -30,13 +16,13 @@ def execute(cmd):
         logging.debug("FAKE NET: %s" % cmd)
         return "fake", 0
     else:
-        utils.execute(cmd)
+        return nova.utils.execute(cmd)
 
 def runthis(desc, cmd):
     if FLAGS.fake_network:
-        execute(cmd)
+        return execute(cmd)
     else:
-        utils.runthis(desc,cmd)
+        return nova.utils.runthis(desc,cmd)
 
 def Popen(cmd):
     if FLAGS.fake_network:
@@ -61,44 +47,46 @@ def bind_public_ip(ip, interface):
 
 def vlan_create(net):
     """ create a vlan on on a bridge device unless vlan already exists """
-    if not device_exists("vlan%s" % net.vlan):
+    if not device_exists("vlan%s" % net['vlan']):
+        logging.debug("Starting VLAN inteface for %s network", (net['vlan']))
         execute("sudo vconfig set_name_type VLAN_PLUS_VID_NO_PAD")
-        execute("sudo vconfig add %s %s" % (net.bridge_dev, net.vlan))
-        execute("sudo ifconfig vlan%s up" % (net.vlan))
+        execute("sudo vconfig add %s %s" % (FLAGS.bridge_dev, net['vlan']))
+        execute("sudo ifconfig vlan%s up" % (net['vlan']))
 
 def bridge_create(net):
     """ create a bridge on a vlan unless it already exists """
-    if not device_exists(net.bridge_name):
-        execute("sudo brctl addbr %s" % (net.bridge_name))
+    if not device_exists(net['bridge_name']):
+        logging.debug("Starting Bridge inteface for %s network", (net['vlan']))
+        execute("sudo brctl addbr %s" % (net['bridge_name']))
         # execute("sudo brctl setfd %s 0" % (net.bridge_name))
         # execute("sudo brctl setageing %s 10" % (net.bridge_name))
-        execute("sudo brctl stp %s off" % (net.bridge_name))
-        execute("sudo brctl addif %s vlan%s" % (net.bridge_name, net.vlan))
+        execute("sudo brctl stp %s off" % (net['bridge_name']))
+        execute("sudo brctl addif %s vlan%s" % (net['bridge_name'], net['vlan']))
         if net.bridge_gets_ip:
             execute("sudo ifconfig %s %s broadcast %s netmask %s up" % \
-                (net.bridge_name, net.gateway, net.broadcast, net.netmask))
-            confirm_rule("FORWARD --in-interface %s -j ACCEPT" % (net.bridge_name))
+                (net['bridge_name'], net.gateway, net.broadcast, net.netmask))
+            confirm_rule("FORWARD --in-interface %s -j ACCEPT" % (net['bridge_name']))
         else:
-            execute("sudo ifconfig %s up" % net.bridge_name)
+            execute("sudo ifconfig %s up" % net['bridge_name'])
 
 def dnsmasq_cmd(net):
     cmd = ['sudo dnsmasq',
         ' --strict-order',
         ' --bind-interfaces',
         ' --conf-file=',
-        ' --pid-file=%s' % dhcp_file(net.vlan, 'pid'),
+        ' --pid-file=%s' % dhcp_file(net['vlan'], 'pid'),
         ' --listen-address=%s' % net.dhcp_listen_address,
         ' --except-interface=lo',
-        ' --dhcp-range=%s,%s,120s' % (net.dhcp_range_start, net.dhcp_range_end),
+        ' --dhcp-range=%s,static,120s' % (net.dhcp_range_start),
         ' --dhcp-lease-max=61',
-        ' --dhcp-hostsfile=%s' % dhcp_file(net.vlan, 'conf'),
-        ' --dhcp-leasefile=%s' % dhcp_file(net.vlan, 'leases')]
+        ' --dhcp-hostsfile=%s' % dhcp_file(net['vlan'], 'conf'),
+        ' --dhcp-leasefile=%s' % dhcp_file(net['vlan'], 'leases')]
     return ''.join(cmd)
 
-def hostDHCP(network, host):
-    idx = host['address'].split(".")[-1] # Logically, the idx of instances they've launched in this net
+def hostDHCP(network, host, mac):
+    idx = host.split(".")[-1] # Logically, the idx of instances they've launched in this net
     return "%s,%s-%s-%s.novalocal,%s" % \
-        (host['mac'], host['user_id'], network.vlan, idx, host['address'])
+        (mac, network['user_id'], network['vlan'], idx, host)
 
 # todo(ja): if the system has restarted or pid numbers have wrapped
 #           then you cannot be certain that the pid refers to the
@@ -111,9 +99,9 @@ def start_dnsmasq(network):
     if a dnsmasq instance is already running then send a HUP
     signal causing it to reload, otherwise spawn a new instance
     """
-    with open(dhcp_file(network.vlan, 'conf'), 'w') as f:
+    with open(dhcp_file(network['vlan'], 'conf'), 'w') as f:
         for host_name in network.hosts:
-            f.write("%s\n" % hostDHCP(network, network.hosts[host_name]))
+            f.write("%s\n" % hostDHCP(network, host_name, network.hosts[host_name]))
 
     pid = dnsmasq_pid_for(network)
 
@@ -123,12 +111,11 @@ def start_dnsmasq(network):
         #           correct dnsmasq process
         try:
             os.kill(pid, signal.SIGHUP)
-            return
         except Exception, e:
             logging.debug("Hupping dnsmasq threw %s", e)
 
     # otherwise delete the existing leases file and start dnsmasq
-    lease_file = dhcp_file(network.vlan, 'leases')
+    lease_file = dhcp_file(network['vlan'], 'leases')
     if os.path.exists(lease_file):
         os.unlink(lease_file)
 
@@ -156,7 +143,7 @@ def dnsmasq_pid_for(network):
     if machine has rebooted pid might be incorrect (caller should check)
     """
 
-    pid_file = dhcp_file(network.vlan, 'pid')
+    pid_file = dhcp_file(network['vlan'], 'pid')
 
     if os.path.exists(pid_file):
         with open(pid_file, 'r') as f: