renaming SliceAttribute into SliceTag and InterfaceSetting into InterfaceTag

[tests.git] / system / TestNode.py

diff --git a/system/TestNode.py b/system/TestNode.py
index 7f682c0..ab51bb7 100644 (file)
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -67,29 +67,31 @@ class TestNode:
         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'})
         # populate network interfaces - primary
         server.AddInterface(userauth,self.name(),
-                                            self.node_spec['network_fields'])
+                                            self.node_spec['interface_fields'])
         # populate network interfaces - others
         if self.node_spec.has_key('extra_interfaces'):
             for interface in self.node_spec['extra_interfaces']:
-                server.AddInterface(userauth,self.name(),
-                                                    interface['network_fields'])
+                server.AddInterface(userauth,self.name(), interface['interface_fields'])
                 if interface.has_key('settings'):
                     for (attribute,value) in interface['settings'].iteritems():
                         # locate node network
-                        nn = server.GetInterfaces(userauth,{'ip':interface['network_fields']['ip']})[0]
-                        nnid=nn['interface_id']
+                        interface = server.GetInterfaces(userauth,{'ip':interface['interface_fields']['ip']})[0]
+                        interface_id=interface['interface_id']
                         # locate or create node network attribute type
                         try:
-                            nnst = server.GetTagTypes(userauth,{'name':attribute})[0]
+                            interface_tagtype = server.GetTagTypes(userauth,{'name':attribute})[0]
                         except:
-                            nnst = server.AddTagType(rootauth,{'category':'test',
-                                                               'tagname':attribute})
+                            interface_tagtype = server.AddTagType(rootauth,{'category':'test',
+                                                                            'tagname':attribute})
                         # attach value
-                        server.AddInterfaceSetting(userauth,nnid,attribute,value)
+                        server.AddInterfaceTag(userauth,interface_id,attribute,value)
 
     def delete_node (self):
         # uses the right auth as far as poss.
@@ -114,7 +116,8 @@ class TestNode:
         utils.header("Calling GetBootMedium for %s"%self.name())
         options = []
         if self.is_qemu():
-            options=['serial']
+            options.append('serial')
+            options.append('no-hangcheck')
         encoded=self.test_plc.apiserver.GetBootMedium(self.test_plc.auth_root(), 
                                                       self.name(), 'node-iso', '', options)
         if (encoded == ''):
@@ -137,9 +140,9 @@ class TestNode:
     def configure_qemu(self):
         if not self.is_qemu():
             return
-        mac=self.node_spec['network_fields']['mac']
+        mac=self.node_spec['interface_fields']['mac']
         hostname=self.node_spec['node_fields']['hostname']
-        ip=self.node_spec['network_fields']['ip']
+        ip=self.node_spec['interface_fields']['ip']
         auth=self.test_plc.auth_root()
         target_arch=self.test_plc.apiserver.GetPlcRelease(auth)['build']['target-arch']
         conf_filename="%s/qemu.conf"%(self.nodedir())
@@ -181,7 +184,7 @@ class TestNode:
 
         test_box.run_in_buildname("%s/qemu-bridge-init start >> %s/log.txt"%(self.nodedir(),self.nodedir()))
         # kick it off in background, as it would otherwise hang
-        test_box.run_in_buildname("%s/qemu-start-node 2>&1 >> %s/log.txt"%(self.nodedir(),self.nodedir()),True)
+        test_box.run_in_buildname("%s/qemu-start-node 2>&1 >> %s/log.txt"%(self.nodedir(),self.nodedir()))
 
     def list_qemu (self):
         utils.header("Listing qemu for host %s on box %s"%(self.name(),self.test_box().hostname()))
@@ -236,3 +239,4 @@ class TestNode:
             # xxx - temporary : always return true for now
             #return False
         return True
+