Start machines

diff --git a/tools/flock b/tools/flock
index b351530942724676c3003043712cc9d2c9fd8121..76391bf209d712b305743f1f2d5acbb214b0d6b6 160000 (submodule)
--- a/tools/flock
+++ b/tools/flock
@@ -1 +1 @@
-Subproject commit b351530942724676c3003043712cc9d2c9fd8121
+Subproject commit 76391bf209d712b305743f1f2d5acbb214b0d6b6

diff --git a/tools/netlabflock/__init__.py b/tools/netlabflock/__init__.py
index 2f58f634f7e95a70c942c9c3628e173904bb4021..0ab2b066785142a81c9d2a7efc24e2bfa0760db8 100644 (file)
--- a/tools/netlabflock/__init__.py
+++ b/tools/netlabflock/__init__.py
@@ -1,6 +1,4 @@
-import os
 import pathlib
-from . import flock
 
 class NetlabFlock:
     toolsdir = pathlib.Path(__file__).parent.parent
@@ -8,46 +6,3 @@ class NetlabFlock:
 
 if not NetlabFlock.netlabdir.exists():
     raise Exception(f"Netlab dir not found at {NetlabFlock.netlabdir.absolute()}, did you run git submodule update --init?")
-
-class Suite:
-    def __init__(self, name: str):
-        self.name = name
-        self.dir = NetlabFlock.netlabdir / name
-        if not self.dir.exists():
-            raise Exception(f"Suite dir {self.dir} not found")
-
-        self.rundir = pathlib.Path(os.environ['XDG_RUNTIME_DIR']) / "netlabflock"
-
-    def help(self, *args: str):
-        print("Usage: python3 -m netlabflock (start|stop|save|check) suitename [targetdir]")
-
-    async def start(self):
-        print("start", self.targetdir)
-        flock.create(self.targetdir)
-
-    async def stop(self):
-        print("stop", self.targetdir)
-        flock.delete(self.targetdir)
-
-    async def save(self):
-        ...
-
-    async def check(self):
-        ...
-
-    async def exec(self, cmd: str, targetdir: str = None):
-        if targetdir is None:
-            if not self.rundir.exists():
-                self.rundir.mkdir()
-
-            self.targetdir = self.rundir / self.name
-        else:
-            self.targetdir = pathlib.Path(targetdir)
-
-        await {
-                "start": self.start,
-                "stop": self.stop,
-                "save": self.save,
-                "check": self.check,
-                }[cmd]()
-

diff --git a/tools/netlabflock/__main__.py b/tools/netlabflock/__main__.py
index d3788f4dbf6c8ceb4882c840a1e8c1e3f97c5537..6528a237498689965859dadaa5207f859b3655b9 100644 (file)
--- a/tools/netlabflock/__main__.py
+++ b/tools/netlabflock/__main__.py
@@ -9,4 +9,4 @@ if __name__ == "__main__":
     except ValueError as e:
         Suite.help(*sys.argv[1:])
 
-    asyncio.run(Suite(suite).exec(cmd, *args))
+    asyncio.run(Suite.Suite(suite).exec(cmd, *args))