use new boot states

[tests.git] / system / TestNode.py

diff --git a/system/TestNode.py b/system/TestNode.py
index 7e822fd..23cc26a 100644 (file)
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -68,7 +68,7 @@ class TestNode:
                        self.test_site.site_spec['site_fields']['login_base'],
                        self.node_spec['node_fields'])
         # create as reinstall to avoid user confirmation
-        server.UpdateNode(userauth, self.name(), {'boot_state':'rins'})
+        server.UpdateNode(userauth, self.name(), {'boot_state':'reinstall'})
         # populate network interfaces - primary
         server.AddInterface(userauth,self.name(),
                                             self.node_spec['network_fields'])
@@ -81,13 +81,13 @@ class TestNode:
                     for (attribute,value) in interface['settings'].iteritems():
                         # locate node network
                         nn = server.GetInterfaces(userauth,{'ip':interface['network_fields']['ip']})[0]
-                        nnid=nn['nodenetwork_id']
+                        nnid=nn['interface_id']
                         # locate or create node network attribute type
                         try:
-                            nnst = server.GetInterfaceSettingTypes(userauth,{'name':attribute})[0]
+                            nnst = server.GetTagTypes(userauth,{'name':attribute})[0]
                         except:
-                            nnst = server.AddInterfaceSettingType(rootauth,{'category':'test',
-                                                                              'name':attribute})
+                            nnst = server.AddTagType(rootauth,{'category':'test',
+                                                               'tagname':attribute})
                         # attach value
                         server.AddInterfaceSetting(userauth,nnid,attribute,value)