Add local net and local net6 to environment.

bluhm · Dec 6, 2023 · 244cc6e · 244cc6e
1 parent 88a3893
commit 244cc6e
Show file tree

Hide file tree

Showing 14 changed files with 54 additions and 23 deletions.
diff --git a/env-ot1.sh b/env-ot1.sh
@@ -14,6 +14,7 @@ TARGET_SSH=ot3
 TARGET_IF=em3
 
 LOCAL_ADDR=10.188.81.21
+LOCAL_NET=10.188.81.21/24
 REMOTE_ADDR=10.188.81.22
 FAKE_ADDR=10.188.81.188
 OTHER_ADDR=10.188.82.22
@@ -23,6 +24,7 @@ FAKE_NET=10.188.80.0/24
 FAKE_NET_ADDR=10.188.80.188
 
 LOCAL_ADDR6=fdd7:e83e:66bc:81::21
+LOCAL_NET6=fdd7:e83e:66bc:81::21/64
 REMOTE_ADDR6=fdd7:e83e:66bc:81::22
 FAKE_ADDR6=fdd7:e83e:66bc:81::188
 OTHER_ADDR6=fdd7:e83e:66bc:82::22
@@ -35,9 +37,9 @@ FAKE_NET_ADDR6=fdd7:e83e:66bc:80::188
 export LOCAL_IF LOCAL_MAC
 export REMOTE_SSH REMOTE_IF REMOTE_MAC FAKE_MAC OTHER_IF
 export TARGET_SSH TARGET_IF
-export LOCAL_ADDR REMOTE_ADDR FAKE_ADDR
+export LOCAL_ADDR LOCAL_NET REMOTE_ADDR FAKE_ADDR
 export OTHER_ADDR OTHER_FAKE_ADDR
-export LOCAL_ADDR6 REMOTE_ADDR6 FAKE_ADDR6
+export LOCAL_ADDR6 LOCAL_NET6 REMOTE_ADDR6 FAKE_ADDR6
 export OTHER_ADDR6 OTHER_FAKE1_ADDR6 OTHER_FAKE2_ADDR6
 export FAKE_NET FAKE_NET_ADDR
 export FAKE_NET6 FAKE_NET_ADDR6 TARGET_ADDR

diff --git a/env-ot10.sh b/env-ot10.sh
@@ -11,6 +11,7 @@ FAKE_MAC=12:34:56:78:9a:bc
 OTHER_IF=em0
 
 LOCAL_ADDR=10.188.31.30
+LOCAL_NET=10.188.31.30/24
 REMOTE_ADDR=10.188.31.31
 FAKE_ADDR=10.188.31.188
 OTHER_ADDR=10.188.32.31
@@ -19,6 +20,7 @@ FAKE_NET=10.188.30.0/24
 FAKE_NET_ADDR=10.188.30.188
 
 LOCAL_ADDR6=fdd7:e83e:66bc:31::30
+LOCAL_NET6=fdd7:e83e:66bc:31::30/64
 REMOTE_ADDR6=fdd7:e83e:66bc:31::31
 FAKE_ADDR6=fdd7:e83e:66bc:31::188
 OTHER_ADDR6=fdd7:e83e:66bc:32::31
@@ -29,9 +31,9 @@ FAKE_NET_ADDR6=fdd7:e83e:66bc:30::188
 
 export LOCAL_IF LOCAL_MAC
 export REMOTE_SSH REMOTE_IF REMOTE_MAC FAKE_MAC OTHER_IF
-export LOCAL_ADDR REMOTE_ADDR FAKE_ADDR
+export LOCAL_ADDR LOCAL_NET REMOTE_ADDR FAKE_ADDR
 export OTHER_ADDR OTHER_FAKE_ADDR
-export LOCAL_ADDR6 REMOTE_ADDR6 FAKE_ADDR6
+export LOCAL_ADDR6 LOCAL_NET6 REMOTE_ADDR6 FAKE_ADDR6
 export OTHER_ADDR6 OTHER_FAKE1_ADDR6 OTHER_FAKE2_ADDR6
 export FAKE_NET FAKE_NET_ADDR
 export FAKE_NET6 FAKE_NET_ADDR6
