Code Review
/
vpp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (parent:
1d1644c
)
VPP-63: clean up config scripts, remove specific hostnames
26/1126/1
author
Dave Barach
<dave@barachs.net>
Sat, 14 May 2016 22:38:48 +0000
(18:38 -0400)
committer
Dave Barach
<dave@barachs.net>
Sat, 14 May 2016 22:39:11 +0000
(18:39 -0400)
Change-Id: Ifb77256fa691b1a90045a10448835c09b764e74f
Signed-off-by: Dave Barach <dave@barachs.net>
37 files changed:
vnet/etc/scripts/dhcp/dhcpd.conf
[moved from
vnet/etc/scripts/dhcp/ludd-cluster-5-dhcpd.conf
with 100% similarity]
patch
|
blob
|
history
vnet/etc/scripts/dhcp/left-ping-target.sh
[new file with mode: 0644]
patch
|
blob
vnet/etc/scripts/dhcp/leftpeer.conf
[moved from
vnet/etc/scripts/dhcp/ludd-cluster-1
with 100% similarity]
patch
|
blob
|
history
vnet/etc/scripts/dhcp/ludd-cluster-2-sh
[deleted file]
patch
|
blob
|
history
vnet/etc/scripts/dhcp/ludd-cluster-5-isc-dhcp-server
[deleted file]
patch
|
blob
|
history
vnet/etc/scripts/leftpeer/leftpeer-classify
[moved from
vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-classify
with 100% similarity]
patch
|
blob
|
history
vnet/etc/scripts/leftpeer/leftpeer-classify6
[moved from
vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-classify6
with 100% similarity]
patch
|
blob
|
history
vnet/etc/scripts/leftpeer/leftpeer-classifyl2
[moved from
vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-classifyl2
with 100% similarity]
patch
|
blob
|
history
vnet/etc/scripts/leftpeer/leftpeer-dhcp
[moved from
vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-dhcp
with 100% similarity]
patch
|
blob
|
history
vnet/etc/scripts/leftpeer/leftpeer-ioam.conf
[moved from
vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-ioam.conf
with 72% similarity]
patch
|
blob
|
history
vnet/etc/scripts/leftpeer/leftpeer-l3vxlan.conf
[moved from
vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-l3vxlan.conf
with 83% similarity]
patch
|
blob
|
history
vnet/etc/scripts/leftpeer/leftpeer-lisp.conf
[moved from
vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-lisp.conf
with 92% similarity]
patch
|
blob
|
history
vnet/etc/scripts/leftpeer/leftpeer-mpls.conf
[moved from
vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-mpls.conf
with 91% similarity]
patch
|
blob
|
history
vnet/etc/scripts/leftpeer/leftpeer-nsh.conf
[moved from
vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-nsh.conf
with 92% similarity]
patch
|
blob
|
history
vnet/etc/scripts/leftpeer/leftpeer-sr.conf
[moved from
vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-sr.conf
with 90% similarity]
patch
|
blob
|
history
vnet/etc/scripts/leftpeer/leftpeer-vxlan.conf
[moved from
vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-vxlan.conf
with 78% similarity]
patch
|
blob
|
history
vnet/etc/scripts/leftpeer/leftpeer-vxnsh.conf
[moved from
vnet/etc/scripts/ludd-cluster-1/ludd-cluster-1-vxnsh.conf
with 92% similarity]
patch
|
blob
|
history
vnet/etc/scripts/leftpeer/leftpeer.script
[moved from
vnet/etc/scripts/ludd-cluster-1/lc1.script
with 100% similarity]
patch
|
blob
|
history
vnet/etc/scripts/mpls-o-ethernet/leftpeer.conf
[moved from
vnet/etc/scripts/mpls-o-ethernet/ludd-cluster-1.conf
with 82% similarity]
patch
|
blob
|
history
vnet/etc/scripts/mpls-o-ethernet/rightpeer.conf
[moved from
vnet/etc/scripts/mpls-o-ethernet/ludd-cluster-3.conf
with 75% similarity]
patch
|
blob
|
history
vnet/etc/scripts/mpls-o-gre/dhcpd.conf
[moved from
vnet/etc/scripts/mpls-o-gre/ludd-cluster-5-dhcpd.conf
with 100% similarity]
patch
|
blob
|
history
vnet/etc/scripts/mpls-o-gre/leftpeer.conf
[moved from
vnet/etc/scripts/mpls-o-gre/ludd-cluster-1.conf
with 66% similarity]
patch
|
blob
|
history
vnet/etc/scripts/mpls-o-gre/rightpeer.conf
[moved from
vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-mpls.conf
with 66% similarity]
patch
|
blob
|
history
vnet/etc/scripts/rightpeer/rightpeer-ioam.conf
[moved from
vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-ioam.conf
with 75% similarity]
patch
|
blob
|
history
vnet/etc/scripts/rightpeer/rightpeer-l3vxlan.conf
[moved from
vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-l3vxlan.conf
with 63% similarity]
patch
|
blob
|
history
vnet/etc/scripts/rightpeer/rightpeer-lisp.conf
[moved from
vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-lisp.conf
with 82% similarity]
patch
|
blob
|
history
vnet/etc/scripts/rightpeer/rightpeer-mpls-l2.conf
[moved from
vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-mpls-l2.conf
with 88% similarity]
patch
|
blob
|
history
vnet/etc/scripts/rightpeer/rightpeer-mpls.conf
[moved from
vnet/etc/scripts/mpls-o-gre/ludd-cluster-3.conf
with 82% similarity]
patch
|
blob
|
history
vnet/etc/scripts/rightpeer/rightpeer-nsh.conf
[moved from
vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-nsh.conf
with 84% similarity]
patch
|
blob
|
history
vnet/etc/scripts/rightpeer/rightpeer-sr.conf
[moved from
vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-sr.conf
with 91% similarity]
patch
|
blob
|
history
vnet/etc/scripts/rightpeer/rightpeer-vxlan.conf
[moved from
vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-vxlan.conf
with 70% similarity]
patch
|
blob
|
history
vnet/etc/scripts/rightpeer/rightpeer-vxnsh.conf
[moved from
vnet/etc/scripts/ludd-cluster-3/ludd-cluster-3-vxnsh.conf
with 84% similarity]
patch
|
blob
|
history
vnet/etc/scripts/rightpeer/rightpeer.script
[moved from
vnet/etc/scripts/ludd-cluster-3/lc3.script
with 100% similarity]
patch
|
blob
|
history
vnet/etc/scripts/sr/left-linux-ping.sh
[moved from
vnet/etc/scripts/sr/ludd-cluster-2.sh
with 100% similarity]
patch
|
blob
|
history
vnet/etc/scripts/sr/leftpeer.conf
[moved from
vnet/etc/scripts/sr/ludd-cluster-1.conf
with 92% similarity]
patch
|
blob
|
history
vnet/etc/scripts/sr/right-linux-ping.sh
[moved from
vnet/etc/scripts/sr/ludd-cluster-4.sh
with 100% similarity]
patch
|
blob
|
history
vnet/etc/scripts/sr/rightpeer.conf
[moved from
vnet/etc/scripts/sr/ludd-cluster-3.conf
with 89% similarity]
patch
|
blob
|
history
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
(file)
index 0000000..
2edc2a5
--- /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
(file)
index
32924ec
..0000000
--- 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
(file)
index
6fafc1e
..0000000
--- 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
5234ace
..
6c1b502
100644
(file)
--- 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 l
udd-cluster-2
eth1 addr db02::2/64 }
+comment { connects to l
inux ping source
eth1 addr db02::2/64 }
set int ip address GigabitEthernet2/2/0 db02::1/64
set int state GigabitEthernet2/2/0 up
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
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
ed43059
..
a75f9b4
100644
(file)
--- 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
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
15a6ccb
..
cb3180b
100644
(file)
--- 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
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
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
b6cf8cd
..
74bce81
100644
(file)
--- 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
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
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
47c1d26
..
6397a38
100644
(file)
--- 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
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
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
7cb612c
..
a7b962d
100644
(file)
--- 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 { 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
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 l
udd-cluster-2
}
+comment { subscriber l
inux-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
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
0688d40
..
d50e8bf
100644
(file)
--- 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
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
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
1457ba2
..
69bd9d9
100644
(file)
--- 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
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
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
e439ccb
..
dd37b94
100644
(file)
--- 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 { 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 { 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
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
3d71647
..
7709ce4
100644
(file)
--- 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 { 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 l
udd-cluster-1 on vlan 101
}
+comment { tunnel to l
eftpeer
}
set int ip address GigabitEthernet2/3/0 6.0.3.3/24
set int state GigabitEthernet2/3/0 up
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
992a24c
..
149c70c
100644
(file)
--- 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
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
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
ea8b75f
..
b5bb597
100644
(file)
--- 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
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 l
udd-cluster-1 on vlan 101
}
+comment { tunnel to l
eftpeer
}
set int ip address GigabitEthernet2/3/0 6.0.3.3/24
set int state GigabitEthernet2/3/0 up
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
88b5ab2
..
3e9a8d3
100644
(file)
--- 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
set int ip address GigabitEthernet2/4/0 db04::1/64
set int state GigabitEthernet2/4/0 up
-comment { connects to ioam domain l
udd-cluster-1
addr db03::1/64 }
+comment { connects to ioam domain l
eftpeer
addr db03::1/64 }
set int ip address GigabitEthernet2/3/0 db03::3/64
set int state GigabitEthernet2/3/0 up
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
94357d7
..
abba1ab
100644
(file)
--- 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
set int ip address GigabitEthernet2/4/0 6.0.4.1/24
set int state GigabitEthernet2/4/0 up
-comment { tunnel to l
udd-cluster-1
on vlan 101 }
+comment { tunnel to l
eftpeer
on vlan 101 }
set int ip address GigabitEthernet2/3/0 6.0.3.3/24
set int state GigabitEthernet2/3/0 up
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
faab4bf
..
961204a
100644
(file)
--- 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 { 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 l
udd-cluster-1 on vlan 101
}
+comment { tunnel to l
eftpeer
}
set int ip address GigabitEthernet2/3/0 6.0.3.3/24
set int state GigabitEthernet2/3/0 up
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
2d94b2b
..
0ce3858
100644
(file)
--- 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 { 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 { 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 l
udd-cluster-1 on vlan 101
}
+comment { tunnel to l
eftpeer
}
set int ip address GigabitEthernet2/3/0 6.0.3.3/24
set int state GigabitEthernet2/3/0 up
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
ea8b75f
..
fc97ba1
100644
(file)
--- 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 { 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 { 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 l
udd-cluster-1 on vlan 101
}
+comment { tunnel to l
eftpeer
}
set int ip address GigabitEthernet2/3/0 6.0.3.3/24
set int state GigabitEthernet2/3/0 up
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
7a67b9a
..
76c1203
100644
(file)
--- 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 { 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 { 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 l
udd-cluster-1 on vlan 101
}
+comment { tunnel to l
eftpeer
}
set int ip address GigabitEthernet2/3/0 6.0.3.3/24
set int state GigabitEthernet2/3/0 up
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
d9cf576
..
0b2a98b
100644
(file)
--- 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 { test sr segment chunk-offset on }
test sr hmac validate on
-comment { trunk to l
udd-cluster-1
}
+comment { trunk to l
eftpeer
}
set int ip address GigabitEthernet2/3/0 db03::1/64
enable ip6 interface GigabitEthernet2/3/0
set int state GigabitEthernet2/3/0 up
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 }
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
3caa65f
..
bd4c427
100644
(file)
--- 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 { configure client lc4 eth1 }
set int state GigabitEthernet2/4/0 up
-comment { tunnel to l
udd-cluster-1 on vlan 101
}
+comment { tunnel to l
eftpeer
}
set int ip address GigabitEthernet2/3/0 6.0.3.3/24
set int state GigabitEthernet2/3/0 up
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
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
628b566
..
45b0b7e
100644
(file)
--- 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 { 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 { 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 l
udd-cluster-1 on vlan 101
}
+comment { tunnel to l
eftpeer
}
set int ip address GigabitEthernet2/3/0 6.0.3.3/24
set int state GigabitEthernet2/3/0 up
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
f257b1b
..
9591d96
100644
(file)
--- 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 { 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
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 l
udd-cluster-2
}
+comment { subscriber l
eft-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
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
005bee6
..
6da7a7a
100644
(file)
--- a/
vnet/etc/scripts/sr/ludd-cluster-3.conf
+++ b/
vnet/etc/scripts/sr/rightpeer.conf
@@
-1,9
+1,9
@@
-comment { trunk to l
udd-cluster-1
}
+comment { trunk to l
eftpeer
}
set int ip address GigabitEthernet2/0/0 db03::1/64
enable ip6 interface GigabitEthernet2/0/0
set int state GigabitEthernet2/0/0 up
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 }
set int ip address GigabitEthernet2/2/0 db04::2/64
comment { next address to fake out ND on shared LAN segment }