Added an optional parameter to the function, SearchObject, for naming attri...

el_kaboing

05.15.2006 2aa16074b3644e46040cafbe641eb62b9abe3343

Added an optional parameter to the function, SearchObject, for naming attributes to return from the search.

 opends/tests/functional-tests/shared/functions/ldap.xml

@@ -162,17 +162,20 @@
        <function-optional-arg name="extraParams" default="' '">
            Optional extra parameters for specific test cases
        </function-optional-arg>
        <function-optional-arg name="attributes" default="' '">
            Attributes to return
        </function-optional-arg>
    </function-map-args>

      <sequence>

        <message>
            'ldapsearch%s -h %s -p %s -D "%s" -w %s %s -b "%s" "%s"' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,dsBaseDN,dsFilter)
            'ldapsearch%s -h %s -p %s -D "%s" -w %s %s -b "%s" "%s" "%s"' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,dsBaseDN,dsFilter,attributes)
        </message>
        <process name="'Search Base Object'">
            <location>'%s' % (STAF_REMOTE_HOSTNAME) </location>
            <command>'%s/ldapsearch%s' % (OPENDS_BINPATH,fileExt)</command>
            <parms>'-h %s -p %s -D "%s" -w %s %s -b "%s" "%s"' % (dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,dsBaseDN,dsFilter)</parms>
            <parms>'-h %s -p %s -D "%s" -w %s %s -b "%s" "%s" "%s"' % (dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,dsBaseDN,dsFilter,attributes)</parms>
            <workdir>'%s' % (OPENDS_BINPATH)</workdir>
            <envs>
                ['PATH=/bin:/usr/bin:%s' % (OPENDS_BINPATH), 'JAVA_HOME=%s' % (JAVA_HOME)]