From: Tony Mack <tmack@cs.princeton.edu>
Date: Wed, 26 Mar 2008 00:25:03 +0000 (+0000)
Subject: modified load() to load confg elements as dicts, not lists
X-Git-Tag: tests-4.2-4~163
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e42381b5f14658319af947a88e52ddf0ebf1a3d7;p=tests.git

modified load() to load confg elements as dicts, not lists
---

diff --git a/qaapi/qa/Config.py b/qaapi/qa/Config.py
index 570957a..c7c4f2e 100644
--- a/qaapi/qa/Config.py
+++ b/qaapi/qa/Config.py
@@ -80,6 +80,18 @@ class Config:
 	node_test_files = os.listdir(self.node_tests_path)
 	self.node_test_files = filter(valid_node_test_files, node_test_files) 
 
+    def get_plc(self, plc_name):
+	plc = PLC(self)
+	if hasattr(self, 'plcs')  and plc_name in self.plcs.keys():
+	    plc.update(self.plcs[plc_name])
+	return plc
+
+    def get_node(self, hostname):
+	node = Node(self)
+	if hasattr(self, 'nodes') and hostname in self.nodes.keys():
+	    node.update(self.nodes[hostname])
+	return node			
+
     def load(self, conffile):
 	
 	confdata = {}
@@ -92,14 +104,14 @@ class Config:
 	config = Config()
 	for loadable in loadables:
 	    if loadable in confdata and loadable in ['plcs']:
-	        setattr(self, loadable, PLCs(config, confdata[loadable]))
+	        setattr(self, loadable, PLCs(config, confdata[loadable]).dict('name'))
 	    elif loadable in confdata and loadable in ['nodes']:
-		setattr(self, loadable, Nodes(config, confdata[loadable])) 		
+		setattr(self, loadable, Nodes(config, confdata[loadable]).dict('hostname')) 		
 	    elif loadable in confdata and loadable in ['sites']:
-		setattr(self, loadable, Sites(confdata[loadable]))
+		setattr(self, loadable, Sites(confdata[loadable]).dict('login_base'))
 	    elif loadable in confdata and loadable in ['slices']:
-		setattr(self, loadable, Slices(confdata[loadable]))
+		setattr(self, loadable, Slices(confdata[loadable]).dict('name'))
 	    elif loadable in confdata and loadable in ['persons']:
-		setattr(self, loadable, Persons(confdata[loadable])) 
+		setattr(self, loadable, Persons(confdata[loadable]).dict('email'))