From e1c8a524cf81af215762d8bae27d73361b5db4b3 Mon Sep 17 00:00:00 2001
From: al_xipe <al_xipe@localhost>
Date: Mon, 13 Aug 2007 02:19:20 +0000
Subject: [PATCH] this commit includes some code refactoring but mainly code to support emma in the functional tests and the new XSL sheet for dynamic report drill down
---
opends/tests/functional-tests/shared/functions/baselib.xml | 151 ++++++++++++++++++++++++--------------------------
1 files changed, 73 insertions(+), 78 deletions(-)
diff --git a/opends/tests/functional-tests/shared/functions/baselib.xml b/opends/tests/functional-tests/shared/functions/baselib.xml
index 0b3151b..bcb7210 100755
--- a/opends/tests/functional-tests/shared/functions/baselib.xml
+++ b/opends/tests/functional-tests/shared/functions/baselib.xml
@@ -26,7 +26,6 @@
! Portions Copyright 2007 Sun Microsystems, Inc.
! -->
<stax>
-
<function name="GetDirectoryServerVars">
<function-prolog>
This function gets variables associated with the Directory Server
@@ -45,108 +44,104 @@
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
</function-map-args>
-
+
<sequence>
-
<script>
mylocation=location
mypath=dsPath
-
DSInfo=directory_server_information()
</script>
-
+
<message>'Get Information about server %s %s' % (mylocation,dsPath)</message>
-
+
<!-- Obtain the variables for the system from start-ds -->
<call function="'StartDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : mypath,
- 'dsSystemInfo' : 'true' }
+ { 'location' : mylocation,
+ 'dsPath' : mypath,
+ 'dsSystemInfo' : 'true'
+ }
</call>
-
+
<if expr="RC != 0">
<message>
'Unable to obtain system information variables for %s %s.' % (mylocation,mypath)
</message>
- <else>
- <script>
- DSInfo.SystemList=STAXResult[1].split('\n')
-
- DSInfo.ServerDict['server version']= \
- DSInfo.getServerVersion(DSInfo.SystemList[0])
-
- for DSInfo.line in DSInfo.SystemList:
- DSInfo.key=DSInfo.line[0:DSInfo.line.find(':')].strip()
- DSInfo.value= \
- DSInfo.line[DSInfo.line.find(':')+1:len(DSInfo.line)].strip()
- DSInfo.SystemDict[DSInfo.key]=DSInfo.value
-
- DSInfo.ServerDict['server buildid']= \
- DSInfo.getServerValueFromKey('Build ID',DSInfo.SystemDict)
- DSInfo.ServerDict['java version']= \
- DSInfo.getServerValueFromKey('Java Version',DSInfo.SystemDict)
- DSInfo.ServerDict['java vendor']= \
- DSInfo.getServerValueFromKey('Java Vendor',DSInfo.SystemDict)
- DSInfo.ServerDict['jvm version']= \
- DSInfo.getServerValueFromKey('JVM Version',DSInfo.SystemDict)
- DSInfo.ServerDict['jvm vendor']= \
- DSInfo.getServerValueFromKey('JVM Vendor',DSInfo.SystemDict)
- DSInfo.ServerDict['system os']= \
- DSInfo.getServerValueFromKey('Operating System',DSInfo.SystemDict)
- DSInfo.ServerDict['system name']= \
- DSInfo.getServerValueFromKey('System Name',DSInfo.SystemDict)
-
- DSInfoServersDict[mypath]=DSInfo.ServerDict
- </script>
-
- </else>
-
+ <else>
+ <sequence>
+ <message>
+ 'Processing [%s]' % STAXResult
+ </message>
+ <script>
+ DSInfo.SystemList=STAXResult[0][1].split('\n')
+ DSInfo.ServerDict['server version']= \
+ DSInfo.getServerVersion(DSInfo.SystemList[0])
+
+ for DSInfo.line in DSInfo.SystemList:
+ DSInfo.key=DSInfo.line[0:DSInfo.line.find(':')].strip()
+ DSInfo.value= \
+ DSInfo.line[DSInfo.line.find(':')+1:len(DSInfo.line)].strip()
+ DSInfo.SystemDict[DSInfo.key]=DSInfo.value
+
+ DSInfo.ServerDict['server buildid']= \
+ DSInfo.getServerValueFromKey('Build ID',DSInfo.SystemDict)
+ DSInfo.ServerDict['java version']= \
+ DSInfo.getServerValueFromKey('Java Version',DSInfo.SystemDict)
+ DSInfo.ServerDict['java vendor']= \
+ DSInfo.getServerValueFromKey('Java Vendor',DSInfo.SystemDict)
+ DSInfo.ServerDict['jvm version']= \
+ DSInfo.getServerValueFromKey('JVM Version',DSInfo.SystemDict)
+ DSInfo.ServerDict['jvm vendor']= \
+ DSInfo.getServerValueFromKey('JVM Vendor',DSInfo.SystemDict)
+ DSInfo.ServerDict['system os']= \
+ DSInfo.getServerValueFromKey('Operating System',DSInfo.SystemDict)
+ DSInfo.ServerDict['system name']= \
+ DSInfo.getServerValueFromKey('System Name',DSInfo.SystemDict)
+
+ DSInfoServersDict[mypath]=DSInfo.ServerDict
+ </script>
+ </sequence>
+ </else>
</if>
<!-- Obtain the secret variables for the system from start-ds -->
<call function="'StartDsWithScript'">
{ 'location' : mylocation,
'dsPath' : mypath,
- 'dsBuildInfo' : 'true' }
+ 'dsBuildInfo' : 'true'
+ }
</call>
-
+
<if expr="RC != 0">
<message>
'Unable to obtain build information variables for %s %s.' % (mylocation,mypath)
- </message>
- <else>
-
- <script>
- DSInfo.SystemList=STAXResult[1].split('\n')
-
- for DSInfo.line in DSInfo.SystemList:
- DSInfo.key=DSInfo.line[0:DSInfo.line.find(':')].strip()
- DSInfo.value= \
- DSInfo.line[DSInfo.line.find(':')+1:len(DSInfo.line)].strip()
- DSInfo.SystemDict[DSInfo.key]=DSInfo.value
-
- DSInfo.ServerDict['svn revision']= \
- DSInfo.getServerValueFromKey('Revision Number',DSInfo.SystemDict)
- DSInfo.ServerDict['major version']= \
- DSInfo.getServerValueFromKey('Major Version',DSInfo.SystemDict)
- DSInfo.ServerDict['minor version']= \
- DSInfo.getServerValueFromKey('Minor Version',DSInfo.SystemDict)
- DSInfo.ServerDict['point version']= \
- DSInfo.getServerValueFromKey('Point Version',DSInfo.SystemDict)
- DSInfo.ServerDict['version qualifier']= \
- DSInfo.getServerValueFromKey('Version Qualifier',DSInfo.SystemDict)
- DSInfo.ServerDict['fix ids']= \
- DSInfo.getServerValueFromKey('Fix IDs',DSInfo.SystemDict)
- DSInfo.ServerDict['debug build']= \
- DSInfo.getServerValueFromKey('Debug Build',DSInfo.SystemDict)
- </script>
-
- </else>
-
+ </message>
+ <else>
+ <script>
+ DSInfo.SystemList=STAXResult[0][1].split('\n')
+
+ for DSInfo.line in DSInfo.SystemList:
+ DSInfo.key=DSInfo.line[0:DSInfo.line.find(':')].strip()
+ DSInfo.value= \
+ DSInfo.line[DSInfo.line.find(':')+1:len(DSInfo.line)].strip()
+ DSInfo.SystemDict[DSInfo.key]=DSInfo.value
+
+ DSInfo.ServerDict['svn revision']= \
+ DSInfo.getServerValueFromKey('Revision Number',DSInfo.SystemDict)
+ DSInfo.ServerDict['major version']= \
+ DSInfo.getServerValueFromKey('Major Version',DSInfo.SystemDict)
+ DSInfo.ServerDict['minor version']= \
+ DSInfo.getServerValueFromKey('Minor Version',DSInfo.SystemDict)
+ DSInfo.ServerDict['point version']= \
+ DSInfo.getServerValueFromKey('Point Version',DSInfo.SystemDict)
+ DSInfo.ServerDict['version qualifier']= \
+ DSInfo.getServerValueFromKey('Version Qualifier',DSInfo.SystemDict)
+ DSInfo.ServerDict['fix ids']= \
+ DSInfo.getServerValueFromKey('Fix IDs',DSInfo.SystemDict)
+ DSInfo.ServerDict['debug build']= \
+ DSInfo.getServerValueFromKey('Debug Build',DSInfo.SystemDict)
+ </script>
+ </else>
</if>
-
</sequence>
-
</function>
-
</stax>
--
Gitblit v1.10.0