Skip to content

Commit 8920e6f

Browse files
mwfarbjuagargi
authored andcommitted
explictly use python2, updated health check instruction
1 parent df81c65 commit 8920e6f

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

webapp/dependencies.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ webapp \
4646
- sleep
4747
- cat
4848
- systemctl
49+
- python2
4950

5051
## SCION Binaries Used/Checked
5152
- $sbin/scmp

webapp/web/template/health.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
<h2>SCIONLab Health Check</h2>
1010
<p>
11-
If all automated tests have passed, please continue to <a href="/apps">Apps</a>
11+
Click on any test in the list below to read detailed results. If all
12+
automated tests have passed, please continue to <a href="/apps">Apps</a>
1213
in the menu to use SCIONLab.
1314
</p>
1415
<ul id="health-list">
@@ -17,7 +18,7 @@ <h2>SCIONLab Health Check</h2>
1718
<span id="test-complete"></span>
1819
</p>
1920
<p>
20-
Some tests take a few seconds to succeed, click <a href="/">Health</a>
21+
Some tests take a few seconds to complete, click <a href="/">Health</a>
2122
to test again. Our <a
2223
href='http://netsec-ethz.github.io/scion-tutorials/general_scion_configuration/troubleshooting'>troubleshooting
2324
guide</a> may also be useful.

webapp/web/tests/health/netcheck.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ as=$(echo ${iaFile} | cut -d"-" -f2)
1010
topologyFile=$SCION_GEN/ISD$isd/AS$as/endhost/topology.json
1111

1212
# get remote addresses from interfaces
13-
ip_dsts=$(cat $topologyFile | python -c "import sys, json
13+
ip_dsts=$(cat $topologyFile | python2 -c "import sys, json
1414
brs = json.load(sys.stdin)['BorderRouters']
1515
for b in brs:
1616
for i in brs[b]['Interfaces']:

webapp/web/tests/health/scmpcheck.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ as=$(echo ${iaFile} | cut -d"-" -f2)
1515
topologyFile=$SCION_GEN/ISD$isd/AS$as/endhost/topology.json
1616

1717
# get remote addresses from interfaces, return paired list
18-
dsts=($(cat $topologyFile | python -c "import sys, json
18+
dsts=($(cat $topologyFile | python2 -c "import sys, json
1919
brs = json.load(sys.stdin)['BorderRouters']
2020
for b in brs:
2121
for i in brs[b]['Interfaces']:

webapp/web/tests/health/testVPN.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ fi
2828
ipAddress=$(echo "$targetLines" | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}\b" | head -n1)
2929
topologyFile=$SCION_GEN/ISD*/AS*/endhost/topology.json
3030
# ip address specified in the topology file. If "bind" parameter present, use that one; "public" if not
31-
ipTopology=$(cat $topologyFile | python -c "import sys, json
31+
ipTopology=$(cat $topologyFile | python2 -c "import sys, json
3232
brs = json.load(sys.stdin)['BorderRouters']
3333
interfaces=next(iter(brs.values()))['Interfaces']
3434
inter=next(iter(interfaces.values()))

0 commit comments

Comments
 (0)