Menu
▾
▴
[Sblim-commit] testsuite associator.pm,1.13,1.14 consistence.pm,1.29,1.30 instance.pm,1.13,1.14 run.sh,1.16,1.17
|
From: Adrian S. <a3s...@us...> - 2005-06-14 16:22:10
|
Update of /cvsroot/sblim/testsuite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23872 Modified Files: associator.pm consistence.pm instance.pm run.sh Log Message: Added -verbose parameter support - -verbose causes actual wbemcli commands to be written to console prior to execution. Index: run.sh =================================================================== RCS file: /cvsroot/sblim/testsuite/run.sh,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- run.sh 21 Jun 2004 17:43:43 -0000 1.16 +++ run.sh 14 Jun 2005 16:21:59 -0000 1.17 @@ -45,6 +45,7 @@ NAMESPACE="/root/cimv2" HOSTNAME="localhost" PORT="5988" +VERBOSE= while [ "$#" -gt 0 ] do @@ -80,6 +81,9 @@ elif [[ -n "$COMMAND" && "$COMMAND" == "-n" ]]; then NAMESPACE=$1; + elif [[ -n "$COMMAND" && "$COMMAND" == "-verbose" ]]; then + VERBOSE="yes"; + fi done @@ -103,6 +107,11 @@ export SBLIM_TESTSUITE_NAMESPACE="$NAMESPACE"; fi +if [[ -n $VERBOSE ]]; then + export SBLIM_TESTSUITE_VERBOSE=1; +fi + + #******************************************************************************# # # exit, if CIMOM is not running Index: instance.pm =================================================================== RCS file: /cvsroot/sblim/testsuite/instance.pm,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- instance.pm 30 Mar 2004 00:10:14 -0000 1.13 +++ instance.pm 14 Jun 2005 16:21:59 -0000 1.14 @@ -45,6 +45,14 @@ # asked for in parameter ${class} -> Provider failure ? # +sub wbem_cli { + my ($cmd,$parm) = @_; + my @enum = (); + my $e = $ENV{'SBLIM_TESTSUITE_VERBOSE'}; + if (defined $e) { print "\n>>${cmd} ${parm}<<\n"; } + @enum = `${cmd} ${parm} 2>&1`; + return @enum +} #******************************************************************************# # call enumInstances or enumInstanceNames of a certain class @@ -64,10 +72,12 @@ my @rc = (0,""); $|=1; - if ( $op =~ /enumInstanceNames/) { @enum = `wbemein ${cimom::HOST}${class} 2>&1`; +# if ( $op =~ /enumInstanceNames/) { @enum = `wbemein ${cimom::HOST}${class} 2>&1`; + if ( $op =~ /enumInstanceNames/) { @enum = wbem_cli("wbemein", "${cimom::HOST}${class}"); $rc[7]= "wbemein ${cimom::HOST}${class}"; } - elsif ( $op =~ /enumInstances/ ) { @enum = `wbemei ${cimom::HOST}${class} 2>&1`; +# elsif ( $op =~ /enumInstances/ ) { @enum = `wbemei ${cimom::HOST}${class} 2>&1`; + elsif ( $op =~ /enumInstances/ ) { @enum = wbem_cli("wbemei", "${cimom::HOST}${class}"); $rc[7]= "wbemei ${cimom::HOST}${class}"; } else { @@ -126,7 +136,8 @@ my ($class, $volatile) = @_; my @stexec = times(); print $class." --- get() started "; - my @enum = `wbemein ${cimom::HOST}${class} 2>&1`; +# my @enum = `wbemein ${cimom::HOST}${class} 2>&1`; + my @enum = wbem_cli("wbemein","${cimom::HOST}${class}"); my @rc = (0,""); $rc[7]= "wbemein ${cimom::HOST}${class}"; $|=1; @@ -214,7 +225,8 @@ my $var = $input; $var =~ s/$class\.//; my @rc = (0,""); - my @rv = `wbemci '${cimom::HOST}$input' $var 2>&1`; +# my @rv = `wbemci '${cimom::HOST}$input' $var 2>&1`; + my @rv = wbem_cli("wbemci", "'${cimom::HOST}$input' $var"); $rc[7]= "wbemci '${cimom::HOST}$input' $var"; $|=1; @@ -231,7 +243,8 @@ } # getInstance to check if creation was really sucessfull - @rv = `wbemgi '${cimom::HOST}${input}' 2>&1`; +# @rv = `wbemgi '${cimom::HOST}${input}' 2>&1`; + @rv = wbem_cli("wbemgi", "'${cimom::HOST}${input}'"); # if $rv[1] contains no value, no exception occurred if ( ! defined $rv[1] ) { @@ -282,7 +295,8 @@ my @stexec = times(); print $class." --- delete() started "; my @rc = (0,""); - my @rv = `wbemdi '${cimom::HOST}${input}' 2>&1`; +# my @rv = `wbemdi '${cimom::HOST}${input}' 2>&1`; + my @rv = wbem_cli("wbemdi", "'${cimom::HOST}${input}'"); $rc[7]= "wbemdi '${cimom::HOST}${input}'"; $|=1; @@ -299,7 +313,8 @@ } # getInstance to check if deletion was really sucessfull - @rv = `wbemgi ${cimom::HOST}${input} 2>&1`; +# @rv = `wbemgi ${cimom::HOST}${input} 2>&1`; + @rv = wbem_cli("wbemgi","${cimom::HOST}${input}"); # if $rv[1] contains no value, no exception occurred if ( ! defined $rv[1] ) { @@ -358,7 +373,8 @@ if( $op =~ /associators/ || $op =~ /associatorNames/ || $op =~ /references/ || $op =~ /referenceNames/ ) { - @enum = `wbemein ${cimom::HOST}${input} 2>&1`; +# @enum = `wbemein ${cimom::HOST}${input} 2>&1`; + @enum = wbem_cli("wbemein", "${cimom::HOST}${input}"); $rc[9]= "wbemein ${cimom::HOST}${input}"; $input=$enum[0]; chomp($input); @@ -366,40 +382,49 @@ } # ---------------------------- Instance Interface -------------------------- # - if ( $op =~ /enumInstanceNames/) { @enum = `wbemein ${cimom::HOST}${class} 2>&1`; +# if ( $op =~ /enumInstanceNames/) { @enum = `wbemein ${cimom::HOST}${class} 2>&1`; + if ( $op =~ /enumInstanceNames/) { @enum = wbem_cli("wbemein", "${cimom::HOST}${class}"); $rc[7]= "wbemein ${cimom::HOST}${class}"; } - elsif ( $op =~ /enumInstances/ ) { @enum = `wbemei ${cimom::HOST}${class} 2>&1`; +# elsif ( $op =~ /enumInstances/ ) { @enum = `wbemei ${cimom::HOST}${class} 2>&1`; + elsif ( $op =~ /enumInstances/ ) { @enum = wbem_cli("wbemei", "${cimom::HOST}${class}"); $rc[7]= "wbemei ${cimom::HOST}${class}"; } - elsif ( $op =~ /get/ ) { @enum = `wbemgi '${cimom::HOST}${input}' 2>&1`; +# elsif ( $op =~ /get/ ) { @enum = `wbemgi '${cimom::HOST}${input}' 2>&1`; + elsif ( $op =~ /get/ ) { @enum = wbem_cli("wbemgi", "'${cimom::HOST}${input}'"); $rc[7]= "wbemgi '${cimom::HOST}${input}'"; } elsif ( $op =~ /create/ ) { my $var = $input; $var =~ s/$class\.|\"//; - @enum = `wbemci '${cimom::HOST}${input}' $var 2>&1`; +# @enum = `wbemci '${cimom::HOST}${input}' $var 2>&1`; + @enum = wbem_cli("wbemci", "'${cimom::HOST}${input}' $var"); $rc[7]= "wbemci '${cimom::HOST}${input}' $var"; } - elsif ( $op =~ /delete/ ) { @enum = `wbemdi '${cimom::HOST}${input}' 2>&1`; +# elsif ( $op =~ /delete/ ) { @enum = `wbemdi '${cimom::HOST}${input}' 2>&1`; + elsif ( $op =~ /delete/ ) { @enum = wbem_cli("wbemdi", "'${cimom::HOST}${input}'"); $rc[7]= "wbemdi '${cimom::HOST}${input}'"; } # -------------------------- Association Interface ------------------------- # elsif ( $op =~ /associators/) { - @enum = `wbemai -ac $class '${cimom::PROTOCOL}${input}' 2>&1`; +# @enum = `wbemai -ac $class '${cimom::PROTOCOL}${input}' 2>&1`; + @enum = wbem_cli("wbemai", "-ac $class '${cimom::PROTOCOL}${input}'"); $rc[9]= "wbemai -ac $class '${cimom::PROTOCOL}${input}'"; } elsif ( $op =~ /associatorNames/ ) { - @enum = `wbemain -ac $class '${cimom::PROTOCOL}${input}' 2>&1`; +# @enum = `wbemain -ac $class '${cimom::PROTOCOL}${input}' 2>&1`; + @enum = wbem_cli("wbemain", "-ac $class '${cimom::PROTOCOL}${input}'"); $rc[9]= "wbemain -ac $class '${cimom::PROTOCOL}${input}' "; } elsif ( $op =~ /references/) { - @enum = `wbemri -arc $class '${cimom::PROTOCOL}${input}' 2>&1`; +# @enum = `wbemri -arc $class '${cimom::PROTOCOL}${input}' 2>&1`; + @enum = wbem_cli("wbemri", "-arc $class '${cimom::PROTOCOL}${input}'"); $rc[9]= "wbemri -arc $class '${cimom::PROTOCOL}${input}'"; } elsif ( $op =~ /referenceNames/ ) { - @enum = `wbemrin -arc $class '${cimom::PROTOCOL}${input}' 2>&1`; +# @enum = `wbemrin -arc $class '${cimom::PROTOCOL}${input}' 2>&1`; + @enum = wbem_cli("wbemrin", "-arc $class '${cimom::PROTOCOL}${input}'"); $rc[9]= "wbemrin -arc $class '${cimom::PROTOCOL}${input}'"; } # --------------------------------- else ---------------------------------- # Index: associator.pm =================================================================== RCS file: /cvsroot/sblim/testsuite/associator.pm,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- associator.pm 21 Jun 2004 16:12:23 -0000 1.13 +++ associator.pm 14 Jun 2005 16:21:51 -0000 1.14 @@ -28,6 +28,15 @@ use cimom; +sub wbem_cli { + my ($cmd,$parm) = @_; + my @enum = (); + my $e = $ENV{'SBLIM_TESTSUITE_VERBOSE'}; + if (defined $e) { print "\n>>${cmd} ${parm}<<\n"; } + @enum = `${cmd} ${parm} 2>&1`; + return @enum +} + #******************************************************************************# # ReturnCode Description : @@ -92,7 +101,8 @@ my @assoc; $|=1; - my @enum = `2>&1 wbemein ${cimom::HOST}${ref}`; +# my @enum = `2>&1 wbemein ${cimom::HOST}${ref}`; + my @enum = wbem_cli("wbemein", "${cimom::HOST}${ref}"); $rc[3]="wbemein ${cimom::HOST}${ref}"; if ( defined $enum[0] && defined $enum[1] ) { if ( $enum[0]=~/\*/ && $enum[1]=~/${cimom::ERROR_PREFIX}/i) { @@ -114,10 +124,12 @@ $count=0; chomp($elem); - if ( $op =~ /associatorNames/) { @assoc = `2>&1 wbemain -ac $class '${cimom::PROTOCOL}${elem}'`; +# if ( $op =~ /associatorNames/) { @assoc = `2>&1 wbemain -ac $class '${cimom::PROTOCOL}${elem}'`; + if ( $op =~ /associatorNames/) { @assoc = wbem_cli("wbemain", "-ac $class '${cimom::PROTOCOL}${elem}'"); $rc[3]="wbemain -ac $class '${cimom::PROTOCOL}${elem}'"; } - elsif ( $op =~ /associators/ ) { @assoc = `2>&1 wbemai -ac $class '${cimom::PROTOCOL}${elem}'`; +# elsif ( $op =~ /associators/ ) { @assoc = `2>&1 wbemai -ac $class '${cimom::PROTOCOL}${elem}'`; + elsif ( $op =~ /associators/ ) { @assoc = wbem_cli("wbemai", "-ac $class '${cimom::PROTOCOL}${elem}'"); $rc[3]="wbemai -ac $class '${cimom::PROTOCOL}${elem}'"; } else { @@ -220,7 +232,8 @@ my @refer; $|=1; - my @enum = `2>&1 wbemein ${cimom::HOST}${ref}`; +# my @enum = `2>&1 wbemein ${cimom::HOST}${ref}`; + my @enum = wbem_cli("wbemein", "${cimom::HOST}${ref}"); $rc[3]="wbemein ${cimom::HOST}${ref}"; if ( defined $enum[0] && defined $enum[1] ) { if ( $enum[0]=~/\*/ && $enum[1]=~/${cimom::ERROR_PREFIX}/i) { @@ -242,10 +255,12 @@ $count=0; chomp($elem); - if ( $op =~ /referenceNames/) { @refer = `2>&1 wbemrin -arc $class '${cimom::PROTOCOL}${elem}'`; +# if ( $op =~ /referenceNames/) { @refer = `2>&1 wbemrin -arc $class '${cimom::PROTOCOL}${elem}'`; + if ( $op =~ /referenceNames/) { @refer = wbem_cli("wbemrin", "-arc $class '${cimom::PROTOCOL}${elem}'"); $rc[3] = "wbemrin -arc $class '${cimom::PROTOCOL}${elem}'"; } - elsif ( $op =~ /references/ ) { @refer = `2>&1 wbemri -arc $class '${cimom::PROTOCOL}${elem}'`; +# elsif ( $op =~ /references/ ) { @refer = `2>&1 wbemri -arc $class '${cimom::PROTOCOL}${elem}'`; + elsif ( $op =~ /references/ ) { @refer = wbem_cli("wbemri", "-arc $class '${cimom::PROTOCOL}${elem}'"); $rc[3] = "wbemri -arc $class '${cimom::PROTOCOL}${elem}'"; } else { @@ -375,7 +390,8 @@ # enumerate instances of the sourceClass and take # each object path entry as reference for the # referenceNames and associatorNames calls - my @enum = `2>&1 wbemein ${cimom::HOST}${sourceClass}`; +# my @enum = `2>&1 wbemein ${cimom::HOST}${sourceClass}`; + my @enum = wbem_cli("wbemein", "${cimom::HOST}${sourceClass}"); if ( defined $enum[0] && defined $enum[1] ) { if ( $enum[0]=~/\*/ && $enum[1]=~/${cimom::ERROR_PREFIX}/i) { @@ -451,7 +467,8 @@ #-------------------------------------------------------------------# - @refer = `2>&1 wbemrin -arc $class -ar $role '${cimom::PROTOCOL}${elem}'`; +# @refer = `2>&1 wbemrin -arc $class -ar $role '${cimom::PROTOCOL}${elem}'`; + @refer = wbem_cli("wbemrin", "-arc $class -ar $role '${cimom::PROTOCOL}${elem}'"); $rc[8] = "wbemrin -arc $class -ar $role '${cimom::PROTOCOL}${elem}'"; if ( defined $refer[0] && defined $refer[1] ) { @@ -486,7 +503,8 @@ #-------------------------------------------------------------------# - @refer = `2>&1 wbemrin -arc $class -ar $resultRole '${cimom::PROTOCOL}${elem}'`; +# @refer = `2>&1 wbemrin -arc $class -ar $resultRole '${cimom::PROTOCOL}${elem}'`; + @refer = wbem_cli("wbemrin", "-arc $class -ar $resultRole '${cimom::PROTOCOL}${elem}'"); $rc[9] = "wbemrin -arc $class -ar $resultRole '${cimom::PROTOCOL}${elem}'"; if(defined $refer[0]) { @@ -522,11 +540,13 @@ $TEST_TARGETCLASS = $targetClass[0]->[$i]; if ( $op == 1 ) { - @assoc = `2>&1 wbemain -ac $class -ar $role -arc $targetClass[0]->[$i] '${cimom::PROTOCOL}${elem}'`; +# @assoc = `2>&1 wbemain -ac $class -ar $role -arc $targetClass[0]->[$i] '${cimom::PROTOCOL}${elem}'`; + @assoc = wbem_cli("wbemain", "-ac $class -ar $role -arc $targetClass[0]->[$i] '${cimom::PROTOCOL}${elem}'"); $rc[8] = "wbemain -ac $class -ar $role -arc $targetClass[0]->[$i] '${cimom::PROTOCOL}${elem}'"; } if ( $op == 2 ) { - @assoc = `2>&1 wbemain -ac $class -arr $resultRole -arc $targetClass[0]->[$i] '${cimom::PROTOCOL}${elem}'`; +# @assoc = `2>&1 wbemain -ac $class -arr $resultRole -arc $targetClass[0]->[$i] '${cimom::PROTOCOL}${elem}'`; + @assoc = wbem_cli("wbemain", "-ac $class -arr $resultRole -arc $targetClass[0]->[$i] '${cimom::PROTOCOL}${elem}'"); $rc[8] = "wbemain -ac $class -arr $resultRole -arc $targetClass[0]->[$i] '${cimom::PROTOCOL}${elem}'"; } @@ -583,12 +603,14 @@ #---------------------------------------------------------------------# if ( $op == 1 ) { - @assoc = `2>&1 wbemain -ac $class -ar $resultRole -arc $targetClass[0]->[$i] '${cimom::PROTOCOL}${elem}'`; +# @assoc = `2>&1 wbemain -ac $class -ar $resultRole -arc $targetClass[0]->[$i] '${cimom::PROTOCOL}${elem}'`; + @assoc = wbem_cli("wbemain", "-ac $class -ar $resultRole -arc $targetClass[0]->[$i] '${cimom::PROTOCOL}${elem}'"); $rc[9] = "wbemain -ac $class -ar $resultRole -arc $targetClass[0]->[$i] '${cimom::PROTOCOL}${elem}'"; } if ( $op == 2 ) { - @assoc = `2>&1 wbemain -ac $class -arr $role -arc $targetClass[0]->[$i] '${cimom::PROTOCOL}${elem}'`; +# @assoc = `2>&1 wbemain -ac $class -arr $role -arc $targetClass[0]->[$i] '${cimom::PROTOCOL}${elem}'`; + @assoc = wbem_cli("wbemain", "-ac $class -arr $role -arc $targetClass[0]->[$i] '${cimom::PROTOCOL}${elem}'"); $rc[9] = "wbemain -ac $class -arr $role -arc $targetClass[0]->[$i] '${cimom::PROTOCOL}${elem}'"; } @@ -634,7 +656,8 @@ $TEST_TARGETCLASS = $targetClass[0]->[$i]; - @assoc = `2>&1 wbemain -ac $class -arc $targetClass[0]->[$i] '${cimom::PROTOCOL}${elem}'`; +# @assoc = `2>&1 wbemain -ac $class -arc $targetClass[0]->[$i] '${cimom::PROTOCOL}${elem}'`; + @assoc = wbem_cli("wbemain", "-ac $class -arc $targetClass[0]->[$i] '${cimom::PROTOCOL}${elem}'"); $rc[8] = "wbemain -ac $class -arc $targetClass[0]->[$i] '${cimom::PROTOCOL}${elem}'"; $count=0; @@ -683,7 +706,8 @@ #---------------------------------------------------------------------# - @assoc = `2>&1 wbemain -ac $class -arc $sourceClass '${cimom::PROTOCOL}${elem}'`; +# @assoc = `2>&1 wbemain -ac $class -arc $sourceClass '${cimom::PROTOCOL}${elem}'`; + @assoc = wbem_cli("wbemain", "-ac $class -arc $sourceClass '${cimom::PROTOCOL}${elem}'"); $rc[9] = "wbemain -ac $class -arc $sourceClass '${cimom::PROTOCOL}${elem}'"; if(defined $assoc[0]) { Index: consistence.pm =================================================================== RCS file: /cvsroot/sblim/testsuite/consistence.pm,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- consistence.pm 21 Jun 2004 16:12:23 -0000 1.29 +++ consistence.pm 14 Jun 2005 16:21:59 -0000 1.30 @@ -31,6 +31,15 @@ use cimom; +sub wbem_cli { + my ($cmd,$parm) = @_; + my @enum = (); + my $e = $ENV{'SBLIM_TESTSUITE_VERBOSE'}; + if (defined $e) { print "\n>>${cmd} ${parm}<<\n"; } + @enum = `${cmd} ${parm} 2>&1`; + return @enum +} + #******************************************************************************# # ReturnCode Description : @@ -541,7 +550,8 @@ my $warning = 0; $|=1; - my @enum = `2>&1 wbemein ${cimom::HOST}${sourceClass}`; +# my @enum = `2>&1 wbemein ${cimom::HOST}${sourceClass}`; + my @enum = wbem_cli("wbemein", "${cimom::HOST}${sourceClass}"); if ( defined $enum[0] && defined $enum[1] ) { if ( $enum[0]=~/\*/ && $enum[1]=~/$cimom::ERROR_PREFIX|exception/i) { $rc[0]=2; @@ -563,7 +573,8 @@ chomp($elem); $inst = $elem; - @assoc = `2>&1 wbemai -ac $CLASS -arc $targetClass '${cimom::PROTOCOL}${elem}'`; +# @assoc = `2>&1 wbemai -ac $CLASS -arc $targetClass '${cimom::PROTOCOL}${elem}'`; + @assoc = wbem_cli("wbemai", "-ac $CLASS -arc $targetClass '${cimom::PROTOCOL}${elem}'"); $checkRef_ain = "wbemai -ac $CLASS -arc $targetClass '${cimom::PROTOCOL}${elem}'"; if( defined $assoc[0] && defined $assoc[1]) { @@ -593,7 +604,8 @@ if ( $assoc =~ /^(.*?)\s/ ) { my $path = $1; - my @get = `2>&1 wbemgi '${cimom::PROTOCOL}${path}'`; +# my @get = `2>&1 wbemgi '${cimom::PROTOCOL}${path}'`; + my @get = wbem_cli("wbemgi", "'${cimom::PROTOCOL}${path}'"); $checkRef_gi = "wbemgi '${cimom::PROTOCOL}${path}'"; if ( defined $get[0]) { |
