From 7e55d364fd88bb462c7211209f5cbb5bbae3a68c Mon Sep 17 00:00:00 2001
From: Dave Barach <dave@barachs.net>
Date: Sat, 14 May 2016 18:38:48 -0400
Subject: VPP-63: clean up config scripts, remove specific hostnames

Change-Id: Ifb77256fa691b1a90045a10448835c09b764e74f
Signed-off-by: Dave Barach <dave@barachs.net>
---
 vnet/etc/scripts/dhcp/dhcpd.conf                   |   8 ++
 vnet/etc/scripts/dhcp/left-ping-target.sh          |   4 +
 vnet/etc/scripts/dhcp/leftpeer.conf                |  17 +++
 vnet/etc/scripts/dhcp/ludd-cluster-1               |  17 ---
 vnet/etc/scripts/dhcp/ludd-cluster-2-sh            |   4 -
 vnet/etc/scripts/dhcp/ludd-cluster-5-dhcpd.conf    |   8 --
 .../scripts/dhcp/ludd-cluster-5-isc-dhcp-server    |   3 -
 vnet/etc/scripts/leftpeer/leftpeer-classify        |   8 ++
 vnet/etc/scripts/leftpeer/leftpeer-classify6       |   5 +
 vnet/etc/scripts/leftpeer/leftpeer-classifyl2      |   8 ++
 vnet/etc/scripts/leftpeer/leftpeer-dhcp            |  23 ++++
 vnet/etc/scripts/leftpeer/leftpeer-ioam.conf       |  15 +++
 vnet/etc/scripts/leftpeer/leftpeer-l3vxlan.conf    |  12 +++
 vnet/etc/scripts/leftpeer/leftpeer-lisp.conf       |  18 ++++
 vnet/etc/scripts/leftpeer/leftpeer-mpls.conf       |  17 +++
 vnet/etc/scripts/leftpeer/leftpeer-nsh.conf        |  18 ++++
 vnet/etc/scripts/leftpeer/leftpeer-sr.conf         |  24 +++++
 vnet/etc/scripts/leftpeer/leftpeer-vxlan.conf      |  17 +++
 vnet/etc/scripts/leftpeer/leftpeer-vxnsh.conf      |  18 ++++
 vnet/etc/scripts/leftpeer/leftpeer.script          |   9 ++
 vnet/etc/scripts/ludd-cluster-1/lc1.script         |   9 --
 .../scripts/ludd-cluster-1/ludd-cluster-1-classify |   8 --
 .../ludd-cluster-1/ludd-cluster-1-classify6        |   5 -
 .../ludd-cluster-1/ludd-cluster-1-classifyl2       |   8 --
 .../etc/scripts/ludd-cluster-1/ludd-cluster-1-dhcp |  23 ----
 .../ludd-cluster-1/ludd-cluster-1-ioam.conf        |  15 ---
 .../ludd-cluster-1/ludd-cluster-1-l3vxlan.conf     |  12 ---
 .../ludd-cluster-1/ludd-cluster-1-lisp.conf        |  18 ----
 .../ludd-cluster-1/ludd-cluster-1-mpls.conf        |  17 ---
 .../scripts/ludd-cluster-1/ludd-cluster-1-nsh.conf |  18 ----
 .../scripts/ludd-cluster-1/ludd-cluster-1-sr.conf  |  24 -----
 .../ludd-cluster-1/ludd-cluster-1-vxlan.conf       |  17 ---
 .../ludd-cluster-1/ludd-cluster-1-vxnsh.conf       |  18 ----
 vnet/etc/scripts/ludd-cluster-3/lc3.script         |   9 --
 .../ludd-cluster-3/ludd-cluster-3-ioam.conf        |  14 ---
 .../ludd-cluster-3/ludd-cluster-3-l3vxlan.conf     |  12 ---
 .../ludd-cluster-3/ludd-cluster-3-lisp.conf        |  16 ---
 .../ludd-cluster-3/ludd-cluster-3-mpls-l2.conf     |  24 -----
 .../ludd-cluster-3/ludd-cluster-3-mpls.conf        |  17 ---
 .../scripts/ludd-cluster-3/ludd-cluster-3-nsh.conf |  19 ----
 .../scripts/ludd-cluster-3/ludd-cluster-3-sr.conf  |  28 -----
 .../ludd-cluster-3/ludd-cluster-3-vxlan.conf       |  16 ---
 .../ludd-cluster-3/ludd-cluster-3-vxnsh.conf       |  18 ----
 vnet/etc/scripts/mpls-o-ethernet/leftpeer.conf     |  17 +++
 .../scripts/mpls-o-ethernet/ludd-cluster-1.conf    |  17 ---
 .../scripts/mpls-o-ethernet/ludd-cluster-3.conf    |  17 ---
 vnet/etc/scripts/mpls-o-ethernet/rightpeer.conf    |  15 +++
 vnet/etc/scripts/mpls-o-gre/dhcpd.conf             | 116 +++++++++++++++++++++
 vnet/etc/scripts/mpls-o-gre/leftpeer.conf          |  14 +++
 vnet/etc/scripts/mpls-o-gre/ludd-cluster-1.conf    |  17 ---
 vnet/etc/scripts/mpls-o-gre/ludd-cluster-3.conf    |  17 ---
 .../scripts/mpls-o-gre/ludd-cluster-5-dhcpd.conf   | 116 ---------------------
 vnet/etc/scripts/mpls-o-gre/rightpeer.conf         |  14 +++
 vnet/etc/scripts/rightpeer/rightpeer-ioam.conf     |  14 +++
 vnet/etc/scripts/rightpeer/rightpeer-l3vxlan.conf  |   9 ++
 vnet/etc/scripts/rightpeer/rightpeer-lisp.conf     |  16 +++
 vnet/etc/scripts/rightpeer/rightpeer-mpls-l2.conf  |  24 +++++
 vnet/etc/scripts/rightpeer/rightpeer-mpls.conf     |  17 +++
 vnet/etc/scripts/rightpeer/rightpeer-nsh.conf      |  19 ++++
 vnet/etc/scripts/rightpeer/rightpeer-sr.conf       |  28 +++++
 vnet/etc/scripts/rightpeer/rightpeer-vxlan.conf    |  16 +++
 vnet/etc/scripts/rightpeer/rightpeer-vxnsh.conf    |  18 ++++
 vnet/etc/scripts/rightpeer/rightpeer.script        |   9 ++
 vnet/etc/scripts/sr/left-linux-ping.sh             |   3 +
 vnet/etc/scripts/sr/leftpeer.conf                  |  27 +++++
 vnet/etc/scripts/sr/ludd-cluster-1.conf            |  27 -----
 vnet/etc/scripts/sr/ludd-cluster-2.sh              |   3 -
 vnet/etc/scripts/sr/ludd-cluster-3.conf            |  22 ----
 vnet/etc/scripts/sr/ludd-cluster-4.sh              |   4 -
 vnet/etc/scripts/sr/right-linux-ping.sh            |   4 +
 vnet/etc/scripts/sr/rightpeer.conf                 |  22 ++++
 71 files changed, 623 insertions(+), 637 deletions(-)
 create mode 100644 vnet/etc/scripts/dhcp/dhcpd.conf
 create mode 100644 vnet/etc/scripts/dhcp/left-ping-target.sh
 create mode 100644 vnet/etc/scripts/dhcp/leftpeer.conf
 delete mode 100644 vnet/etc/scripts/dhcp/ludd-cluster-1
 delete mode 100644 vnet/etc/scripts/dhcp/ludd-cluster-2-sh
 delete mode 100644 vnet/etc/scripts/dhcp/ludd-cluster-5-dhcpd.conf
 delete mode 100644 vnet/etc/scripts/dhcp/ludd-cluster-5-isc-dhcp-server
 create mode 100755 vnet/etc/scripts/leftpeer/leftpeer-classify
 create mode 100644 vnet/etc/scripts/leftpeer/leftpeer-classify6
 create mode 100644 vnet/etc/scripts/leftpeer/leftpeer-classifyl2
 create mode 100644 vnet/etc/scripts/leftpeer/leftpeer-dhcp
 create mode 100644 vnet/etc/scripts/leftpeer/leftpeer-ioam.conf
 create mode 100644 vnet/etc/scripts/leftpeer/leftpeer-l3vxlan.conf
 create mode 100644 vnet/etc/scripts/leftpeer/leftpeer-lisp.conf
 create mode 100644 vnet/etc/scripts/leftpeer/leftpeer-mpls.conf
 create mode 100644 vnet/etc/scripts/leftpeer/leftpeer-nsh.conf
 create mode 100644 vnet/etc/scripts/leftpeer/leftpeer-sr.conf
 create mode 100644 vnet/etc/scripts/leftpeer/leftpeer-vxlan.conf
 create mode 100644 vnet/etc/scripts/leftpeer/leftpeer-vxnsh.conf
 create mode 100644 vnet/etc/scripts/leftpeer/leftpeer.script
 delete mode 100644 vnet/etc/scripts/ludd-cluster-1/lc1.script
 delete mode 100755 vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-classify
 delete mode 100644 vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-classify6
 delete mode 100644 vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-classifyl2
 delete mode 100644 vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-dhcp
 delete mode 100644 vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-ioam.conf
 delete mode 100644 vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-l3vxlan.conf
 delete mode 100644 vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-lisp.conf
 delete mode 100644 vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-mpls.conf
 delete mode 100644 vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-nsh.conf
 delete mode 100644 vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-sr.conf
 delete mode 100644 vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-vxlan.conf
 delete mode 100644 vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-vxnsh.conf
 delete mode 100644 vnet/etc/scripts/ludd-cluster-3/lc3.script
 delete mode 100644 vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-ioam.conf
 delete mode 100644 vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-l3vxlan.conf
 delete mode 100644 vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-lisp.conf
 delete mode 100644 vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-mpls-l2.conf
 delete mode 100644 vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-mpls.conf
 delete mode 100644 vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-nsh.conf
 delete mode 100644 vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-sr.conf
 delete mode 100644 vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-vxlan.conf
 delete mode 100644 vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-vxnsh.conf
 create mode 100644 vnet/etc/scripts/mpls-o-ethernet/leftpeer.conf
 delete mode 100644 vnet/etc/scripts/mpls-o-ethernet/ludd-cluster-1.conf
 delete mode 100644 vnet/etc/scripts/mpls-o-ethernet/ludd-cluster-3.conf
 create mode 100644 vnet/etc/scripts/mpls-o-ethernet/rightpeer.conf
 create mode 100644 vnet/etc/scripts/mpls-o-gre/dhcpd.conf
 create mode 100644 vnet/etc/scripts/mpls-o-gre/leftpeer.conf
 delete mode 100644 vnet/etc/scripts/mpls-o-gre/ludd-cluster-1.conf
 delete mode 100644 vnet/etc/scripts/mpls-o-gre/ludd-cluster-3.conf
 delete mode 100644 vnet/etc/scripts/mpls-o-gre/ludd-cluster-5-dhcpd.conf
 create mode 100644 vnet/etc/scripts/mpls-o-gre/rightpeer.conf
 create mode 100644 vnet/etc/scripts/rightpeer/rightpeer-ioam.conf
 create mode 100644 vnet/etc/scripts/rightpeer/rightpeer-l3vxlan.conf
 create mode 100644 vnet/etc/scripts/rightpeer/rightpeer-lisp.conf
 create mode 100644 vnet/etc/scripts/rightpeer/rightpeer-mpls-l2.conf
 create mode 100644 vnet/etc/scripts/rightpeer/rightpeer-mpls.conf
 create mode 100644 vnet/etc/scripts/rightpeer/rightpeer-nsh.conf
 create mode 100644 vnet/etc/scripts/rightpeer/rightpeer-sr.conf
 create mode 100644 vnet/etc/scripts/rightpeer/rightpeer-vxlan.conf
 create mode 100644 vnet/etc/scripts/rightpeer/rightpeer-vxnsh.conf
 create mode 100644 vnet/etc/scripts/rightpeer/rightpeer.script
 create mode 100755 vnet/etc/scripts/sr/left-linux-ping.sh
 create mode 100644 vnet/etc/scripts/sr/leftpeer.conf
 delete mode 100644 vnet/etc/scripts/sr/ludd-cluster-1.conf
 delete mode 100755 vnet/etc/scripts/sr/ludd-cluster-2.sh
 delete mode 100644 vnet/etc/scripts/sr/ludd-cluster-3.conf
 delete mode 100755 vnet/etc/scripts/sr/ludd-cluster-4.sh
 create mode 100755 vnet/etc/scripts/sr/right-linux-ping.sh
 create mode 100644 vnet/etc/scripts/sr/rightpeer.conf

