Reorganize source tree to use single autotools instance

Change-Id: I7b51f88292e057c6443b12224486f2d0c9f8ae23 Signed-off-by: Damjan Marion <damarion@cisco.com>
author: Damjan Marion <damarion@cisco.com> 2016-12-19 23:05:39 +0100
committer: Damjan Marion <damarion@cisco.com> 2016-12-28 12:25:14 +0100
commit: 7cd468a3d7dee7d6c92f69a0bb7061ae208ec727 (patch)
tree: 5de62f8dbd3a752f5a676ca600e43d2652d1ff1a /vnet/etc
parent: 696f1adec0df3b8f161862566dd9c86174302658 (diff)
77 files changed, 0 insertions, 3645 deletions
diff --git a/vnet/etc/scripts/arp4 b/vnet/etc/scripts/arp4
deleted file mode 100644
index acb20da33c8..00000000000
--- a/vnet/etc/scripts/arp4
+++ /dev/null
@@ -1,21 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP: 1.0.0.2 -> 2.0.0.2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-trace add pg-input 100
-loop create
-loop create
-set int state loop0 up
-set int state loop1 up
-
-set int ip address loop0 1.0.0.1/24
-set int ip address loop1 2.0.0.1/24
diff --git a/vnet/etc/scripts/arp4-mpls b/vnet/etc/scripts/arp4-mpls
deleted file mode 100644
index d3d39f3b921..00000000000
--- a/vnet/etc/scripts/arp4-mpls
+++ /dev/null
@@ -1,24 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP: 1.0.0.2 -> 2.2.2.2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-loop create
-loop create
-set int state loop0 up
-set int state loop1 up
-
-set int ip address loop0 1.0.0.1/24
-set int ip address loop1 2.0.0.1/24
-
-ip route add 2.2.2.2/32 via 2.0.0.2 loop1 out-label 33
-
-trace add pg-input 100
diff --git a/vnet/etc/scripts/arp6 b/vnet/etc/scripts/arp6
deleted file mode 100644
index e6a98935309..00000000000
--- a/vnet/etc/scripts/arp6
+++ /dev/null
@@ -1,21 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip6-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP6: 2000::2 -> 2001::2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-tr add pg-input 100
-loop create
-loop create
-set int state loop0 up
-set int state loop1 up
-
-set int ip address loop0 2000::1/64
-set int ip address loop1 2001::1/64
diff --git a/vnet/etc/scripts/bvi b/vnet/etc/scripts/bvi
deleted file mode 100644
index 2174da0db63..00000000000
--- a/vnet/etc/scripts/bvi
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-set int state tuntap-0 down
-set int ip address GigabitEthernet2/1/0 1.2.3.4/24
-
-set int state GigabitEthernet2/1/0 up 
-cre sub GigabitEthernet2/1/0 1 dot1q 7 
-set int state GigabitEthernet2/1/0.1 up
-
-set int state GigabitEthernet2/2/0 up
-cre sub GigabitEthernet2/2/0 1 dot1q 9 
-set int state GigabitEthernet2/2/0.1 up
-
-
-loop create
-set int l2 bridge loop0 0 bvi
-set int ip table loop0 0
-set int state loop0 up
-
-
-set int l2 bridge GigabitEthernet2/1/0.1 0
-set int l2 bridge GigabitEthernet2/2/0.1 0
-
-set int l2 tag-rewrite GigabitEthernet2/1/0.1 pop 1
-set int l2 tag-rewrite GigabitEthernet2/2/0.1 pop 1 
-
-l2fib add 00:22:44:06:08:0a    0  GigabitEthernet2/1/0.1 static
-l2fib add 00:02:04:06:08:0a    0  GigabitEthernet2/2/0.1 static
-
-
-ip route table 0 8.0.0.1/32 via loop0
-set ip arp loop0 8.0.0.1 00:02:04:06:08:0a
-
-
-ip route add 1.2.3.3/32 via GigabitEthernet2/1/0 IP4: 00:15:17:61:73:47 -> 00:15:17:61:73:46
-
-cle er
-cle int
-cle run
-
-packet-generator new {
-  name bvi_to_l2 
-  limit 100
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 0050.56b7.296d 
-      GRE: 1.2.3.3 -> 8.0.0.1 mpls_unicast 
-  }
-}
-
-packet-generator new {
-  name l2_to_bvi
-  limit 50
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/2/0
-  data {
-      IP4: 0050.56b7.7c83 -> dead.0000.0000  vlan 9
-      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
-  }
-}
-
-packet-generator new {
-  name l2_to_bvi_via_flood
-  limit 25
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/2/0
-  data {
-      IP4: 0050.56b7.7c83 -> ffff.ffff.ffff  vlan 9
-      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
-  }
-}
-
diff --git a/vnet/etc/scripts/dhcp/dhcpd.conf b/vnet/etc/scripts/dhcp/dhcpd.conf
deleted file mode 100644
index d4cb3ed718a..00000000000
--- a/vnet/etc/scripts/dhcp/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/left-ping-target.sh b/vnet/etc/scripts/dhcp/left-ping-target.sh
deleted file mode 100644
index 2edc2a50eaa..00000000000
--- a/vnet/etc/scripts/dhcp/left-ping-target.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/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
deleted file mode 100644
index 458eecf0caf..00000000000
--- a/vnet/etc/scripts/dhcp/leftpeer.conf
+++ /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/icmp b/vnet/etc/scripts/icmp
deleted file mode 100644
index 1e054e2df4a..00000000000
--- a/vnet/etc/scripts/icmp
+++ /dev/null
@@ -1,16 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP: 1.2.3.4 -> 5.6.7.8
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-tr add pg-input 100
-ip route 5.6.7.8/32 via local
-ip route 1.2.3.4/32 via local
diff --git a/vnet/etc/scripts/icmp6 b/vnet/etc/scripts/icmp6
deleted file mode 100644
index 2a65acba256..00000000000
--- a/vnet/etc/scripts/icmp6
+++ /dev/null
@@ -1,16 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip6-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP6: ::1 -> ::2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-tr add pg-input 100
-ip route ::1/128 via local
-ip route ::2/128 via local
diff --git a/vnet/etc/scripts/ige b/vnet/etc/scripts/ige
deleted file mode 100644
index 80d045af36d..00000000000
--- a/vnet/etc/scripts/ige
+++ /dev/null
@@ -1,19 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-lookup
-  size 50-50
-  data {
-    ICMP: 1.0.0.1 -> 1.0.0.3 ttl 1
-    incrementing 30
-  }
-}
-
-comment { tr add pg-input 100 }
-set int ip address GigabitEthernet4/0/0 1.0.0.1/24
-set int ip address GigabitEthernet4/0/1 1.0.0.2/24
-set int state GigabitEthernet4/0/0 up
-set int state GigabitEthernet4/0/1 up
-
-ip route add 1.0.0.3/32 via GigabitEthernet4/0/1 IP4: 00:15:17:61:73:47 -> 00:15:17:61:73:46
-tr add ige-input 10
diff --git a/vnet/etc/scripts/ip6 b/vnet/etc/scripts/ip6
deleted file mode 100644
index 4f9f3ee5474..00000000000
--- a/vnet/etc/scripts/ip6
+++ /dev/null
@@ -1,15 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ethernet-input
-  size 64-64
-  no-recycle
-  data {
-    IP6: 1.2.3 -> 4.5.6
-    ICMP: ::1 -> ::2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-tr add pg-input 100
diff --git a/vnet/etc/scripts/ip6-hbh b/vnet/etc/scripts/ip6-hbh
deleted file mode 100644
index 0c6de47f100..00000000000
--- a/vnet/etc/scripts/ip6-hbh
+++ /dev/null
@@ -1,84 +0,0 @@
-tap connect tap0
-set int state tap-0 up
-set int ip address tap-0 1::1/64
-packet-generator new {
-  name hbh1
-  limit 1
-  node ip6-input
-  size 48-48
-  no-recycle
-  data {
-    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
-    hex 0x3B00010403040506
-    incrementing 100
-  }
-}
-packet-generator new {
-  name hbh2
-  limit 1
-  node ip6-input
-  size 48-48
-  no-recycle
-  data {
-    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
-    hex 0x3B00C10403040506
-    incrementing 100
-  }
-}
-
-packet-generator new {
-  name hbh3
-  limit 1
-  node ip6-input
-  size 48-48
-  no-recycle
-  data {
-    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
-    hex 0x3BffC10403040506
-    incrementing 100
-  }
-}
-
-packet-generator new {
-  name hbh4
-  limit 1
-  node ip6-input
-  size 64-64
-  no-recycle
-  data {
-    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
-    hex 0x3BffC10403040506
-    incrementing 100
-  }
-}
-
-packet-generator new {
-  name hbh5
-  limit 1
-  node ip6-input
-  size 56-56
-  no-recycle
-  data {
-    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
-    length 16
-    hex 0x3B010104030405060106030405060708
-    incrementing 100
-  }
-}
-
-packet-generator new {
-  name hbh6
-  limit 1
-  node ip6-input
-  size 56-56
-  no-recycle
-  data {
-    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
-    length 16
-    hex 0x3a00050200000100
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-tr add pg-input 100
diff --git a/vnet/etc/scripts/ixge b/vnet/etc/scripts/ixge
deleted file mode 100644
index 6722b5369cd..00000000000
--- a/vnet/etc/scripts/ixge
+++ /dev/null
@@ -1,15 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-lookup
-  size 50-50
-  data {
-    ICMP: 1.0.0.1 -> 1.0.0.3 ttl 1
-    incrementing 30
-  }
-}
-
-comment { tr add pg-input 100 }
-set int ip address TenGigabitEthernet5/0/0 33.0.1.1/8
-set int state TenGigabitEthernet5/0/0 up
-
diff --git a/vnet/etc/scripts/l2efpfilter b/vnet/etc/scripts/l2efpfilter
deleted file mode 100644
index 307b4436e81..00000000000
--- a/vnet/etc/scripts/l2efpfilter
+++ /dev/null
@@ -1,83 +0,0 @@
-
-set int ip address GigabitEthernet2/1/0 1.2.3.4/24
-set int state GigabitEthernet2/1/0 up 
-set int state tuntap-0 down
-
-
-cre sub GigabitEthernet2/1/0 1 dot1q 1 
-cre sub GigabitEthernet2/1/0 2 dot1q 2 
-cre sub GigabitEthernet2/1/0 3 dot1q 3
-cre sub GigabitEthernet2/2/0 1 dot1q 1 
-cre sub GigabitEthernet2/2/0 100 dot1q 100 
-
-set int l2 bridge GigabitEthernet2/1/0 0
-set int l2 bridge GigabitEthernet2/1/0.1 0
-set int l2 bridge GigabitEthernet2/1/0.2 0
-set int l2 bridge GigabitEthernet2/1/0.3 0
-set int l2 bridge GigabitEthernet2/2/0 0
-set int l2 bridge GigabitEthernet2/2/0.1 0
-set int l2 bridge GigabitEthernet2/2/0.100 0
-
-set int l2 tag-rewrite GigabitEthernet2/2/0.1 push dot1q 50
-set int l2 tag-rewrite GigabitEthernet2/1/0.2 translate 1-1 dot1q 100
-set int l2 tag-rewrite GigabitEthernet2/1/0.3 translate 1-1 dot1q 99 
-
-set int l2 efp-filter GigabitEthernet2/2/0
-set int l2 efp-filter GigabitEthernet2/2/0.1
-set int l2 efp-filter GigabitEthernet2/2/0.100
-
-
-l2fib add 00:00:00:00:00:11    0  GigabitEthernet2/2/0.1 static
-l2fib add 00:00:00:00:00:22    0  GigabitEthernet2/2/0.100 static
-
-set int state GigabitEthernet2/1/0 up
-set int state GigabitEthernet2/1/0.1 up
-set int state GigabitEthernet2/1/0.2 up
-set int state GigabitEthernet2/1/0.3 up
-set int state GigabitEthernet2/2/0 up
-set int state GigabitEthernet2/2/0.1 up
-set int state GigabitEthernet2/2/0.100 up
-
-
-trace add pg-input 6
-
-clear error
-clear run
-clear int
-
-packet-generator new {
-  name pre_vtr_fail
-  limit 10
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 00:00:00:00:00:11 vlan 1
-      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
-  }
-}
-
-packet-generator new {
-  name post_vtr_pass
-  limit 20
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 00:00:00:00:00:22 vlan 2
-      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
-  }
-}
-
-packet-generator new {
-  name post_vtr_fail
-  limit 50
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 00:00:00:00:00:22 vlan 3
-      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
-  }
-}
-
diff --git a/vnet/etc/scripts/l2efpfilter_perf b/vnet/etc/scripts/l2efpfilter_perf
deleted file mode 100644
index b2f4b490cb8..00000000000
--- a/vnet/etc/scripts/l2efpfilter_perf
+++ /dev/null
@@ -1,58 +0,0 @@
-
-set int ip address GigabitEthernet2/1/0 1.2.3.4/24
-set int state GigabitEthernet2/1/0 up 
-set int state tuntap-0 down
-
-
-cre sub GigabitEthernet2/1/0 1 dot1q 1 
-cre sub GigabitEthernet2/1/0 2 dot1q 2 
-cre sub GigabitEthernet2/1/0 3 dot1q 3
-cre sub GigabitEthernet2/2/0 1 dot1q 1 
-cre sub GigabitEthernet2/2/0 100 dot1q 100 
-
-set int l2 bridge GigabitEthernet2/1/0 0
-set int l2 bridge GigabitEthernet2/1/0.1 0
-set int l2 bridge GigabitEthernet2/1/0.2 0
-set int l2 bridge GigabitEthernet2/1/0.3 0
-set int l2 bridge GigabitEthernet2/2/0 0
-set int l2 bridge GigabitEthernet2/2/0.1 0
-set int l2 bridge GigabitEthernet2/2/0.100 0
-
-set int l2 tag-rewrite GigabitEthernet2/2/0.1 push dot1q 50
-set int l2 tag-rewrite GigabitEthernet2/1/0.2 translate 1-1 dot1q 100
-set int l2 tag-rewrite GigabitEthernet2/1/0.3 translate 1-1 dot1q 99 
-
-set int l2 efp-filter GigabitEthernet2/2/0
-set int l2 efp-filter GigabitEthernet2/2/0.1
-set int l2 efp-filter GigabitEthernet2/2/0.100
-
-
-l2fib add 00:00:00:00:00:11    0  GigabitEthernet2/2/0.1 static
-l2fib add 00:00:00:00:00:22    0  GigabitEthernet2/2/0.100 static
-
-set int state GigabitEthernet2/1/0 up
-set int state GigabitEthernet2/1/0.1 up
-set int state GigabitEthernet2/1/0.2 up
-set int state GigabitEthernet2/1/0.3 up
-set int state GigabitEthernet2/2/0 up
-set int state GigabitEthernet2/2/0.1 up
-set int state GigabitEthernet2/2/0.100 up
-
-
-trace add pg-input 6
-
-clear error
-clear run
-clear int
-
-packet-generator new {
-  name post_vtr_pass
-  limit 9111003
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 00:00:00:00:00:22 vlan 2
-      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
-  }
-}
diff --git a/vnet/etc/scripts/l2fib b/vnet/etc/scripts/l2fib
deleted file mode 100644
index 81ede171ef2..00000000000
--- a/vnet/etc/scripts/l2fib
+++ /dev/null
@@ -1,46 +0,0 @@
-
-set int ip address GigabitEthernet2/1/0 1.2.3.4/24
-set int state GigabitEthernet2/1/0 up 
-
-set int state GigabitEthernet2/2/0 up
-cre sub GigabitEthernet2/2/0 1 dot1q 9 
-set int state GigabitEthernet2/2/0.1 up
-set int state tuntap-0 down
-
-set int acl input GigabitEthernet2/1/0
-set int acl output GigabitEthernet2/1/0
-set int acl input GigabitEthernet2/2/0.1 
-set int acl output GigabitEthernet2/2/0.1
-
-set int l2 bridge GigabitEthernet2/1/0 0
-set int l2 bridge GigabitEthernet2/2/0.1 0
-
-set int l2 tag-rewrite GigabitEthernet2/1/0 push dot1q 50
-set int l2 tag-rewrite GigabitEthernet2/2/0.1 pop 1
-
-
-trace add pg-input 6
-
-clear error
-clear run
-clear int
-
-packet-generator new {
-  name new_input_if_index_mac_move
-  limit 4
-  no-recycle
-  node ethernet-input 
-  interface GigabitEthernet2/1/0
-  size 98-98
-  data { hex 0x00010203040500020406080a080045006402b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2040160011000000010101cc000400000000001a00100000000100000000ffffffff }
-}
-
-packet-generator new {
-  name dmac_hit
-  limit 7
-  no-recycle
-  node ethernet-input 
-  interface GigabitEthernet2/2/0
-  size 98-98
-  data { hex 0x00020406080a00224406080a8100000981000011080045006402b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2040160011000000010101cc000400000000001a00100000000100000000ffffffff }
-}
diff --git a/vnet/etc/scripts/l2fib_perf b/vnet/etc/scripts/l2fib_perf
deleted file mode 100644
index 638317ff705..00000000000
--- a/vnet/etc/scripts/l2fib_perf
+++ /dev/null
@@ -1,29 +0,0 @@
-
-set int ip address GigabitEthernet2/1/0 1.2.3.4/24
-set int state GigabitEthernet2/1/0 up 
-
-set int state GigabitEthernet2/2/0 up
-cre sub GigabitEthernet2/2/0 1 dot1q 9 
-set int state GigabitEthernet2/2/0.1 up
-set int state tuntap-0 down
-
-set int l2 bridge GigabitEthernet2/1/0 0
-set int l2 bridge GigabitEthernet2/2/0.1 0
-
-l2fib add 00:22:44:06:08:0a    0  GigabitEthernet2/1/0   static
-l2fib add 00:02:04:06:08:0a    0  GigabitEthernet2/2/0.1 static
-
-cle er
-cle int
-cle run
-
-packet-generator new {
-  name perf
-  limit 9111003
-  no-recycle
-  node ethernet-input 
-  interface GigabitEthernet2/2/0.1 
-  size 98-98
-  data { hex 0x00224406080a00020406080a81000009080045006402b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2040160011000000010101cc000400000000001a00100000000100000000ffffffff }
-}
-
diff --git a/vnet/etc/scripts/l2fib_xc b/vnet/etc/scripts/l2fib_xc
deleted file mode 100644
index 35d7342b3f7..00000000000
--- a/vnet/etc/scripts/l2fib_xc
+++ /dev/null
@@ -1,31 +0,0 @@
-
-set int ip address GigabitEthernet2/1/0 1.2.3.4/24
-set int state GigabitEthernet2/1/0 up 
-
-set int state GigabitEthernet2/2/0 up
-cre sub GigabitEthernet2/2/0 1 dot1q 9 
-set int state GigabitEthernet2/2/0.1 up
-set int state tuntap-0 down
-
-set int acl input GigabitEthernet2/1/0
-set int acl output GigabitEthernet2/1/0
-set int acl input GigabitEthernet2/2/0.1 
-set int acl output GigabitEthernet2/2/0.1
-
-set int l2 xc GigabitEthernet2/1/0   GigabitEthernet2/2/0.1
-set int l2 xc GigabitEthernet2/2/0.1 GigabitEthernet2/1/0
-
-clear error
-clear run
-clear int
-
-packet-generator new {
-  name xc
-  limit 11
-  no-recycle
-  node ethernet-input 
-  interface GigabitEthernet2/1/0
-  size 98-98
-  data { hex 0x00010203040500020406080a080045006402b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2040160011000000010101cc000400000000001a00100000000100000000ffffffff }
-}
-
diff --git a/vnet/etc/scripts/l2flood b/vnet/etc/scripts/l2flood
deleted file mode 100644
index 013462cef64..00000000000
--- a/vnet/etc/scripts/l2flood
+++ /dev/null
@@ -1,42 +0,0 @@
-
-set int ip address GigabitEthernet2/1/0 1.2.3.4/24
-set int state GigabitEthernet2/1/0 up 
-set int state tuntap-0 down
-
-
-loop create
-cre sub loop0 1 dot1q 1 
-cre sub loop0 2 dot1q 2 
-cre sub loop0 3 dot1q 3 
-cre sub GigabitEthernet2/1/0 1 dot1q 1 
-
-
-set int l2 bridge loop0.1 7
-set int l2 bridge loop0.2 7
-set int l2 bridge loop0.3 7
-set int l2 bridge GigabitEthernet2/1/0.1 7
-
-loop cre
-set int l2 bridge loop1 7 bvi
-
-set int state GigabitEthernet2/1/0.1 up 
-
-trace add pg-input 6
-
-clear error
-clear run
-clear int
-
-packet-generator new {
-  name flood
-  limit 1
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> ffff.ffff.ffff  vlan 1
-      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
-  }
-
-}
-
diff --git a/vnet/etc/scripts/l2tp b/vnet/etc/scripts/l2tp
deleted file mode 100644
index 337805aa44c..00000000000
--- a/vnet/etc/scripts/l2tp
+++ /dev/null
@@ -1,134 +0,0 @@
-
-set int ip address GigabitEthernet2/1/0 1.2.3.4/24
-set int state GigabitEthernet2/1/0 up 
-set int state tuntap-0 down
-
-
-cre sub GigabitEthernet2/1/0 1 dot1q 1 
-cre sub GigabitEthernet2/1/0 2 dot1q 2 
-cre sub GigabitEthernet2/1/0 3 dot1q 3
-cre sub GigabitEthernet2/2/0 1 dot1q 1 
-cre sub GigabitEthernet2/2/0 100 dot1q 100 
-
-
-set int l2 tag-rewrite GigabitEthernet2/1/0.1 pop 1
-set int l2 tag-rewrite GigabitEthernet2/1/0.2 pop 1
-
-
-l2tp session add client 11::1 our 22::2 l2-interface GigabitEthernet2/1/0.1
-l2tp session add client 11::1 our 22::3 l2-interface GigabitEthernet2/1/0.2 local-session-id 2 l2-sublayer-present
-
-ip route 11::1/128 via GigabitEthernet2/2/0
-set ip6 neighbor GigabitEthernet2/2/0 11::1 00:02:04:06:08:0a
-
-enable ip6 interface GigabitEthernet2/2/0 
-
-set int ip6 l2tpv3 GigabitEthernet2/2/0
-
-set int state GigabitEthernet2/1/0 up
-set int state GigabitEthernet2/1/0.1 up
-set int state GigabitEthernet2/1/0.2 up
-set int state GigabitEthernet2/1/0.3 up
-set int state GigabitEthernet2/2/0 up
-
-
-trace add pg-input 2
-
-clear error
-clear run
-clear int
-
-packet-generator new {
-  name decap
-  limit 10
-  size 200-200
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/2/0
-  data {
-      IP6: 00:50:00:00:00:01 -> 00:50:56:b7:29:7a 
-      L2TP: 11::1 -> 22::2 
-      L2TP: session_id 1 cookie 0xffffffffffffffff 
-      IP4: 00:55:55:55:00:01 -> 00:dd:dd:dd:00:01
-      UDP: 1.2.3.4 -> 5.6.7.8
-      incrementing 8
-  }
-}
-
-packet-generator new {
-  name decap_bad_sid
-  limit 30
-  size 200-200
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/2/0
-  data {
-      IP6: 00:50:00:00:00:01 -> 00:50:56:b7:29:7a 
-      L2TP: 11::1 -> 22::2 
-      L2TP: session_id 0x999 cookie 0xffffffffffffffff
-      IP4: 00:55:55:55:00:01 -> 00:dd:dd:dd:00:01
-      UDP: 1.2.3.4 -> 5.6.7.8
-      incrementing 8
-  }
-}
-
-packet-generator new {
-  name decap_bad_cookie
-  limit 50
-  size 200-200
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/2/0
-  data {
-      IP6: 00:50:00:00:00:01 -> 00:50:56:b7:29:7a 
-      L2TP: 11::1 -> 22::2 
-      L2TP: session_id 1 cookie 0x3333ffffffffffff
-      IP4: 00:55:55:55:00:01 -> 00:dd:dd:dd:00:01
-      UDP: 1.2.3.4 -> 5.6.7.8
-      incrementing 8
-  }
-}
-
-packet-generator new {
-  name encap
-  limit 100
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0000.5555.0002 -> 00:00:dd:dd:00:02 vlan 1
-      UDP: 1.2.3.4 -> 5.6.7.8
-      incrementing 8
-  }
-}
-
-packet-generator new {
-  name decap_sublayer
-  limit 300
-  size 200-200
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/2/0
-  data {
-      IP6: 00:50:00:00:00:01 -> 00:50:56:b7:29:7a 
-      L2TP: 11::1 -> 22::3
-      L2TP: session_id 2 cookie 0xffffffffffffffff l2_sublayer 0
-      IP4: 00:55:55:55:00:01 -> 00:dd:dd:dd:00:01
-      UDP: 1.2.3.4 -> 5.6.7.8
-      incrementing 8
-  }
-}
-
-packet-generator new {
-  name encap_sublayer
-  limit 700
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0000.5555.0002 -> 00:00:dd:dd:00:02 vlan 2
-      UDP: 1.2.3.4 -> 5.6.7.8
-      incrementing 8
-  }
-}
-
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-classify b/vnet/etc/scripts/leftpeer/leftpeer-classify
deleted file mode 100755
index 74285912aeb..00000000000
--- a/vnet/etc/scripts/leftpeer/leftpeer-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/leftpeer/leftpeer-classify6 b/vnet/etc/scripts/leftpeer/leftpeer-classify6
deleted file mode 100644
index 6579d50d3c5..00000000000
--- a/vnet/etc/scripts/leftpeer/leftpeer-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/leftpeer/leftpeer-classifyl2 b/vnet/etc/scripts/leftpeer/leftpeer-classifyl2
deleted file mode 100644
index 6be4b1e52cf..00000000000
--- a/vnet/etc/scripts/leftpeer/leftpeer-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/leftpeer/leftpeer-dhcp b/vnet/etc/scripts/leftpeer/leftpeer-dhcp
deleted file mode 100644
index c13a8f3aa5e..00000000000
--- a/vnet/etc/scripts/leftpeer/leftpeer-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/leftpeer/leftpeer-ioam.conf b/vnet/etc/scripts/leftpeer/leftpeer-ioam.conf
deleted file mode 100644
index 6c1b502c2f7..00000000000
--- a/vnet/etc/scripts/leftpeer/leftpeer-ioam.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index a75f9b4c8ae..00000000000
--- a/vnet/etc/scripts/leftpeer/leftpeer-l3vxlan.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index cb3180b711d..00000000000
--- a/vnet/etc/scripts/leftpeer/leftpeer-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 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
deleted file mode 100644
index 74bce81b190..00000000000
--- a/vnet/etc/scripts/leftpeer/leftpeer-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 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-sr.conf b/vnet/etc/scripts/leftpeer/leftpeer-sr.conf
deleted file mode 100644
index a7b962d3aba..00000000000
--- a/vnet/etc/scripts/leftpeer/leftpeer-sr.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index d50e8bf49f3..00000000000
--- a/vnet/etc/scripts/leftpeer/leftpeer-vxlan.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-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.script b/vnet/etc/scripts/leftpeer/leftpeer.script
deleted file mode 100644
index f08c809012c..00000000000
--- a/vnet/etc/scripts/leftpeer/leftpeer.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/lfib/ip4-to-mpls b/vnet/etc/scripts/lfib/ip4-to-mpls
deleted file mode 100644
index 85753797751..00000000000
--- a/vnet/etc/scripts/lfib/ip4-to-mpls
+++ /dev/null
@@ -1,26 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP: 1.0.0.2 -> 2.2.2.2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-loop create
-loop create
-set int state loop0 up
-set int state loop1 up
-
-set int ip address loop0 1.0.0.1/24
-set int ip address loop1 2.0.0.1/24
-
-set ip arp static loop1 2.0.0.2 dead.beef.babe
-set int mpls loop1 enable
-ip route add 2.2.2.2/32 via 2.0.0.2 loop1 out-label 33
-
-trace add pg-input 100
diff --git a/vnet/etc/scripts/lfib/mpls-pop-to-mpls b/vnet/etc/scripts/lfib/mpls-pop-to-mpls
deleted file mode 100644
index 2818ac133e1..00000000000
--- a/vnet/etc/scripts/lfib/mpls-pop-to-mpls
+++ /dev/null
@@ -1,28 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node mpls-input
-  size 72-72
-  no-recycle
-  data {
-   hex 0x0001e0ff0001f1ff4500004000000000400177ba010000020202020208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627
-  }
-}
-
-loop create
-loop create
-set int state loop0 up
-set int state loop1 up
-
-set int ip address loop0 1.0.0.1/24
-set int ip address loop1 2.0.0.1/24
-
-set ip arp static loop1 2.0.0.2 dead.beef.babe
-set int mpls loop1 enable
-
-ip route add 2.2.2.2/32 via 2.0.0.2 loop1 out-label 33
-
-mpls local-label add 30 non-eos mpls-lookup-in-table 0
-mpls local-label add 31 2.2.2.2/32 
-
-trace add pg-input 100
diff --git a/vnet/etc/scripts/lfib/mpls-to-ip4 b/vnet/etc/scripts/lfib/mpls-to-ip4
deleted file mode 100644
index 24e235e01db..00000000000
--- a/vnet/etc/scripts/lfib/mpls-to-ip4
+++ /dev/null
@@ -1,27 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node mpls-input
-  size 68-68
-  no-recycle
-  data {
-   hex 0x0001e1ff4500004000000000400177ba010000020202020208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627
-  }
-}
-
-loop create
-loop create
-set int state loop0 up
-set int state loop1 up
-
-set int ip address loop0 1.0.0.1/24
-set int ip address loop1 2.0.0.1/24
-
-set ip arp static loop1 2.0.0.2 dead.beef.babe
-set int mpls loop1 enable
-
-ip route add 2.2.2.2/32 via 2.0.0.2 loop1 out-label 33
-
-mpls local-label add 30 eos ip4-lookup-in-table 0
-
-trace add pg-input 100
diff --git a/vnet/etc/scripts/lfib/mpls-to-mpls b/vnet/etc/scripts/lfib/mpls-to-mpls
deleted file mode 100644
index 497dbab324f..00000000000
--- a/vnet/etc/scripts/lfib/mpls-to-mpls
+++ /dev/null
@@ -1,26 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node mpls-input
-  size 68-68
-  no-recycle
-  data {
-   hex 0x0001e1ff4500004000000000400177ba010000020200000208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627
-  }
-}
-
-loop create
-loop create
-set int state loop0 up
-set int state loop1 up
-
-set int ip address loop0 1.0.0.1/24
-set int ip address loop1 2.0.0.1/24
-
-set ip arp static loop1 2.0.0.2 dead.beef.babe
-set int mpls loop1 enable
-
-ip route add 2.2.2.2/32 via 2.0.0.2 loop1 out-label 33
-mpls local-label add 30 2.2.2.2/32 
-
-trace add pg-input 100
diff --git a/vnet/etc/scripts/mpls-o-ethernet/leftpeer.conf b/vnet/etc/scripts/mpls-o-ethernet/leftpeer.conf
deleted file mode 100644
index dd37b942062..00000000000
--- a/vnet/etc/scripts/mpls-o-ethernet/leftpeer.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-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/pg b/vnet/etc/scripts/mpls-o-ethernet/pg
deleted file mode 100644
index ba5397f7648..00000000000
--- a/vnet/etc/scripts/mpls-o-ethernet/pg
+++ /dev/null
@@ -1,10 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node mpls-ethernet-input
-  size 68-68
-  no-recycle
-  data {
-   hex 0x0001e1ff4500004000000000400177ba010000020200000208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627
-  }
-}
-\ No newline at end of file
diff --git a/vnet/etc/scripts/mpls-o-ethernet/rightpeer.conf b/vnet/etc/scripts/mpls-o-ethernet/rightpeer.conf
deleted file mode 100644
index 7709ce4d584..00000000000
--- a/vnet/etc/scripts/mpls-o-ethernet/rightpeer.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-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-ethernet/single.conf b/vnet/etc/scripts/mpls-o-ethernet/single.conf
deleted file mode 100644
index 2a25d35512c..00000000000
--- a/vnet/etc/scripts/mpls-o-ethernet/single.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-comment { single node configuration }
-
-loop create
-loop create
-set int state loop0 up
-set int state loop1 up
-
-set int ip address loop0 1.0.0.1/24
-set int ip address loop1 2.0.0.1/24
-
-
-ip route add 2.2.2.2/32 via 2.0.0.2 loop1
-
-mpls encap add label 30 fib 0 dest 2.2.2.2
-mpls decap add label 30 fib 0
-
-create mpls ethernet tunnel dst 00:50:56:b7:05:cb adj 2.2.2.2/32 tx-intfc loop1 fib-id 0
diff --git a/vnet/etc/scripts/mpls-o-gre/dhcpd.conf b/vnet/etc/scripts/mpls-o-gre/dhcpd.conf
deleted file mode 100644
index f0f659cd55f..00000000000
--- a/vnet/etc/scripts/mpls-o-gre/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/leftpeer.conf b/vnet/etc/scripts/mpls-o-gre/leftpeer.conf
deleted file mode 100644
index 149c70c068d..00000000000
--- a/vnet/etc/scripts/mpls-o-gre/leftpeer.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-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/rightpeer.conf b/vnet/etc/scripts/mpls-o-gre/rightpeer.conf
deleted file mode 100644
index b5bb597db49..00000000000
--- a/vnet/etc/scripts/mpls-o-gre/rightpeer.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-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/mpls-tunnel b/vnet/etc/scripts/mpls-tunnel
deleted file mode 100644
index d04b29702e7..00000000000
--- a/vnet/etc/scripts/mpls-tunnel
+++ /dev/null
@@ -1,87 +0,0 @@
-packet-generator new {
-  name x0
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP: 1.0.0.2 -> 2.0.0.2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-packet-generator new {
-  name x1
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP: 1.0.0.2 -> 2.0.1.2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-packet-generator new {
-  name x2
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP: 1.0.0.2 -> 2.0.2.2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-packet-generator new {
-  name x3
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP: 1.0.0.2 -> 2.0.3.2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-
-
-trace add pg-input 100
-
-loop create
-set int state loop0 up
-
-set int ip address loop0 10.0.0.1/24
-set ip arp loop0 10.0.0.2 00:00:11:aa:bb:cc
-
-mpls tunnel add via 10.0.0.2 loop0 out-label 33 out-label 34 out-label 35 out-label 36
-set int state mpls-tunnel0 up
-set int ip addr  mpls-tunnel0 192.168.0.1/32
-ip route add 2.0.0.2/32 via 192.168.0.2 mpls-tunnel0
-
-
-mpls tunnel add via 10.0.0.2 out-label 33
-set int state mpls-tunnel1 up
-set int ip addr  mpls-tunnel1 192.168.1.1/32
-ip route add 2.0.1.2/32 via 192.168.1.2 mpls-tunnel1 out-label 99
-
-mpls tunnel add via 10.0.0.2 loop0 out-label 3
-set int state mpls-tunnel2 up
-set int ip addr  mpls-tunnel2 192.168.2.1/32
-ip route add 2.0.2.2/32 via 192.168.2.2 mpls-tunnel2
-
-
-mpls tunnel add l2-only via 10.0.0.2 loop0 out-label 234 out-label 0
-set int state mpls-tunnel3 up
-set int l2 bridge mpls-tunnel3 1
-
-loop create
-set int ip addr loop1 6.0.1.44/24
-set int l2 bridge loop1 1 bvi
-set int l2 learn loop1 disable
-set int state loop1 up
-
-ip route add 2.0.3.2/32 via 6.0.1.45 loop1
diff --git a/vnet/etc/scripts/pcap b/vnet/etc/scripts/pcap
deleted file mode 100644
index 692e5f27012..00000000000
--- a/vnet/etc/scripts/pcap
+++ /dev/null
@@ -1,18 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ethernet-input
-  no-recycle
-  pcap /home/eliot/pcap-data/ISIS_level1_adjacency.cap
-}
-
-packet-generator new {
-  name y
-  limit 1
-  node hdlc-input
-  no-recycle
-  pcap /home/eliot/pcap-data/ISIS_p2p_adjacency.cap
-}
-
-tr add pg-input 10
-
diff --git a/vnet/etc/scripts/probe4 b/vnet/etc/scripts/probe4
deleted file mode 100644
index b530e0dbc1d..00000000000
--- a/vnet/etc/scripts/probe4
+++ /dev/null
@@ -1,11 +0,0 @@
-ethernet create-interfaces
-set int state fake-eth0 up
-set int ip address fake-eth0 1.0.0.1/24
-comment { error }
-comment { ip probe fake-eth0 1.0.0.1 }
-comment { ip probe fake-eth0 1.2.3.4 }
-comment { error }
-comment { ip probe fake-eth0 1.0.0.2 }
-
-
-
diff --git a/vnet/etc/scripts/probe6 b/vnet/etc/scripts/probe6
deleted file mode 100644
index a5490c90b98..00000000000
--- a/vnet/etc/scripts/probe6
+++ /dev/null
@@ -1,7 +0,0 @@
-ethernet create-interfaces
-set int state fake-eth0 up
-set int ip address fake-eth0 2000::1/64
-comment { ip probe fake-eth0 2000::1 }
-
-
-
diff --git a/vnet/etc/scripts/rewrite b/vnet/etc/scripts/rewrite
deleted file mode 100644
index d41b9dbf7fc..00000000000
--- a/vnet/etc/scripts/rewrite
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-comment { test ipv4 port/vlan/qinq rewrites by generating arps }
-
-set int state tuntap-0 down
-
-set int ip address GigabitEthernet2/2/0 1.2.5.4/24
-
-cre sub GigabitEthernet2/2/0 1 dot1q 6 exact-match
-set int ip address GigabitEthernet2/2/0.1 1.2.6.4/24
-
-cre sub GigabitEthernet2/2/0 2 dot1ad 7 inner-dot1q 8 exact-match
-set int ip address GigabitEthernet2/2/0.2 1.2.7.4/24
-
-set int state GigabitEthernet2/1/0 up 
-set int state GigabitEthernet2/2/0 up
-set int state GigabitEthernet2/2/0.1 up
-set int state GigabitEthernet2/2/0.2 up
-
-trace add pg-input 2
-
-cle er
-cle int
-cle run
-
-packet-generator new {
-  name toport
-  limit 2
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 0050.56b7.296d 
-      GRE: 8.0.0.1 -> 1.2.5.6 mpls_unicast 
-  }
-}
-
-packet-generator new {
-  name tovlan
-  limit 2
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 0050.56b7.296d 
-      GRE: 8.0.0.1 -> 1.2.6.6 mpls_unicast 
-  }
-}
-
-packet-generator new {
-  name toqinq
-  limit 2
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 0050.56b7.296d 
-      GRE: 8.0.0.1 -> 1.2.7.6 mpls_unicast 
-  }
-}
-
-
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-ioam.conf b/vnet/etc/scripts/rightpeer/rightpeer-ioam.conf
deleted file mode 100644
index 3e9a8d343e2..00000000000
--- a/vnet/etc/scripts/rightpeer/rightpeer-ioam.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644
index abba1ab0ef6..00000000000
--- a/vnet/etc/scripts/rightpeer/rightpeer-l3vxlan.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
index 961204a346b..00000000000
--- a/vnet/etc/scripts/rightpeer/rightpeer-lisp.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index 0ce38583e83..00000000000
--- a/vnet/etc/scripts/rightpeer/rightpeer-mpls-l2.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index fc97ba16332..00000000000
--- a/vnet/etc/scripts/rightpeer/rightpeer-mpls.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-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-sr.conf b/vnet/etc/scripts/rightpeer/rightpeer-sr.conf
deleted file mode 100644
index 0b2a98bba1b..00000000000
--- a/vnet/etc/scripts/rightpeer/rightpeer-sr.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-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
deleted file mode 100644
index bd4c427e768..00000000000
--- a/vnet/etc/scripts/rightpeer/rightpeer-vxlan.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-
-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.script b/vnet/etc/scripts/rightpeer/rightpeer.script
deleted file mode 100644
index 153988cefad..00000000000
--- a/vnet/etc/scripts/rightpeer/rightpeer.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/rpf b/vnet/etc/scripts/rpf
deleted file mode 100644
index 571c6b79a8c..00000000000
--- a/vnet/etc/scripts/rpf
+++ /dev/null
@@ -1,18 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP: 1.2.3.4 -> 5.6.7.8
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-tr add pg-input 100
-set interface ip source-check pg/stream-0
-ip route 1.2.3.4/32 via pg/stream-0 0x01020304
-ip route 5.6.7.8/32 via drop
-
diff --git a/vnet/etc/scripts/rtt-test b/vnet/etc/scripts/rtt-test
deleted file mode 100644
index 5501b99dc45..00000000000
--- a/vnet/etc/scripts/rtt-test
+++ /dev/null
@@ -1,31 +0,0 @@
-set int state TenGigabitEthernet4/0/0 up
-set int state TenGigabitEthernet5/0/0 up
-
-set int ip address TenGigabitEthernet4/0/0 1.0.0.1/24
-set int ip address TenGigabitEthernet5/0/0 2.0.0.1/24
-
-ip route table 0 1.0.0.2/32 via TenGigabitEthernet4/0/0 IP4: 00:1b:21:74:5b:04 -> 00:1b:21:79:8e:bc
-ip route table 0 2.0.0.2/32 via TenGigabitEthernet5/0/0 IP4: 00:1b:21:79:8e:bc -> 00:1b:21:74:5b:04
-ip route table 1 2.0.0.2/32 via local
-ip route table 1 1.0.0.2/32 via local
-
-set int ip table TenGigabitEthernet5/0/0 1
-set int ip table TenGigabitEthernet4/0/0 1
-
-comment { trace add rtt-test-tx 100 }
-comment { trace add ixge-input 100 }
-comment { te rtt { 1.0.0.2 -> 2.0.0.2 count 1e4 rate 1e9 size 100 histogram-time 1e-5 } }
-
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 170-170
-  data {
-    ICMP: 1.0.0.2 -> 2.0.0.2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-
diff --git a/vnet/etc/scripts/snat b/vnet/etc/scripts/snat
deleted file mode 100644
index 87fd699ee51..00000000000
--- a/vnet/etc/scripts/snat
+++ /dev/null
@@ -1,34 +0,0 @@
-packet-generator new {
-  name f1
-  limit 1000000
-  node ip4-input
-  size 64-64
-  no-recycle
-  worker 0
-  data {
-    UDP: 10.0.0.3 -> 172.16.1.2
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-
-packet-generator new {
-  name f2
-  limit 1000000
-  node ip4-input
-  size 64-64
-  no-recycle
-  worker 1
-  data {
-    UDP: 10.0.0.3 -> 172.16.1.2
-    UDP: 3005 -> 3006
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-snat add address 172.16.1.3
-ip route 172.16.1.2/32 via drop
-set int ip address pg0 10.0.0.1/24
-set int snat in pg0
-trace add pg-input 10
diff --git a/vnet/etc/scripts/snat_static b/vnet/etc/scripts/snat_static
deleted file mode 100644
index 8fe48bffaaa..00000000000
--- a/vnet/etc/scripts/snat_static
+++ /dev/null
@@ -1,44 +0,0 @@
-create packet-generator interface pg0
-create packet-generator interface pg1
-
-packet-generator new {
-  name f1
-  limit 1000000
-  node ip4-input
-  size 64-64
-  no-recycle
-  worker 0
-  interface pg0
-  data {
-    UDP: 10.0.0.3 -> 172.16.1.2
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-
-packet-generator new {
-  name f2
-  limit 1000000
-  node ip4-input
-  size 64-64
-  no-recycle
-  worker 1
-  interface pg1
-  data {
-    UDP: 172.16.1.2 -> 172.16.1.3
-    UDP: 3001 -> 3000
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-snat add address 172.16.1.3
-snat add static mapping local 10.0.0.3 external 172.16.1.3
-set int ip address pg0 10.0.0.1/24
-set int ip address pg1 172.16.1.1/24
-set int state pg0 up
-set int state pg1 up
-set ip arp static pg0 10.0.0.3 abcd.abcd.abcd
-set ip arp static pg1 172.16.1.2 cdef.abcd.abcd
-set int snat in pg0 out pg1
-trace add pg-input 10
diff --git a/vnet/etc/scripts/snat_static_with_port b/vnet/etc/scripts/snat_static_with_port
deleted file mode 100644
index f646145a5bf..00000000000
--- a/vnet/etc/scripts/snat_static_with_port
+++ /dev/null
@@ -1,44 +0,0 @@
-create packet-generator interface pg0
-create packet-generator interface pg1
-
-packet-generator new {
-  name f1
-  limit 1000000
-  node ip4-input
-  size 64-64
-  no-recycle
-  worker 0
-  interface pg0
-  data {
-    UDP: 10.0.0.3 -> 172.16.1.2
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-
-packet-generator new {
-  name f2
-  limit 1000000
-  node ip4-input
-  size 64-64
-  no-recycle
-  worker 1
-  interface pg1
-  data {
-    UDP: 172.16.1.2 -> 172.16.1.3
-    UDP: 3001 -> 3000
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-snat add address 172.16.1.3
-snat add static mapping local 10.0.0.3 3000 external 172.16.1.3 3000
-set int ip address pg0 10.0.0.1/24
-set int ip address pg1 172.16.1.1/24
-set int state pg0 up
-set int state pg1 up
-set ip arp static pg0 10.0.0.3 abcd.abcd.abcd
-set ip arp static pg1 172.16.1.2 cdef.abcd.abcd
-set int snat in pg0 out pg1
-trace add pg-input 10
diff --git a/vnet/etc/scripts/source_and_port_range_check b/vnet/etc/scripts/source_and_port_range_check
deleted file mode 100644
index dce227b4315..00000000000
--- a/vnet/etc/scripts/source_and_port_range_check
+++ /dev/null
@@ -1,63 +0,0 @@
-
-create loop int
-
-set int state loop0 up
-set int ip addr loop0 10.10.10.10/32
-
-packet-generator new {
-  name deny-from-default-route
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    UDP: 1.2.3.4 -> 5.6.7.8
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-packet-generator new {
-  name allow
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    UDP: 1.1.1.1 -> 5.6.7.8
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-packet-generator new {
-  name deny-from-port-range
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    UDP: 1.1.1.1 -> 5.6.7.8
-    UDP: 6000 -> 6001
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-set ip source-and-port-range-check 1.1.1.0/24 range 2000 - 3000 vrf 99
-
-set interface ip source-and-port-range-check pg0 udp-out-vrf 99
-
- show ip source-and-port-range-check vrf 99 1.1.1.1
-
-set ip source-and-port-range-check 1.1.1.0/24 range 4000 - 5000 vrf 99
-
-set ip source-and-port-range-check 1.1.2.0/24 range 4000 - 5000 vrf 99
-
-show ip source-and-port-range-check vrf 99 1.1.1.1
-show ip source-and-port-range-check vrf 99 1.1.2.1
-
-set ip source-and-port-range-check 1.1.2.0/24 range 4000 - 5000 vrf 99 del
-
-show ip source-and-port-range-check vrf 99 1.1.2.1
-
-tr add pg-input 100
diff --git a/vnet/etc/scripts/speed b/vnet/etc/scripts/speed
deleted file mode 100644
index d60d671f29f..00000000000
--- a/vnet/etc/scripts/speed
+++ /dev/null
@@ -1,14 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 50-50
-  data {
-    ICMP: 1.2.3.4 -> 5.6.7.8
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-tr add pg-input 100
-ip route 5.6.7.8/32 via pg/stream-0 000102030405060708090a0b0c0d
diff --git a/vnet/etc/scripts/sr/left-linux-ping.sh b/vnet/etc/scripts/sr/left-linux-ping.sh
deleted file mode 100755
index 55b835063c7..00000000000
--- a/vnet/etc/scripts/sr/left-linux-ping.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/leftpeer.conf b/vnet/etc/scripts/sr/leftpeer.conf
deleted file mode 100644
index 9591d968b8b..00000000000
--- a/vnet/etc/scripts/sr/leftpeer.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-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/right-linux-ping.sh b/vnet/etc/scripts/sr/right-linux-ping.sh
deleted file mode 100755
index 029368dbb8b..00000000000
--- a/vnet/etc/scripts/sr/right-linux-ping.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/rightpeer.conf b/vnet/etc/scripts/sr/rightpeer.conf
deleted file mode 100644
index 6da7a7afd05..00000000000
--- a/vnet/etc/scripts/sr/rightpeer.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-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
diff --git a/vnet/etc/scripts/sr/srlocal.sh b/vnet/etc/scripts/sr/srlocal.sh
deleted file mode 100755
index 2f568408b94..00000000000
--- a/vnet/etc/scripts/sr/srlocal.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-ifconfig srlocal inet6 add db04::1/64
-route -6 add db02::0/64 gw db04::99
diff --git a/vnet/etc/scripts/srp b/vnet/etc/scripts/srp
deleted file mode 100644
index 7cc37011386..00000000000
--- a/vnet/etc/scripts/srp
+++ /dev/null
@@ -1,27 +0,0 @@
-srp create-interfaces
-srp create-interfaces
-set int hw-class fake-srp0 srp
-set int hw-class fake-srp1 srp
-
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP: 1.0.0.2 -> 2.0.0.2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-tr add pg-input 100
-set int state fake-srp0 up
-set int state fake-srp1 up
-
-set int ip address fake-srp0 1.0.0.1/24
-set int ip address fake-srp1 2.0.0.1/24
-
-
-
diff --git a/vnet/etc/scripts/tcp b/vnet/etc/scripts/tcp
deleted file mode 100644
index a2ee8b2dacc..00000000000
--- a/vnet/etc/scripts/tcp
+++ /dev/null
@@ -1,16 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    TCP: 1.2.3.4 -> 5.6.7.8
-    TCP: 1234 -> 5678
-    incrementing 100
-  }
-}
-
-tr add pg-input 100
-ip route 5.6.7.8/32 via local
-ip route 1.2.3.4/32 via local
diff --git a/vnet/etc/scripts/tcp-test b/vnet/etc/scripts/tcp-test
deleted file mode 100644
index 52bfbcdd8c0..00000000000
--- a/vnet/etc/scripts/tcp-test
+++ /dev/null
@@ -1,6 +0,0 @@
-int create-ethernet
-set int ip address fake-eth0 1.2.3.4/24
-set int state fake-eth0 up
-ip route 1.2.3.5/32 via local
-trace add tuntap-rx 100
-
diff --git a/vnet/etc/scripts/tf-ucs-1 b/vnet/etc/scripts/tf-ucs-1
deleted file mode 100644
index efa5f2dc27f..00000000000
--- a/vnet/etc/scripts/tf-ucs-1
+++ /dev/null
@@ -1,16 +0,0 @@
-comment { connected to Ixia port 1}
-set int ip address TenGigabitEthernet4/0/0 1.0.0.2/8
-
-set int state TenGigabitEthernet4/0/0 up
-
-comment { connected to Ixia port 2}
-set int ip address TenGigabitEthernet4/0/1 2.0.0.2/8
-set int state TenGigabitEthernet4/0/1 up
-
-comment { connected to Ixia port 3}
-set int ip address TenGigabitEthernet6/0/0 3.0.0.2/8
-set int state TenGigabitEthernet6/0/0 up
-
-comment { connected to Ixia port 4}
-set int ip address TenGigabitEthernet6/0/1 4.0.0.2/8
-set int state TenGigabitEthernet6/0/1 up
diff --git a/vnet/etc/scripts/urpf b/vnet/etc/scripts/urpf
deleted file mode 100644
index a4d875276ee..00000000000
--- a/vnet/etc/scripts/urpf
+++ /dev/null
@@ -1,86 +0,0 @@
-
-create loop int
-
-set int state loop0 up
-set int ip addr loop0 10.10.10.10/24
-
-packet-generator new {
-  name transit-deny
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    UDP: 1.2.3.4 -> 2.2.2.2
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-packet-generator new {
-  name transit-allow
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    UDP: 1.1.1.1 -> 2.2.2.2
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-packet-generator new {
-  name transit-allow-from-excemption
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    UDP: 11.11.12.13 -> 2.2.2.2
-    UDP: 6000 -> 6001
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-packet-generator new {
-  name for-us-allow-from-excemption
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    UDP: 11.11.12.13 -> 10.10.10.10
-    UDP: 6000 -> 6001
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-packet-generator new {
-  name for-us-allow
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    UDP: 1.1.1.1 -> 10.10.10.10
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-tr add pg-input 100
-
-set int ip addr pg0 10.10.11.10/24
-
-set interface ip source-check pg0 strict
-
-ip route add 1.1.1.1/32 via 10.10.11.11 pg0
-ip route add 2.2.2.2/32 via 10.10.10.11 loop0
-
-ip urpf-accept 11.11.0.0/16
-
-#set interface ip source-check pg0 strict del
-#set interface ip source-check pg0 loose
-
-#ip urpf-accept del 11.11.0.0/16
diff --git a/vnet/etc/scripts/virl/ip6sr.virl b/vnet/etc/scripts/virl/ip6sr.virl
deleted file mode 100644
index 5d4d1a0ac67..00000000000
--- a/vnet/etc/scripts/virl/ip6sr.virl
+++ /dev/null
@@ -1,874 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<topology xmlns="http://www.cisco.com/VIRL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="0.9" xsi:schemaLocation="http://www.cisco.com/VIRL https://raw.github.com/CiscoVIRL/schema/v0.9/virl.xsd">
-    <extensions>
-        <entry key="management_network" type="String">flat</entry>
-        <entry key="AutoNetkit.address_family" type="String">dual_stack</entry>
-        <entry key="AutoNetkit.enable_routing" type="Boolean">false</entry>
-    </extensions>
-    <node name="iosv-1" type="SIMPLE" subtype="IOSv" location="195,78" ipv4="192.168.0.2" ipv6="::b:1:0:0:2">
-        <extensions>
-            <entry key="config" type="string">!
-! Last configuration change at 16:41:18 UTC Fri Mar 27 2015
-!
-version 15.4
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-!
-hostname iosv-1
-!
-boot-start-marker
-boot-end-marker
-!
-!
-enable password cisco
-!
-no aaa new-model
-!
-!
-!
-mmi polling-interval 60
-no mmi auto-configure
-no mmi pvc
-mmi snmp-timeout 180
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-no ip domain lookup
-ip cef
-ipv6 unicast-routing
-ipv6 cef
-!
-multilink bundle-name authenticated
-!
-!
-cts logging verbose
-!
-!
-!
-redundancy
-!
-!
-! 
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-interface Loopback0
- description Loopback
- ip address 192.168.0.2 255.255.255.255
- ipv6 address ::B:1:0:0:2/128
-!
-interface GigabitEthernet0/0
- description OOB Management
- ip address 172.16.1.193 255.255.255.0
- duplex auto
- speed auto
- media-type rj45
-!
-interface GigabitEthernet0/1
- description to vpp-1
- ip address 10.0.0.5 255.255.255.252
- duplex auto
- speed auto
- media-type rj45
- ipv6 address ::A:1:1:0:6/126
-!
-ip forward-protocol nd
-!
-!
-no ip http server
-no ip http secure-server
-!
-! route to iosv-2
-ipv6 route ::A:1:1:0:16/128 ::A:1:1:0:7
-! route to iosv-4
-ipv6 route ::A:1:1:0:22/128 ::A:1:1:0:7
-!
-!
-!
-control-plane
-!
-banner exec `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner incoming `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner login `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-!
-line con 0
- password cisco
-line aux 0
-line vty 0 4
- exec-timeout 720 0
- password cisco
- login
- transport input telnet ssh
-!
-no scheduler allocate
-!
-end</entry>
-            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.5" ipv6="::a:1:1:0:6" netPrefixLenV4="30" netPrefixLenV6="126"/>
-    </node>
-    <node name="iosv-2" type="SIMPLE" subtype="IOSv" location="667,82" ipv4="192.168.0.3" ipv6="::b:1:0:0:3">
-        <extensions>
-            <entry key="config" type="string">!
-! Last configuration change at 16:41:10 UTC Fri Mar 27 2015
-!
-version 15.4
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-!
-hostname iosv-2
-!
-boot-start-marker
-boot-end-marker
-!
-!
-enable password cisco
-!
-no aaa new-model
-!
-!
-!
-mmi polling-interval 60
-no mmi auto-configure
-no mmi pvc
-mmi snmp-timeout 180
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-no ip domain lookup
-ip cef
-ipv6 unicast-routing
-ipv6 cef
-!
-multilink bundle-name authenticated
-!
-!
-cts logging verbose
-!
-!
-!
-redundancy
-!
-!
-! 
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-interface Loopback0
- description Loopback
- ip address 192.168.0.3 255.255.255.255
- ipv6 address ::B:1:0:0:3/128
-!
-interface GigabitEthernet0/0
- description OOB Management
- ip address 172.16.1.191 255.255.255.0
- duplex auto
- speed auto
- media-type rj45
-!
-interface GigabitEthernet0/1
- description to vpp-2
- ip address 10.0.0.21 255.255.255.252
- duplex auto
- speed auto
- media-type rj45
- ipv6 address ::A:1:1:0:16/126
-!
-ip forward-protocol nd
-!
-!
-no ip http server
-no ip http secure-server
-!
-ipv6 route ::A:1:1:0:6/128 ::A:1:1:0:17
-!
-!
-!
-control-plane
-!
-banner exec `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner incoming `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner login `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-!
-line con 0
- password cisco
-line aux 0
-line vty 0 4
- exec-timeout 720 0
- password cisco
- login
- transport input telnet ssh
-!
-no scheduler allocate
-!
-end</entry>
-            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.21" ipv6="::a:1:1:0:16" netPrefixLenV4="30" netPrefixLenV6="126"/>
-    </node>
-    <node name="iosv-3" type="SIMPLE" subtype="IOSv" location="194,186" ipv4="192.168.0.6" ipv6="::b:1:0:0:4">
-        <extensions>
-            <entry key="config" type="string">!
-! Last configuration change at 16:27:43 UTC Fri Mar 27 2015
-!
-version 15.4
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-!
-hostname iosv-3
-!
-boot-start-marker
-boot-end-marker
-!
-!
-enable password cisco
-!
-no aaa new-model
-!
-!
-!
-mmi polling-interval 60
-no mmi auto-configure
-no mmi pvc
-mmi snmp-timeout 180
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-no ip domain lookup
-ip cef
-ipv6 unicast-routing
-ipv6 cef
-!
-multilink bundle-name authenticated
-!
-!
-cts logging verbose
-!
-!
-!
-redundancy
-!
-!
-! 
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-interface Loopback0
- description Loopback
- ip address 192.168.0.6 255.255.255.255
- ipv6 address ::B:1:0:0:4/128
-!
-interface GigabitEthernet0/0
- description OOB Management
- ip address 172.16.1.192 255.255.255.0
- duplex auto
- speed auto
- media-type rj45
-!
-interface GigabitEthernet0/1
- description to vpp-1
- ip address 10.0.0.9 255.255.255.252
- duplex auto
- speed auto
- media-type rj45
- ipv6 address ::A:1:1:0:A/126
-!
-ip forward-protocol nd
-!
-!
-no ip http server
-no ip http secure-server
-!
-!
-!
-!
-control-plane
-!
-banner exec `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner incoming `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner login `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-!
-line con 0
- password cisco
-line aux 0
-line vty 0 4
- exec-timeout 720 0
- password cisco
- login
- transport input telnet ssh
-!
-no scheduler allocate
-!
-end</entry>
-            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.9" ipv6="::a:1:1:0:a" netPrefixLenV4="30" netPrefixLenV6="126"/>
-    </node>
-    <node name="iosv-4" type="SIMPLE" subtype="IOSv" location="668,193" ipv4="192.168.0.8" ipv6="::b:1:0:0:5">
-        <extensions>
-            <entry key="config" type="string">!
-! Last configuration change at 16:27:43 UTC Fri Mar 27 2015
-!
-version 15.4
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-!
-hostname iosv-4
-!
-boot-start-marker
-boot-end-marker
-!
-!
-enable password cisco
-!
-no aaa new-model
-!
-!
-!
-mmi polling-interval 60
-no mmi auto-configure
-no mmi pvc
-mmi snmp-timeout 180
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-no ip domain lookup
-ip cef
-ipv6 unicast-routing
-ipv6 cef
-!
-multilink bundle-name authenticated
-!
-!
-cts logging verbose
-!
-!
-!
-redundancy
-!
-!
-! 
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-interface Loopback0
- description Loopback
- ip address 192.168.0.8 255.255.255.255
- ipv6 address ::B:1:0:0:5/128
-!
-interface GigabitEthernet0/0
- description OOB Management
- ip address 172.16.1.194 255.255.255.0
- duplex auto
- speed auto
- media-type rj45
-!
-interface GigabitEthernet0/1
- description to vpp-2
- ip address 10.0.0.33 255.255.255.252
- duplex auto
- speed auto
- media-type rj45
- ipv6 address ::A:1:1:0:22/126
-!
-! Route to iosv-1
-ipv6 route ::A:1:1:0:6/128 ::A:1:1:0:23
-ip forward-protocol nd
-!
-!
-no ip http server
-no ip http secure-server
-!
-!
-!
-!
-control-plane
-!
-banner exec `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner incoming `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner login `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-!
-line con 0
- password cisco
-line aux 0
-line vty 0 4
- exec-timeout 720 0
- password cisco
- login
- transport input telnet ssh
-!
-no scheduler allocate
-!
-end</entry>
-            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.33" ipv6="::a:1:1:0:22" netPrefixLenV4="30" netPrefixLenV6="126"/>
-    </node>
-    <node name="vpp-1" type="SIMPLE" subtype="vPP" location="302,140">
-        <extensions>
-            <entry key="config" type="string">#cloud-config
-bootcmd:
-- ln -s -t /etc/rc.d /etc/rc.local
-hostname: vpp-1
-manage_etc_hosts: true
-runcmd:
-- start ttyS0
-- systemctl start getty@ttyS0.service
-- systemctl start rc-local
-- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
-- echo "UseDNS no" &gt;&gt; /etc/ssh/sshd_config
-- service ssh restart
-- service sshd restart
-- sed -i 's/no-pci//' /cisco/etc/qn.conf
-- sed -i 's/1024/1024 decimal-interface-names/g' /cisco/etc/qn.conf
-users:
-- default
-- gecos: User configured by VIRL Configuration Engine 0.15.3
-  lock-passwd: false
-  name: cisco
-  plain-text-passwd: cisco
-  shell: /bin/bash
-  ssh-authorized-keys:
-  - VIRL-USER-SSH-PUBLIC-KEY
-  sudo: ALL=(ALL) ALL
-write_files:
-- path: /etc/init/ttyS0.conf
-  owner: root:root
-  content: |
-    # ttyS0 - getty
-    # This service maintains a getty on ttyS0 from the point the system is
-    # started until it is shut down again.
-    start on stopped rc or RUNLEVEL=[12345]
-    stop on runlevel [!12345]
-    respawn
-    exec /sbin/getty -L 115200 ttyS0 vt102
-  permissions: '0644'
-- path: /etc/systemd/system/dhclient@.service
-  content: |
-    [Unit]
-    Description=Run dhclient on %i interface
-    After=network.target
-    [Service]
-    Type=oneshot
-    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
-    RemainAfterExit=yes
-  owner: root:root
-  permissions: '0644'
-- path: /cisco/etc/vpp-server.conf
-  owner: root:root
-  permissions: '0644'
-  content: |-
-    set interface ip address GigabitEthernet0/4/0 10.0.0.6/30
-    set interface ip address GigabitEthernet0/4/0 ::a:1:1:0:7/126
-    set interface state GigabitEthernet0/4/0 up
-    set interface ip address GigabitEthernet0/5/0 10.0.0.10/30
-    set interface ip address GigabitEthernet0/5/0 ::a:1:1:0:b/126
-    set interface state GigabitEthernet0/5/0 up
-    set interface ip address GigabitEthernet0/6/0 10.0.0.13/30
-    set interface ip address GigabitEthernet0/6/0 ::a:1:1:0:e/126
-    set interface state GigabitEthernet0/6/0 up
-    set interface ip address GigabitEthernet0/7/0 10.0.0.17/30
-    set interface ip address GigabitEthernet0/7/0 ::a:1:1:0:12/126
-    set interface state GigabitEthernet0/7/0 up
-    sr tunnel src 0::a:1:1:0:6 dst 0::a:1:1:0:16/128 next 0::a:1:1:0:f next 0::a:1:1:0:1a next 0::a:1:1:0:16 tag 0::a:1:1:0:7 InPE 1 clean
-    sr tunnel src 0::a:1:1:0:6 dst 0::a:1:1:0:22/128 next 0::a:1:1:0:f next 0::a:1:1:0:1a next 0::a:1:1:0:22 tag 0::a:1:1:0:7 InPE 1 clean
-</entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/4/0" ipv4="10.0.0.6" ipv6="::a:1:1:0:7" netPrefixLenV4="30" netPrefixLenV6="126"/>
-        <interface id="1" name="GigabitEthernet0/5/0" ipv4="10.0.0.10" ipv6="::a:1:1:0:b" netPrefixLenV4="30" netPrefixLenV6="126"/>
-        <interface id="2" name="GigabitEthernet0/6/0" ipv4="10.0.0.13" ipv6="::a:1:1:0:e" netPrefixLenV4="30" netPrefixLenV6="126"/>
-        <interface id="3" name="GigabitEthernet0/7/0" ipv4="10.0.0.17" ipv6="::a:1:1:0:12" netPrefixLenV4="30" netPrefixLenV6="126"/>
-    </node>
-    <node name="vpp-2" type="SIMPLE" subtype="vPP" location="541,147">
-        <extensions>
-            <entry key="config" type="string">#cloud-config
-bootcmd:
-- ln -s -t /etc/rc.d /etc/rc.local
-hostname: vpp-2
-manage_etc_hosts: true
-runcmd:
-- start ttyS0
-- systemctl start getty@ttyS0.service
-- systemctl start rc-local
-- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
-- echo "UseDNS no" &gt;&gt; /etc/ssh/sshd_config
-- service ssh restart
-- service sshd restart
-- sed -i 's/no-pci//' /cisco/etc/qn.conf
-- sed -i 's/1024/1024 decimal-interface-names/g' /cisco/etc/qn.conf
-users:
-- default
-- gecos: User configured by VIRL Configuration Engine 0.15.3
-  lock-passwd: false
-  name: cisco
-  plain-text-passwd: cisco
-  shell: /bin/bash
-  ssh-authorized-keys:
-  - VIRL-USER-SSH-PUBLIC-KEY
-  sudo: ALL=(ALL) ALL
-write_files:
-- path: /etc/init/ttyS0.conf
-  owner: root:root
-  content: |
-    # ttyS0 - getty
-    # This service maintains a getty on ttyS0 from the point the system is
-    # started until it is shut down again.
-    start on stopped rc or RUNLEVEL=[12345]
-    stop on runlevel [!12345]
-    respawn
-    exec /sbin/getty -L 115200 ttyS0 vt102
-  permissions: '0644'
-- path: /etc/systemd/system/dhclient@.service
-  content: |
-    [Unit]
-    Description=Run dhclient on %i interface
-    After=network.target
-    [Service]
-    Type=oneshot
-    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
-    RemainAfterExit=yes
-  owner: root:root
-  permissions: '0644'
-- path: /cisco/etc/vpp-server.conf
-  owner: root:root
-  permissions: '0644'
-  content: |-
-    set interface ip address GigabitEthernet0/4/0 10.0.0.25/30
-    set interface ip address GigabitEthernet0/4/0 ::a:1:1:0:1a/126
-    set interface state GigabitEthernet0/4/0 up
-    set interface ip address GigabitEthernet0/5/0 10.0.0.29/30
-    set interface ip address GigabitEthernet0/5/0 ::a:1:1:0:1e/126
-    set interface state GigabitEthernet0/5/0 up
-    set interface ip address GigabitEthernet0/6/0 10.0.0.22/30
-    set interface ip address GigabitEthernet0/6/0 ::a:1:1:0:17/126
-    set interface state GigabitEthernet0/6/0 up
-    set interface ip address GigabitEthernet0/7/0 10.0.0.34/30
-    set interface ip address GigabitEthernet0/7/0 ::a:1:1:0:23/126
-    set interface state GigabitEthernet0/7/0 up
-    sr tunnel src 0::a:1:1:0:16 dst 0::a:1:1:0:6/128 next 0::a:1:1:0:1b next 0::a:1:1:0:e next 0::a:1:1:0:6 tag 0::a:1:1:0:17 InPE 1 clean
-</entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/4/0" ipv4="10.0.0.25" ipv6="::a:1:1:0:1a" netPrefixLenV4="30" netPrefixLenV6="126"/>
-        <interface id="1" name="GigabitEthernet0/5/0" ipv4="10.0.0.29" ipv6="::a:1:1:0:1e" netPrefixLenV4="30" netPrefixLenV6="126"/>
-        <interface id="2" name="GigabitEthernet0/6/0" ipv4="10.0.0.22" ipv6="::a:1:1:0:17" netPrefixLenV4="30" netPrefixLenV6="126"/>
-        <interface id="3" name="GigabitEthernet0/7/0" ipv4="10.0.0.34" ipv6="::a:1:1:0:23" netPrefixLenV4="30" netPrefixLenV6="126"/>
-    </node>
-    <node name="vpp-3" type="SIMPLE" subtype="vPP" location="415,89">
-        <extensions>
-            <entry key="config" type="string">#cloud-config
-bootcmd:
-- ln -s -t /etc/rc.d /etc/rc.local
-hostname: vpp-3
-manage_etc_hosts: true
-runcmd:
-- start ttyS0
-- systemctl start getty@ttyS0.service
-- systemctl start rc-local
-- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
-- echo "UseDNS no" &gt;&gt; /etc/ssh/sshd_config
-- service ssh restart
-- service sshd restart
-- sed -i 's/no-pci//' /cisco/etc/qn.conf
-- sed -i 's/1024/1024 decimal-interface-names/g' /cisco/etc/qn.conf
-users:
-- default
-- gecos: User configured by VIRL Configuration Engine 0.15.3
-  lock-passwd: false
-  name: cisco
-  plain-text-passwd: cisco
-  shell: /bin/bash
-  ssh-authorized-keys:
-  - VIRL-USER-SSH-PUBLIC-KEY
-  sudo: ALL=(ALL) ALL
-write_files:
-- path: /etc/init/ttyS0.conf
-  owner: root:root
-  content: |
-    # ttyS0 - getty
-    # This service maintains a getty on ttyS0 from the point the system is
-    # started until it is shut down again.
-    start on stopped rc or RUNLEVEL=[12345]
-    stop on runlevel [!12345]
-    respawn
-    exec /sbin/getty -L 115200 ttyS0 vt102
-  permissions: '0644'
-- path: /etc/systemd/system/dhclient@.service
-  content: |
-    [Unit]
-    Description=Run dhclient on %i interface
-    After=network.target
-    [Service]
-    Type=oneshot
-    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
-    RemainAfterExit=yes
-  owner: root:root
-  permissions: '0644'
-- path: /cisco/etc/vpp-server.conf
-  owner: root:root
-  permissions: '0644'
-  content: |-
-    set interface ip address GigabitEthernet0/4/0 10.0.0.14/30
-    set interface ip address GigabitEthernet0/4/0 ::a:1:1:0:f/126
-    set interface state GigabitEthernet0/4/0 up
-    set interface ip address GigabitEthernet0/5/0 10.0.0.26/30
-    set interface ip address GigabitEthernet0/5/0 ::a:1:1:0:1b/126
-    set interface state GigabitEthernet0/5/0 up
-    comment { fix src rpf drop screws}
-    ip route add ::a:1:1:0:6/128 via drop
-    ip route add ::a:1:1:0:16/128 via drop
-    ip route add ::a:1:1:0:22/128 via drop
-</entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/4/0" ipv4="10.0.0.14" ipv6="::a:1:1:0:f" netPrefixLenV4="30" netPrefixLenV6="126"/>
-        <interface id="1" name="GigabitEthernet0/5/0" ipv4="10.0.0.26" ipv6="::a:1:1:0:1b" netPrefixLenV4="30" netPrefixLenV6="126"/>
-    </node>
-    <node name="vpp-4" type="SIMPLE" subtype="vPP" location="419,216">
-        <extensions>
-            <entry key="config" type="string">#cloud-config
-bootcmd:
-- ln -s -t /etc/rc.d /etc/rc.local
-hostname: vpp-4
-manage_etc_hosts: true
-runcmd:
-- start ttyS0
-- systemctl start getty@ttyS0.service
-- systemctl start rc-local
-- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
-- echo "UseDNS no" &gt;&gt; /etc/ssh/sshd_config
-- service ssh restart
-- service sshd restart
-- sed -i 's/no-pci//' /cisco/etc/qn.conf
-- sed -i 's/1024/1024 decimal-interface-names/g' /cisco/etc/qn.conf
-users:
-- default
-- gecos: User configured by VIRL Configuration Engine 0.15.3
-  lock-passwd: false
-  name: cisco
-  plain-text-passwd: cisco
-  shell: /bin/bash
-  ssh-authorized-keys:
-  - VIRL-USER-SSH-PUBLIC-KEY
-  sudo: ALL=(ALL) ALL
-write_files:
-- path: /etc/init/ttyS0.conf
-  owner: root:root
-  content: |
-    # ttyS0 - getty
-    # This service maintains a getty on ttyS0 from the point the system is
-    # started until it is shut down again.
-    start on stopped rc or RUNLEVEL=[12345]
-    stop on runlevel [!12345]
-    respawn
-    exec /sbin/getty -L 115200 ttyS0 vt102
-  permissions: '0644'
-- path: /etc/systemd/system/dhclient@.service
-  content: |
-    [Unit]
-    Description=Run dhclient on %i interface
-    After=network.target
-    [Service]
-    Type=oneshot
-    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
-    RemainAfterExit=yes
-  owner: root:root
-  permissions: '0644'
-- path: /cisco/etc/vpp-server.conf
-  owner: root:root
-  permissions: '0644'
-  content: |-
-    set interface ip address GigabitEthernet0/4/0 10.0.0.18/30
-    set interface ip address GigabitEthernet0/4/0 ::a:1:1:0:13/126
-    set interface state GigabitEthernet0/4/0 up
-    set interface ip address GigabitEthernet0/5/0 10.0.0.30/30
-    set interface ip address GigabitEthernet0/5/0 ::a:1:1:0:1f/126
-    set interface state GigabitEthernet0/5/0 up
-</entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/4/0" ipv4="10.0.0.18" ipv6="::a:1:1:0:13" netPrefixLenV4="30" netPrefixLenV6="126"/>
-        <interface id="1" name="GigabitEthernet0/5/0" ipv4="10.0.0.30" ipv6="::a:1:1:0:1f" netPrefixLenV4="30" netPrefixLenV6="126"/>
-    </node>
-    <connection dst="/virl:topology/virl:node[5]/virl:interface[1]" src="/virl:topology/virl:node[1]/virl:interface[1]"/>
-    <connection dst="/virl:topology/virl:node[5]/virl:interface[2]" src="/virl:topology/virl:node[3]/virl:interface[1]"/>
-    <connection dst="/virl:topology/virl:node[7]/virl:interface[1]" src="/virl:topology/virl:node[5]/virl:interface[3]"/>
-    <connection dst="/virl:topology/virl:node[8]/virl:interface[1]" src="/virl:topology/virl:node[5]/virl:interface[4]"/>
-    <connection dst="/virl:topology/virl:node[6]/virl:interface[1]" src="/virl:topology/virl:node[7]/virl:interface[2]"/>
-    <connection dst="/virl:topology/virl:node[6]/virl:interface[2]" src="/virl:topology/virl:node[8]/virl:interface[2]"/>
-    <connection dst="/virl:topology/virl:node[2]/virl:interface[1]" src="/virl:topology/virl:node[6]/virl:interface[3]"/>
-    <connection dst="/virl:topology/virl:node[4]/virl:interface[1]" src="/virl:topology/virl:node[6]/virl:interface[4]"/>
-</topology>
diff --git a/vnet/etc/scripts/virl/ip6sr_notes.txt b/vnet/etc/scripts/virl/ip6sr_notes.txt
deleted file mode 100644
index 5febf2c690b..00000000000
--- a/vnet/etc/scripts/virl/ip6sr_notes.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-vpp-1, tunnel 1: iosv-1 vpp-1 vpp-3 vpp-2 iosv-2
-
-iosv-1
-::a:1:1:0:6
-
-to iosv2
-ipv6 route ::a:1:1:0:16/128 ::a:1:1:0:7
-to iosv4
-ipv6 route ::a:1:1:0:22/128 ::a:1:1:0:7
-
-vpp-1
-
-::a:1:1:0:7
-...
-::a:1:1:0:e
-
-sr tunnel src 0::a:1:1:0:6 dst 0::a:1:1:0:16/128 next 0::a:1:1:0:f next 0::a:1:1:0:1a next 0::a:1:1:0:16 tag 0::a:1:1:0:7 InPE 1 clean
-
-vpp-3
-::a:1:1:0:f
-..
-::a:1:1:0:1b
-
-comment {fix src rpf screws}
-ip route add ::a:1:1:0:6/128 via drop
-ip route add ::a:1:1:0:16/128 via drop
-ip route add ::a:1:1:0:22/128 via drop
-vpp-2
-::a:1:1:0:1a
-..
-::a:1:1:0:17
-
-sr tunnel src 0::a:1:1:0:16 dst 0::a:1:1:0:6/128 next 0::a:1:1:0:1b next 0::a:1:1:0:e next 0::a:1:1:0:6 tag 0::a:1:1:0:17 InPE 1 clean
-
-iosv-2
-::a:1:1:0:16
-
-ipv6 route ::a:1:1:0:6/128 ::a:1:1:0:17
diff --git a/vnet/etc/scripts/virl/mplsogre.virl b/vnet/etc/scripts/virl/mplsogre.virl
deleted file mode 100644
index 33dd03299d4..00000000000
--- a/vnet/etc/scripts/virl/mplsogre.virl
+++ /dev/null
@@ -1,319 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<topology xmlns="http://www.cisco.com/VIRL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="0.9" xsi:schemaLocation="http://www.cisco.com/VIRL https://raw.github.com/CiscoVIRL/schema/v0.9/virl.xsd">
-    <extensions>
-        <entry key="management_network" type="String">flat</entry>
-    </extensions>
-    <node name="vpp-1" type="SIMPLE" subtype="vPP" location="467,307" vmImage="vPP-hacker [445e503a-564e-4c14-93e1-9660957c539a]" vmFlavor="vPP-small [e7f7de38-54e3-46f1-92ef-92b0039c1c60]">
-        <extensions>
-            <entry key="config" type="string">#cloud-config
-bootcmd:
-- ln -s -t /etc/rc.d /etc/rc.local
-hostname: vpp-1
-manage_etc_hosts: true
-runcmd:
-- start ttyS0
-- systemctl start getty@ttyS0.service
-- systemctl start rc-local
-- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
-- echo &quot;UseDNS no&quot; &gt;&gt; /etc/ssh/sshd_config
-- service ssh restart
-- service sshd restart
-- sed -i 's/no-pci//' /cisco/etc/qn.conf
-- sed -i 's/1024/1024 decimal-interface-names/g' /cisco/etc/qn.conf
-users:
-- default
-- gecos: User configured by VIRL Configuration Engine 0.15.3
-  lock-passwd: false
-  name: cisco
-  plain-text-passwd: cisco
-  shell: /bin/bash
-  ssh-authorized-keys:
-  - VIRL-USER-SSH-PUBLIC-KEY
-  sudo: ALL=(ALL) ALL
-write_files:
-- path: /etc/init/ttyS0.conf
-  owner: root:root
-  content: |
-    # ttyS0 - getty
-    # This service maintains a getty on ttyS0 from the point the system is
-    # started until it is shut down again.
-    start on stopped rc or RUNLEVEL=[12345]
-    stop on runlevel [!12345]
-    respawn
-    exec /sbin/getty -L 115200 ttyS0 vt102
-  permissions: '0644'
-- path: /etc/systemd/system/dhclient@.service
-  content: |
-    [Unit]
-    Description=Run dhclient on %i interface
-    After=network.target
-    [Service]
-    Type=oneshot
-    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
-    RemainAfterExit=yes
-  owner: root:root
-  permissions: '0644'
-- path: /cisco/etc/vpp-server.conf
-  owner: root:root
-  permissions: '0644'
-  content: |-
-    set interface ip address GigabitEthernet0/4/0 10.0.0.6/30
-    set interface state GigabitEthernet0/4/0 up
-    set interface ip address GigabitEthernet0/5/0 10.0.0.9/30
-    set interface state GigabitEthernet0/5/0 up
-    mpls encap add label 30 fib 0 dest 10.0.0.10
-    mpls decap add label 30 fib 0 
-    create mpls gre tunnel src 10.0.0.9 dst 10.0.0.10 intfc 10.0.0.13/30 inner-fib-id 0 outer-fib-id 0
-</entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/4/0" ipv4="10.0.0.6" netPrefixLenV4="30"/>
-        <interface id="1" name="GigabitEthernet0/5/0" ipv4="10.0.0.9" netPrefixLenV4="30"/>
-    </node>
-    <node name="vpp-2" type="SIMPLE" subtype="vPP" location="591,305" vmImage="vPP-hacker [445e503a-564e-4c14-93e1-9660957c539a]" vmFlavor="vPP-small [e7f7de38-54e3-46f1-92ef-92b0039c1c60]">
-        <extensions>
-            <entry key="config" type="string">#cloud-config
-bootcmd:
-- ln -s -t /etc/rc.d /etc/rc.local
-hostname: vpp-2
-manage_etc_hosts: true
-runcmd:
-- start ttyS0
-- systemctl start getty@ttyS0.service
-- systemctl start rc-local
-- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
-- echo &quot;UseDNS no&quot; &gt;&gt; /etc/ssh/sshd_config
-- service ssh restart
-- service sshd restart
-- sed -i 's/no-pci//' /cisco/etc/qn.conf
-- sed -i 's/1024/1024 decimal-interface-names/g' /cisco/etc/qn.conf
-users:
-- default
-- gecos: User configured by VIRL Configuration Engine 0.15.3
-  lock-passwd: false
-  name: cisco
-  plain-text-passwd: cisco
-  shell: /bin/bash
-  ssh-authorized-keys:
-  - VIRL-USER-SSH-PUBLIC-KEY
-  sudo: ALL=(ALL) ALL
-write_files:
-- path: /etc/init/ttyS0.conf
-  owner: root:root
-  content: |
-    # ttyS0 - getty
-    # This service maintains a getty on ttyS0 from the point the system is
-    # started until it is shut down again.
-    start on stopped rc or RUNLEVEL=[12345]
-    stop on runlevel [!12345]
-    respawn
-    exec /sbin/getty -L 115200 ttyS0 vt102
-  permissions: '0644'
-- path: /etc/systemd/system/dhclient@.service
-  content: |
-    [Unit]
-    Description=Run dhclient on %i interface
-    After=network.target
-    [Service]
-    Type=oneshot
-    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
-    RemainAfterExit=yes
-  owner: root:root
-  permissions: '0644'
-- path: /cisco/etc/vpp-server.conf
-  owner: root:root
-  permissions: '0644'
-  content: |-
-    set interface ip address GigabitEthernet0/4/0 10.0.0.10/30
-    set interface state GigabitEthernet0/4/0 up
-    set interface ip address GigabitEthernet0/5/0 10.0.0.14/30
-    set interface state GigabitEthernet0/5/0 up
-    mpls encap add label 30 fib 0 dest 10.0.0.9
-    mpls decap add label 30 fib 0 
-    create mpls gre tunnel src 10.0.0.10 dst 10.0.0.9 intfc 10.0.0.5/30 inner-fib-id 0 outer-fib-id 0
-</entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/4/0" ipv4="10.0.0.10" netPrefixLenV4="30"/>
-        <interface id="1" name="GigabitEthernet0/5/0" ipv4="10.0.0.14" netPrefixLenV4="30"/>
-    </node>
-    <node name="iosv-1" type="SIMPLE" subtype="IOSv" location="326,311" ipv4="192.168.0.1">
-        <extensions>
-            <entry key="config" type="string">! IOS Config generated on 2015-03-03 17:26
-! by autonetkit_0.15.0
-!
-hostname iosv-1
-boot-start-marker
-boot-end-marker
-!
-no aaa new-model
-!
-!
-ip cef
-ipv6 unicast-routing
-ipv6 cef
-!
-!
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-no service config
-enable password cisco
-ip classless
-ip subnet-zero
-no ip domain lookup
-line vty 0 4
- transport input ssh telnet
- exec-timeout 720 0
- password cisco
- login
-line con 0
- password cisco
-!
-!
-interface Loopback0
-  description Loopback
-  ip address 192.168.0.1 255.255.255.255
-!
-interface GigabitEthernet0/0
-  description OOB Management
-  ! Configured on launch
-  no ip address
-  duplex auto
-  speed auto
-  no shutdown
-!
-interface GigabitEthernet0/1
-  description to vpp-1
-  ip address 10.0.0.5 255.255.255.252
-  ip ospf cost 1
-  duplex auto
-  speed auto
-  no shutdown
-!
-!
-!
-router ospf 1
-  network 192.168.0.1 0.0.0.0 area 0
-  log-adjacency-changes
-  passive-interface Loopback0
-  network 10.0.0.4 0.0.0.3 area 0
-!
-!
-router bgp 1
-  bgp router-id 192.168.0.1
-  no synchronization
-! ibgp
-  ! ibgp peers
-  !
-  neighbor 192.168.0.4 remote-as 1
-  neighbor 192.168.0.4 description iBGP peer iosv-2
-  neighbor 192.168.0.4 update-source Loopback0
-!
-!
- !
- address-family ipv4
-  network 192.168.0.1 mask 255.255.255.255
-  neighbor 192.168.0.4 activate
- exit-address-family
-!
-!
-!
-ip route 10.0.0.13 255.255.255.255 10.0.0.6
-end
-</entry>
-            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.5" netPrefixLenV4="30"/>
-    </node>
-    <node name="iosv-2" type="SIMPLE" subtype="IOSv" location="741,307" ipv4="192.168.0.4">
-        <extensions>
-            <entry key="config" type="string">! IOS Config generated on 2015-03-03 17:26
-! by autonetkit_0.15.0
-!
-hostname iosv-2
-boot-start-marker
-boot-end-marker
-!
-no aaa new-model
-!
-!
-ip cef
-ipv6 unicast-routing
-ipv6 cef
-!
-!
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-no service config
-enable password cisco
-ip classless
-ip subnet-zero
-no ip domain lookup
-line vty 0 4
- transport input ssh telnet
- exec-timeout 720 0
- password cisco
- login
-line con 0
- password cisco
-!
-!
-interface Loopback0
-  description Loopback
-  ip address 192.168.0.4 255.255.255.255
-!
-interface GigabitEthernet0/0
-  description OOB Management
-  ! Configured on launch
-  no ip address
-  duplex auto
-  speed auto
-  no shutdown
-!
-interface GigabitEthernet0/1
-  description to vpp-2
-  ip address 10.0.0.13 255.255.255.252
-  ip ospf cost 1
-  duplex auto
-  speed auto
-  no shutdown
-!
-!
-!
-router ospf 1
-  network 192.168.0.4 0.0.0.0 area 0
-  log-adjacency-changes
-  passive-interface Loopback0
-  network 10.0.0.12 0.0.0.3 area 0
-!
-!
-router bgp 1
-  bgp router-id 192.168.0.4
-  no synchronization
-! ibgp
-  ! ibgp peers
-  !
-  neighbor 192.168.0.1 remote-as 1
-  neighbor 192.168.0.1 description iBGP peer iosv-1
-  neighbor 192.168.0.1 update-source Loopback0
-!
-!
- !
- address-family ipv4
-  network 192.168.0.4 mask 255.255.255.255
-  neighbor 192.168.0.1 activate
- exit-address-family
-!
-!
-ip route 10.0.0.5 255.255.255.255 10.0.0.14
-!
-end
-</entry>
-            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.13" netPrefixLenV4="30"/>
-    </node>
-    <connection dst="/virl:topology/virl:node[1]/virl:interface[1]" src="/virl:topology/virl:node[3]/virl:interface[1]"/>
-    <connection dst="/virl:topology/virl:node[2]/virl:interface[1]" src="/virl:topology/virl:node[1]/virl:interface[2]"/>
-    <connection dst="/virl:topology/virl:node[4]/virl:interface[1]" src="/virl:topology/virl:node[2]/virl:interface[2]"/>
-</topology>
diff --git a/vnet/etc/scripts/virl/simple.virl b/vnet/etc/scripts/virl/simple.virl
deleted file mode 100644
index 6033c42c36a..00000000000
--- a/vnet/etc/scripts/virl/simple.virl
+++ /dev/null
@@ -1,389 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<topology xmlns="http://www.cisco.com/VIRL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="0.9" xsi:schemaLocation="http://www.cisco.com/VIRL https://raw.github.com/CiscoVIRL/schema/v0.9/virl.xsd">
-    <extensions>
-        <entry key="management_network" type="String">flat</entry>
-    </extensions>
-    <node name="iosv-1" type="SIMPLE" subtype="IOSv" location="427,219" ipv4="192.168.0.2">
-        <extensions>
-            <entry key="config" type="string">!
-! Last configuration change at 14:27:32 UTC Fri Mar 27 2015
-!
-version 15.4
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-!
-hostname iosv-1
-!
-boot-start-marker
-boot-end-marker
-!
-!
-enable password cisco
-!
-no aaa new-model
-!
-!
-!
-mmi polling-interval 60
-no mmi auto-configure
-no mmi pvc
-mmi snmp-timeout 180
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-no ip domain lookup
-ip cef
-ipv6 unicast-routing
-ipv6 cef
-!
-multilink bundle-name authenticated
-!
-!
-cts logging verbose
-!
-!
-!
-redundancy
-!
-!
-! 
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-interface Loopback0
- description Loopback
- ip address 192.168.0.2 255.255.255.255
-!
-interface GigabitEthernet0/0
- description OOB Management
- ip address 172.16.1.167 255.255.255.0
- duplex auto
- speed auto
- media-type rj45
-!
-interface GigabitEthernet0/1
- description to vpp-1
- ip address 10.0.0.5 255.255.255.252
- ip ospf cost 1
- duplex auto
- speed auto
- media-type rj45
-!
-router ospf 1
- passive-interface Loopback0
- network 10.0.0.4 0.0.0.3 area 0
- network 192.168.0.2 0.0.0.0 area 0
-!
-router bgp 1
- bgp router-id 192.168.0.2
- bgp log-neighbor-changes
- neighbor 192.168.0.3 remote-as 1
- neighbor 192.168.0.3 description iBGP peer iosv-2
- neighbor 192.168.0.3 update-source Loopback0
- !
- address-family ipv4
-  network 192.168.0.2 mask 255.255.255.255
-  neighbor 192.168.0.3 activate
- exit-address-family
-!
-ip forward-protocol nd
-!
-!
-no ip http server
-no ip http secure-server
-ip route 10.0.0.9 255.255.255.255 10.0.0.6
-!
-!
-!
-!
-control-plane
-!
-banner exec `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner incoming `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner login `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-!
-line con 0
- password cisco
-line aux 0
-line vty 0 4
- exec-timeout 720 0
- password cisco
- login
- transport input telnet ssh
-!
-no scheduler allocate
-!
-end</entry>
-            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.5" netPrefixLenV4="30"/>
-    </node>
-    <node name="iosv-2" type="SIMPLE" subtype="IOSv" location="704,221" ipv4="192.168.0.3">
-        <extensions>
-            <entry key="config" type="string">!
-! Last configuration change at 14:26:58 UTC Fri Mar 27 2015
-!
-version 15.4
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-!
-hostname iosv-2
-!
-boot-start-marker
-boot-end-marker
-!
-!
-enable password cisco
-!
-no aaa new-model
-!
-!
-!
-mmi polling-interval 60
-no mmi auto-configure
-no mmi pvc
-mmi snmp-timeout 180
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-no ip domain lookup
-ip cef
-ipv6 unicast-routing
-ipv6 cef
-!
-multilink bundle-name authenticated
-!
-!
-cts logging verbose
-!
-!
-!
-redundancy
-!
-!
-! 
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-interface Loopback0
- description Loopback
- ip address 192.168.0.3 255.255.255.255
-!
-interface GigabitEthernet0/0
- description OOB Management
- ip address 172.16.1.164 255.255.255.0
- duplex auto
- speed auto
- media-type rj45
-!
-interface GigabitEthernet0/1
- description to vpp-1
- ip address 10.0.0.9 255.255.255.252
- ip ospf cost 1
- duplex auto
- speed auto
- media-type rj45
-!
-router ospf 1
- passive-interface Loopback0
- network 10.0.0.8 0.0.0.3 area 0
- network 192.168.0.3 0.0.0.0 area 0
-!
-router bgp 1
- bgp router-id 192.168.0.3
- bgp log-neighbor-changes
- neighbor 192.168.0.2 remote-as 1
- neighbor 192.168.0.2 description iBGP peer iosv-1
- neighbor 192.168.0.2 update-source Loopback0
- !
- address-family ipv4
-  network 192.168.0.3 mask 255.255.255.255
-  neighbor 192.168.0.2 activate
- exit-address-family
-!
-ip forward-protocol nd
-!
-!
-no ip http server
-no ip http secure-server
-ip route 10.0.0.5 255.255.255.255 10.0.0.10
-!
-!
-!
-!
-control-plane
-!
-banner exec `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner incoming `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner login `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-!
-line con 0
- password cisco
-line aux 0
-line vty 0 4
- exec-timeout 720 0
- password cisco
- login
- transport input telnet ssh
-!
-no scheduler allocate
-!
-end</entry>
-            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.9" netPrefixLenV4="30"/>
-    </node>
-    <node name="vpp-1" type="SIMPLE" subtype="vPP" location="561,217">
-        <extensions>
-            <entry key="config" type="string">#cloud-config
-bootcmd:
-- ln -s -t /etc/rc.d /etc/rc.local
-hostname: vpp-1
-manage_etc_hosts: true
-runcmd:
-- start ttyS0
-- systemctl start getty@ttyS0.service
-- systemctl start rc-local
-- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
-- echo "UseDNS no" &gt;&gt; /etc/ssh/sshd_config
-- service ssh restart
-- service sshd restart
-- sed -i 's/no-pci//' /cisco/etc/qn.conf
-- sed -i 's/1024/1024 decimal-interface-names/g' /cisco/etc/qn.conf
-users:
-- default
-- gecos: User configured by VIRL Configuration Engine 0.15.3
-  lock-passwd: false
-  name: cisco
-  plain-text-passwd: cisco
-  shell: /bin/bash
-  ssh-authorized-keys:
-  - VIRL-USER-SSH-PUBLIC-KEY
-  sudo: ALL=(ALL) ALL
-write_files:
-- path: /etc/init/ttyS0.conf
-  owner: root:root
-  content: |
-    # ttyS0 - getty
-    # This service maintains a getty on ttyS0 from the point the system is
-    # started until it is shut down again.
-    start on stopped rc or RUNLEVEL=[12345]
-    stop on runlevel [!12345]
-    respawn
-    exec /sbin/getty -L 115200 ttyS0 vt102
-  permissions: '0644'
-- path: /etc/systemd/system/dhclient@.service
-  content: |
-    [Unit]
-    Description=Run dhclient on %i interface
-    After=network.target
-    [Service]
-    Type=oneshot
-    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
-    RemainAfterExit=yes
-  owner: root:root
-  permissions: '0644'
-- path: /cisco/etc/vpp-server.conf
-  owner: root:root
-  permissions: '0644'
-  content: |-
-    set interface ip address GigabitEthernet0/4/0 10.0.0.6/30
-    set interface state GigabitEthernet0/4/0 up
-    set interface ip address GigabitEthernet0/5/0 10.0.0.10/30
-    set interface state GigabitEthernet0/5/0 up
-</entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/4/0" ipv4="10.0.0.6" netPrefixLenV4="30"/>
-        <interface id="1" name="GigabitEthernet0/5/0" ipv4="10.0.0.10" netPrefixLenV4="30"/>
-    </node>
-    <connection dst="/virl:topology/virl:node[3]/virl:interface[1]" src="/virl:topology/virl:node[1]/virl:interface[1]"/>
-    <connection dst="/virl:topology/virl:node[2]/virl:interface[1]" src="/virl:topology/virl:node[3]/virl:interface[2]"/>
-</topology>
diff --git a/vnet/etc/scripts/vlan b/vnet/etc/scripts/vlan
deleted file mode 100644
index 076080a6978..00000000000
--- a/vnet/etc/scripts/vlan
+++ /dev/null
@@ -1,23 +0,0 @@
-int create-ethernet
-int create-sub fake-eth0 1
-set int state fake-eth0 up
-set int state fake-eth0.1 up
-
-packet-generator new {
-  name x
-  limit 1
-  node ethernet-input
-  interface fake-eth0
-  size 64-64
-  no-recycle
-  data {
-    IP4: 1.2.3 -> 4.5.6 vlan 1
-    ICMP: 1.2.3.4 -> 5.6.7.8
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-tr add pg-input 100
-ip route 5.6.7.8/32 via local
-ip route 1.2.3.4/32 via local
author	Damjan Marion <damarion@cisco.com>	2016-12-19 23:05:39 +0100
committer	Damjan Marion <damarion@cisco.com>	2016-12-28 12:25:14 +0100
commit	7cd468a3d7dee7d6c92f69a0bb7061ae208ec727 (patch)
tree	5de62f8dbd3a752f5a676ca600e43d2652d1ff1a /vnet/etc
parent	696f1adec0df3b8f161862566dd9c86174302658 (diff)