updated config

[tests.git] / qaapi / qa / Nodes.py

diff --git a/qaapi/qa/Nodes.py b/qaapi/qa/Nodes.py
index d1375e8..379f14a 100644 (file)
--- a/qaapi/qa/Nodes.py
+++ b/qaapi/qa/Nodes.py
@@ -7,12 +7,13 @@ from Table import Table
 class Node(dict, Remote):
 
     fields = {
-       'plc': None,
+       'plcs': ['TestPLC'],
        'hostname': None,               # Node Hostname
        'host': 'localhost',            # host where node lives
        'redir_port': None,             # Port on host where ssh is redirected to virtual node
        'vserver': None,                # vserver where this node lives
        'type': 'vm',                   # type of node
+       'model': '/minhw',
        'nodenetworks': [],             # node networks
        'homedir': '/var/VirtualMachines/',
        'rootkey': None                  # path to root ssh key
@@ -25,8 +26,20 @@ class Node(dict, Remote):
        
        # Merge defined fields with defaults
        self.update(fields)
-       self.config = config    
-    
+       self.config = config
+
+    def host_popen(self, command, fatal = True):
+        command = self.get_host_command(command)
+        return utils.popen(command, fatal, self.config.verbose)
+
+    def host_popen3(self, command):
+        command = self.get_host_command(command)
+        return utils.popen3(command, self.config.verbose)
+
+    def host_commands(self, command, fatal = True):
+        command = self.get_host_command(command)
+        return utils.commands(command, fatal, self.config.verbose)    
+        
 class Nodes(list, Table):
 
     def __init__(self, config, nodes):