X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=exec%2Fvif_up;h=39557df1e1d10bbc88ac5ad9b86675b3ae8181fc;hb=ff35284423a071786b6ae47544ddac43d0b253b0;hp=9549715e6068dde9e4974a906b7be199d1bb70ad;hpb=439b12b88e2fb04e03ed87b3371c1b3a85c4e037;p=vsys-scripts.git

diff --git a/exec/vif_up b/exec/vif_up
index 9549715..39557df 100755
--- a/exec/vif_up
+++ b/exec/vif_up
@@ -101,6 +101,8 @@ if vmask<mask:
 
 opt_txqueuelen = None
 opt_rp_filter = None
+opt_snat = None
+opt_ovs_dp = None
 
 
 for optionline in options:
@@ -126,13 +128,17 @@ 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
+    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:
@@ -145,15 +151,32 @@ os.system(cmd_ifconfig)
 # Add iptables rules (Clearing old ones first, if they exist)
 cmd_iptables_in = "/sbin/iptables -A INPUT -i %s -m mark -m state --state NEW ! --mark %d -j DROP" % (vif, sliceid)
 cmd_iptables_del_in = "/sbin/iptables -D INPUT -i %s -m mark -m state --state NEW ! --mark %d -j DROP 2>/dev/null" % (vif, sliceid)
-cmd_iptables_out = "/sbin/iptables -A OUTPUT -o %s -m mark ! --mark %d -j DROP" % (vif, sliceid)
-cmd_iptables_del_out = "/sbin/iptables -D OUTPUT -o %s -m mark ! --mark %d -j DROP 2>/dev/null" % (vif, sliceid)
+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("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 > /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_pr)
+    #print cmd_iptables_del_pr
+    #print cmd_iptables_pr
+
 # 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)