Move topology files to "shared/topology" folder

Christophe Sovant

17.23.2009 0dd46bee0fdb313979dc5891eb304976919c66d9

Move topology files to "shared/topology" folder

 opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 !      Portions Copyright 2006-2009 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -61,8 +61,8 @@
            file="'%s/testcases/replication/replication_setup.xml' 
                  % (TESTS_DIR)"/>
          <call function="'replication_setup'">
            { 'topologyFile'       : '%s/config/replication/basic_topology.txt'\
                                      % TESTS_DIR,
            { 'topologyFile'       : '%s/basic_topology.txt' \
                                      % TESTS_TOPOLOGY_DIR,
              'dataFile'           : 'Short_Example.ldif',
              'isolateLdapServers' : True,
              'enableDebugLogs'    : False

 opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -61,8 +61,8 @@
            file="'%s/testcases/replication/replication_setup.xml'
                  % (TESTS_DIR)"/>
          <call function="'replication_setup'">
            { 'topologyFile'     : '%s/config/replication/3server_topology.txt'\
                                   % TESTS_DIR,
            { 'topologyFile'     : '%s/3server_topology.txt' \
                                    % TESTS_TOPOLOGY_DIR,
              'secureReplication': True,
              'dataFile'         : 'Example.ldif'
            }

 opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -59,7 +59,7 @@
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/replication/replication_setup.xml' % (TESTS_DIR)"/>
          <call function="'replication_setup'">
            {  'topologyFile'  :  '%s/config/replication/3server_topology.txt' % TESTS_DIR  }
            {  'topologyFile' : '%s/3server_topology.txt' % TESTS_TOPOLOGY_DIR }
          </call>
                                    
          <script>

 opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2007-2008 Sun Microsystems, Inc.
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 ! -->
<stax>

@@ -33,8 +33,7 @@
    <function-map-args>
      <function-arg-def name="topologyFile" 
                        type="optional" 
                        default="'%s/config/replication/basic_topology.txt' 
                          % TESTS_DIR">
                        default="'%s/basic_topology.txt' % TESTS_TOPOLOGY_DIR">
        <function-arg-description>
          Pathname to file describing the topology.
        </function-arg-description>

 opends/tests/staf-tests/shared/tests/config.py.stubs

@@ -21,7 +21,7 @@
# CDDL HEADER END
#
#
#      Copyright 2007-2008 Sun Microsystems, Inc.
#      Copyright 2007-2009 Sun Microsystems, Inc.

TEST_OS_STRING              = '${os.name}'
TEST_JVM_STRING             = '${java.version}(${sun.arch.data.model} bits)'
@@ -37,8 +37,8 @@
TESTS_DIR                   = '%s/functional-tests' % TESTS_ROOT
TESTS_SHARED_DIR            = '%s/shared' % TESTS_DIR
TESTS_FUNCTIONS_DIR         = '%s/shared/functions' % TESTS_ROOT
TESTS_DATA_DIR              = '%s/data' % TESTS_SHARED_DIR
TESTS_JAVA_DIR              = '%s/shared/java' % TESTS_ROOT
TESTS_TOPOLOGY_DIR          = '%s/shared/topology' % TESTS_ROOT
DIRECTORY_INSTANCE_DN       = '${opends.admin.dn}'
DIRECTORY_INSTANCE_PSWD     = '${opends.admin.pwd}'
DIRECTORY_INSTANCE_BIN      = '%s' % TMPDIR

 opends/tests/staf-tests/shared/topology/3server_topology.txt

 opends/tests/staf-tests/shared/topology/basic_topology.txt

 opends/tests/staf-tests/stress-tests/config/replication/basic_topology.txt

File was deleted