From 7e55d364fd88bb462c7211209f5cbb5bbae3a68c Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Sat, 14 May 2016 18:38:48 -0400 Subject: [PATCH] VPP-63: clean up config scripts, remove specific hostnames Change-Id: Ifb77256fa691b1a90045a10448835c09b764e74f Signed-off-by: Dave Barach --- vnet/etc/scripts/dhcp/{ludd-cluster-5-dhcpd.conf => dhcpd.conf} | 0 vnet/etc/scripts/dhcp/left-ping-target.sh | 4 ++++ vnet/etc/scripts/dhcp/{ludd-cluster-1 => leftpeer.conf} | 0 vnet/etc/scripts/dhcp/ludd-cluster-2-sh | 4 ---- vnet/etc/scripts/dhcp/ludd-cluster-5-isc-dhcp-server | 3 --- .../ludd-cluster-1-classify => leftpeer/leftpeer-classify} | 0 .../ludd-cluster-1-classify6 => leftpeer/leftpeer-classify6} | 0 .../ludd-cluster-1-classifyl2 => leftpeer/leftpeer-classifyl2} | 0 .../{ludd-cluster-1/ludd-cluster-1-dhcp => leftpeer/leftpeer-dhcp} | 0 .../ludd-cluster-1-ioam.conf => leftpeer/leftpeer-ioam.conf} | 4 ++-- .../ludd-cluster-1-l3vxlan.conf => leftpeer/leftpeer-l3vxlan.conf} | 2 +- .../ludd-cluster-1-lisp.conf => leftpeer/leftpeer-lisp.conf} | 2 +- .../ludd-cluster-1-mpls.conf => leftpeer/leftpeer-mpls.conf} | 2 +- .../ludd-cluster-1-nsh.conf => leftpeer/leftpeer-nsh.conf} | 2 +- .../ludd-cluster-1-sr.conf => leftpeer/leftpeer-sr.conf} | 4 ++-- .../ludd-cluster-1-vxlan.conf => leftpeer/leftpeer-vxlan.conf} | 4 ++-- .../ludd-cluster-1-vxnsh.conf => leftpeer/leftpeer-vxnsh.conf} | 2 +- .../{ludd-cluster-1/lc1.script => leftpeer/leftpeer.script} | 0 .../scripts/mpls-o-ethernet/{ludd-cluster-1.conf => leftpeer.conf} | 4 ++-- .../mpls-o-ethernet/{ludd-cluster-3.conf => rightpeer.conf} | 6 ++---- .../scripts/mpls-o-gre/{ludd-cluster-5-dhcpd.conf => dhcpd.conf} | 0 vnet/etc/scripts/mpls-o-gre/{ludd-cluster-1.conf => leftpeer.conf} | 7 ++----- .../ludd-cluster-3-mpls.conf => mpls-o-gre/rightpeer.conf} | 7 ++----- .../ludd-cluster-3-ioam.conf => rightpeer/rightpeer-ioam.conf} | 4 ++-- .../rightpeer-l3vxlan.conf} | 5 +---- .../ludd-cluster-3-lisp.conf => rightpeer/rightpeer-lisp.conf} | 4 ++-- .../rightpeer-mpls-l2.conf} | 4 ++-- .../ludd-cluster-3.conf => rightpeer/rightpeer-mpls.conf} | 4 ++-- .../ludd-cluster-3-nsh.conf => rightpeer/rightpeer-nsh.conf} | 4 ++-- .../ludd-cluster-3-sr.conf => rightpeer/rightpeer-sr.conf} | 4 ++-- .../ludd-cluster-3-vxlan.conf => rightpeer/rightpeer-vxlan.conf} | 6 +++--- .../ludd-cluster-3-vxnsh.conf => rightpeer/rightpeer-vxnsh.conf} | 4 ++-- .../{ludd-cluster-3/lc3.script => rightpeer/rightpeer.script} | 0 vnet/etc/scripts/sr/{ludd-cluster-2.sh => left-linux-ping.sh} | 0 vnet/etc/scripts/sr/{ludd-cluster-1.conf => leftpeer.conf} | 4 ++-- vnet/etc/scripts/sr/{ludd-cluster-4.sh => right-linux-ping.sh} | 0 vnet/etc/scripts/sr/{ludd-cluster-3.conf => rightpeer.conf} | 4 ++-- 37 files changed, 45 insertions(+), 59 deletions(-) rename vnet/etc/scripts/dhcp/{ludd-cluster-5-dhcpd.conf => dhcpd.conf} (100%) create mode 100644 vnet/etc/scripts/dhcp/left-ping-target.sh rename vnet/etc/scripts/dhcp/{ludd-cluster-1 => leftpeer.conf} (100%) delete mode 100644 vnet/etc/scripts/dhcp/ludd-cluster-2-sh delete mode 100644 vnet/etc/scripts/dhcp/ludd-cluster-5-isc-dhcp-server rename vnet/etc/scripts/{ludd-cluster-1/ludd-cluster-1-classify => leftpeer/leftpeer-classify} (100%) rename vnet/etc/scripts/{ludd-cluster-1/ludd-cluster-1-classify6 => leftpeer/leftpeer-classify6} (100%) rename vnet/etc/scripts/{ludd-cluster-1/ludd-cluster-1-classifyl2 => leftpeer/leftpeer-classifyl2} (100%) rename vnet/etc/scripts/{ludd-cluster-1/ludd-cluster-1-dhcp => leftpeer/leftpeer-dhcp} (100%) rename vnet/etc/scripts/{ludd-cluster-1/ludd-cluster-1-ioam.conf => leftpeer/leftpeer-ioam.conf} (72%) rename vnet/etc/scripts/{ludd-cluster-1/ludd-cluster-1-l3vxlan.conf => leftpeer/leftpeer-l3vxlan.conf} (83%) rename vnet/etc/scripts/{ludd-cluster-1/ludd-cluster-1-lisp.conf => leftpeer/leftpeer-lisp.conf} (92%) rename vnet/etc/scripts/{ludd-cluster-1/ludd-cluster-1-mpls.conf => leftpeer/leftpeer-mpls.conf} (91%) rename vnet/etc/scripts/{ludd-cluster-1/ludd-cluster-1-nsh.conf => leftpeer/leftpeer-nsh.conf} (92%) rename vnet/etc/scripts/{ludd-cluster-1/ludd-cluster-1-sr.conf => leftpeer/leftpeer-sr.conf} (90%) rename vnet/etc/scripts/{ludd-cluster-1/ludd-cluster-1-vxlan.conf => leftpeer/leftpeer-vxlan.conf} (78%) rename vnet/etc/scripts/{ludd-cluster-1/ludd-cluster-1-vxnsh.conf => leftpeer/leftpeer-vxnsh.conf} (92%) rename vnet/etc/scripts/{ludd-cluster-1/lc1.script => leftpeer/leftpeer.script} (100%) rename vnet/etc/scripts/mpls-o-ethernet/{ludd-cluster-1.conf => leftpeer.conf} (82%) rename vnet/etc/scripts/mpls-o-ethernet/{ludd-cluster-3.conf => rightpeer.conf} (75%) rename vnet/etc/scripts/mpls-o-gre/{ludd-cluster-5-dhcpd.conf => dhcpd.conf} (100%) rename vnet/etc/scripts/mpls-o-gre/{ludd-cluster-1.conf => leftpeer.conf} (66%) rename vnet/etc/scripts/{ludd-cluster-3/ludd-cluster-3-mpls.conf => mpls-o-gre/rightpeer.conf} (66%) rename vnet/etc/scripts/{ludd-cluster-3/ludd-cluster-3-ioam.conf => rightpeer/rightpeer-ioam.conf} (75%) rename vnet/etc/scripts/{ludd-cluster-3/ludd-cluster-3-l3vxlan.conf => rightpeer/rightpeer-l3vxlan.conf} (63%) rename vnet/etc/scripts/{ludd-cluster-3/ludd-cluster-3-lisp.conf => rightpeer/rightpeer-lisp.conf} (82%) rename vnet/etc/scripts/{ludd-cluster-3/ludd-cluster-3-mpls-l2.conf => rightpeer/rightpeer-mpls-l2.conf} (88%) rename vnet/etc/scripts/{mpls-o-gre/ludd-cluster-3.conf => rightpeer/rightpeer-mpls.conf} (82%) rename vnet/etc/scripts/{ludd-cluster-3/ludd-cluster-3-nsh.conf => rightpeer/rightpeer-nsh.conf} (84%) rename vnet/etc/scripts/{ludd-cluster-3/ludd-cluster-3-sr.conf => rightpeer/rightpeer-sr.conf} (91%) rename vnet/etc/scripts/{ludd-cluster-3/ludd-cluster-3-vxlan.conf => rightpeer/rightpeer-vxlan.conf} (70%) rename vnet/etc/scripts/{ludd-cluster-3/ludd-cluster-3-vxnsh.conf => rightpeer/rightpeer-vxnsh.conf} (84%) rename vnet/etc/scripts/{ludd-cluster-3/lc3.script => rightpeer/rightpeer.script} (100%) rename vnet/etc/scripts/sr/{ludd-cluster-2.sh => left-linux-ping.sh} (100%) rename vnet/etc/scripts/sr/{ludd-cluster-1.conf => leftpeer.conf} (92%) rename vnet/etc/scripts/sr/{ludd-cluster-4.sh => right-linux-ping.sh} (100%) rename vnet/etc/scripts/sr/{ludd-cluster-3.conf => rightpeer.conf} (89%) diff --git a/vnet/etc/scripts/dhcp/ludd-cluster-5-dhcpd.conf b/vnet/etc/scripts/dhcp/dhcpd.conf similarity index 100% rename from vnet/etc/scripts/dhcp/ludd-cluster-5-dhcpd.conf rename to vnet/etc/scripts/dhcp/dhcpd.conf diff --git a/vnet/etc/scripts/dhcp/left-ping-target.sh b/vnet/etc/scripts/dhcp/left-ping-target.sh new file mode 100644 index 00000000000..2edc2a50eaa --- /dev/null +++ b/vnet/etc/scripts/dhcp/left-ping-target.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +# to obtain dhcp address from leftpeer +dhclient -d -v eth1 diff --git a/vnet/etc/scripts/dhcp/ludd-cluster-1 b/vnet/etc/scripts/dhcp/leftpeer.conf similarity index 100% rename from vnet/etc/scripts/dhcp/ludd-cluster-1 rename to vnet/etc/scripts/dhcp/leftpeer.conf diff --git a/vnet/etc/scripts/dhcp/ludd-cluster-2-sh b/vnet/etc/scripts/dhcp/ludd-cluster-2-sh deleted file mode 100644 index 32924ecc5e5..00000000000 --- a/vnet/etc/scripts/dhcp/ludd-cluster-2-sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -# to obtain dhcp address from ludd-cluster-1 -dhclient -d -v eth1 diff --git a/vnet/etc/scripts/dhcp/ludd-cluster-5-isc-dhcp-server b/vnet/etc/scripts/dhcp/ludd-cluster-5-isc-dhcp-server deleted file mode 100644 index 6fafc1eec13..00000000000 --- a/vnet/etc/scripts/dhcp/ludd-cluster-5-isc-dhcp-server +++ /dev/null @@ -1,3 +0,0 @@ -# add eth6 to interfaces - -INTERFACES="eth6" diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-classify b/vnet/etc/scripts/leftpeer/leftpeer-classify similarity index 100% rename from vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-classify rename to vnet/etc/scripts/leftpeer/leftpeer-classify diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-classify6 b/vnet/etc/scripts/leftpeer/leftpeer-classify6 similarity index 100% rename from vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-classify6 rename to vnet/etc/scripts/leftpeer/leftpeer-classify6 diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-classifyl2 b/vnet/etc/scripts/leftpeer/leftpeer-classifyl2 similarity index 100% rename from vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-classifyl2 rename to vnet/etc/scripts/leftpeer/leftpeer-classifyl2 diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-dhcp b/vnet/etc/scripts/leftpeer/leftpeer-dhcp similarity index 100% rename from vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-dhcp rename to vnet/etc/scripts/leftpeer/leftpeer-dhcp diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-ioam.conf b/vnet/etc/scripts/leftpeer/leftpeer-ioam.conf similarity index 72% rename from vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-ioam.conf rename to vnet/etc/scripts/leftpeer/leftpeer-ioam.conf index 5234ace39bf..6c1b502c2f7 100644 --- a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-ioam.conf +++ b/vnet/etc/scripts/leftpeer/leftpeer-ioam.conf @@ -1,8 +1,8 @@ -comment { connects to ludd-cluster-2 eth1 addr db02::2/64 } +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 ludd-cluster-3 eth2 addr db03::3/64 } +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 diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-l3vxlan.conf b/vnet/etc/scripts/leftpeer/leftpeer-l3vxlan.conf similarity index 83% rename from vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-l3vxlan.conf rename to vnet/etc/scripts/leftpeer/leftpeer-l3vxlan.conf index ed43059dea9..a75f9b4c8ae 100644 --- a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-l3vxlan.conf +++ b/vnet/etc/scripts/leftpeer/leftpeer-l3vxlan.conf @@ -1,4 +1,4 @@ -comment { tunnel to ludd-cluster-3 6.0.3.3 on vlan 101 } +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 diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-lisp.conf b/vnet/etc/scripts/leftpeer/leftpeer-lisp.conf similarity index 92% rename from vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-lisp.conf rename to vnet/etc/scripts/leftpeer/leftpeer-lisp.conf index 15a6ccb3b24..cb3180b711d 100644 --- a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-lisp.conf +++ b/vnet/etc/scripts/leftpeer/leftpeer-lisp.conf @@ -6,7 +6,7 @@ comment { configure lc2 eth1 at e.g. 6.0.2.2/24 } set int ip address GigabitEthernet2/2/0 6.0.2.1/24 set int state GigabitEthernet2/2/0 up -comment { tunnel to ludd-cluster-3 on vlan 101 } +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 diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-mpls.conf b/vnet/etc/scripts/leftpeer/leftpeer-mpls.conf similarity index 91% rename from vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-mpls.conf rename to vnet/etc/scripts/leftpeer/leftpeer-mpls.conf index b6cf8cd62c8..74bce81b190 100644 --- a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-mpls.conf +++ b/vnet/etc/scripts/leftpeer/leftpeer-mpls.conf @@ -7,7 +7,7 @@ set int ip table GigabitEthernet2/2/0 1 set int ip address GigabitEthernet2/2/0 6.0.2.1/24 set int state GigabitEthernet2/2/0 up -comment { tunnel to ludd-cluster-3 on vlan 101 } +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 diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-nsh.conf b/vnet/etc/scripts/leftpeer/leftpeer-nsh.conf similarity index 92% rename from vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-nsh.conf rename to vnet/etc/scripts/leftpeer/leftpeer-nsh.conf index 47c1d263ce1..6397a3816dd 100644 --- a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-nsh.conf +++ b/vnet/etc/scripts/leftpeer/leftpeer-nsh.conf @@ -6,7 +6,7 @@ comment { configure lc2 eth1 at e.g. 6.0.2.2/24 } set int ip address GigabitEthernet2/2/0 6.0.2.1/24 set int state GigabitEthernet2/2/0 up -comment { tunnel to ludd-cluster-3 on vlan 101 } +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 diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-sr.conf b/vnet/etc/scripts/leftpeer/leftpeer-sr.conf similarity index 90% rename from vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-sr.conf rename to vnet/etc/scripts/leftpeer/leftpeer-sr.conf index 7cb612cb1e7..a7b962d3aba 100644 --- a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-sr.conf +++ b/vnet/etc/scripts/leftpeer/leftpeer-sr.conf @@ -1,12 +1,12 @@ comment { test sr segment chunk-offset on } test sr hmac validate on -comment { trunk to ludd-cluster-3 } +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 ludd-cluster-2 } +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 diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-vxlan.conf b/vnet/etc/scripts/leftpeer/leftpeer-vxlan.conf similarity index 78% rename from vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-vxlan.conf rename to vnet/etc/scripts/leftpeer/leftpeer-vxlan.conf index 0688d40b564..d50e8bf49f3 100644 --- a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-vxlan.conf +++ b/vnet/etc/scripts/leftpeer/leftpeer-vxlan.conf @@ -1,9 +1,9 @@ -comment { tunnel to ludd-cluster-3 6.0.3.3 on vlan 101 } +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 ludd-cluster-5 6.0.5.5 on vlan 105 } +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 diff --git a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-vxnsh.conf b/vnet/etc/scripts/leftpeer/leftpeer-vxnsh.conf similarity index 92% rename from vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-vxnsh.conf rename to vnet/etc/scripts/leftpeer/leftpeer-vxnsh.conf index 1457ba21247..69bd9d9de20 100644 --- a/vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-vxnsh.conf +++ b/vnet/etc/scripts/leftpeer/leftpeer-vxnsh.conf @@ -6,7 +6,7 @@ comment { configure lc2 eth1 at e.g. 6.0.2.2/24 } set int ip address GigabitEthernet2/2/0 6.0.2.1/24 set int state GigabitEthernet2/2/0 up -comment { tunnel to ludd-cluster-3 on vlan 101 } +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 diff --git a/vnet/etc/scripts/ludd-cluster-1/lc1.script b/vnet/etc/scripts/leftpeer/leftpeer.script similarity index 100% rename from vnet/etc/scripts/ludd-cluster-1/lc1.script rename to vnet/etc/scripts/leftpeer/leftpeer.script diff --git a/vnet/etc/scripts/mpls-o-ethernet/ludd-cluster-1.conf b/vnet/etc/scripts/mpls-o-ethernet/leftpeer.conf similarity index 82% rename from vnet/etc/scripts/mpls-o-ethernet/ludd-cluster-1.conf rename to vnet/etc/scripts/mpls-o-ethernet/leftpeer.conf index e439ccb0fdf..dd37b942062 100644 --- a/vnet/etc/scripts/mpls-o-ethernet/ludd-cluster-1.conf +++ b/vnet/etc/scripts/mpls-o-ethernet/leftpeer.conf @@ -1,13 +1,13 @@ comment { vpe_phase2 configuration } -comment { local client facing interface on vlan 100 } +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 ludd-cluster-3 on vlan 101 } +comment { tunnel to rightpeer } set int ip address GigabitEthernet2/3/0 6.0.3.1/24 set int state GigabitEthernet2/3/0 up diff --git a/vnet/etc/scripts/mpls-o-ethernet/ludd-cluster-3.conf b/vnet/etc/scripts/mpls-o-ethernet/rightpeer.conf similarity index 75% rename from vnet/etc/scripts/mpls-o-ethernet/ludd-cluster-3.conf rename to vnet/etc/scripts/mpls-o-ethernet/rightpeer.conf index 3d71647c1d2..7709ce4d584 100644 --- a/vnet/etc/scripts/mpls-o-ethernet/ludd-cluster-3.conf +++ b/vnet/etc/scripts/mpls-o-ethernet/rightpeer.conf @@ -1,13 +1,11 @@ -comment { vpe_phase1d configuration } - -comment { local client facing interface on vlan 102 } +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 ludd-cluster-1 on vlan 101 } +comment { tunnel to leftpeer } set int ip address GigabitEthernet2/3/0 6.0.3.3/24 set int state GigabitEthernet2/3/0 up diff --git a/vnet/etc/scripts/mpls-o-gre/ludd-cluster-5-dhcpd.conf b/vnet/etc/scripts/mpls-o-gre/dhcpd.conf similarity index 100% rename from vnet/etc/scripts/mpls-o-gre/ludd-cluster-5-dhcpd.conf rename to vnet/etc/scripts/mpls-o-gre/dhcpd.conf diff --git a/vnet/etc/scripts/mpls-o-gre/ludd-cluster-1.conf b/vnet/etc/scripts/mpls-o-gre/leftpeer.conf similarity index 66% rename from vnet/etc/scripts/mpls-o-gre/ludd-cluster-1.conf rename to vnet/etc/scripts/mpls-o-gre/leftpeer.conf index 992a24c428e..149c70c068d 100644 --- a/vnet/etc/scripts/mpls-o-gre/ludd-cluster-1.conf +++ b/vnet/etc/scripts/mpls-o-gre/leftpeer.conf @@ -1,13 +1,10 @@ -comment { vpe_phase2 configuration } - -comment { local client facing interface on vlan 100 } -comment { configure lc2 eth1 at e.g. 6.0.2.2/24 } +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 ludd-cluster-3 on vlan 101 } +comment { tunnel to rightpeer } set int ip address GigabitEthernet2/3/0 6.0.3.1/24 set int state GigabitEthernet2/3/0 up diff --git a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-mpls.conf b/vnet/etc/scripts/mpls-o-gre/rightpeer.conf similarity index 66% rename from vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-mpls.conf rename to vnet/etc/scripts/mpls-o-gre/rightpeer.conf index ea8b75f765a..b5bb597db49 100644 --- a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-mpls.conf +++ b/vnet/etc/scripts/mpls-o-gre/rightpeer.conf @@ -1,13 +1,10 @@ -comment { vpe_phase1d configuration } - -comment { local client facing interface on vlan 102 } -comment { configure lc4 eth1 at e.g. 6.0.4.4/24 } +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 ludd-cluster-1 on vlan 101 } +comment { tunnel to leftpeer } set int ip address GigabitEthernet2/3/0 6.0.3.3/24 set int state GigabitEthernet2/3/0 up diff --git a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-ioam.conf b/vnet/etc/scripts/rightpeer/rightpeer-ioam.conf similarity index 75% rename from vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-ioam.conf rename to vnet/etc/scripts/rightpeer/rightpeer-ioam.conf index 88b5ab2c389..3e9a8d343e2 100644 --- a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-ioam.conf +++ b/vnet/etc/scripts/rightpeer/rightpeer-ioam.conf @@ -1,8 +1,8 @@ -comment { connects to ludd-cluster-4 eth3 addr db04::4/64 } +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 ludd-cluster-1 addr db03::1/64 } +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 diff --git a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-l3vxlan.conf b/vnet/etc/scripts/rightpeer/rightpeer-l3vxlan.conf similarity index 63% rename from vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-l3vxlan.conf rename to vnet/etc/scripts/rightpeer/rightpeer-l3vxlan.conf index 94357d7de9e..abba1ab0ef6 100644 --- a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-l3vxlan.conf +++ b/vnet/etc/scripts/rightpeer/rightpeer-l3vxlan.conf @@ -1,10 +1,7 @@ -comment { local client facing interface on vlan 102 } - -comment { configure client lc4 eth1 } set int ip address GigabitEthernet2/4/0 6.0.4.1/24 set int state GigabitEthernet2/4/0 up -comment { tunnel to ludd-cluster-1 on vlan 101 } +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 diff --git a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-lisp.conf b/vnet/etc/scripts/rightpeer/rightpeer-lisp.conf similarity index 82% rename from vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-lisp.conf rename to vnet/etc/scripts/rightpeer/rightpeer-lisp.conf index faab4bf7758..961204a346b 100644 --- a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-lisp.conf +++ b/vnet/etc/scripts/rightpeer/rightpeer-lisp.conf @@ -1,10 +1,10 @@ -comment { local client facing interface on vlan 102 } +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 ludd-cluster-1 on vlan 101 } +comment { tunnel to leftpeer } set int ip address GigabitEthernet2/3/0 6.0.3.3/24 set int state GigabitEthernet2/3/0 up diff --git a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-mpls-l2.conf b/vnet/etc/scripts/rightpeer/rightpeer-mpls-l2.conf similarity index 88% rename from vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-mpls-l2.conf rename to vnet/etc/scripts/rightpeer/rightpeer-mpls-l2.conf index 2d94b2bf58c..0ce38583e83 100644 --- a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-mpls-l2.conf +++ b/vnet/etc/scripts/rightpeer/rightpeer-mpls-l2.conf @@ -1,13 +1,13 @@ comment { vpe_phase1d configuration } -comment { local client facing interface on vlan 102 } +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 ludd-cluster-1 on vlan 101 } +comment { tunnel to leftpeer } set int ip address GigabitEthernet2/3/0 6.0.3.3/24 set int state GigabitEthernet2/3/0 up diff --git a/vnet/etc/scripts/mpls-o-gre/ludd-cluster-3.conf b/vnet/etc/scripts/rightpeer/rightpeer-mpls.conf similarity index 82% rename from vnet/etc/scripts/mpls-o-gre/ludd-cluster-3.conf rename to vnet/etc/scripts/rightpeer/rightpeer-mpls.conf index ea8b75f765a..fc97ba16332 100644 --- a/vnet/etc/scripts/mpls-o-gre/ludd-cluster-3.conf +++ b/vnet/etc/scripts/rightpeer/rightpeer-mpls.conf @@ -1,13 +1,13 @@ comment { vpe_phase1d configuration } -comment { local client facing interface on vlan 102 } +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 ludd-cluster-1 on vlan 101 } +comment { tunnel to leftpeer } set int ip address GigabitEthernet2/3/0 6.0.3.3/24 set int state GigabitEthernet2/3/0 up diff --git a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-nsh.conf b/vnet/etc/scripts/rightpeer/rightpeer-nsh.conf similarity index 84% rename from vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-nsh.conf rename to vnet/etc/scripts/rightpeer/rightpeer-nsh.conf index 7a67b9af064..76c1203b44c 100644 --- a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-nsh.conf +++ b/vnet/etc/scripts/rightpeer/rightpeer-nsh.conf @@ -1,12 +1,12 @@ comment { vpe_phase1d configuration } -comment { local client facing interface on vlan 102 } +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 ludd-cluster-1 on vlan 101 } +comment { tunnel to leftpeer } set int ip address GigabitEthernet2/3/0 6.0.3.3/24 set int state GigabitEthernet2/3/0 up diff --git a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-sr.conf b/vnet/etc/scripts/rightpeer/rightpeer-sr.conf similarity index 91% rename from vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-sr.conf rename to vnet/etc/scripts/rightpeer/rightpeer-sr.conf index d9cf57625cf..0b2a98bba1b 100644 --- a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-sr.conf +++ b/vnet/etc/scripts/rightpeer/rightpeer-sr.conf @@ -1,12 +1,12 @@ comment { test sr segment chunk-offset on } test sr hmac validate on -comment { trunk to ludd-cluster-1 } +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 ludd-cluster-4 } +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 } diff --git a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-vxlan.conf b/vnet/etc/scripts/rightpeer/rightpeer-vxlan.conf similarity index 70% rename from vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-vxlan.conf rename to vnet/etc/scripts/rightpeer/rightpeer-vxlan.conf index 3caa65fe7b1..bd4c427e768 100644 --- a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-vxlan.conf +++ b/vnet/etc/scripts/rightpeer/rightpeer-vxlan.conf @@ -1,14 +1,14 @@ -comment { local client facing interface on vlan 102 } +comment { local client facing interface } comment { configure client lc4 eth1 } set int state GigabitEthernet2/4/0 up -comment { tunnel to ludd-cluster-1 on vlan 101 } +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 ludd-cluster-5 on vlan 105 } +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 diff --git a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-vxnsh.conf b/vnet/etc/scripts/rightpeer/rightpeer-vxnsh.conf similarity index 84% rename from vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-vxnsh.conf rename to vnet/etc/scripts/rightpeer/rightpeer-vxnsh.conf index 628b56653a9..45b0b7ef7c4 100644 --- a/vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-vxnsh.conf +++ b/vnet/etc/scripts/rightpeer/rightpeer-vxnsh.conf @@ -1,12 +1,12 @@ comment { vpe_phase1d configuration } -comment { local client facing interface on vlan 102 } +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 ludd-cluster-1 on vlan 101 } +comment { tunnel to leftpeer } set int ip address GigabitEthernet2/3/0 6.0.3.3/24 set int state GigabitEthernet2/3/0 up diff --git a/vnet/etc/scripts/ludd-cluster-3/lc3.script b/vnet/etc/scripts/rightpeer/rightpeer.script similarity index 100% rename from vnet/etc/scripts/ludd-cluster-3/lc3.script rename to vnet/etc/scripts/rightpeer/rightpeer.script diff --git a/vnet/etc/scripts/sr/ludd-cluster-2.sh b/vnet/etc/scripts/sr/left-linux-ping.sh similarity index 100% rename from vnet/etc/scripts/sr/ludd-cluster-2.sh rename to vnet/etc/scripts/sr/left-linux-ping.sh diff --git a/vnet/etc/scripts/sr/ludd-cluster-1.conf b/vnet/etc/scripts/sr/leftpeer.conf similarity index 92% rename from vnet/etc/scripts/sr/ludd-cluster-1.conf rename to vnet/etc/scripts/sr/leftpeer.conf index f257b1bc521..9591d968b8b 100644 --- a/vnet/etc/scripts/sr/ludd-cluster-1.conf +++ b/vnet/etc/scripts/sr/leftpeer.conf @@ -1,12 +1,12 @@ comment { test sr segment chunk-offset on } test sr hmac validate on -comment { trunk to ludd-cluster-3 } +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 ludd-cluster-2 } +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 diff --git a/vnet/etc/scripts/sr/ludd-cluster-4.sh b/vnet/etc/scripts/sr/right-linux-ping.sh similarity index 100% rename from vnet/etc/scripts/sr/ludd-cluster-4.sh rename to vnet/etc/scripts/sr/right-linux-ping.sh diff --git a/vnet/etc/scripts/sr/ludd-cluster-3.conf b/vnet/etc/scripts/sr/rightpeer.conf similarity index 89% rename from vnet/etc/scripts/sr/ludd-cluster-3.conf rename to vnet/etc/scripts/sr/rightpeer.conf index 005bee6e3e4..6da7a7afd05 100644 --- a/vnet/etc/scripts/sr/ludd-cluster-3.conf +++ b/vnet/etc/scripts/sr/rightpeer.conf @@ -1,9 +1,9 @@ -comment { trunk to ludd-cluster-1 } +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 ludd-cluster-4 } +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 } -- 2.16.6