Call linux left and right ssh consistently in netlink and perform.

bluhm · Feb 8, 2024 · dad536e · dad536e
1 parent c0c8718
commit dad536e
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 85 deletions.
diff --git a/env-ot14.sh b/env-ot14.sh
@@ -19,13 +19,13 @@ LINUX_RELAY_ADDR=10.3.34.34
 LINUX_RELAY_ADDR6=fdd7:e83e:66bc:0334::34
 LINUX_LINUX_ADDR=10.3.36.36
 LINUX_LINUX_ADDR6=fdd7:e83e:66bc:336::36
-LINUX_SSH=perform@lt13
+LINUX_LEFT_SSH=perform@lt13
 
 LINUX_RELAY_LOCAL_ADDR=10.3.56.35
 LINUX_RELAY_LOCAL_ADDR6=fdd7:e83e:66bc:0356::35
 LINUX_RELAY_REMOTE_ADDR=10.3.46.34
 LINUX_RELAY_REMOTE_ADDR6=fdd7:e83e:66bc:0346::34
-LINUX_OTHER_SSH=perform@lt16
+LINUX_RIGHT_SSH=perform@lt16
 
 LOCAL_IPSEC_ADDR=10.4.34.34
 LOCAL_IPSEC_ADDR6=fdd7:e83e:66bc:0434::34
@@ -55,10 +55,10 @@ export REMOTE_IF REMOTE_MAC REMOTE_ADDR REMOTE_ADDR6
 export REMOTE_SSH
 export LINUX_ADDR LINUX_ADDR6 LINUX_FORWARD_ADDR LINUX_FORWARD_ADDR6
 export LINUX_RELAY_ADDR LINUX_RELAY_ADDR6 LINUX_LINUX_ADDR LINUX_LINUX_ADDR6
-export LINUX_SSH
+export LINUX_LEFT_SSH
 export LINUX_RELAY_LOCAL_ADDR LINUX_RELAY_LOCAL_ADDR6
 export LINUX_RELAY_REMOTE_ADDR LINUX_RELAY_REMOTE_ADDR6
-export LINUX_OTHER_SSH
+export LINUX_RIGHT_SSH
 export LOCAL_IPSEC_ADDR REMOTE_IPSEC_ADDR LINUX_IPSEC_ADDR
 export LOCAL_IPSEC_ADDR6 REMOTE_IPSEC_ADDR6 LINUX_IPSEC_ADDR6
 export LINUX_VEB_ADDR LINUX_VEB_ADDR6

diff --git a/env-ot19.sh b/env-ot19.sh
@@ -6,6 +6,8 @@ export SKIP_IF=em18
 export NETLINK_LINE=3
 # currently there is no distinct linux interface for link 4, share with 3
 export LINUX_IF=enp6s0
+export LINUX_LEFT_SSH=root@lt40
+export LINUX_RIGHT_SSH=root@lt43
 
 # allow to manually run perform tests frag and splice on netlink hosts
 
@@ -23,7 +25,4 @@ LOCAL_ADDR_RANGE=10.10.31.20
 LOCAL_ADDR6_RANGE=fdd7:e83e:66bd:1031::20
 LINUX_ADDR_RANGE=10.10.32.40
 LINUX_ADDR6_RANGE=fdd7:e83e:66bd:1032::40
-LINUX_SSH=root@lt40
-LINUX_OTHER_SSH=root@lt43
 export LOCAL_ADDR_RANGE LOCAL_ADDR6_RANGE LINUX_ADDR_RANGE LINUX_ADDR6_RANGE
-export LINUX_SSH LINUX_OTHER_SSH
diff --git a/env-ot25.sh b/env-ot25.sh
@@ -9,6 +9,8 @@ export SKIP_IF=em0,em1,em4,em5,em8,em9,em10,em11,em12,ix0,ix1
 export NETLINK_LINE=4
 # currently there is no distinct linux interface for link 4, share with 3
 export LINUX_IF=enp6s0
+export LINUX_LEFT_SSH=root@lt40
+export LINUX_RIGHT_SSH=root@lt43
 
 # allow to manually run perform tests frag and splice on netlink hosts
 