diff --git a/env-ot11.sh b/env-ot11.sh
@@ -5,14 +5,16 @@ LOCAL_IF=mcx1
 LOCAL_MAC=b8:59:9f:0e:57:55
 
 LOCAL_ADDR=10.188.31.31
+LOCAL_NET=10.188.31.31/24
 FAKE_ADDR=10.188.31.188
 
 LOCAL_ADDR6=fdd7:e83e:66bc:31::31
+LOCAL_NET6=fdd7:e83e:66bc:31::31/64
 FAKE_ADDR6=fdd7:e83e:66bc:31::188
 
 export LOCAL_IF LOCAL_MAC
-export LOCAL_ADDR FAKE_ADDR
-export LOCAL_ADDR6 FAKE_ADDR6
+export LOCAL_ADDR LOCAL_NET FAKE_ADDR
+export LOCAL_ADDR6 LOCAL_NET6 FAKE_ADDR6
 
 ftp_proxy=http://10.0.1.3:8000/
 http_proxy=http://10.0.1.3:8000/

diff --git a/env-ot12.sh b/env-ot12.sh
@@ -1,8 +1,11 @@
 LOCAL_IF=ix0
 LOCAL_ADDR=10.3.0.32
+LOCAL_NET=10.3.0.32/24
 LOCAL_ADDR6=fdd7:e83e:66bc:0300::32
+LOCAL_NET6=fdd7:e83e:66bc:0300::32/64
 REMOTE_ADDR=10.3.0.33
 REMOTE_ADDR6=fdd7:e83e:66bc:0300::33
 REMOTE_SSH=ot13
 
-export LOCAL_IF LOCAL_ADDR LOCAL_ADDR6 REMOTE_ADDR REMOTE_ADDR6 REMOTE_SSH
+export LOCAL_IF LOCAL_ADDR LOCAL_NET LOCAL_ADDR6 LOCAL_NET6
+export REMOTE_ADDR REMOTE_ADDR6 REMOTE_SSH
diff --git a/env-ot14.sh b/env-ot14.sh
@@ -1,7 +1,9 @@
 LOCAL_IF=ix0
 LOCAL_MAC=00:1b:21:0d:db:8f
 LOCAL_ADDR=10.3.45.34
+LOCAL_NET=10.3.45.34/24
 LOCAL_ADDR6=fdd7:e83e:66bc:0345::34
+LOCAL_NET6=fdd7:e83e:66bc:0345::34/64
 
 REMOTE_IF=ix1
 REMOTE_MAC=00:1b:21:0d:db:9b
@@ -48,7 +50,7 @@ REMOTE6_ADDR_RANGE=fdd7:e83e:66bc:356::50
 LINUX_ADDR_RANGE=10.3.46.60
 LINUX_ADDR6_RANGE=fdd7:e83e:66bc:346::60
 
-export LOCAL_IF LOCAL_MAC LOCAL_ADDR LOCAL_ADDR6
+export LOCAL_IF LOCAL_MAC LOCAL_ADDR LOCAL_NET LOCAL_ADDR6 LOCAL_NET6
 export REMOTE_IF REMOTE_MAC REMOTE_ADDR REMOTE_ADDR6
 export REMOTE_SSH
 export LINUX_ADDR LINUX_ADDR6 LINUX_FORWARD_ADDR LINUX_FORWARD_ADDR6

diff --git a/env-ot2.sh b/env-ot2.sh
@@ -4,11 +4,13 @@ export TEST_SSH_UNSAFE_PERMISSIONS=yes
 LOCAL_IF=em1
 LOCAL_MAC=90:e2:ba:d8:67:2d
 LOCAL_ADDR=10.188.81.22
+LOCAL_NET=10.188.81.22/24
 FAKE_ADDR=10.188.81.188
 
 LOCAL_ADDR6=fdd7:e83e:66bc:81::22
+LOCAL_NET6=fdd7:e83e:66bc:81::22
 FAKE_ADDR6=fdd7:e83e:66bc:81::188
 
 export LOCAL_IF LOCAL_MAC
