aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2022-09-15 17:33:42 +0200
committerQuentin Dufour <quentin@deuxfleurs.fr>2022-09-15 17:33:42 +0200
commit6588e878b2f10bc8ba98e5e17cc851db8df8bc80 (patch)
tree2d4d7f379404408c0460929ec9fc8981774f5dfd
parent9652978433b3a327573ddbfc51c23070869e0c9c (diff)
downloadmknet-6588e878b2f10bc8ba98e5e17cc851db8df8bc80.tar.gz
mknet-6588e878b2f10bc8ba98e5e17cc851db8df8bc80.zip
Add flavors
-rw-r--r--README.md9
-rwxr-xr-xscenarios/garage-s3lat14
-rwxr-xr-xscenarios/garage-warp8
3 files changed, 25 insertions, 6 deletions
diff --git a/README.md b/README.md
index 2259901..bee8dbf 100644
--- a/README.md
+++ b/README.md
@@ -54,9 +54,12 @@ Feel free to write new topologies!
## Scenarios
-All scenarions:
- - `./scenarios/garage-s3lat` - Run s3lat on Garage
- - `./scenarios/garage-warp [default|fast]` - Run warp on Garage. 2 flavors are available: fast and default.
+All scenarios:
+ - `./scenarios/garage-s3lat [garage-v0.7|garage-v0.8]` - Run s3lat on Garage
+ - `./scenarios/garage-warp [garage-v0.7|garage-v0.8] [default|fast]` - Run warp on Garage. 2 flavors are available: fast and default.
+
+*Scenarios take optional flavors as input that modulate their behavioir. Passing them is not mandatory,
+a default one will be selected for you.*
How to run them:
diff --git a/scenarios/garage-s3lat b/scenarios/garage-s3lat
index c9dd695..f94849e 100755
--- a/scenarios/garage-s3lat
+++ b/scenarios/garage-s3lat
@@ -1,13 +1,23 @@
#!/usr/bin/env python3
from fragments import garage, s3lat, shared
+import sys
+
+garage_version_flavor = {
+ "garage-v0.7": "v0.7.3",
+ "garage-v0.8": "89b8087ba81c508ba382aa6c9cb6bb3afa6a43c8"
+}
+garage_version = garage_version_flavor["garage-v0.7"]
+for flavor in sys.argv[1:]:
+ if flavor in garage_version_flavor:
+ garage_version = garage_version_flavor[flavor]
if shared.id() == 1:
- garage.deploy_coord()
+ garage.deploy_coord(version=garage_version)
s3lat.on_garage()
garage.delete_key()
garage.destroy()
else:
- garage.deploy_follow()
+ garage.deploy_follow(version=garage_version)
garage.sync_on_key_down()
garage.destroy()
shared.log("bye")
diff --git a/scenarios/garage-warp b/scenarios/garage-warp
index e8d466a..0f00580 100755
--- a/scenarios/garage-warp
+++ b/scenarios/garage-warp
@@ -1,7 +1,13 @@
#!/usr/bin/env python3
from fragments import garage, warp, shared
+
+
if shared.id() == 1:
- pass
+ garage.deploy_coord()
+ warp.on_garage()
+ garage.delete_key()
+ garage.destroy()
+else