X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=exec%2Fvif_up;h=00edd6968afd1061fcd82d14904ff316e2dff183;hb=91a70f483609c9700ebe156cc38659906e717db4;hp=0f905c6402ea6ecb9530d62c94ee7ff9b9de84d8;hpb=b92fb292f7e7240236a96061cb2630c51287d172;p=vsys-scripts.git

diff --git a/exec/vif_up b/exec/vif_up
old mode 100644
new mode 100755
index 0f905c6..00edd69
--- a/exec/vif_up
+++ b/exec/vif_up
@@ -14,37 +14,7 @@ import pwd
 import re
 import socket
 import struct
-import os
-import string
-
-vsys_config_dir = "/etc/planetlab/vsys-attributes"
-
-if len(sys.argv) != 2: sys.exit(1)
-
-# VSYS scripts get slicename as $1
-slicename=sys.argv[1]
-sliceid = pwd.getpwnam(slicename).pw_uid
-
-netblock_config=os.path.join(vsys_config_dir,slicename,"vsys_vnet")
-
-# Read netblock allocation file
-base = None
-
-for netblock in open(netblock_config,'r'):
-    base, mask = netblock.split('/')
-
-if base is None:
-    print >>sys.stderr, "Could not find entry for slice %s in netblock config file %s" % (slicename, netblock_config)
-    sys.exit(1)
-
-
-### Read args from stdin
-arglines = map(string.strip, sys.stdin.readlines())
-
-if len(arglines)<3:
-    print >>sys.stderr, "Insufficient argument lines."
-    sys.exit(1)
-
+import o
 vif = arglines[0] # interface name
 vip = arglines[1] # IP
 vmask = int(arglines[2]) # netmask as int
@@ -102,6 +72,8 @@ if vmask<mask:
 opt_txqueuelen = None
 opt_rp_filter = None
 opt_snat = None
+opt_ovs_dp = None
+opt_pointopoint = None
 
 
 for optionline in options:
@@ -127,23 +99,36 @@ for optionline in options:
             print >>sys.stderr, "txqueuelen value %s out of range 1-10000" % (val)
             sys.exit(1)
         opt_txqueuelen = intval
-
     elif opt=="snat":
-	intval = int(val)
-	if val=="1":
-	  opt_snat = True
+        intval = int(val)
+        if val=="1":
+            opt_snat = True
+    elif opt=="pointopoint":
+        opt_pointopoint = val.strip()
+        try:
+            socket.inet_aton(opt_pointopoint)
+        except socket.error,e:
+            print >>sys.stderr, "pointopoint: %s" % (e,)
+            sys.exit(1)
+    elif opt=="vswitch":
+        opt_ovs_dp = val
     else:
         print >>sys.stderr, "Unknown option: \"%s\"" % (opt)
         sys.exit(1)
 
 
-        
 ### Configure interface
 
-if opt_txqueuelen is None:
-    cmd_ifconfig = "/sbin/ifconfig %s %s/%d" % (vif, vip, vmask)
+cmd_ifconfig = "/sbin/ifconfig %s %s" % (vif, vip)
+if opt_pointopoint is None:
+    cmd_ifconfig += "/%d" % (vmask,)
 else:
-    cmd_ifconfig = "/sbin/ifconfig %s %s/%d txqueuelen %d" % (vif, vip, vmask, opt_txqueuelen)
+    # point-to-point mask
+    cmd_ifconfig += " netmask 255.255.255.255"
+if opt_txqueuelen is not None:
+    cmd_ifconfig += " txqueuelen %d" % (opt_txqueuelen,)
+if opt_pointopoint is not None:
+    cmd_ifconfig += " pointopoint %s" % (opt_pointopoint,)
 
 os.system(cmd_ifconfig)
 
@@ -153,24 +138,40 @@ cmd_iptables_del_in = "/sbin/iptables -D INPUT -i %s -m mark -m state --state NE
 cmd_iptables_out = "/sbin/iptables -A OUTPUT -o %s -m state --state NEW -m mark ! --mark %d -j DROP" % (vif, sliceid)
 cmd_iptables_del_out = "/sbin/iptables -D OUTPUT -o %s -m state --state NEW -m mark ! --mark %d -j DROP 2>/dev/null" % (vif, sliceid)
 
-public_src = os.popen("ip route get 1.1.1.1 | head -1 | awk '{print $7;}'").read().rstrip();
+public_src = os.popen("ifconfig | grep $(ip route | grep default | awk '{print $3}' | awk -F. '{print $1\"[.]\"$2}') | head -1 | awk '{print $2}' | awk -F : '{print $2}'").read().rstrip()
 cmd_iptables_pr = "/sbin/iptables -t nat -A POSTROUTING -s %s/%d -j SNAT --to-source %s --random" % (vip, vmask, public_src)
-cmd_iptables_del_pr = "/sbin/iptables -t nat -D POSTROUTING -s %s/%d -j SNAT --to-source %s --random" % (vip, vmask, public_src)
+cmd_iptables_del_pr = "/sbin/iptables -t nat -D POSTROUTING -s %s/%d -j SNAT --to-source %s --random > /dev/null 2>&1" % (vip, vmask, public_src)
 
 os.system(cmd_iptables_del_in)
 os.system(cmd_iptables_in)
 os.system(cmd_iptables_del_out)
 os.system(cmd_iptables_out)
 
+# always remove snat rules
+# in case there are leftovers from previous calls
+os.system(cmd_iptables_del_pr)
 if (opt_snat):
-    os.system(cmd_iptables_del_pr)
     os.system(cmd_iptables_pr)
     #print cmd_iptables_del_pr
     #print cmd_iptables_pr
 
+#if opt_pointopoint and vmask < 32:
+#    # Make target vnet masked address
+#    p2p_int = struct.unpack('!L', socket.inet_aton(opt_pointopoint))[0]
+#    vip_vnet = socket.inet_ntoa(
+#        struct.pack('!L', ((p2p_int>>(32-vmask))<<(32-vmask))) )
+#
+#    cmd_routing_p2p = "/sbin/route add -net %s/%d gw %s dev %s" % (vip_vnet, vmask, opt_pointopoint, vif)
+#    print >>sys.stderr, cmd_routing_p2p
+#    os.system(cmd_routing_p2p)
+
 # Process additional options
 if opt_rp_filter is not None:
     rp_cmd = "/sbin/sysctl net.ipv4.conf.%s.rp_filter=%s" % (vif, opt_rp_filter)
     os.system(rp_cmd)
 
+# OVS datapath
+if opt_ovs_dp is not None:
+    cmd_ovs_addif = "ovs-dpctl add-if %s %s"%(opt_ovs_dp,vif)
+    os.system(cmd_ovs_addif)