-export LOCAL_ADDR FAKE_ADDR
-export LOCAL_ADDR6 FAKE_ADDR6
+export LOCAL_ADDR LOCAL_NET FAKE_ADDR
+export LOCAL_ADDR6 LOCAL_NET6 FAKE_ADDR6
diff --git a/env-ot21.sh b/env-ot21.sh
@@ -10,11 +10,13 @@ LOCAL_IF=cas1
 LOCAL_MAC=00:03:ba:ac:b9:b4
 
 LOCAL_ADDR=10.188.21.41
+LOCAL_NET=10.188.21.41/24
 FAKE_ADDR=10.188.21.188
 
 LOCAL_ADDR6=fdd7:e83e:66bc:21::41
+LOCAL_NET6=fdd7:e83e:66bc:21::41/64
 FAKE_ADDR6=fdd7:e83e:66bc:21::188
 
 export LOCAL_IF LOCAL_MAC
-export LOCAL_ADDR FAKE_ADDR
-export LOCAL_ADDR6 FAKE_ADDR6
+export LOCAL_ADDR LOCAL_NET FAKE_ADDR
+export LOCAL_ADDR6 LOCAL_NET6 FAKE_ADDR6
diff --git a/env-ot26.sh b/env-ot26.sh
@@ -5,14 +5,16 @@ LOCAL_IF=em1
 LOCAL_MAC=00:1b:21:30:3c:51
 
 LOCAL_ADDR=10.188.51.46
+LOCAL_NET=10.188.51.46/24
 FAKE_ADDR=10.188.51.188
 
 LOCAL_ADDR6=fdd7:e83e:66bc:51::46
+LOCAL_NET6=fdd7:e83e:66bc:51::46/64
 FAKE_ADDR6=fdd7:e83e:66bc:51::188
 
 export LOCAL_IF LOCAL_MAC
-export LOCAL_ADDR FAKE_ADDR
-export LOCAL_ADDR6 FAKE_ADDR6
+export LOCAL_ADDR LOCAL_NET FAKE_ADDR
+export LOCAL_ADDR6 LOCAL_NET6 FAKE_ADDR6
 
 ftp_proxy=http://10.0.1.3:8000/
 http_proxy=http://10.0.1.3:8000/

diff --git a/env-ot27.sh b/env-ot27.sh
@@ -5,14 +5,16 @@ LOCAL_IF=bge0
 LOCAL_MAC=2c:09:4d:00:04:b7
 
 LOCAL_ADDR=10.188.27.47
+LOCAL_NET=10.188.27.47/24
 FAKE_ADDR=10.188.27.188
 
 LOCAL_ADDR6=fdd7:e83e:66bc:27::47
+LOCAL_NET6=fdd7:e83e:66bc:27::47/64
 FAKE_ADDR6=fdd7:e83e:66bc:27::188
 
 export LOCAL_IF LOCAL_MAC
-export LOCAL_ADDR FAKE_ADDR
-export LOCAL_ADDR6 FAKE_ADDR6
+export LOCAL_ADDR LOCAL_NET FAKE_ADDR
+export LOCAL_ADDR6 LOCAL_NET6 FAKE_ADDR6
 
 ftp_proxy=http://10.0.1.3:8000/
 http_proxy=http://10.0.1.3:8000/

diff --git a/env-ot31.sh b/env-ot31.sh
@@ -1,7 +1,9 @@
 LOCAL_IF=ixl0
 LOCAL_MAC=3c:fd:fe:0d:03:e0
 LOCAL_ADDR=10.6.12.51
+LOCAL_NET=10.6.12.51/24
 LOCAL_ADDR6=fdd7:e83e:66bc:0612::51
+LOCAL_NET6=fdd7:e83e:66bc:0612::51/64
 
 REMOTE_IF=ixl1
 REMOTE_MAC=40:a6:b7:02:38:3d
@@ -55,7 +57,7 @@ REMOTE6_ADDR_RANGE=fdd7:e83e:66bc:626::20
 LINUX_ADDR_RANGE=10.6.16.60
 LINUX_ADDR6_RANGE=fdd7:e83e:66bc:616::60
 
