From 2624e33e465ca06a3de1ce53c0abbfd008512be5 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 24 Jun 2015 16:42:11 +0200 Subject: [PATCH] nodedistro targets also set pldistro --- system/TestApiserver.py | 1 + system/TestNode.py | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/system/TestApiserver.py b/system/TestApiserver.py index 502f2dc..91f26b1 100644 --- a/system/TestApiserver.py +++ b/system/TestApiserver.py @@ -10,6 +10,7 @@ server_methods = [ ('GetNodes', []), ('AddNode', True), ('SetNodePlainBootstrapfs', True), ('SetNodeFcdistro', True), + ('SetNodePldistro', True), ('DeleteNode' , True), ('UpdateNode' , True), ('AddInterface' , True), diff --git a/system/TestNode.py b/system/TestNode.py index f3f5d21..8f8954c 100644 --- a/system/TestNode.py +++ b/system/TestNode.py @@ -221,19 +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') + return self.nodedistro_set('f21', 'lxc') def nodedistro_f22(self): - return self.nodedistro_set('f22') - def nodedistro_set(self, distro): + 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" -- 2.43.0