Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: mgmt by alan from ([email protected])
2. Linux-HA CVS: cim by panjiam from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 21 Dec 2005 10:03:56 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/client
Modified Files:
Makefile.am
Log Message:
Added a few more things that kept the RPM from building :-(
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 12 Dec 2005 05:09:41 -0000 1.7
+++ Makefile.am 21 Dec 2005 17:03:56 -0000 1.8
@@ -19,6 +19,7 @@
#
MAINTAINERCLEANFILES = Makefile.in
+
halibdir = $(libdir)/@HB_PKG@
halib_SCRIPTS = haclient.py mgmtcmd.py
halib_DATA = haclient.glade ha.png
@@ -39,5 +40,7 @@
mozhCNdir = $(datadir)/locale/zh_CN/LC_MESSAGES
mozhCN_DATA = haclient.zh_CN.mo
+EXTRA_DIST = $(halib_DATA) $(mozhCN_DATA)
+
.po.mo:
$(MSGFMT) -o $@ $<
------------------------------
Message: 2
Date: Wed, 21 Dec 2005 10:04:58 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cim by panjiam from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : panjiam
Host :
Project : linux-ha
Module : cim
Dir : linux-ha/cim/tests
Modified Files:
runtest.sh
Log Message:
sfcbd returns nothing if no association class name given.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/tests/runtest.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- runtest.sh 21 Dec 2005 10:04:54 -0000 1.5
+++ runtest.sh 21 Dec 2005 17:04:57 -0000 1.6
@@ -53,10 +53,31 @@
HA_InstalledSoftwareIdentity
HA_SubResource
HA_ResourceInstance
- HA_OperationOnResource"
+ HA_OperationOnResource
+ HA_HostedResource
+ HA_ResourceInstance"
ALL_CLASSES="$INST_CLASSES $ASSOC_CLASSES"
+function get_assoc_classes_of ()
+{
+ case $1 in
+ HA_Cluster)
+ echo "HA_ParticipatingNode HA_InstalledSoftwareIdentity";;
+ HA_ClusterNode)
+ echo "HA_ParticipatingNode HA_HostedResource";;
+ HA_PrimitiveResource)
+ echo "HA_SubResource HA_HostedResource
+ HA_ResourceInstance HA_OperationOnResource";;
+ HA_MasterSlaveResource|HA_ResourceClone|HA_ResourceGroup)
+ echo "HA_SubResource HA_ResourceInstance
+ HA_OperationOnResource";;
+ HA_SoftwareIdentity)
+ echo "HA_InstalledSoftwareIdentity";;
+ *) echo ""
+ esac
+}
+
if test $color = 1; then
HL="\33[1m" #high light
@@ -71,14 +92,14 @@
success=0
failure=0
-zero=0
+empty=0
total=0
-function call_zero ()
+function call_empty ()
{
- echo -e $'\t'$HL$YELLOW"[ ZERO ]"$END
- zero=`expr $zero + 1`
+ echo -e $'\t'$HL$YELLOW"[ EMPTY ]"$END
+ empty=`expr $empty + 1`
}
function call_ok ()
@@ -95,7 +116,7 @@
}
-ZERO=0
+EMPTY=0
ERROR=1
SUCCESS=2
@@ -106,11 +127,11 @@
cat $TMP
fi
- # zero
+ # empty
lc=`cat $TMP | wc -l`
if [ $lc -eq 0 ]; then
- call_zero
- return $ZERO
+ call_empty
+ return $EMPTY
fi
# error
@@ -154,9 +175,9 @@
{
op=$1
ref=$2
-
- echo -en $op$'\t'$HL"http://"$USERNAME:"*PASSWD*"@$ref$END
- result=`$WBEMCLI $op http://$USERNAME:[EMAIL PROTECTED] >$TMP 2>&1`
+ assoc_class=$3
+ echo -en $op$'\t'$HL"http://"$USERNAME:"*PASSWD*"@$ref$END -ac
$assoc_class
+ result=`$WBEMCLI $op http://$USERNAME:[EMAIL PROTECTED] -ac
$assoc_class >$TMP 2>&1`
check_result
return $?
}
@@ -165,9 +186,9 @@
{
op=$1
ref=$2
-
- echo -en $op$'\t'$HL"http://"$USERNAME:"*PASSWD*"@$ref$END
- result=`$WBEMCLI $op http://$USERNAME:[EMAIL PROTECTED] >$TMP 2>&1`
+ assoc_class=$3
+ echo -en $op$'\t'$HL"http://"$USERNAME:"*PASSWD*"@$ref$END -arc
$assoc_class
+ result=`$WBEMCLI $op http://$USERNAME:[EMAIL PROTECTED] -arc
$assoc_class >$TMP 2>&1`
check_result
return $?
}
@@ -201,11 +222,14 @@
fi
for ref in $result; do
- cim_enum_associators ain $ref
- cim_enum_associators ai $ref
+ assoc_classes=`get_assoc_classes_of $inst_class`
+ for assoc_class in $assoc_classes; do
+ cim_enum_associators ain $ref $assoc_class
+ cim_enum_associators ai $ref $assoc_class
- cim_enum_references rin $ref
- cim_enum_references ri $ref
+ cim_enum_references rin $ref $assoc_class
+ cim_enum_references ri $ref $assoc_class
+ done
done
done
}
@@ -219,7 +243,7 @@
assoc_test
done
-total=`expr $zero + $failure + $success`
-echo Total: $total, Success: $success, Failure: $failure, Zero: $zero
+total=`expr $empty + $failure + $success`
+echo Total: $total, Success: $success, Failure: $failure, Empty: $empty
rm -rf $TMP
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 25, Issue 58
********************************************
