nodedistro targets also set pldistro

[tests.git] / system / TestNode.py

diff --git a/system/TestNode.py b/system/TestNode.py
index 6ff9836..8f8954c 100644 (file)
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -221,17 +221,21 @@ class TestNode:
         return True
     
     def nodedistro_f14(self):
-        return self.nodedistro_set('f14')
+        return self.nodedistro_set('f14', 'onelab')
     def nodedistro_f18(self):
-        return self.nodedistro_set('f18')
+        return self.nodedistro_set('f18', 'lxc')
     def nodedistro_f20(self):
-        return self.nodedistro_set('f20')
+        return self.nodedistro_set('f20', 'lxc')
     def nodedistro_f21(self):
-        return self.nodedistro_set('f21')
-    def nodedistro_set(self, distro):
+        return self.nodedistro_set('f21', 'lxc')
+    def nodedistro_f22(self):
+        return self.nodedistro_set('f22', 'lxc')
+    def nodedistro_set(self, fcdistro, pldistro):
         "set the fcdistro tag to distro, passed in arg"
         self.test_plc.apiserver.SetNodeFcdistro(self.test_plc.auth_root(),
-                                                self.name(), distro)
+                                                self.name(), fcdistro)
+        self.test_plc.apiserver.SetNodePldistro(self.test_plc.auth_root(),
+                                                self.name(), pldistro)
         return True
     def nodeflavour_show(self):
         "display the fcdistro tag - or flavour actually - of node"
@@ -323,6 +327,7 @@ class TestNode:
                                          .format(now, self.nodedir()), dry_run=self.dry_run()) == 0
 
     def qemu_nodefamily(self):
+        "write nodefamily stamp in qemu working dir"
         auth = self.test_plc.auth_root()
         hostname = self.node_spec['node_fields']['hostname']
         nodeflavour = self.test_plc.apiserver.GetNodeFlavour(auth, hostname)