nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-25 17:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixos/tests/scion: use new json schema and update CLI flags

Browse Source
This commit is contained in:
Yifei Sun
2026-08-21 16:09:00 +02:00
parent 36d9083134
commit a63d445212
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/scion/freestanding-deployment/default.nix
View File

@@ -122,7 +122,7 @@ in
ret=0
for as in "$@"
do
scion ping "$as,127.0.0.1" -c 3
scion ping --sciond default "$as,127.0.0.1" -c 3
ret=$?
if [ "$ret" -ne "0" ]; then
break

6
nixos/tests/scion/freestanding-deployment/topology1.json
View File

@@ -21,7 +21,7 @@
"interfaces": {
"1": {
"underlay": {
"public": "192.168.1.1:50014",
"local": "192.168.1.1:50014",
"remote": "192.168.1.4:50014"
},
"isd_as": "42-ffaa:1:4",
@@ -30,7 +30,7 @@
},
"2": {
"underlay": {
"public": "192.168.1.1:50012",
"local": "192.168.1.1:50012",
"remote": "192.168.1.2:50012"
},
"isd_as": "42-ffaa:1:2",
@@ -39,7 +39,7 @@
},
"3": {
"underlay": {
"public": "192.168.1.1:50013",
"local": "192.168.1.1:50013",
"remote": "192.168.1.3:50013"
},
"isd_as": "42-ffaa:1:3",

6
nixos/tests/scion/freestanding-deployment/topology2.json
View File

@@ -21,7 +21,7 @@
"interfaces": {
"1": {
"underlay": {
"public": "192.168.1.2:50012",
"local": "192.168.1.2:50012",
"remote": "192.168.1.1:50012"
},
"isd_as": "42-ffaa:1:1",
@@ -30,7 +30,7 @@
},
"2": {
"underlay": {
"public": "192.168.1.2:50023",
"local": "192.168.1.2:50023",
"remote": "192.168.1.3:50023"
},
"isd_as": "42-ffaa:1:3",
@@ -39,7 +39,7 @@
},
"3": {
"underlay": {
"public": "192.168.1.2:50025",
"local": "192.168.1.2:50025",
"remote": "192.168.1.5:50025"
},
"isd_as": "42-ffaa:1:5",

8
nixos/tests/scion/freestanding-deployment/topology3.json
View File

@@ -21,7 +21,7 @@
"interfaces": {
"1": {
"underlay": {
"public": "192.168.1.3:50013",
"local": "192.168.1.3:50013",
"remote": "192.168.1.1:50013"
},
"isd_as": "42-ffaa:1:1",
@@ -30,7 +30,7 @@
},
"2": {
"underlay": {
"public": "192.168.1.3:50023",
"local": "192.168.1.3:50023",
"remote": "192.168.1.2:50023"
},
"isd_as": "42-ffaa:1:2",
@@ -39,7 +39,7 @@
},
"3": {
"underlay": {
"public": "192.168.1.3:50034",
"local": "192.168.1.3:50034",
"remote": "192.168.1.4:50034"
},
"isd_as": "42-ffaa:1:4",
@@ -48,7 +48,7 @@
},
"4": {
"underlay": {
"public": "192.168.1.3:50035",
"local": "192.168.1.3:50035",
"remote": "192.168.1.5:50035"
},
"isd_as": "42-ffaa:1:5",

4
nixos/tests/scion/freestanding-deployment/topology4.json
View File

@@ -19,7 +19,7 @@
"interfaces": {
"1": {
"underlay": {
"public": "192.168.1.4:50014",
"local": "192.168.1.4:50014",
"remote": "192.168.1.1:50014"
},
"isd_as": "42-ffaa:1:1",
@@ -28,7 +28,7 @@
},
"2": {
"underlay": {
"public": "192.168.1.4:50034",
"local": "192.168.1.4:50034",
"remote": "192.168.1.3:50034"
},
"isd_as": "42-ffaa:1:3",

4
nixos/tests/scion/freestanding-deployment/topology5.json
View File

@@ -19,7 +19,7 @@
"interfaces": {
"1": {
"underlay": {
"public": "192.168.1.5:50025",
"local": "192.168.1.5:50025",
"remote": "192.168.1.2:50025"
},
"isd_as": "42-ffaa:1:2",
@@ -28,7 +28,7 @@
},
"2": {
"underlay": {
"public": "192.168.1.5:50035",
"local": "192.168.1.5:50035",
"remote": "192.168.1.3:50035"
},
"isd_as": "42-ffaa:1:3",