move pre-configuration phase before generation and import of ldif data

andrug

28.50.2008 52f371288dc7e8d6bac22333a6a0474d1608d8a6

move pre-configuration phase before generation and import of ldif data

 opends/tests/system-tests/phases/main_run.xml

@@ -234,22 +234,6 @@
      </if>
      
      
      <!-- ============ GENERATE LDIF & IMPORT LDIF  ================== -->
      <if expr="runGenerateLdif == 'true' and ERR_NUM_TOTAL == 0">
        <sequence>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/phases/generateLdif/generateLdif.xml' % (TESTS_DIR)"/>
          <call function="'generateLdif'">
            { 'suffix'       : suffix }
          </call>
          <script>
            ERR_NUM_GEN_LDIF = ERR_NUM[0]
            ERR_NUM_TOTAL    = ERR_NUM_TOTAL + ERR_NUM[0]
          </script>
        </sequence>
      </if>
      
      
      <!-- ============ PRE-CONFIGURATION ============================ -->
      <if expr="runPreConfiguration == 'true' and ERR_NUM_TOTAL == 0">
        <sequence>
@@ -290,6 +274,22 @@
      </if>
      
      
      <!-- ============ GENERATE LDIF & IMPORT LDIF  ================== -->
      <if expr="runGenerateLdif == 'true' and ERR_NUM_TOTAL == 0">
        <sequence>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/phases/generateLdif/generateLdif.xml' % (TESTS_DIR)"/>
          <call function="'generateLdif'">
            { 'suffix'       : suffix }
          </call>
          <script>
            ERR_NUM_GEN_LDIF = ERR_NUM[0]
            ERR_NUM_TOTAL    = ERR_NUM_TOTAL + ERR_NUM[0]
          </script>
        </sequence>
      </if>
      
      
      <!-- ============ CONFIGURATION  =============================== -->
      <if expr="runConfiguration == 'true' and ERR_NUM_TOTAL == 0">
        <sequence>