@@ -41,7 +43,4 @@ LOCAL_ADDR_RANGE=10.10.41.20
 LOCAL_ADDR6_RANGE=fdd7:e83e:66bd:1041::20
 LINUX_ADDR_RANGE=10.10.42.40
 LINUX_ADDR6_RANGE=fdd7:e83e:66bd:1042::40
-LINUX_SSH=root@lt40
-LINUX_OTHER_SSH=root@lt43
 export LOCAL_ADDR_RANGE LOCAL_ADDR6_RANGE LINUX_ADDR_RANGE LINUX_ADDR6_RANGE
-export LINUX_SSH LINUX_OTHER_SSH
diff --git a/env-ot31.sh b/env-ot31.sh
@@ -19,13 +19,13 @@ LINUX_RELAY_ADDR=10.6.31.51
 LINUX_RELAY_ADDR6=fdd7:e83e:66bc:0631::51
 LINUX_LINUX_ADDR=10.3.36.36
 LINUX_LINUX_ADDR6=fdd7:e83e:66bc:336::36
-LINUX_SSH=perform@lt13
+LINUX_LEFT_SSH=perform@lt13
 
 LINUX_RELAY_LOCAL_ADDR=10.6.26.52
 LINUX_RELAY_LOCAL_ADDR6=fdd7:e83e:66bc:0626::52
 LINUX_RELAY_REMOTE_ADDR=10.6.16.51
 LINUX_RELAY_REMOTE_ADDR6=fdd7:e83e:66bc:0616::51
-LINUX_OTHER_SSH=perform@lt16
+LINUX_RIGHT_SSH=perform@lt16
 
 LOCAL_IPSEC_ADDR=10.7.31.51
 LOCAL_IPSEC_ADDR6=fdd7:e83e:66bc:0731::51
@@ -62,10 +62,10 @@ export REMOTE_IF REMOTE_MAC REMOTE_ADDR REMOTE_ADDR6
 export REMOTE_SSH
 export LINUX_ADDR LINUX_ADDR6 LINUX_FORWARD_ADDR LINUX_FORWARD_ADDR6
 export LINUX_RELAY_ADDR LINUX_RELAY_ADDR6 LINUX_LINUX_ADDR LINUX_LINUX_ADDR6
-export LINUX_SSH
+export LINUX_LEFT_SSH
 export LINUX_RELAY_LOCAL_ADDR LINUX_RELAY_LOCAL_ADDR6
 export LINUX_RELAY_REMOTE_ADDR LINUX_RELAY_REMOTE_ADDR6
-export LINUX_OTHER_SSH
+export LINUX_RIGHT_SSH
 export LOCAL_IPSEC_ADDR REMOTE_IPSEC_ADDR LINUX_IPSEC_ADDR
 export LOCAL_IPSEC_ADDR6 REMOTE_IPSEC_ADDR6 LINUX_IPSEC_ADDR6
 export LOCAL_IPSEC6_ADDR REMOTE_IPSEC6_ADDR LINUX_IPSEC6_ADDR

diff --git a/env-ot41.sh b/env-ot41.sh
@@ -3,6 +3,8 @@ export MANAGEMENT_IF=em4
 export SKIP_IF=em4,em2,em3
 export NETLINK_LINE=1
 export LINUX_IF=ens2f1
+export LINUX_LEFT_SSH=root@lt40
+export LINUX_RIGHT_SSH=root@lt43
 
 # allow to manually run perform tests frag and splice on netlink hosts
 
@@ -20,7 +22,4 @@ LOCAL_ADDR_RANGE=10.10.11.20
 LOCAL_ADDR6_RANGE=fdd7:e83e:66bd:1011::20
 LINUX_ADDR_RANGE=10.10.12.40
 LINUX_ADDR6_RANGE=fdd7:e83e:66bd:1012::40
-LINUX_SSH=root@lt40
-LINUX_OTHER_SSH=root@lt43
 export LOCAL_ADDR_RANGE LOCAL_ADDR6_RANGE LINUX_ADDR_RANGE LINUX_ADDR6_RANGE