-export LOCAL_IF LOCAL_MAC LOCAL_ADDR LOCAL_ADDR6
+export LOCAL_IF LOCAL_MAC LOCAL_ADDR LOCAL_NET LOCAL_ADDR6 LOCAL_NET6
 export REMOTE_IF REMOTE_MAC REMOTE_ADDR REMOTE_ADDR6
 export REMOTE_SSH
 export LINUX_ADDR LINUX_ADDR6 LINUX_FORWARD_ADDR LINUX_FORWARD_ADDR6

diff --git a/env-ot41.sh b/env-ot41.sh
@@ -4,11 +4,14 @@ export NETLINK_LINE=1
 # allow to manually run perform tests frag and splice on netlink hosts
 
 LOCAL_ADDR=undef
+LOCAL_NET=undef
 LOCAL_ADDR6=undef
+LOCAL_NET6=undef
 REMOTE_ADDR=undef
 REMOTE_ADDR6=undef
 REMOTE_SSH=undef
-export LOCAL_ADDR LOCAL_ADDR6 REMOTE_ADDR REMOTE_ADDR6 REMOTE_SSH
+export LOCAL_ADDR LOCAL_NET LOCAL_ADDR6 LOCAL_NET6
+export  REMOTE_ADDR REMOTE_ADDR6 REMOTE_SSH
 
 LOCAL_ADDR_RANGE=10.10.11.20
 LOCAL_ADDR6_RANGE=fdd7:e83e:66bd:1011::20

diff --git a/env-ot42.sh b/env-ot42.sh
@@ -4,11 +4,14 @@ export NETLINK_LINE=2
 # allow to manually run perform tests frag and splice on netlink hosts
 
 LOCAL_ADDR=undef
+LOCAL_NET=undef
 LOCAL_ADDR6=undef
+LOCAL_NET6=undef
 REMOTE_ADDR=undef
 REMOTE_ADDR6=undef
 REMOTE_SSH=undef
-export LOCAL_ADDR LOCAL_ADDR6 REMOTE_ADDR REMOTE_ADDR6 REMOTE_SSH
+export LOCAL_ADDR LOCAL_NET LOCAL_ADDR6 LOCAL_NET6
+export REMOTE_ADDR REMOTE_ADDR6 REMOTE_SSH
 
 LOCAL_ADDR_RANGE=10.10.21.20
 LOCAL_ADDR6_RANGE=fdd7:e83e:66bd:1021::20

diff --git a/env-ot5.sh b/env-ot5.sh
@@ -10,11 +10,13 @@ LOCAL_IF=em0
 LOCAL_MAC=90:e2:ba:7e:e8:10
 
 LOCAL_ADDR=10.188.51.25
+LOCAL_NET=10.188.51.25/24
 FAKE_ADDR=10.188.51.188
 
 LOCAL_ADDR6=fdd7:e83e:66bc:51::25
+LOCAL_NET6=fdd7:e83e:66bc:51::25/64
 FAKE_ADDR6=fdd7:e83e:66bc:51::188
 
 export LOCAL_IF LOCAL_MAC
-export LOCAL_ADDR FAKE_ADDR
-export LOCAL_ADDR6 FAKE_ADDR6
+export LOCAL_ADDR LOCAL_NET FAKE_ADDR
+export LOCAL_ADDR6 LOCAL_NET6 FAKE_ADDR6
diff --git a/env-ot6.sh b/env-ot6.sh
@@ -5,11 +5,13 @@ LOCAL_IF=em1
 LOCAL_MAC=00:04:23:d8:a7:59
 
 LOCAL_ADDR=10.188.61.26
+LOCAL_NET=10.188.61.26/24
 FAKE_ADDR=10.188.61.188
 
 LOCAL_ADDR6=fdd7:e83e:66bc:61::26
+LOCAL_NET6=fdd7:e83e:66bc:61::26/64
 FAKE_ADDR6=fdd7:e83e:66bc:61::188
 
 export LOCAL_IF LOCAL_MAC
-export LOCAL_ADDR FAKE_ADDR
-export LOCAL_ADDR6 FAKE_ADDR6
+export LOCAL_ADDR LOCAL_NET FAKE_ADDR
+export LOCAL_ADDR6 LOCAL_NET6 FAKE_ADDR6