mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
parent: 99cb2c34 | patch | commit | show whitespace
andrug
16.32.2008 7a274c2dba638051b905270860b97efd21bf5813 
client:add suffix as parameter, getting client parameters is now more robust
3 files modified
158 ■■■■■ changed files
opends/tests/system-tests/clients/modifyLoad/modifyLoad.xml 53 ●●●●● patch | view | raw | blame | history
opends/tests/system-tests/clients/searchLoad/searchLoad.xml 52 ●●●●● patch | view | raw | blame | history
opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoad.xml 53 ●●●●● patch | view | raw | blame | history 
 opends/tests/system-tests/clients/modifyLoad/modifyLoad.xml


@@ -42,6 +42,8 @@


      </function-arg-def>


      <function-arg-def name="duration" type="required">


      </function-arg-def>


      <function-arg-def name="suffix" type="required">


      </function-arg-def>


      <function-arg-def name="fileFd" type="required">


      </function-arg-def>


    </function-map-args>


@@ -66,23 +68,51 @@


        


        outFile = '%s/client_modifyLoad_id%s.txt' % \


                  (client.getLogDir(),client.getId())


        cParams = client.getParams()


        serverInstanceFromClient = cParams[0][1]


        baseDn = cParams[1][1]


        nbCnx = cParams[2][1]


        nbMaxSearch = cParams[3][1]


        attributeName = cParams[4][1]


        


        #


        # Extract client parameters from client.getParams()


        #


        cParams = client.getParams()


        try:


          serverInstanceFromClient = cParams[0][1]


        except IndexError:


          serverInstanceFromClient = NOT_DEFINED


          msg = '%s\nERROR: serverInstanceFromClient undefined,mandatory' % msg


        try:


          baseDn = cParams[1][1]


        except IndexError:


          baseDn = NOT_DEFINED


          msg = '%s\nERROR: baseDn undefined,mandatory' % msg


        try:


          nbCnx = cParams[2][1]


        except IndexError:


          nbCnx = NOT_DEFINED


          msg = '%s\nERROR: nbCnx undefined,mandatory' % msg


        try:


          nbMaxSearch = cParams[3][1]


        except IndexError:


          nbMaxSearch = NOT_DEFINED


          msg = '%s\nERROR: nbMaxSearch undefined,mandatory' % msg


        try:


          attributeName = cParams[4][1]


        except IndexError:


          attributeName = NOT_DEFINED


        


        #


        # setup parms to run the client


        #


        if serverInstanceFromClient != NOT_DEFINED:


        sys.path.append("%s/phases/scheduler" % TESTS_DIR )


        from scheduler import getInstance


        serverInstance = getInstance(serverInstanceFromClient,instances)


        if (serverInstance == 'ERROR'):


          msg = 'ERROR: cant find client instance named'


          msg = '%s %s in server instance list' %(msg,serverInstanceFromClient)


            msg = '%s\nERROR: cant find client instance named' % msg


            msg = '%s %s in server instance list' % \


                  (msg,serverInstanceFromClient)


          


        else:


          # remove sec, try to finish before timer kill -9 the client


          duration = duration - 10


            duration = duration - 20


          


          parms=[]


          parms.append('-h %s -p %s' % \


@@ -90,8 +120,9 @@


          parms.append('-b "%s"' % baseDn)


          parms.append('-D "%s" -w "%s"' % \


                      (DIRECTORY_INSTANCE_DN,DIRECTORY_INSTANCE_PSWD))


          parms.append('-t %s -M %s -a %s -d %s' % \


                      (nbCnx,nbMaxSearch,attributeName,duration))


            parms.append('-t %s -M %s -d %s' % (nbCnx,nbMaxSearch,duration))


            if attributeName != NOT_DEFINED:


              parms.append('-a %s' % attributeName)


          parms = ' '.join(parms)


      </script>


      




 opends/tests/system-tests/clients/searchLoad/searchLoad.xml


@@ -42,6 +42,8 @@


      </function-arg-def>


      <function-arg-def name="duration" type="required">


      </function-arg-def>


      <function-arg-def name="suffix" type="required">


      </function-arg-def>


      <function-arg-def name="fileFd" type="required">


      </function-arg-def>


    </function-map-args>


@@ -54,6 +56,7 @@


      <!-- to inform scheduler if it has pass/fail status       -->


      <script>


        errNum = 0


        msg = ''


      </script>


      


      <!-- ==================    Preamble   =================== -->


@@ -66,19 +69,47 @@


        


        outFile = '%s/client_searchLoad_id%s.txt' % \


                  (client.getLogDir(),client.getId())


        cParams = client.getParams()


        serverInstanceFromClient = cParams[0][1]


        baseDn = cParams[1][1]


        nbCnx = cParams[2][1]


        nbMaxSearch = cParams[3][1]


        attributeName = cParams[4][1]


        


        #


        # Extract client parameters from client.getParams()


        #


        cParams = client.getParams()


        try:


          serverInstanceFromClient = cParams[0][1]


        except IndexError:


          serverInstanceFromClient = NOT_DEFINED


          msg = '%s\nERROR: serverInstanceFromClient undefined,mandatory' % msg


        try:


          baseDn = cParams[1][1]


        except IndexError:


          baseDn = NOT_DEFINED


          msg = '%s\nERROR: baseDn undefined,mandatory' % msg


        try:


          nbCnx = cParams[2][1]


        except IndexError:


          nbCnx = NOT_DEFINED


          msg = '%s\nERROR: nbCnx undefined,mandatory' % msg


        try:


          nbMaxSearch = cParams[3][1]


        except IndexError:


          nbMaxSearch = NOT_DEFINED


          msg = '%s\nERROR: nbMaxSearch undefined,mandatory' % msg


        try:


          attributeName = cParams[4][1]


        except IndexError:


          attributeName = NOT_DEFINED


        


        #


        # setup parms to run the client


        #


        if serverInstanceFromClient != NOT_DEFINED:


        sys.path.append("%s/phases/scheduler" % TESTS_DIR )


        from scheduler import getInstance


        serverInstance = getInstance(serverInstanceFromClient,instances)


        if (serverInstance == 'ERROR'):


          msg = 'ERROR: cant find client instance named'


          msg = '%s %s in server instance list' %(msg,serverInstanceFromClient)


            msg = '%s\nERROR: cant find client instance named' % msg


            msg = '%s %s in server instance list' % \


                  (msg,serverInstanceFromClient)


          


        else:


          # remove sec, try to finish before timer kill -9 the client


@@ -90,8 +121,9 @@


          parms.append('-b "%s"' % baseDn)


          parms.append('-D "%s" -w "%s"' % \


                      (DIRECTORY_INSTANCE_DN,DIRECTORY_INSTANCE_PSWD))


          parms.append('-t %s -M %s -a %s -d %s' % \


                      (nbCnx,nbMaxSearch,attributeName,duration))


            parms.append('-t %s -M %s -d %s' % (nbCnx,nbMaxSearch,duration))


            if attributeName != NOT_DEFINED:


              parms.append('-a %s' % attributeName)


          parms = ' '.join(parms)


      </script>


      




 opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoad.xml


@@ -42,6 +42,8 @@


      </function-arg-def>


      <function-arg-def name="duration" type="required">


      </function-arg-def>


      <function-arg-def name="suffix" type="required">


      </function-arg-def>


      <function-arg-def name="fileFd" type="required">


      </function-arg-def>


    </function-map-args>


@@ -66,23 +68,51 @@


        


        outFile = '%s/client_sampleSearchLoad_id%s.txt' % \


                  (client.getLogDir(),client.getId())


        cParams = client.getParams()


        serverInstanceFromClient = cParams[0][1]


        baseDn = cParams[1][1]


        nbCnx = cParams[2][1]


        nbMaxSearch = cParams[3][1]


        attributeName = cParams[4][1]


        


        #


        # Extract client parameters from client.getParams()


        #


        cParams = client.getParams()


        try:


          serverInstanceFromClient = cParams[0][1]


        except IndexError:


          serverInstanceFromClient = NOT_DEFINED


          msg = '%s\nERROR: serverInstanceFromClient undefined,mandatory' % msg


        try:


          baseDn = cParams[1][1]


        except IndexError:


          baseDn = NOT_DEFINED


          msg = '%s\nERROR: baseDn undefined,mandatory' % msg


        try:


          nbCnx = cParams[2][1]


        except IndexError:


          nbCnx = NOT_DEFINED


          msg = '%s\nERROR: nbCnx undefined,mandatory' % msg


        try:


          nbMaxSearch = cParams[3][1]


        except IndexError:


          nbMaxSearch = NOT_DEFINED


          msg = '%s\nERROR: nbMaxSearch undefined,mandatory' % msg


        try:


          attributeName = cParams[4][1]


        except IndexError:


          attributeName = NOT_DEFINED


        


        #


        # setup parms to run the client


        #


        if serverInstanceFromClient != NOT_DEFINED:


        sys.path.append("%s/phases/scheduler" % TESTS_DIR )


        from scheduler import getInstance


        serverInstance = getInstance(serverInstanceFromClient,instances)


        if (serverInstance == 'ERROR'):


          msg = 'ERROR: cant find client instance named'


          msg = '%s %s in server instance list' %(msg,serverInstanceFromClient)


            msg = '%s\nERROR: cant find client instance named' % msg


            msg = '%s %s in server instance list' % \


                  (msg,serverInstanceFromClient)


          


        else:


          # remove sec, try to finish before timer kill -9 the client


          duration = duration - 10


            duration = duration - 20


          


          parms=[]


          parms.append('-h %s -p %s' % \


@@ -90,8 +120,9 @@


          parms.append('-b "%s"' % baseDn)


          parms.append('-D "%s" -w "%s"' % \


                      (DIRECTORY_INSTANCE_DN,DIRECTORY_INSTANCE_PSWD))


          parms.append('-t %s -M %s -a %s -d %s' % \


                      (nbCnx,nbMaxSearch,attributeName,duration))


            parms.append('-t %s -M %s -d %s' % (nbCnx,nbMaxSearch,duration))


            if attributeName != NOT_DEFINED:


              parms.append('-a %s' % attributeName)


          parms = ' '.join(parms)


      </script>