]> git.ipfire.org Git - nitsi.git/commitdiff
Add more stuff to the virtual_environ() class
authorJonatan Schlag <jonatan.schlag@ipfire.org>
Thu, 19 Apr 2018 11:14:34 +0000 (13:14 +0200)
committerJonatan Schlag <jonatan.schlag@ipfire.org>
Thu, 19 Apr 2018 11:14:34 +0000 (13:14 +0200)
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
test.py

diff --git a/test.py b/test.py
index 36b391b46c161cf05e4ade0eaa6b60a7ed40c6f1..d9001dc14a346dd24361e20f7aaaea518bf2f14f 100755 (executable)
--- a/test.py
+++ b/test.py
@@ -556,10 +556,22 @@ class virtual_environ():
             self.log.debug(_machine)
             machines.setdefault(_machine, vm(
                 os.path.normpath(self.path + "/" + self.config[_machine]["xml_file"]),
             self.log.debug(_machine)
             machines.setdefault(_machine, vm(
                 os.path.normpath(self.path + "/" + self.config[_machine]["xml_file"]),
-                os.path.normpath(self.path + "/" + self.config[_machine]["snapshot_xml_file"])))
+                os.path.normpath(self.path + "/" + self.config[_machine]["snapshot_xml_file"]),
+                self.config[_machine]["image"],
+                self.config[_machine]["root_uid"],
+                self.config[_machine]["username"],
+                self.config[_machine]["password"]))
 
         return machines
 
 
         return machines
 
+    @property
+    def machine_names(self):
+        return self.machines
+
+    @property
+    def network_names(self):
+        return self.networks
+
 
 if __name__ == "__main__":
     import argparse
 
 if __name__ == "__main__":
     import argparse