From 90cbe4acd1ccc247bb4afa4938a206b6144bfa28 Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Fri, 11 Apr 2008 09:06:42 +0000
Subject: [PATCH] factorize the code: Get the list of opends instances in the topology with getOpendsInstancesInATopology()
---
opends/tests/system-tests/phases/configuration/configuration.xml | 33 +++++----------------------------
1 files changed, 5 insertions(+), 28 deletions(-)
diff --git a/opends/tests/system-tests/phases/configuration/configuration.xml b/opends/tests/system-tests/phases/configuration/configuration.xml
index 64858f5..19aae17 100755
--- a/opends/tests/system-tests/phases/configuration/configuration.xml
+++ b/opends/tests/system-tests/phases/configuration/configuration.xml
@@ -59,36 +59,13 @@
fileList = STAXGlobal([])
</script>
- <!-- == Get the list of opends instances in the topology == -->
+ <!--== Get the list of opends instances in the topology == -->
+ <call function="'getOpendsInstancesInATopology'">
+ { 'suffix' : suffix }
+ </call>
<script>
- opendsInstances = []
- msg = ''
- topoInstances = suffix.getTopology()
-
- sys.path.append("%s/phases/parser" % TESTS_DIR )
- from parser import getRefObjectByName
-
- for topoInstance in topoInstances:
- result = getRefObjectByName(topoInstance.getName(),instances)
- if result[0] != '':
- msg = '%s\n%s' % (msg,result[0])
- currentInstance = result[1]
-
- if currentInstance.getProduct() == 'opends':
- opendsInstances.append(currentInstance)
-
+ opendsInstances = STAXResult
</script>
- <if expr="msg != ''">
- <sequence>
- <message>'%s' % msg</message>
- <call function="'writeMessage'">
- { 'fileFd' : LOG_MAIN_FD,
- 'content' : msg
- }
- </call>
- <script>ERR_NUM[0] += 1</script>
- </sequence>
- </if>
<!-- == Configure opends == -->
<call function="'configureOpends'">
--
Gitblit v1.10.0