X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestNode.py;h=7461929c3d6a15f937c77f115b26abc5c0d91621;hb=9385eabe5ac58244848c08805f0bec15c7e11009;hp=b018598a77cb7e75775d9e07dde7e39a7b83b99c;hpb=8666ae7f0291e8d115e166ef555f02abafc40fc8;p=tests.git

diff --git a/system/TestNode.py b/system/TestNode.py
index b018598..7461929 100644
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -97,16 +97,17 @@ class TestNode:
         node_id = server.AddNode(userauth,
                                  self.test_site.site_spec['site_fields']['login_base'],
                                  self.node_spec['node_fields'])
-        server.SetNodePlainBootstrapfs(userauth,
-                                       self.node_spec['node_fields']['hostname'],
-                                       'YES')
         # create as reinstall to avoid user confirmation
-        server.UpdateNode(userauth, self.name(), {'boot_state':'reinstall'})
+        server.UpdateNode(userauth, self.name(), { 'boot_state' : 'reinstall' })
 
+        # you are supposed to make sure the tags exist
+        for tagname, tagvalue in self.node_spec['tags'].items():
+            server.AddNodeTag(userauth, node_id, tagname, tagvalue)
+            
         if not self.test_plc.has_addresses_api():
 #            print 'USING OLD INTERFACE'
             # populate network interfaces - primary
-            server.AddInterface(userauth,self.name(),
+            server.AddInterface(userauth, self.name(),
                                 self.node_spec['interface_fields'])
         else:
 #            print 'USING NEW INTERFACE with separate ip addresses'
@@ -121,31 +122,32 @@ class TestNode:
         # populate network interfaces - others
         if 'extra_interfaces' in self.node_spec:
             for interface in self.node_spec['extra_interfaces']:
-                server.AddInterface(userauth,self.name(), interface['interface_fields'])
+                server.AddInterface(userauth, self.name(), interface['interface_fields'])
                 if 'settings' in interface:
                     for attribute, value in interface['settings'].items():
                         # locate node network
-                        interface = server.GetInterfaces(userauth,{'ip':interface['interface_fields']['ip']})[0]
+                        interface = server.GetInterfaces( userauth,
+                                                          {'ip' : interface['interface_fields']['ip']})[0]
                         interface_id = interface['interface_id']
                         # locate or create node network attribute type
                         try:
-                            interface_tagtype = server.GetTagTypes(userauth,{'name':attribute})[0]
+                            interface_tagtype = server.GetTagTypes(userauth, {'name' : attribute})[0]
                         except:
-                            interface_tagtype = server.AddTagType(rootauth,{'category':'test',
-                                                                            'tagname':attribute})
+                            interface_tagtype = server.AddTagType(rootauth,{'category' : 'test',
+                                                                            'tagname' : attribute})
                         # attach value
-                        server.AddInterfaceTag(userauth,interface_id,attribute,value)
+                        server.AddInterfaceTag(userauth, interface_id, attribute, value)
 
     def delete_node(self):
         # uses the right auth as far as poss.
         try:
             ownername = self.node_spec['owner']
             user_spec = self.test_site.locate_user(ownername)
-            test_user = TestUser(self.test_plc,self.test_site,user_spec)
+            test_user = TestUser(self.test_plc, self.test_site, user_spec)
             auth = test_user.auth()
         except:
             auth = self.test_plc.auth_root()
-        self.test_plc.apiserver.DeleteNode(auth,self.name())
+        self.test_plc.apiserver.DeleteNode(auth, self.name())
 
     # Do most of the stuff locally - will be pushed on host_box - *not* the plc - later if needed
     def qemu_local_init(self):
@@ -161,13 +163,9 @@ class TestNode:
         "all nodes: invoke GetBootMedium and store result locally"
         utils.header("Calling GetBootMedium for {}".format(self.name()))
         # this would clearly belong in the config but, well ..
-        options = []
-        if self.is_qemu():
-            options.append('serial')
-            options.append('no-hangcheck')
-            options.append('systemd-debug')
-        encoded = self.test_plc.apiserver.GetBootMedium(self.test_plc.auth_root(), 
-                                                        self.name(), 'node-iso', '', options)
+        options = self.node_spec['bootmedium_options'] if 'bootmedium_options' in self.node_spec else []
+        encoded = self.test_plc.apiserver.GetBootMedium(
+            self.test_plc.auth_root(), self.name(), 'node-iso', '', options)
         if encoded == '':
             raise Exception('GetBootmedium failed')
 
@@ -276,6 +274,17 @@ class TestNode:
         return test_box.run_in_buildname("echo {:d} > {}/timestamp"\
                                          .format(now, self.nodedir()), dry_run=self.dry_run()) == 0
 
+    def qemu_nodefamily(self):
+        auth = self.test_plc.auth_root()
+        hostname = self.node_spec['node_fields']['hostname']
+        nodeflavour = self.test_plc.apiserver.GetNodeFlavour(auth, hostname)
+        if self.dry_run():
+            return True
+        nodedir = self.nodedir()
+        nodefamily = nodeflavour['nodefamily']
+        self.test_box().run_in_buildname("echo {nodefamily} > {nodedir}/nodefamily".format(**locals()))
+        return True
+
     def start_qemu(self):
         test_box = self.test_box()
         utils.header("Starting qemu node {} on {}".format(self.name(), test_box.hostname()))