VLAN support on dev-env (not yet working)

snabbco · Dec 15, 2015 · 891246a · 891246a
1 parent db0445b
commit 891246a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 123 deletions.
diff --git a/src/program/lisper/dev-env/lisper04.conf b/src/program/lisper/dev-env/lisper04.conf
@@ -4,7 +4,7 @@
    "arp_timeout"  : 60, // seconds
 
    "interfaces": [
-      { "name": "e0",  "mac": "00:00:00:00:01:04" }, //, "pci": "0000:05:00.0" },
+      { "name": "e0",  "mac": "00:00:00:00:01:04" }, //"pci": "0000:05:00.0", "vlan_id": 2 },
       { "name": "e03", "mac": "00:00:00:00:01:03" },
       { "name": "e13", "mac": "00:00:00:00:01:13" }
    ],

diff --git a/src/program/lisper/dev-env/lisper08.conf b/src/program/lisper/dev-env/lisper08.conf
@@ -4,7 +4,7 @@
    "arp_timeout"  : 60, // seconds
 
    "interfaces": [
-      { "name": "e0",  "mac": "00:00:00:00:01:08" },
+      { "name": "e0",  "mac": "00:00:00:00:01:08" }, //"pci": "0000:07:00.0", "vlan_id": 2 },
       { "name": "e07", "mac": "00:00:00:00:01:07" },
       { "name": "e17", "mac": "00:00:00:00:01:17" }
    ],

diff --git a/src/program/lisper/dev-env/net-bringup b/src/program/lisper/dev-env/net-bringup
@@ -31,13 +31,12 @@ intelnode() {
     ip netns add node$n
     echo -n $pci0 > /sys/bus/pci/drivers/ixgbe/unbind # e0
     echo -n $pcin > /sys/bus/pci/drivers/ixgbe/bind   # e$n
-    # ip netns exec node$n ip link set $e0 address 00:00:00:00:01:$n
-    ip netns exec r2     ip link set dev $en address 00:00:00:00:00:$n
-    ip netns exec r2     ip addr add fd80:$n::1/56 dev $en
-    ip netns exec node$n ip addr add fd80:$n::2/56 dev $e0
-    #ip netns exec node$n ip -6 route add default via fd80:$n::1
-    #ip netns exec node$n ip link set $e0 up
-    ip netns exec r2     ip link set $en up
+    ip link set $en netns r2
+    ip netns exec r2 ip link add link $en name $en.2 type vlan id 2
+    ip netns exec r2 ip link set dev $en.2 address 00:00:00:00:00:$n
+    ip netns exec r2 ip addr add fd80:$n::1/56 dev $en.2
+    ip netns exec r2 ip link set $en up
+    ip netns exec r2 ip link set $en.2 up
 }
 
 if [ "$intel" ]; then

diff --git a/src/program/lisper/lisper-validators._lua b/src/program/lisper/lisper-validators._lua
diff --git a/src/program/lisper/lisper._lua b/src/program/lisper/lisper._lua