(limited to 'vnet')

diff --git a/vnet/etc/scripts/dhcp/dhcpd.conf b/vnet/etc/scripts/dhcp/dhcpd.conf
new file mode 100644
index 00000000000..d4cb3ed718a
--- /dev/null
+++ b/vnet/etc/scripts/dhcp/dhcpd.conf
@@ -0,0 +1,8 @@
+# add at the bottom
+
+subnet 192.168.0.0 netmask 255.255.0.0 {
+   range 192.168.1.10 192.168.1.254;
+   option routers 192.168.1.1;
+   default-lease-time 15;
+   max-lease-time 15;
+}
diff --git a/vnet/etc/scripts/dhcp/left-ping-target.sh b/vnet/etc/scripts/dhcp/left-ping-target.sh
new file mode 100644
index 00000000000..2edc2a50eaa
--- /dev/null
+++ b/vnet/etc/scripts/dhcp/left-ping-target.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# to obtain dhcp address from leftpeer
+dhclient -d -v eth1
diff --git a/vnet/etc/scripts/dhcp/leftpeer.conf b/vnet/etc/scripts/dhcp/leftpeer.conf
new file mode 100644
index 00000000000..458eecf0caf
--- /dev/null
+++ b/vnet/etc/scripts/dhcp/leftpeer.conf
@@ -0,0 +1,17 @@
+set int ip table GigabitEthernet2/2/0 12
+set int ip address GigabitEthernet2/2/0 192.168.1.1/24
+set int state GigabitEthernet2/2/0 up
+
+set int ip table GigabitEthernet2/7/0 11
+set int ip address GigabitEthernet2/7/0 192.168.2.1/24
+set int state GigabitEthernet2/7/0 up
+
+comment { set dhcp proxy server 1.2.3.4 src-address 1.2.3.5 add-option-82 rx-fib-id 0 server-fib-id 0 }
+
+comment { set dhcp proxy server 192.168.2.2 src-address 192.168.2.1 add-option-82 rx-fib-id 12 server-fib-id 11 }
+
+ip route add 0.0.0.0/24 table 11 via local
+ip route add 255.255.255.255/24 table 11 via local
+
+ip route add 0.0.0.0/24 table 12 via local
+ip route add 255.255.255.255/24 table 12 via local
diff --git a/vnet/etc/scripts/dhcp/ludd-cluster-1 b/vnet/etc/scripts/dhcp/ludd-cluster-1
deleted file mode 100644
index 458eecf0caf..00000000000
--- a/vnet/etc/scripts/dhcp/ludd-cluster-1
+++ /dev/null
@@ -1,17 +0,0 @@
-set int ip table GigabitEthernet2/2/0 12
-set int ip address GigabitEthernet2/2/0 192.168.1.1/24
-set int state GigabitEthernet2/2/0 up
-
-set int ip table GigabitEthernet2/7/0 11
-set int ip address GigabitEthernet2/7/0 192.168.2.1/24
-set int state GigabitEthernet2/7/0 up
-
-comment { set dhcp proxy server 1.2.3.4 src-address 1.2.3.5 add-option-82 rx-fib-id 0 server-fib-id 0 }
-
-comment { set dhcp proxy server 192.168.2.2 src-address 192.168.2.1 add-option-82 rx-fib-id 12 server-fib-id 11 }
-
-ip route add 0.0.0.0/24 table 11 via local
-ip route add 255.255.255.255/24 table 11 via local
-
-ip route add 0.0.0.0/24 table 12 via local
-ip route add 255.255.255.255/24 table 12 via local
diff --git a/vnet/etc/scripts/dhcp/ludd-cluster-2-sh b/vnet/etc/scripts/dhcp/ludd-cluster-2-sh
deleted file mode 100644
index 32924ecc5e5..00000000000
--- a/vnet/etc/scripts/dhcp/ludd-cluster-2-sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# to obtain dhcp address from ludd-cluster-1
-dhclient -d -v eth1
diff --git a/vnet/etc/scripts/dhcp/ludd-cluster-5-dhcpd.conf b/vnet/etc/scripts/dhcp/ludd-cluster-5-dhcpd.conf
deleted file mode 100644
index d4cb3ed718a..00000000000
--- a/vnet/etc/scripts/dhcp/ludd-cluster-5-dhcpd.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# add at the bottom
-
-subnet 192.168.0.0 netmask 255.255.0.0 {
-   range 192.168.1.10 192.168.1.254;
-   option routers 192.168.1.1;
-   default-lease-time 15;
-   max-lease-time 15;
-}
diff --git a/vnet/etc/scripts/dhcp/ludd-cluster-5-isc-dhcp-server b/vnet/etc/scripts/dhcp/ludd-cluster-5-isc-dhcp-server
deleted file mode 100644
index 6fafc1eec13..00000000000
--- a/vnet/etc/scripts/dhcp/ludd-cluster-5-isc-dhcp-server
+++ /dev/null
@@ -1,3 +0,0 @@
-# add eth6 to interfaces
-
-INTERFACES="eth6"
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-classify b/vnet/etc/scripts/leftpeer/leftpeer-classify
new file mode 100755
index 00000000000..74285912aeb
--- /dev/null
+++ b/vnet/etc/scripts/leftpeer/leftpeer-classify
@@ -0,0 +1,8 @@
+classify table mask l2 src l3 ip4 src buckets 2 miss-next local
+
+comment { classify table mask l3 ip4 src buckets 2 miss-next local }
+set ip classify intfc GigabitEthernet2/2/0 table-index 0
+set int ip address GigabitEthernet2/2/0 192.168.1.1/24
+set int state GigabitEthernet2/2/0 up
+
+classify session hit-next local table-index 0 match l2 src 00:50:56:b7:05:bb l3 ip4 src 192.168.1.2
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-classify6 b/vnet/etc/scripts/leftpeer/leftpeer-classify6
new file mode 100644
index 00000000000..6579d50d3c5
--- /dev/null
+++ b/vnet/etc/scripts/leftpeer/leftpeer-classify6
@@ -0,0 +1,5 @@
+classify table mask l3 ip6 src buckets 2 miss-next local
+set ip6 classify intfc GigabitEthernet2/2/0 table-index 0
+set int ip address GigabitEthernet2/2/0 db01::1/64
+set int state GigabitEthernet2/2/0 up
+classify session hit-next local table-index 0 match l3 ip6 src db01::2
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-classifyl2 b/vnet/etc/scripts/leftpeer/leftpeer-classifyl2
new file mode 100644
index 00000000000..6be4b1e52cf
--- /dev/null
+++ b/vnet/etc/scripts/leftpeer/leftpeer-classifyl2
@@ -0,0 +1,8 @@
+set int ip address GigabitEthernet2/2/0 192.168.1.1/24
+set int state GigabitEthernet2/2/0 up
+
+classify table mask l3 ip4 src buckets 2 l2-miss-next ethernet
+
+classify session advance 14 l2-hit-next ip4 table-index 0 match l3 ip4 src 192.168.1.2
+
+set int l2 class intfc GigabitEthernet2/2/0 ip4-table 0
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-dhcp b/vnet/etc/scripts/leftpeer/leftpeer-dhcp
new file mode 100644
index 00000000000..c13a8f3aa5e
--- /dev/null
+++ b/vnet/etc/scripts/leftpeer/leftpeer-dhcp
@@ -0,0 +1,23 @@
+loop cre
+set int ip table loop0 12
+set int ip address loop0 192.168.1.1/24
+set int state loop0 up
+
+set int ip table GigabitEthernet2/2/0 12
+comment { set int ip address GigabitEthernet2/2/0 192.168.1.1/24 }
+set int unnumbered GigabitEthernet2/2/0 use loop0
+set int state GigabitEthernet2/2/0 up
+
+set int ip table GigabitEthernet2/7/0 11
+set int ip address GigabitEthernet2/7/0 192.168.2.1/24
+set int state GigabitEthernet2/7/0 up
+
+uncomment { set dhcp proxy server 1.2.3.4 src-address 1.2.3.5 add-option-82 rx-fib-id 0 server-fib-id 0 }
+
+uncomment { set dhcp proxy server 192.168.2.2 src-address 192.168.2.1 add-option-82 rx-fib-id 12 server-fib-id 11 }
+
+ip route add 0.0.0.0/24 table 11 via local
+ip route add 255.255.255.255/24 table 11 via local
+
+ip route add 0.0.0.0/24 table 12 via local
+ip route add 255.255.255.255/24 table 12 via local
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-ioam.conf b/vnet/etc/scripts/leftpeer/leftpeer-ioam.conf
new file mode 100644
index 00000000000..6c1b502c2f7
--- /dev/null
+++ b/vnet/etc/scripts/leftpeer/leftpeer-ioam.conf
@@ -0,0 +1,15 @@
+comment { connects to linux ping source eth1 addr db02::2/64 }
+set int ip address GigabitEthernet2/2/0 db02::1/64
+set int state GigabitEthernet2/2/0 up
+
+comment { connects to ioam domain rightpeer eth2 addr db03::3/64 }
+set int ip address GigabitEthernet2/3/0 db03::1/64
+set int state GigabitEthernet2/3/0 up
+
+ioam set rewrite trace-elts 2 pow
+
+set ip6 neighbor GigabitEthernet2/3/0 db03::3 00:50:56:b7:05:cb
+
+ip route add db04::0/64 via db03::3 
+
+ioam set destination db04::0/64 add 
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-l3vxlan.conf b/vnet/etc/scripts/leftpeer/leftpeer-l3vxlan.conf
new file mode 100644
index 00000000000..a75f9b4c8ae
--- /dev/null
+++ b/vnet/etc/scripts/leftpeer/leftpeer-l3vxlan.conf
@@ -0,0 +1,12 @@
+comment { tunnel to rightpeer 6.0.3.3 on vlan 101 }
+
+set int ip address GigabitEthernet2/3/0 6.0.3.1/24
+set int state GigabitEthernet2/3/0 up
+
+comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
+
+set int ip address GigabitEthernet2/2/0 6.0.2.1/24
+set int state GigabitEthernet2/2/0 up
+
+vxlan tunnel src 6.0.3.1 peer 6.0.3.3 vni 123 adj 6.0.4.4/24
+
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-lisp.conf b/vnet/etc/scripts/leftpeer/leftpeer-lisp.conf
new file mode 100644
index 00000000000..cb3180b711d
--- /dev/null
+++ b/vnet/etc/scripts/leftpeer/leftpeer-lisp.conf
@@ -0,0 +1,18 @@
+comment { vpe_phase2 configuration }
+
+comment { local client facing interface on vlan 100  }
+comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
+
+set int ip address GigabitEthernet2/2/0 6.0.2.1/24
+set int state GigabitEthernet2/2/0 up
+
+comment { tunnel to rightpeer on vlan 101 }
+set int ip address GigabitEthernet2/3/0 6.0.3.1/24
+set int state GigabitEthernet2/3/0 up
+
+lisp gpe tunnel src 6.0.3.1 dst 6.0.3.3 next-ip4 decap-next ip4 iid 1133
+set int ip address lisp_gpe_tunnel0 6.0.4.1/24
+set int state lisp_gpe_tunnel0 up
+
+lisp gpe tunnel src 6.0.3.3 dst 6.0.3.1 next-ip4 decap-next ip4 iid 3311 
+set int stat lisp_gpe_tunnel1 up
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-mpls.conf b/vnet/etc/scripts/leftpeer/leftpeer-mpls.conf
new file mode 100644
index 00000000000..74bce81b190
--- /dev/null
+++ b/vnet/etc/scripts/leftpeer/leftpeer-mpls.conf
@@ -0,0 +1,17 @@
+comment { vpe_phase2 configuration }
+
+comment { local client facing interface on vlan 100  }
+comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
+
+set int ip table GigabitEthernet2/2/0 1
+set int ip address GigabitEthernet2/2/0 6.0.2.1/24
+set int state GigabitEthernet2/2/0 up
+
+comment { tunnel to rightpeer on vlan 101 }
+set int ip address GigabitEthernet2/3/0 6.0.3.1/24
+set int state GigabitEthernet2/3/0 up
+
+mpls encap add label 30 fib 1 dest 6.0.3.3
+mpls decap add label 30 fib 1 
+
+create mpls gre tunnel src 6.0.3.1 dst 6.0.3.3 intfc 6.0.4.1/24 inner-fib-id 1 outer-fib-id 0
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-nsh.conf b/vnet/etc/scripts/leftpeer/leftpeer-nsh.conf
new file mode 100644
index 00000000000..6397a3816dd
--- /dev/null
+++ b/vnet/etc/scripts/leftpeer/leftpeer-nsh.conf
@@ -0,0 +1,18 @@
+comment { vpe_phase2 configuration }
+
+comment { local client facing interface on vlan 100  }
+comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
+
+set int ip address GigabitEthernet2/2/0 6.0.2.1/24
+set int state GigabitEthernet2/2/0 up
+
+comment { tunnel to rightpeer on vlan 101 }
+set int ip address GigabitEthernet2/3/0 6.0.3.1/24
+set int state GigabitEthernet2/3/0 up
+
+nsh gre tunnel src 6.0.3.1 dst 6.0.3.3 c1 1 c2 2 c3 3 c4 4 spi 1133 si 0 next-ip4
+set int ip address nsh_gre_tunnel0 6.0.4.1/24
+set int state nsh_gre_tunnel0 up
+
+nsh gre tunnel src 6.0.3.3 dst 6.0.3.1 c1 1 c2 2 c3 3 c4 4 spi 3311 si 0 next-ip4
+set int stat nsh_gre_tunnel1 up
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-sr.conf b/vnet/etc/scripts/leftpeer/leftpeer-sr.conf
new file mode 100644
index 00000000000..a7b962d3aba
--- /dev/null
+++ b/vnet/etc/scripts/leftpeer/leftpeer-sr.conf
@@ -0,0 +1,24 @@
+comment { test sr segment chunk-offset on }
+test sr hmac validate on
+
+comment { trunk to rightpeer }
+set int ip address GigabitEthernet2/3/0 db03::2/64
+enable ip6 interface GigabitEthernet2/3/0
+set int state GigabitEthernet2/3/0 up
+
+comment { subscriber linux-ping-source }
+set int ip address GigabitEthernet2/2/0 db02::2/64
+enable ip6 interface GigabitEthernet2/2/0
+set int state GigabitEthernet2/2/0 up
+
+sr hmac id 2 key Gozzer
+sr hmac id 3 key Hoser
+
+sr tunnel src db01::1 dst db04::1/128 next db03::1 next db04::1 tag db02::2 clean key Gozzer InPE 1
+
+tap connect srlocal hwaddr random
+set int ip6 table tap-0 1
+set int ip address tap-0 db04::99/64
+enable ip6 interface tap-0
+set int state tap-0 up
+ip route add table 1 db02::0/64 lookup in table 0
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-vxlan.conf b/vnet/etc/scripts/leftpeer/leftpeer-vxlan.conf
new file mode 100644
index 00000000000..d50e8bf49f3
--- /dev/null
+++ b/vnet/etc/scripts/leftpeer/leftpeer-vxlan.conf
@@ -0,0 +1,17 @@
+comment { tunnel to rightpeer 6.0.3.3 on vlan 101 }
+
+set int ip address GigabitEthernet2/3/0 6.0.3.1/24
+set int state GigabitEthernet2/3/0 up
+
+comment { tunnel to thirdpeer 6.0.5.5 on vlan 105 }
+set int ip address GigabitEthernet2/7/0 6.0.5.1/24
+set int state GigabitEthernet2/7/0 up
+
+comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
+
+set int ip address GigabitEthernet2/2/0 6.0.2.1/24
+set int state GigabitEthernet2/2/0 up
+
+vxlan tunnel src 6.0.3.1 peer 6.0.3.3 peer 6.0.3.5 vni 123 
+vxlan l2 GigabitEthernet2/2/0 vni 123
+
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-vxnsh.conf b/vnet/etc/scripts/leftpeer/leftpeer-vxnsh.conf
new file mode 100644
index 00000000000..69bd9d9de20
--- /dev/null
+++ b/vnet/etc/scripts/leftpeer/leftpeer-vxnsh.conf
@@ -0,0 +1,18 @@
+comment { vpe_phase2 configuration }
+
+comment { local client facing interface on vlan 100  }
+comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
+
+set int ip address GigabitEthernet2/2/0 6.0.2.1/24
+set int state GigabitEthernet2/2/0 up
+
+comment { tunnel to rightpeer on vlan 101 }
+set int ip address GigabitEthernet2/3/0 6.0.3.1/24
+set int state GigabitEthernet2/3/0 up
+
+nsh vxlan tunnel src 6.0.3.1 dst 6.0.3.3 c1 1 c2 2 c3 3 c4 4 vni 11 spi 1133 si 0 next-ip4
+set int ip address nsh_vxlan_gpe_tunnel0 6.0.4.1/24
+set int state nsh_vxlan_gpe_tunnel0 up
+
+nsh vxlan tunnel src 6.0.3.3 dst 6.0.3.1 c1 1 c2 2 c3 3 c4 4 vni 33 spi 3311 si 0 next-ip4
+set int stat nsh_vxlan_gpe_tunnel1 up
diff --git a/vnet/etc/scripts/leftpeer/leftpeer.script b/vnet/etc/scripts/leftpeer/leftpeer.script
new file mode 100644
index 00000000000..f08c809012c
--- /dev/null
+++ b/vnet/etc/scripts/leftpeer/leftpeer.script
@@ -0,0 +1,9 @@
+l2tp_set_lookup_key lookup_v6_src
+
+sw_interface_add_del_address GigabitEthernet2/3/0 db03::2/64
+sw_interface_set_flags GigabitEthernet2/3/0 admin-up
+
+comment sw_interface_add_del_address GigabitEthernet2/2/0 db02::2/64
+sw_interface_set_flags GigabitEthernet2/2/0 admin-up
+
+l2tp_session_add_del client_address db03::1 our_address db03::2 GigabitEthernet2/2/0 local_session_id 1 remote_session_id 3 local_cookie 11 remote_cookie 33
diff --git a/vnet/etc/scripts/ludd-cluster-1/lc1.script b/vnet/etc/scripts/ludd-cluster-1/lc1.script
deleted file mode 100644
index f08c809012c..00000000000
--- a/vnet/etc/scripts/ludd-cluster-1/lc1.script
+++ /dev/null
@@ -1,9 +0,0 @@
-l2tp_set_lookup_key lookup_v6_src
-
-sw_interface_add_del_address GigabitEthernet2/3/0 db03::2/64
-sw_interface_set_flags GigabitEthernet2/3/0 admin-up
-
-comment sw_interface_add_del_address GigabitEthernet2/2/0 db02::2/64
-sw_interface_set_flags GigabitEthernet2/2/0 admin-up
-
-l2tp_session_add_del client_address db03::1 our_address db03::2 GigabitEthernet2/2/0 local_session_id 1 remote_session_id 3 local_cookie 11 remote_cookie 33
diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-classify b/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-classify
deleted file mode 100755
index 74285912aeb..00000000000
--- a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-classify
+++ /dev/null
@@ -1,8 +0,0 @@
-classify table mask l2 src l3 ip4 src buckets 2 miss-next local
-
-comment { classify table mask l3 ip4 src buckets 2 miss-next local }
-set ip classify intfc GigabitEthernet2/2/0 table-index 0
-set int ip address GigabitEthernet2/2/0 192.168.1.1/24
-set int state GigabitEthernet2/2/0 up
-
-classify session hit-next local table-index 0 match l2 src 00:50:56:b7:05:bb l3 ip4 src 192.168.1.2
diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-classify6 b/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-classify6
deleted file mode 100644
index 6579d50d3c5..00000000000
--- a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-classify6
+++ /dev/null
@@ -1,5 +0,0 @@
-classify table mask l3 ip6 src buckets 2 miss-next local
-set ip6 classify intfc GigabitEthernet2/2/0 table-index 0
-set int ip address GigabitEthernet2/2/0 db01::1/64
-set int state GigabitEthernet2/2/0 up
-classify session hit-next local table-index 0 match l3 ip6 src db01::2
diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-classifyl2 b/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-classifyl2
deleted file mode 100644
index 6be4b1e52cf..00000000000
--- a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-classifyl2
+++ /dev/null
@@ -1,8 +0,0 @@
-set int ip address GigabitEthernet2/2/0 192.168.1.1/24
-set int state GigabitEthernet2/2/0 up
-
-classify table mask l3 ip4 src buckets 2 l2-miss-next ethernet
-
-classify session advance 14 l2-hit-next ip4 table-index 0 match l3 ip4 src 192.168.1.2
-
-set int l2 class intfc GigabitEthernet2/2/0 ip4-table 0
diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-dhcp b/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-dhcp
deleted file mode 100644
index c13a8f3aa5e..00000000000
--- a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-dhcp
+++ /dev/null
@@ -1,23 +0,0 @@
-loop cre
-set int ip table loop0 12
-set int ip address loop0 192.168.1.1/24
-set int state loop0 up
-
-set int ip table GigabitEthernet2/2/0 12
-comment { set int ip address GigabitEthernet2/2/0 192.168.1.1/24 }
-set int unnumbered GigabitEthernet2/2/0 use loop0
-set int state GigabitEthernet2/2/0 up
-
-set int ip table GigabitEthernet2/7/0 11
-set int ip address GigabitEthernet2/7/0 192.168.2.1/24
-set int state GigabitEthernet2/7/0 up
-
-uncomment { set dhcp proxy server 1.2.3.4 src-address 1.2.3.5 add-option-82 rx-fib-id 0 server-fib-id 0 }
-
-uncomment { set dhcp proxy server 192.168.2.2 src-address 192.168.2.1 add-option-82 rx-fib-id 12 server-fib-id 11 }
-
-ip route add 0.0.0.0/24 table 11 via local
-ip route add 255.255.255.255/24 table 11 via local
-
-ip route add 0.0.0.0/24 table 12 via local
-ip route add 255.255.255.255/24 table 12 via local
diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-ioam.conf b/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-ioam.conf
deleted file mode 100644
index 5234ace39bf..00000000000
--- a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-ioam.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-comment { connects to ludd-cluster-2 eth1 addr db02::2/64 }
-set int ip address GigabitEthernet2/2/0 db02::1/64
-set int state GigabitEthernet2/2/0 up
-
-comment { connects to ioam domain ludd-cluster-3 eth2 addr db03::3/64 }
-set int ip address GigabitEthernet2/3/0 db03::1/64
-set int state GigabitEthernet2/3/0 up
-
-ioam set rewrite trace-elts 2 pow
-
-set ip6 neighbor GigabitEthernet2/3/0 db03::3 00:50:56:b7:05:cb
-
-ip route add db04::0/64 via db03::3 
-
-ioam set destination db04::0/64 add 
diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-l3vxlan.conf b/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-l3vxlan.conf
deleted file mode 100644
index ed43059dea9..00000000000
--- a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-l3vxlan.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-comment { tunnel to ludd-cluster-3 6.0.3.3 on vlan 101 }
-
-set int ip address GigabitEthernet2/3/0 6.0.3.1/24
-set int state GigabitEthernet2/3/0 up
-
-comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
-
-set int ip address GigabitEthernet2/2/0 6.0.2.1/24
-set int state GigabitEthernet2/2/0 up
-
-vxlan tunnel src 6.0.3.1 peer 6.0.3.3 vni 123 adj 6.0.4.4/24
-
diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-lisp.conf b/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-lisp.conf
deleted file mode 100644
index 15a6ccb3b24..00000000000
--- a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-lisp.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-comment { vpe_phase2 configuration }
-
-comment { local client facing interface on vlan 100  }
-comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
-
-set int ip address GigabitEthernet2/2/0 6.0.2.1/24
-set int state GigabitEthernet2/2/0 up
-
-comment { tunnel to ludd-cluster-3 on vlan 101 }
-set int ip address GigabitEthernet2/3/0 6.0.3.1/24
-set int state GigabitEthernet2/3/0 up
-
-lisp gpe tunnel src 6.0.3.1 dst 6.0.3.3 next-ip4 decap-next ip4 iid 1133
-set int ip address lisp_gpe_tunnel0 6.0.4.1/24
-set int state lisp_gpe_tunnel0 up
-
-lisp gpe tunnel src 6.0.3.3 dst 6.0.3.1 next-ip4 decap-next ip4 iid 3311 
-set int stat lisp_gpe_tunnel1 up
diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-mpls.conf b/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-mpls.conf
deleted file mode 100644
index b6cf8cd62c8..00000000000
--- a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-mpls.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-comment { vpe_phase2 configuration }
-
-comment { local client facing interface on vlan 100  }
-comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
-
-set int ip table GigabitEthernet2/2/0 1
-set int ip address GigabitEthernet2/2/0 6.0.2.1/24
-set int state GigabitEthernet2/2/0 up
-
-comment { tunnel to ludd-cluster-3 on vlan 101 }
-set int ip address GigabitEthernet2/3/0 6.0.3.1/24
-set int state GigabitEthernet2/3/0 up
-
-mpls encap add label 30 fib 1 dest 6.0.3.3
-mpls decap add label 30 fib 1 
-
-create mpls gre tunnel src 6.0.3.1 dst 6.0.3.3 intfc 6.0.4.1/24 inner-fib-id 1 outer-fib-id 0
diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-nsh.conf b/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-nsh.conf
deleted file mode 100644
index 47c1d263ce1..00000000000
--- a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-nsh.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-comment { vpe_phase2 configuration }
-
-comment { local client facing interface on vlan 100  }
-comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
-
-set int ip address GigabitEthernet2/2/0 6.0.2.1/24
-set int state GigabitEthernet2/2/0 up
-
-comment { tunnel to ludd-cluster-3 on vlan 101 }
-set int ip address GigabitEthernet2/3/0 6.0.3.1/24
-set int state GigabitEthernet2/3/0 up
-
-nsh gre tunnel src 6.0.3.1 dst 6.0.3.3 c1 1 c2 2 c3 3 c4 4 spi 1133 si 0 next-ip4
-set int ip address nsh_gre_tunnel0 6.0.4.1/24
-set int state nsh_gre_tunnel0 up
-
-nsh gre tunnel src 6.0.3.3 dst 6.0.3.1 c1 1 c2 2 c3 3 c4 4 spi 3311 si 0 next-ip4
-set int stat nsh_gre_tunnel1 up
diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-sr.conf b/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-sr.conf
deleted file mode 100644
index 7cb612cb1e7..00000000000
--- a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-sr.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-comment { test sr segment chunk-offset on }
-test sr hmac validate on
-
-comment { trunk to ludd-cluster-3 }
-set int ip address GigabitEthernet2/3/0 db03::2/64
-enable ip6 interface GigabitEthernet2/3/0
-set int state GigabitEthernet2/3/0 up
-
-comment { subscriber ludd-cluster-2 }
-set int ip address GigabitEthernet2/2/0 db02::2/64
-enable ip6 interface GigabitEthernet2/2/0
-set int state GigabitEthernet2/2/0 up
-
-sr hmac id 2 key Gozzer
-sr hmac id 3 key Hoser
-
-sr tunnel src db01::1 dst db04::1/128 next db03::1 next db04::1 tag db02::2 clean key Gozzer InPE 1
-
-tap connect srlocal hwaddr random
-set int ip6 table tap-0 1
-set int ip address tap-0 db04::99/64
-enable ip6 interface tap-0
-set int state tap-0 up
-ip route add table 1 db02::0/64 lookup in table 0
diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-vxlan.conf b/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-vxlan.conf
deleted file mode 100644
index 0688d40b564..00000000000
--- a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-vxlan.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-comment { tunnel to ludd-cluster-3 6.0.3.3 on vlan 101 }
-
-set int ip address GigabitEthernet2/3/0 6.0.3.1/24
-set int state GigabitEthernet2/3/0 up
-
-comment { tunnel to ludd-cluster-5 6.0.5.5 on vlan 105 }
-set int ip address GigabitEthernet2/7/0 6.0.5.1/24
-set int state GigabitEthernet2/7/0 up
-
-comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
-
-set int ip address GigabitEthernet2/2/0 6.0.2.1/24
-set int state GigabitEthernet2/2/0 up
-
-vxlan tunnel src 6.0.3.1 peer 6.0.3.3 peer 6.0.3.5 vni 123 
-vxlan l2 GigabitEthernet2/2/0 vni 123
-
diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-vxnsh.conf b/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-vxnsh.conf
deleted file mode 100644
index 1457ba21247..00000000000
--- a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-vxnsh.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-comment { vpe_phase2 configuration }
-
-comment { local client facing interface on vlan 100  }
-comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
-
-set int ip address GigabitEthernet2/2/0 6.0.2.1/24
-set int state GigabitEthernet2/2/0 up
-
-comment { tunnel to ludd-cluster-3 on vlan 101 }
-set int ip address GigabitEthernet2/3/0 6.0.3.1/24
-set int state GigabitEthernet2/3/0 up
-
-nsh vxlan tunnel src 6.0.3.1 dst 6.0.3.3 c1 1 c2 2 c3 3 c4 4 vni 11 spi 1133 si 0 next-ip4
-set int ip address nsh_vxlan_gpe_tunnel0 6.0.4.1/24
-set int state nsh_vxlan_gpe_tunnel0 up
-
-nsh vxlan tunnel src 6.0.3.3 dst 6.0.3.1 c1 1 c2 2 c3 3 c4 4 vni 33 spi 3311 si 0 next-ip4
-set int stat nsh_vxlan_gpe_tunnel1 up
diff --git a/vnet/etc/scripts/ludd-cluster-3/lc3.script b/vnet/etc/scripts/ludd-cluster-3/lc3.script
deleted file mode 100644
index 153988cefad..00000000000
--- a/vnet/etc/scripts/ludd-cluster-3/lc3.script
+++ /dev/null
@@ -1,9 +0,0 @@
-l2tp_set_lookup_key lookup_v6_src
-
-sw_interface_add_del_address GigabitEthernet2/3/0 db03::1/64
-sw_interface_set_flags GigabitEthernet2/3/0 admin-up
-
-comment sw_interface_add_del_address GigabitEthernet2/4/0 db02::2/64
-sw_interface_set_flags GigabitEthernet2/4/0 admin-up
-
-l2tp_session_add_del client_address db03::2 our_address db03::1 GigabitEthernet2/4/0 local_session_id 3 remote_session_id 1 local_cookie 33 remote_cookie 11
diff --git a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-ioam.conf b/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-ioam.conf
deleted file mode 100644
index 88b5ab2c389..00000000000
--- a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-ioam.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-comment { connects to ludd-cluster-4 eth3 addr db04::4/64 }
-set int ip address GigabitEthernet2/4/0 db04::1/64
-set int state GigabitEthernet2/4/0 up
-
-comment { connects to ioam domain ludd-cluster-1 addr db03::1/64 }
-set int ip address GigabitEthernet2/3/0 db03::3/64
-set int state GigabitEthernet2/3/0 up
-
-set ip6 neighbor GigabitEthernet2/3/0 db03::1 00:50:56:b7:05:bf
-set ip6 neighbor GigabitEthernet2/4/0 db04::4 00:50:56:b7:05:d2
-
-ip route add db02::0/64 via db03::1
-
-ioam set destination db04::4/128 pop
diff --git a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-l3vxlan.conf b/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-l3vxlan.conf
deleted file mode 100644
index 94357d7de9e..00000000000
--- a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-l3vxlan.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-comment { local client facing interface on vlan 102 }
-
-comment { configure client lc4 eth1 }
-set int ip address GigabitEthernet2/4/0 6.0.4.1/24 
-set int state GigabitEthernet2/4/0 up
-
-comment { tunnel to ludd-cluster-1 on vlan 101 }
-set int ip address GigabitEthernet2/3/0 6.0.3.3/24
-set int state GigabitEthernet2/3/0 up
-
-vxlan tunnel src 6.0.3.3 peer 6.0.3.1 vni 123 adj 6.0.2.0/24
-
diff --git a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-lisp.conf b/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-lisp.conf
deleted file mode 100644
index faab4bf7758..00000000000
--- a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-lisp.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-comment { local client facing interface on vlan 102 }
-comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
-
-set int ip address GigabitEthernet2/4/0 6.0.4.1/24
-set int state GigabitEthernet2/4/0 up
-
-comment { tunnel to ludd-cluster-1 on vlan 101 }
-set int ip address GigabitEthernet2/3/0 6.0.3.3/24
-set int state GigabitEthernet2/3/0 up
-
-lisp gpe tunnel src 6.0.3.3 dst 6.0.3.1 next-ip4 decap-next ip4 iid 3311
-set int ip address lisp_gpe_tunnel0 6.0.2.3/24
-set int state lisp_gpe_tunnel0 up
-
-lisp gpe tunnel src 6.0.3.1 dst 6.0.3.3 next-ip4 decap-next ip4 iid 1133
-set int state lisp_gpe_tunnel1 up
diff --git a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-mpls-l2.conf b/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-mpls-l2.conf
deleted file mode 100644
index 2d94b2bf58c..00000000000
--- a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-mpls-l2.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-comment { vpe_phase1d configuration }
-
-comment { local client facing interface on vlan 102 }
-comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
-
-set int ip table GigabitEthernet2/4/0 1
-set int ip address GigabitEthernet2/4/0 6.0.4.1/24
-set int state GigabitEthernet2/4/0 up
-
-comment { tunnel to ludd-cluster-1 on vlan 101 }
-set int ip address GigabitEthernet2/3/0 6.0.3.3/24
-set int state GigabitEthernet2/3/0 up
-
-mpls encap add label 30 fib 1 dest 6.0.3.1
-mpls decap add label 30 next output GigabitEthernet2/4/0
-
-comment { create mpls gre tunnel src 6.0.3.3 dst 6.0.3.1 intfc 6.0.2.1/24 inner-fib-id 1 outer-fib-id 0 l2-only }
-
-comment {set int l2 xconnect GigabitEthernet2/4/0 mpls-gre0 }
-
-uncomment { create mpls ethernet tunnel dst 00:50:56:b7:05:bf adj 6.0.3.1/8 l2-only tx-intfc GigabitEthernet2/3/0 fib-id 1 }
-
-uncomment { set int l2 xconnect GigabitEthernet2/4/0 mpls-eth0 }
-
diff --git a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-mpls.conf b/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-mpls.conf
deleted file mode 100644
index ea8b75f765a..00000000000
--- a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-mpls.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-comment { vpe_phase1d configuration }
-
-comment { local client facing interface on vlan 102 }
-comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
-
-set int ip table GigabitEthernet2/4/0 1
-set int ip address GigabitEthernet2/4/0 6.0.4.1/24
-set int state GigabitEthernet2/4/0 up
-
-comment { tunnel to ludd-cluster-1 on vlan 101 }
-set int ip address GigabitEthernet2/3/0 6.0.3.3/24
-set int state GigabitEthernet2/3/0 up
-
-mpls encap add label 30 fib 1 dest 6.0.3.1
-mpls decap add label 30 fib 1
-
-create mpls gre tunnel src 6.0.3.3 dst 6.0.3.1 intfc 6.0.2.1/24 inner-fib-id 1 outer-fib-id 0
diff --git a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-nsh.conf b/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-nsh.conf
deleted file mode 100644
index 7a67b9af064..00000000000
--- a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-nsh.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-comment { vpe_phase1d configuration }
-
-comment { local client facing interface on vlan 102 }
-comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
-
-set int ip address GigabitEthernet2/4/0 6.0.4.1/24
-set int state GigabitEthernet2/4/0 up
-
-comment { tunnel to ludd-cluster-1 on vlan 101 }
-set int ip address GigabitEthernet2/3/0 6.0.3.3/24
-set int state GigabitEthernet2/3/0 up
-
-nsh gre tunnel src 6.0.3.3 dst 6.0.3.1 c1 1 c2 2 c3 3 c4 4 spi 3311 si 0 next-ip4
-set int ip address nsh_gre_tunnel0 6.0.2.3/24
-set int state nsh_gre_tunnel0 up
-
-nsh gre tunnel src 6.0.3.1 dst 6.0.3.3 c1 1 c2 2 c3 3 c4 4 spi 1133 si 0 next-ip4
-set int state nsh_gre_tunnel1 up
-
diff --git a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-sr.conf b/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-sr.conf
deleted file mode 100644
index d9cf57625cf..00000000000
--- a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-sr.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-comment { test sr segment chunk-offset on }
-test sr hmac validate on
-
-comment { trunk to ludd-cluster-1 }
-set int ip address GigabitEthernet2/3/0 db03::1/64
-enable ip6 interface GigabitEthernet2/3/0
-set int state GigabitEthernet2/3/0 up
-
-comment { subscriber ludd-cluster-4 }
-set int ip address GigabitEthernet2/4/0 db04::2/64
-
-comment { next address to fake out ND on shared LAN segment }
-comment { set int ip address GigabitEthernet2/4/0 db02::13/64 }
-
-enable ip6 interface GigabitEthernet2/4/0
-set int state GigabitEthernet2/4/0 up
-
-sr hmac id 2 key Gozzer
-sr hmac id 3 key Hoser
-
-sr tunnel src db04::1 dst db02::1/128 next db03::2 next db02::1 tag db04::2 clean key Hoser
-
-tap connect srlocal hwaddr random
-set int ip6 table tap-0 1
-set int ip address tap-0 db04::99/64
-enable ip6 interface tap-0
-set int state tap-0 up
-ip route add table 1 db02::0/64 lookup in table 0
diff --git a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-vxlan.conf b/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-vxlan.conf
deleted file mode 100644
index 3caa65fe7b1..00000000000
--- a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-vxlan.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-
-comment { local client facing interface on vlan 102 }
-
-comment { configure client lc4 eth1 }
-set int state GigabitEthernet2/4/0 up
-
-comment { tunnel to ludd-cluster-1 on vlan 101 }
-set int ip address GigabitEthernet2/3/0 6.0.3.3/24
-set int state GigabitEthernet2/3/0 up
-
-comment { tunnel to ludd-cluster-5 on vlan 105 }
-set int ip address GigabitEthernet2/7/0 6.0.5.3/24
-set int state GigabitEthernet2/3/0 up
-
-vxlan tunnel src 6.0.3.3 peer 6.0.3.1 peer 6.0.3.5 vni 123 
-vxlan l2 GigabitEthernet2/4/0 vni 123
diff --git a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-vxnsh.conf b/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-vxnsh.conf
deleted file mode 100644
index 628b56653a9..00000000000
--- a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-vxnsh.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-comment { vpe_phase1d configuration }
-
-comment { local client facing interface on vlan 102 }
-comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
-
-set int ip address GigabitEthernet2/4/0 6.0.4.1/24
-set int state GigabitEthernet2/4/0 up
-
-comment { tunnel to ludd-cluster-1 on vlan 101 }
-set int ip address GigabitEthernet2/3/0 6.0.3.3/24
-set int state GigabitEthernet2/3/0 up
-
-nsh vxlan tunnel src 6.0.3.3 dst 6.0.3.1 c1 1 c2 2 c3 3 c4 4 vni 33 spi 3311 si 0 next-ip4
-set int ip address nsh_vxlan_gpe_tunnel0 6.0.2.3/24
-set int state nsh_vxlan_gpe_tunnel0 up
-
-nsh vxlan tunnel src 6.0.3.1 dst 6.0.3.3 c1 1 c2 2 c3 3 c4 4 vni 11 spi 1133 si 0 next-ip4
-set int state nsh_vxlan_gpe_tunnel1 up
diff --git a/vnet/etc/scripts/mpls-o-ethernet/leftpeer.conf b/vnet/etc/scripts/mpls-o-ethernet/leftpeer.conf
new file mode 100644
index 00000000000..dd37b942062
--- /dev/null
+++ b/vnet/etc/scripts/mpls-o-ethernet/leftpeer.conf
@@ -0,0 +1,17 @@
+comment { vpe_phase2 configuration }
+
+comment { local client facing interface  }
+comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
+
+set int ip table GigabitEthernet2/2/0 1
+set int ip address GigabitEthernet2/2/0 6.0.2.1/24
+set int state GigabitEthernet2/2/0 up
+
+comment { tunnel to rightpeer }
+set int ip address GigabitEthernet2/3/0 6.0.3.1/24
+set int state GigabitEthernet2/3/0 up
+
+mpls encap add label 30 fib 1 dest 6.0.4.1
+mpls decap add label 30 fib 1
+
+create mpls ethernet tunnel dst 00:50:56:b7:05:cb adj 6.0.4.1/24 tx-intfc GigabitEthernet2/3/0 fib-id 1
diff --git a/vnet/etc/scripts/mpls-o-ethernet/ludd-cluster-1.conf b/vnet/etc/scripts/mpls-o-ethernet/ludd-cluster-1.conf
deleted file mode 100644
index e439ccb0fdf..00000000000
--- a/vnet/etc/scripts/mpls-o-ethernet/ludd-cluster-1.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-comment { vpe_phase2 configuration }
-
-comment { local client facing interface on vlan 100  }
-comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
-
-set int ip table GigabitEthernet2/2/0 1
-set int ip address GigabitEthernet2/2/0 6.0.2.1/24
-set int state GigabitEthernet2/2/0 up
-
-comment { tunnel to ludd-cluster-3 on vlan 101 }
-set int ip address GigabitEthernet2/3/0 6.0.3.1/24
-set int state GigabitEthernet2/3/0 up
-
-mpls encap add label 30 fib 1 dest 6.0.4.1
-mpls decap add label 30 fib 1
-
-create mpls ethernet tunnel dst 00:50:56:b7:05:cb adj 6.0.4.1/24 tx-intfc GigabitEthernet2/3/0 fib-id 1
diff --git a/vnet/etc/scripts/mpls-o-ethernet/ludd-cluster-3.conf b/vnet/etc/scripts/mpls-o-ethernet/ludd-cluster-3.conf
deleted file mode 100644
index 3d71647c1d2..00000000000
--- a/vnet/etc/scripts/mpls-o-ethernet/ludd-cluster-3.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-comment { vpe_phase1d configuration }
-
-comment { local client facing interface on vlan 102 }
-comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
-
-set int ip table GigabitEthernet2/4/0 1
-set int ip address GigabitEthernet2/4/0 6.0.4.1/24
-set int state GigabitEthernet2/4/0 up
-
-comment { tunnel to ludd-cluster-1 on vlan 101 }
-set int ip address GigabitEthernet2/3/0 6.0.3.3/24
-set int state GigabitEthernet2/3/0 up
-
-mpls encap add label 30 fib 1 dest 6.0.2.1
-mpls decap add label 30 fib 1
-
-create mpls ethernet tunnel dst 00:50:56:b7:05:bf adj 6.0.2.1/24 tx-intfc GigabitEthernet2/3/0 fib-id 1
diff --git a/vnet/etc/scripts/mpls-o-ethernet/rightpeer.conf b/vnet/etc/scripts/mpls-o-ethernet/rightpeer.conf
new file mode 100644
index 00000000000..7709ce4d584
--- /dev/null
+++ b/vnet/etc/scripts/mpls-o-ethernet/rightpeer.conf
@@ -0,0 +1,15 @@
+comment { local client facing interface }
+comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
+
+set int ip table GigabitEthernet2/4/0 1
+set int ip address GigabitEthernet2/4/0 6.0.4.1/24
+set int state GigabitEthernet2/4/0 up
+
+comment { tunnel to leftpeer }
+set int ip address GigabitEthernet2/3/0 6.0.3.3/24
+set int state GigabitEthernet2/3/0 up
+
+mpls encap add label 30 fib 1 dest 6.0.2.1
+mpls decap add label 30 fib 1
+
+create mpls ethernet tunnel dst 00:50:56:b7:05:bf adj 6.0.2.1/24 tx-intfc GigabitEthernet2/3/0 fib-id 1
diff --git a/vnet/etc/scripts/mpls-o-gre/dhcpd.conf b/vnet/etc/scripts/mpls-o-gre/dhcpd.conf
new file mode 100644
index 00000000000..f0f659cd55f
--- /dev/null
+++ b/vnet/etc/scripts/mpls-o-gre/dhcpd.conf
@@ -0,0 +1,116 @@
+#
+# Sample configuration file for ISC dhcpd for Debian
+#
+# Attention: If /etc/ltsp/dhcpd.conf exists, that will be used as
+# configuration file instead of this file.
+#
+#
+
+# The ddns-updates-style parameter controls whether or not the server will
+# attempt to do a DNS update when a lease is confirmed. We default to the
+# behavior of the version 2 packages ('none', since DHCP v2 didn't
+# have support for DDNS.)
+ddns-update-style none;
+
+# option definitions common to all supported networks...
+option domain-name "example.org";
+option domain-name-servers ns1.example.org, ns2.example.org;
+
+default-lease-time 600;
+max-lease-time 7200;
+
+# If this DHCP server is the official DHCP server for the local
+# network, the authoritative directive should be uncommented.
+#authoritative;
+
+# Use this to send dhcp log messages to a different log file (you also
+# have to hack syslog.conf to complete the redirection).
+log-facility local7;
+
+# No service will be given on this subnet, but declaring it helps the 
+# DHCP server to understand the network topology.
+
+#subnet 10.152.187.0 netmask 255.255.255.0 {
+#}
+
+# This is a very basic subnet declaration.
+
+#subnet 10.254.239.0 netmask 255.255.255.224 {
+#  range 10.254.239.10 10.254.239.20;
+#  option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org;
+#}
+
+# This declaration allows BOOTP clients to get dynamic addresses,
+# which we don't really recommend.
+
+#subnet 10.254.239.32 netmask 255.255.255.224 {
+#  range dynamic-bootp 10.254.239.40 10.254.239.60;
+#  option broadcast-address 10.254.239.31;
+#  option routers rtr-239-32-1.example.org;
+#}
+
+# A slightly different configuration for an internal subnet.
+#subnet 10.5.5.0 netmask 255.255.255.224 {
+#  range 10.5.5.26 10.5.5.30;
+#  option domain-name-servers ns1.internal.example.org;
+#  option domain-name "internal.example.org";
+#  option routers 10.5.5.1;
+#  option broadcast-address 10.5.5.31;
+#  default-lease-time 600;
+#  max-lease-time 7200;
+#}
+
+# Hosts which require special configuration options can be listed in
+# host statements.   If no address is specified, the address will be
+# allocated dynamically (if possible), but the host-specific information
+# will still come from the host declaration.
+
+#host passacaglia {
+#  hardware ethernet 0:0:c0:5d:bd:95;
+#  filename "vmunix.passacaglia";
+#  server-name "toccata.fugue.com";
+#}
+
+# Fixed IP addresses can also be specified for hosts.   These addresses
+# should not also be listed as being available for dynamic assignment.
+# Hosts for which fixed IP addresses have been specified can boot using
+# BOOTP or DHCP.   Hosts for which no fixed address is specified can only
+# be booted with DHCP, unless there is an address range on the subnet
+# to which a BOOTP client is connected which has the dynamic-bootp flag
+# set.
+#host fantasia {
+#  hardware ethernet 08:00:07:26:c0:a5;
+#  fixed-address fantasia.fugue.com;
+#}
+
+# You can declare a class of clients and then do address allocation
+# based on that.   The example below shows a case where all clients
+# in a certain class get addresses on the 10.17.224/24 subnet, and all
+# other clients get addresses on the 10.0.29/24 subnet.
+
+#class "foo" {
+#  match if substring (option vendor-class-identifier, 0, 4) = "SUNW";
+#}
+
+#shared-network 224-29 {
+#  subnet 10.17.224.0 netmask 255.255.255.0 {
+#    option routers rtr-224.example.org;
+#  }
+#  subnet 10.0.29.0 netmask 255.255.255.0 {
+#    option routers rtr-29.example.org;
+#  }
+#  pool {
+#    allow members of "foo";
+#    range 10.17.224.10 10.17.224.250;
+#  }
+#  pool {
+#    deny members of "foo";
+#    range 10.0.29.10 10.0.29.230;
+#  }
+#}
+subnet 6.0.0.0 netmask 255.255.0.0 {
+   range 6.0.2.2 6.0.2.5;
+   option routers 6.0.2.1;
+   default-lease-time 15;
+   max-lease-time 15;
+}
diff --git a/vnet/etc/scripts/mpls-o-gre/leftpeer.conf b/vnet/etc/scripts/mpls-o-gre/leftpeer.conf
new file mode 100644
index 00000000000..149c70c068d
--- /dev/null
+++ b/vnet/etc/scripts/mpls-o-gre/leftpeer.conf
@@ -0,0 +1,14 @@
+comment { left linux ping target configure at e.g. 6.0.2.2/24 }
+
+set int ip table GigabitEthernet2/2/0 1
+set int ip address GigabitEthernet2/2/0 6.0.2.1/24
+set int state GigabitEthernet2/2/0 up
+
+comment { tunnel to rightpeer }
+set int ip address GigabitEthernet2/3/0 6.0.3.1/24
+set int state GigabitEthernet2/3/0 up
+
+mpls encap add label 30 fib 1 dest 6.0.3.3
+mpls decap add label 30 fib 1
+
+create mpls gre tunnel src 6.0.3.1 dst 6.0.3.3 intfc 6.0.4.1/24 inner-fib-id 1 outer-fib-id 0
diff --git a/vnet/etc/scripts/mpls-o-gre/ludd-cluster-1.conf b/vnet/etc/scripts/mpls-o-gre/ludd-cluster-1.conf
deleted file mode 100644
index 992a24c428e..00000000000
--- a/vnet/etc/scripts/mpls-o-gre/ludd-cluster-1.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-comment { vpe_phase2 configuration }
-
-comment { local client facing interface on vlan 100  }
-comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
-
-set int ip table GigabitEthernet2/2/0 1
-set int ip address GigabitEthernet2/2/0 6.0.2.1/24
-set int state GigabitEthernet2/2/0 up
-
-comment { tunnel to ludd-cluster-3 on vlan 101 }
-set int ip address GigabitEthernet2/3/0 6.0.3.1/24
-set int state GigabitEthernet2/3/0 up
-
-mpls encap add label 30 fib 1 dest 6.0.3.3
-mpls decap add label 30 fib 1
-
-create mpls gre tunnel src 6.0.3.1 dst 6.0.3.3 intfc 6.0.4.1/24 inner-fib-id 1 outer-fib-id 0
diff --git a/vnet/etc/scripts/mpls-o-gre/ludd-cluster-3.conf b/vnet/etc/scripts/mpls-o-gre/ludd-cluster-3.conf
deleted file mode 100644
index ea8b75f765a..00000000000
--- a/vnet/etc/scripts/mpls-o-gre/ludd-cluster-3.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-comment { vpe_phase1d configuration }
-
-comment { local client facing interface on vlan 102 }
-comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
-
-set int ip table GigabitEthernet2/4/0 1
-set int ip address GigabitEthernet2/4/0 6.0.4.1/24
-set int state GigabitEthernet2/4/0 up
-
-comment { tunnel to ludd-cluster-1 on vlan 101 }
-set int ip address GigabitEthernet2/3/0 6.0.3.3/24
-set int state GigabitEthernet2/3/0 up
-
-mpls encap add label 30 fib 1 dest 6.0.3.1
-mpls decap add label 30 fib 1
-
-create mpls gre tunnel src 6.0.3.3 dst 6.0.3.1 intfc 6.0.2.1/24 inner-fib-id 1 outer-fib-id 0
diff --git a/vnet/etc/scripts/mpls-o-gre/ludd-cluster-5-dhcpd.conf b/vnet/etc/scripts/mpls-o-gre/ludd-cluster-5-dhcpd.conf
deleted file mode 100644
index f0f659cd55f..00000000000
--- a/vnet/etc/scripts/mpls-o-gre/ludd-cluster-5-dhcpd.conf
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# Sample configuration file for ISC dhcpd for Debian
-#
-# Attention: If /etc/ltsp/dhcpd.conf exists, that will be used as
-# configuration file instead of this file.
-#
-#
-
-# The ddns-updates-style parameter controls whether or not the server will
-# attempt to do a DNS update when a lease is confirmed. We default to the
-# behavior of the version 2 packages ('none', since DHCP v2 didn't
-# have support for DDNS.)
-ddns-update-style none;
-
-# option definitions common to all supported networks...
-option domain-name "example.org";
-option domain-name-servers ns1.example.org, ns2.example.org;
-
-default-lease-time 600;
-max-lease-time 7200;
-
-# If this DHCP server is the official DHCP server for the local
-# network, the authoritative directive should be uncommented.
-#authoritative;
-
-# Use this to send dhcp log messages to a different log file (you also
-# have to hack syslog.conf to complete the redirection).
-log-facility local7;
-
-# No service will be given on this subnet, but declaring it helps the 
-# DHCP server to understand the network topology.
-
-#subnet 10.152.187.0 netmask 255.255.255.0 {
-#}
-
-# This is a very basic subnet declaration.
-
-#subnet 10.254.239.0 netmask 255.255.255.224 {
-#  range 10.254.239.10 10.254.239.20;
-#  option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org;
-#}
-
-# This declaration allows BOOTP clients to get dynamic addresses,
-# which we don't really recommend.
-
-#subnet 10.254.239.32 netmask 255.255.255.224 {
-#  range dynamic-bootp 10.254.239.40 10.254.239.60;
-#  option broadcast-address 10.254.239.31;
-#  option routers rtr-239-32-1.example.org;
-#}
-
-# A slightly different configuration for an internal subnet.
-#subnet 10.5.5.0 netmask 255.255.255.224 {
-#  range 10.5.5.26 10.5.5.30;
-#  option domain-name-servers ns1.internal.example.org;
-#  option domain-name "internal.example.org";
-#  option routers 10.5.5.1;
-#  option broadcast-address 10.5.5.31;
-#  default-lease-time 600;
-#  max-lease-time 7200;
-#}
-
-# Hosts which require special configuration options can be listed in
-# host statements.   If no address is specified, the address will be
-# allocated dynamically (if possible), but the host-specific information
-# will still come from the host declaration.
-
-#host passacaglia {
-#  hardware ethernet 0:0:c0:5d:bd:95;
-#  filename "vmunix.passacaglia";
-#  server-name "toccata.fugue.com";
-#}
-
-# Fixed IP addresses can also be specified for hosts.   These addresses
-# should not also be listed as being available for dynamic assignment.
-# Hosts for which fixed IP addresses have been specified can boot using
-# BOOTP or DHCP.   Hosts for which no fixed address is specified can only
-# be booted with DHCP, unless there is an address range on the subnet
-# to which a BOOTP client is connected which has the dynamic-bootp flag
-# set.
-#host fantasia {
-#  hardware ethernet 08:00:07:26:c0:a5;
-#  fixed-address fantasia.fugue.com;
-#}
-
-# You can declare a class of clients and then do address allocation
-# based on that.   The example below shows a case where all clients
-# in a certain class get addresses on the 10.17.224/24 subnet, and all
-# other clients get addresses on the 10.0.29/24 subnet.
-
-#class "foo" {
-#  match if substring (option vendor-class-identifier, 0, 4) = "SUNW";
-#}
-
-#shared-network 224-29 {
-#  subnet 10.17.224.0 netmask 255.255.255.0 {
-#    option routers rtr-224.example.org;
-#  }
-#  subnet 10.0.29.0 netmask 255.255.255.0 {
-#    option routers rtr-29.example.org;
-#  }
-#  pool {
-#    allow members of "foo";
-#    range 10.17.224.10 10.17.224.250;
-#  }
-#  pool {
-#    deny members of "foo";
-#    range 10.0.29.10 10.0.29.230;
-#  }
-#}
-subnet 6.0.0.0 netmask 255.255.0.0 {
-   range 6.0.2.2 6.0.2.5;
-   option routers 6.0.2.1;
-   default-lease-time 15;
-   max-lease-time 15;
-}
diff --git a/vnet/etc/scripts/mpls-o-gre/rightpeer.conf b/vnet/etc/scripts/mpls-o-gre/rightpeer.conf
new file mode 100644
index 00000000000..b5bb597db49
--- /dev/null
+++ b/vnet/etc/scripts/mpls-o-gre/rightpeer.conf
@@ -0,0 +1,14 @@
+comment { right linux ping target configure  e.g. 6.0.4.4/24 }
+
+set int ip table GigabitEthernet2/4/0 1
+set int ip address GigabitEthernet2/4/0 6.0.4.1/24
+set int state GigabitEthernet2/4/0 up
+
+comment { tunnel to leftpeer }
+set int ip address GigabitEthernet2/3/0 6.0.3.3/24
+set int state GigabitEthernet2/3/0 up
+
+mpls encap add label 30 fib 1 dest 6.0.3.1
+mpls decap add label 30 fib 1
+
+create mpls gre tunnel src 6.0.3.3 dst 6.0.3.1 intfc 6.0.2.1/24 inner-fib-id 1 outer-fib-id 0
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-ioam.conf b/vnet/etc/scripts/rightpeer/rightpeer-ioam.conf
new file mode 100644
index 00000000000..3e9a8d343e2
--- /dev/null
+++ b/vnet/etc/scripts/rightpeer/rightpeer-ioam.conf
@@ -0,0 +1,14 @@
+comment { connects to right ping target eth3 addr db04::4/64 }
+set int ip address GigabitEthernet2/4/0 db04::1/64
+set int state GigabitEthernet2/4/0 up
+
+comment { connects to ioam domain leftpeer addr db03::1/64 }
+set int ip address GigabitEthernet2/3/0 db03::3/64
+set int state GigabitEthernet2/3/0 up
+
+set ip6 neighbor GigabitEthernet2/3/0 db03::1 00:50:56:b7:05:bf
+set ip6 neighbor GigabitEthernet2/4/0 db04::4 00:50:56:b7:05:d2
+
+ip route add db02::0/64 via db03::1
+
+ioam set destination db04::4/128 pop
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-l3vxlan.conf b/vnet/etc/scripts/rightpeer/rightpeer-l3vxlan.conf
new file mode 100644
index 00000000000..abba1ab0ef6
--- /dev/null
+++ b/vnet/etc/scripts/rightpeer/rightpeer-l3vxlan.conf
@@ -0,0 +1,9 @@
+set int ip address GigabitEthernet2/4/0 6.0.4.1/24 
+set int state GigabitEthernet2/4/0 up
+
+comment { tunnel to leftpeer on vlan 101 }
+set int ip address GigabitEthernet2/3/0 6.0.3.3/24
+set int state GigabitEthernet2/3/0 up
+
+vxlan tunnel src 6.0.3.3 peer 6.0.3.1 vni 123 adj 6.0.2.0/24
+
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-lisp.conf b/vnet/etc/scripts/rightpeer/rightpeer-lisp.conf
new file mode 100644
index 00000000000..961204a346b
--- /dev/null
+++ b/vnet/etc/scripts/rightpeer/rightpeer-lisp.conf
@@ -0,0 +1,16 @@
+comment { local client facing interface }
+comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
+
+set int ip address GigabitEthernet2/4/0 6.0.4.1/24
+set int state GigabitEthernet2/4/0 up
+
+comment { tunnel to leftpeer }
+set int ip address GigabitEthernet2/3/0 6.0.3.3/24
+set int state GigabitEthernet2/3/0 up
+
+lisp gpe tunnel src 6.0.3.3 dst 6.0.3.1 next-ip4 decap-next ip4 iid 3311
+set int ip address lisp_gpe_tunnel0 6.0.2.3/24
+set int state lisp_gpe_tunnel0 up
+
+lisp gpe tunnel src 6.0.3.1 dst 6.0.3.3 next-ip4 decap-next ip4 iid 1133
+set int state lisp_gpe_tunnel1 up
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-mpls-l2.conf b/vnet/etc/scripts/rightpeer/rightpeer-mpls-l2.conf
new file mode 100644
index 00000000000..0ce38583e83
--- /dev/null
+++ b/vnet/etc/scripts/rightpeer/rightpeer-mpls-l2.conf
@@ -0,0 +1,24 @@
+comment { vpe_phase1d configuration }
+
+comment { local client facing interface }
+comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
+
+set int ip table GigabitEthernet2/4/0 1
+set int ip address GigabitEthernet2/4/0 6.0.4.1/24
+set int state GigabitEthernet2/4/0 up
+
+comment { tunnel to leftpeer }
+set int ip address GigabitEthernet2/3/0 6.0.3.3/24
+set int state GigabitEthernet2/3/0 up
+
+mpls encap add label 30 fib 1 dest 6.0.3.1
+mpls decap add label 30 next output GigabitEthernet2/4/0
+
+comment { create mpls gre tunnel src 6.0.3.3 dst 6.0.3.1 intfc 6.0.2.1/24 inner-fib-id 1 outer-fib-id 0 l2-only }
+
+comment {set int l2 xconnect GigabitEthernet2/4/0 mpls-gre0 }
+
+uncomment { create mpls ethernet tunnel dst 00:50:56:b7:05:bf adj 6.0.3.1/8 l2-only tx-intfc GigabitEthernet2/3/0 fib-id 1 }
+
+uncomment { set int l2 xconnect GigabitEthernet2/4/0 mpls-eth0 }
+
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-mpls.conf b/vnet/etc/scripts/rightpeer/rightpeer-mpls.conf
new file mode 100644
index 00000000000..fc97ba16332
--- /dev/null
+++ b/vnet/etc/scripts/rightpeer/rightpeer-mpls.conf
@@ -0,0 +1,17 @@
+comment { vpe_phase1d configuration }
+
+comment { local client facing interface }
+comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
+
+set int ip table GigabitEthernet2/4/0 1
+set int ip address GigabitEthernet2/4/0 6.0.4.1/24
+set int state GigabitEthernet2/4/0 up
+
+comment { tunnel to leftpeer }
+set int ip address GigabitEthernet2/3/0 6.0.3.3/24
+set int state GigabitEthernet2/3/0 up
+
+mpls encap add label 30 fib 1 dest 6.0.3.1
+mpls decap add label 30 fib 1
+
+create mpls gre tunnel src 6.0.3.3 dst 6.0.3.1 intfc 6.0.2.1/24 inner-fib-id 1 outer-fib-id 0
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-nsh.conf b/vnet/etc/scripts/rightpeer/rightpeer-nsh.conf
new file mode 100644
index 00000000000..76c1203b44c
--- /dev/null
+++ b/vnet/etc/scripts/rightpeer/rightpeer-nsh.conf
@@ -0,0 +1,19 @@
+comment { vpe_phase1d configuration }
+
+comment { local client facing interface }
+comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
+
+set int ip address GigabitEthernet2/4/0 6.0.4.1/24
+set int state GigabitEthernet2/4/0 up
+
+comment { tunnel to leftpeer }
+set int ip address GigabitEthernet2/3/0 6.0.3.3/24
+set int state GigabitEthernet2/3/0 up
+
+nsh gre tunnel src 6.0.3.3 dst 6.0.3.1 c1 1 c2 2 c3 3 c4 4 spi 3311 si 0 next-ip4
+set int ip address nsh_gre_tunnel0 6.0.2.3/24
+set int state nsh_gre_tunnel0 up
+
+nsh gre tunnel src 6.0.3.1 dst 6.0.3.3 c1 1 c2 2 c3 3 c4 4 spi 1133 si 0 next-ip4
+set int state nsh_gre_tunnel1 up
+
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-sr.conf b/vnet/etc/scripts/rightpeer/rightpeer-sr.conf
new file mode 100644
index 00000000000..0b2a98bba1b
--- /dev/null
+++ b/vnet/etc/scripts/rightpeer/rightpeer-sr.conf
@@ -0,0 +1,28 @@
+comment { test sr segment chunk-offset on }
+test sr hmac validate on
+
+comment { trunk to leftpeer }
+set int ip address GigabitEthernet2/3/0 db03::1/64
+enable ip6 interface GigabitEthernet2/3/0
+set int state GigabitEthernet2/3/0 up
+
+comment { subscriber right peer target }
+set int ip address GigabitEthernet2/4/0 db04::2/64
+
+comment { next address to fake out ND on shared LAN segment }
+comment { set int ip address GigabitEthernet2/4/0 db02::13/64 }
+
+enable ip6 interface GigabitEthernet2/4/0
+set int state GigabitEthernet2/4/0 up
+
+sr hmac id 2 key Gozzer
+sr hmac id 3 key Hoser
+
+sr tunnel src db04::1 dst db02::1/128 next db03::2 next db02::1 tag db04::2 clean key Hoser
+
+tap connect srlocal hwaddr random
+set int ip6 table tap-0 1
+set int ip address tap-0 db04::99/64
+enable ip6 interface tap-0
+set int state tap-0 up
+ip route add table 1 db02::0/64 lookup in table 0
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-vxlan.conf b/vnet/etc/scripts/rightpeer/rightpeer-vxlan.conf
new file mode 100644
index 00000000000..bd4c427e768
--- /dev/null
+++ b/vnet/etc/scripts/rightpeer/rightpeer-vxlan.conf
@@ -0,0 +1,16 @@
+
+comment { local client facing interface }
+
+comment { configure client lc4 eth1 }
+set int state GigabitEthernet2/4/0 up
+
+comment { tunnel to leftpeer }
+set int ip address GigabitEthernet2/3/0 6.0.3.3/24
+set int state GigabitEthernet2/3/0 up
+
+comment { tunnel to extra ping target }
+set int ip address GigabitEthernet2/7/0 6.0.5.3/24
+set int state GigabitEthernet2/3/0 up
+
+vxlan tunnel src 6.0.3.3 peer 6.0.3.1 peer 6.0.3.5 vni 123 
+vxlan l2 GigabitEthernet2/4/0 vni 123
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-vxnsh.conf b/vnet/etc/scripts/rightpeer/rightpeer-vxnsh.conf
new file mode 100644
index 00000000000..45b0b7ef7c4
--- /dev/null
+++ b/vnet/etc/scripts/rightpeer/rightpeer-vxnsh.conf
@@ -0,0 +1,18 @@
+comment { vpe_phase1d configuration }
+
+comment { local client facing interface }
+comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
+
+set int ip address GigabitEthernet2/4/0 6.0.4.1/24
+set int state GigabitEthernet2/4/0 up
+
+comment { tunnel to leftpeer }
+set int ip address GigabitEthernet2/3/0 6.0.3.3/24
+set int state GigabitEthernet2/3/0 up
+
+nsh vxlan tunnel src 6.0.3.3 dst 6.0.3.1 c1 1 c2 2 c3 3 c4 4 vni 33 spi 3311 si 0 next-ip4
+set int ip address nsh_vxlan_gpe_tunnel0 6.0.2.3/24
+set int state nsh_vxlan_gpe_tunnel0 up
+
+nsh vxlan tunnel src 6.0.3.1 dst 6.0.3.3 c1 1 c2 2 c3 3 c4 4 vni 11 spi 1133 si 0 next-ip4
+set int state nsh_vxlan_gpe_tunnel1 up
diff --git a/vnet/etc/scripts/rightpeer/rightpeer.script b/vnet/etc/scripts/rightpeer/rightpeer.script
new file mode 100644
index 00000000000..153988cefad
--- /dev/null
+++ b/vnet/etc/scripts/rightpeer/rightpeer.script
@@ -0,0 +1,9 @@
+l2tp_set_lookup_key lookup_v6_src
+
+sw_interface_add_del_address GigabitEthernet2/3/0 db03::1/64
+sw_interface_set_flags GigabitEthernet2/3/0 admin-up
+
+comment sw_interface_add_del_address GigabitEthernet2/4/0 db02::2/64
+sw_interface_set_flags GigabitEthernet2/4/0 admin-up
+
+l2tp_session_add_del client_address db03::2 our_address db03::1 GigabitEthernet2/4/0 local_session_id 3 remote_session_id 1 local_cookie 33 remote_cookie 11
diff --git a/vnet/etc/scripts/sr/left-linux-ping.sh b/vnet/etc/scripts/sr/left-linux-ping.sh
new file mode 100755
index 00000000000..55b835063c7
--- /dev/null
+++ b/vnet/etc/scripts/sr/left-linux-ping.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+ifconfig eth2 inet6 add db02::1/64
+route -A inet6 add db04::1/128 gw db02::2
diff --git a/vnet/etc/scripts/sr/leftpeer.conf b/vnet/etc/scripts/sr/leftpeer.conf
new file mode 100644
index 00000000000..9591d968b8b
--- /dev/null
+++ b/vnet/etc/scripts/sr/leftpeer.conf
@@ -0,0 +1,27 @@
+comment { test sr segment chunk-offset on }
+test sr hmac validate on
+
+comment { trunk to rightpeer }
+set int ip address GigabitEthernet2/3/0 db03::2/64
+enable ip6 interface GigabitEthernet2/3/0
+set int state GigabitEthernet2/3/0 up
+
+comment { subscriber left-linux-ping }
+set int ip address GigabitEthernet2/2/0 db02::2/64
+enable ip6 interface GigabitEthernet2/2/0
+set int state GigabitEthernet2/2/0 up
+
+sr hmac id 2 key Gozzer
+sr hmac id 3 key Hoser
+
+sr tunnel src db01::1 dst db04::1/128 next db03::1 next db04::1 tag db02::2 clean key Gozzer InPE 1
+
+comment { sr unaware service chaining to db03::5 }
+comment { sr tunnel src db01::1 dst db04::1/128 next db03::1 next db03::5 next db04::1 tag db02::2 clean key Gozzer InPE 1 }
+
+comment { tap connect srlocal hwaddr random }
+comment { set int ip6 table tap-0 1 }
+comment { set int ip address tap-0 db04::99/64 }
+comment { enable ip6 interface tap-0 }
+comment { set int state tap-0 up }
+comment { ip route add table 1 db02::0/64 lookup in table 0 }
diff --git a/vnet/etc/scripts/sr/ludd-cluster-1.conf b/vnet/etc/scripts/sr/ludd-cluster-1.conf
deleted file mode 100644
index f257b1bc521..00000000000
--- a/vnet/etc/scripts/sr/ludd-cluster-1.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-comment { test sr segment chunk-offset on }
-test sr hmac validate on
-
-comment { trunk to ludd-cluster-3 }
-set int ip address GigabitEthernet2/3/0 db03::2/64
-enable ip6 interface GigabitEthernet2/3/0
-set int state GigabitEthernet2/3/0 up
-
-comment { subscriber ludd-cluster-2 }
-set int ip address GigabitEthernet2/2/0 db02::2/64
-enable ip6 interface GigabitEthernet2/2/0
-set int state GigabitEthernet2/2/0 up
-
-sr hmac id 2 key Gozzer
-sr hmac id 3 key Hoser
-
-sr tunnel src db01::1 dst db04::1/128 next db03::1 next db04::1 tag db02::2 clean key Gozzer InPE 1
-
-comment { sr unaware service chaining to db03::5 }
-comment { sr tunnel src db01::1 dst db04::1/128 next db03::1 next db03::5 next db04::1 tag db02::2 clean key Gozzer InPE 1 }
-
-comment { tap connect srlocal hwaddr random }
-comment { set int ip6 table tap-0 1 }
-comment { set int ip address tap-0 db04::99/64 }
-comment { enable ip6 interface tap-0 }
-comment { set int state tap-0 up }
-comment { ip route add table 1 db02::0/64 lookup in table 0 }
diff --git a/vnet/etc/scripts/sr/ludd-cluster-2.sh b/vnet/etc/scripts/sr/ludd-cluster-2.sh
deleted file mode 100755
index 55b835063c7..00000000000
--- a/vnet/etc/scripts/sr/ludd-cluster-2.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-ifconfig eth2 inet6 add db02::1/64
-route -A inet6 add db04::1/128 gw db02::2
diff --git a/vnet/etc/scripts/sr/ludd-cluster-3.conf b/vnet/etc/scripts/sr/ludd-cluster-3.conf
deleted file mode 100644
index 005bee6e3e4..00000000000
--- a/vnet/etc/scripts/sr/ludd-cluster-3.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-comment { trunk to ludd-cluster-1 }
-set int ip address GigabitEthernet2/0/0 db03::1/64
-enable ip6 interface GigabitEthernet2/0/0
-set int state GigabitEthernet2/0/0 up
-
-comment { subscriber ludd-cluster-4 }
-set int ip address GigabitEthernet2/2/0 db04::2/64
-
-comment { next address to fake out ND on shared LAN segment }
-set int ip address GigabitEthernet2/2/0 db02::13/64
-
-enable ip6 interface GigabitEthernet2/2/0
-set int state GigabitEthernet2/2/0 up
-
-sr tunnel src db04::1 dst db02::1/128 next db03::2 next db02::1 tag db04::2 clean
-
-tap connect srlocal hwaddr random
-set int ip6 table tap-0 1
-set int ip address tap-0 db04::99/64
-enable ip6 interface tap-0
-set int state tap-0 up
-ip route add table 1 db02::0/64 lookup in table 0
diff --git a/vnet/etc/scripts/sr/ludd-cluster-4.sh b/vnet/etc/scripts/sr/ludd-cluster-4.sh
deleted file mode 100755
index 029368dbb8b..00000000000
--- a/vnet/etc/scripts/sr/ludd-cluster-4.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-ifconfig eth1 inet6 add db04::1/64
-route -A inet6 add db02::1/128 gw db04::2
diff --git a/vnet/etc/scripts/sr/right-linux-ping.sh b/vnet/etc/scripts/sr/right-linux-ping.sh
new file mode 100755
index 00000000000..029368dbb8b
--- /dev/null
+++ b/vnet/etc/scripts/sr/right-linux-ping.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+ifconfig eth1 inet6 add db04::1/64
+route -A inet6 add db02::1/128 gw db04::2
diff --git a/vnet/etc/scripts/sr/rightpeer.conf b/vnet/etc/scripts/sr/rightpeer.conf
new file mode 100644
index 00000000000..6da7a7afd05
--- /dev/null
+++ b/vnet/etc/scripts/sr/rightpeer.conf
@@ -0,0 +1,22 @@
+comment { trunk to leftpeer }
+set int ip address GigabitEthernet2/0/0 db03::1/64
+enable ip6 interface GigabitEthernet2/0/0
+set int state GigabitEthernet2/0/0 up
+
+comment { subscriber right-linux-ping }
+set int ip address GigabitEthernet2/2/0 db04::2/64
+
+comment { next address to fake out ND on shared LAN segment }
+set int ip address GigabitEthernet2/2/0 db02::13/64
+
+enable ip6 interface GigabitEthernet2/2/0
+set int state GigabitEthernet2/2/0 up
+
+sr tunnel src db04::1 dst db02::1/128 next db03::2 next db02::1 tag db04::2 clean
+
+tap connect srlocal hwaddr random
+set int ip6 table tap-0 1
+set int ip address tap-0 db04::99/64
+enable ip6 interface tap-0
+set int state tap-0 up
+ip route add table 1 db02::0/64 lookup in table 0
-- 
cgit 1.2.3-korg