-export LINUX_SSH LINUX_OTHER_SSH
diff --git a/env-ot42.sh b/env-ot42.sh
@@ -3,6 +3,8 @@ export MANAGEMENT_IF=igc2
 export SKIP_IF=igc2,igc3
 export NETLINK_LINE=2
 export LINUX_IF=ens2f0
+export LINUX_LEFT_SSH=root@lt40
+export LINUX_RIGHT_SSH=root@lt43
 
 # allow to manually run perform tests frag and splice on netlink hosts
 
@@ -20,7 +22,4 @@ LOCAL_ADDR_RANGE=10.10.21.20
 LOCAL_ADDR6_RANGE=fdd7:e83e:66bd:1021::20
 LINUX_ADDR_RANGE=10.10.22.40
 LINUX_ADDR6_RANGE=fdd7:e83e:66bd:1022::40
-LINUX_SSH=root@lt40
-LINUX_OTHER_SSH=root@lt43
 export LOCAL_ADDR_RANGE LOCAL_ADDR6_RANGE LINUX_ADDR_RANGE LINUX_ADDR6_RANGE
-export LINUX_SSH LINUX_OTHER_SSH
diff --git a/netlink.pl b/netlink.pl
@@ -60,6 +60,10 @@
     or die "MANAGEMENT_IF is not in env";
 my $linux_if = $ENV{LINUX_IF}
     or die "LINUX_IF is not in env";
+my $linux_left_ssh = $ENV{LINUX_LEFT_SSH}
+    or die "LINUX_LEFT_SSH is not in env";
+my $linux_right_ssh = $ENV{LINUX_RIGHT_SSH}
+    or die "LINUX_RIGHT_SSH is not in env";
 
 my ($iftype, $ifnum) = $iface =~ /^([a-z]+)([0-9]+)?$/;
 grep { $_ eq $iftype } @allifaces
@@ -154,7 +158,7 @@
 my $lnx_l_addr6 = "${ip6prefix}${line}1::1";
 my $lnx_l_net6 = "$lnx_l_addr6/64";
 my $lnx_l_net6_flat = "$lnx_l_addr6/60";
-my $lnx_l_ssh = 'root@lt40'; #$ENV{LINUXL_SSH}; # XXX
+my $lnx_l_ssh = $linux_left_ssh;
 
 my $lnx_l_tunnel_addr = "$ip4prefix.${line}3.1";
 my $lnx_l_tunnel_net = "$lnx_l_tunnel_addr/24";
@@ -166,7 +170,7 @@
 my $lnx_r_addr6 = "${ip6prefix}${line}2::4";
 my $lnx_r_net6 = "$lnx_r_addr6/64";
 my $lnx_r_net6_flat = "$lnx_r_addr6/60";
-my $lnx_r_ssh = 'root@lt43'; #$ENV{LINUXR_SSH};
+my $lnx_r_ssh = $linux_right_ssh;
 
 my @lnx_r_addr_range = map { "$lnx_r_addr$_" } 0..9;
 my @lnx_r_net_range = map { "$_/24" } @lnx_r_addr_range;
@@ -1113,13 +1117,13 @@ sub pingflood_finalize {
     }, {
 	statcmd => [ 'netstat', '-nr' ],
     }, {
-	statcmd => [ 'ssh', 'root@lt40', 'netstat', '-nr' ],
+	statcmd => [ 'ssh', $lnx_l_ssh, 'netstat', '-nr' ],
     }, {
-	statcmd => [ 'ssh', 'root@lt40', 'netstat', '-6nr' ],
+	statcmd => [ 'ssh', $lnx_l_ssh, 'netstat', '-6nr' ],
     }, {
-	statcmd => [ 'ssh', 'root@lt43', 'netstat', '-nr' ],
+	statcmd => [ 'ssh', $lnx_r_ssh, 'netstat', '-nr' ],
     }, {
-	statcmd => [ 'ssh', 'root@lt43', 'netstat', '-6nr' ],
+	statcmd => [ 'ssh', $lnx_r_ssh, 'netstat', '-6nr' ],
     }, {
 	statcmd => [ 'vmstat', '-mv' ],
     }, {