Modified USB test and the way it finds USB memory storages.

1 files changed, 37 insertions, 11 deletions

diff --git a/test-cli/test/helpers/setup_xml.py b/test-cli/test/helpers/setup_xml.py
index eb8d73c..603a2ac 100644
--- a/test-cli/test/helpers/setup_xml.py
+++ b/test-cli/test/helpers/setup_xml.py
@@ -1,22 +1,23 @@
 import xml.etree.ElementTree as XMLParser
 
+
 class XMLSetup (object):
-    """aaaaa"""
+    """XML Setup Parser"""
     __tree = None                   # Parser
     __dbType = None                 # database connection required: PgSQLConnection
     __dbConnectionRaw = None        # Connection string in raw
     __dbConnectionStr = None        # Connection string to use in sql object connection
 
     def __init__(self, filename):
-        """aaaaa"""
+        """Parse the file in the constructor"""
         self.__tree = XMLParser.parse(filename)
 
     def __del__(self):
-        """aaaaa"""
+        """Destructor do nothing"""
         pass
 
-    def getdbConnectionStr (self):
-        """aaaaa"""
+    def getdbConnectionStr(self):
+        """XML to database connection string"""
         if self.__dbConnectionRaw is not None:
             return self.__dbConnectionRaw
 
@@ -29,19 +30,44 @@ class XMLSetup (object):
 
         return None
 
-    def getPostgresConnectionStr (self):
-        """aaaaa"""
+    def getPostgresConnectionStr(self):
+        """Get Connection string """
         str = self.__dbConnectionRaw
         del str['type']
         return str
 
-    def getMysqlConnectionStr (self):
-        """aaaaa"""
-        pass
+    def getBoard(self, key, default):
+        for element in self.__tree.iter('board'):
+            if key in element.attrib:
+                return element.attrib[key]
+        return default
+
+    def getTempPath(self, key, default):
+        for element in self.__tree.iter('tmpPath'):
+            if key in element.attrib:
+                return element.attrib[key]
+        return default
+
+    def getKeyVal(self, tag, key, default):
+        for element in self.__tree.iter(tag):
+            if key in element.attrib:
+                return element.attrib[key]
+        return default
 
     def gettagKey (self, xmltag, xmlkey):
         """aaaaa"""
         for element in self.__tree.iter(xmltag):
             return element.attrib[xmlkey]
 
-        return None
\ No newline at end of file
+        return None
+
+    def getUSBlist(self):
+        list = {}
+        count = 0
+        for elements in self.__tree.iter("usbdev"):
+            sublist = {}
+            for key,val in elements.items():
+                sublist[key] = val
+            list[count] = sublist
+            count += 1
+        return list
\ No newline at end of file