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: cim by panjiam from
([email protected])
2. Linux-HA CVS: cim by panjiam from
([email protected])
3. Linux-HA CVS: heartbeat by davidlee from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 25 Apr 2006 01:08:15 -0600 (MDT)
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
Added Files:
ResourceTest.sh
Log Message:
resource creation/update/deletion test script
------------------------------
Message: 2
Date: Tue, 25 Apr 2006 02:59:57 -0600 (MDT)
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:
ResourceTest.sh
Log Message:
added resource group tests
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/tests/ResourceTest.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ResourceTest.sh 25 Apr 2006 07:08:14 -0000 1.1
+++ ResourceTest.sh 25 Apr 2006 08:59:56 -0000 1.2
@@ -1,31 +1,187 @@
#!/bin/sh
+
+if test $# != 2; then
+ echo "usage: $0 user password."
+ exit 1
+fi
+
USER=$1
PASSWD=$2
CIB=/var/lib/heartbeat/crm/cib.xml
-##############################################################
-# primitive resource
-##############################################################
+function resource_query ()
+{
+ crm_resource -Q -r $1
+}
#create a primitive resource
-wbemcli ci http://$USER:[EMAIL
PROTECTED]/root/cimv2:HA_PrimitiveResource.Id="test_resource_id",CreationClassName="HA_PrimitiveResource",SystemName="LinuxHACluster",SystemCreationClassName="HA_LinuxHA"
ResourceClass="ocf",Type="IPaddr",Provider="heartbeat",Id="test_resource_id",CreationClassName="HA_PrimitiveResource",SystemName="LinuxHACluster",SystemCreationClassName="HA_LinuxHA"
+function create_primitive_resource()
+{
+TYPE=$1
+RSC_ID=$2
+
+echo "creating resource, type: $TYPE, id: $RSC_ID."
+wbemcli ci http://$USER:[EMAIL
PROTECTED]/root/cimv2:HA_PrimitiveResource.Id="$RSC_ID",\
+CreationClassName="HA_PrimitiveResource",\
+SystemName="LinuxHACluster",\
+SystemCreationClassName="HA_LinuxHA" \
+ResourceClass="ocf",\
+Type="$TYPE",\
+Provider="heartbeat",\
+Id="$RSC_ID",\
+CreationClassName="HA_PrimitiveResource",\
+SystemName="LinuxHACluster",\
+SystemCreationClassName="HA_LinuxHA" > /dev/null
+}
+
+#create its attributes
+function create_attribute()
+{
+RSC_ID=$1
+ATTR_ID=$2
+NAME=$3
+VALUE=$4
+
+echo "creating attribute for resource: $RSC_ID, id: $ATTR_ID, $NAME=$VALUE."
+wbemcli ci http://$USER:[EMAIL
PROTECTED]/root/cimv2:HA_InstanceAttributes.Id="$ATTR_ID",\
+ResourceId="$RSC_ID" \
+Id="$ATTR_ID",\
+ResourceId="$RSC_ID",\
+Name="$NAME",\
+Value="$VALUE" > /dev/null
+}
+
#add to CIB
-wbemcli cm http://$USER:[EMAIL
PROTECTED]/root/cimv2:HA_ClusteringService.Id=default_service_id
AddResource.Resource=http://localhost/root/cimv2:HA_PrimitiveResource.Id="test_resource_id";
+function cib_add_resource()
+{
+RSC_ID=$1
+echo "adding resource: $RSC_ID to CIB."
+wbemcli cm http://$USER:[EMAIL
PROTECTED]/root/cimv2:HA_ClusteringService.Id=default_service_id \
+AddResource.Resource=http://localhost/root/cimv2:HA_PrimitiveResource.Id="$RSC_ID";
> /dev/null
+}
-# check CIB
-grep "test_resource_id" $CIB > /dev/null
+#delete
+function delete_resource ()
+{
+CLASSNAME=$1
+RSC_ID=$2
+
+echo "deleting resource: $RSC_ID."
+wbemcli di http://$USER:[EMAIL PROTECTED]/root/cimv2:$CLASSNAME.Id="$RSC_ID",\
+CreationClassName="HA_PrimitiveResource",\
+SystemName="LinuxHACluster",\
+SystemCreationClassName="HA_LinuxHA"
+}
+
+
+# create a resource group
+function create_resource_group()
+{
+GROUP_ID=$1
+
+echo "creating resource group, id: $GROUP_ID."
+wbemcli ci http://$USER:[EMAIL
PROTECTED]/root/cimv2:HA_ResourceGroup.Id="$GROUP_ID",\
+CreationClassName="HA_ResourceGroup",\
+SystemName="LinuxHACluster",\
+SystemCreationClassName="HA_LinuxHA" \
+Id="$GROUP_ID",\
+CreationClassName="HA_ResourceGroup",\
+SystemName="LinuxHACluster",\
+SystemCreationClassName="HA_LinuxHA" > /dev/null
+}
+
+#add resource to group
+function group_add_resource()
+{
+GROUP_ID=$1
+RSC_ID=$2
+echo "adding resource: $RSC_ID to resource group $GROUP_ID."
+wbemcli cm http://$USER:[EMAIL
PROTECTED]/root/cimv2:HA_ResourceGroup.Id=$GROUP_ID,\
+CreationClassName="HA_ResourceGroup",\
+SystemName="LinuxHACluster",\
+SystemCreationClassName="HA_LinuxHA" \
+AddPrimitiveResource.Resource=http://localhost/root/cimv2:HA_PrimitiveResource.Id="$RSC_ID";
> /dev/null
+}
-if [ $? != 0 ]; then
- echo "*** add primitive resource test_resource_id failed."
+
+##############################################################
+# primitive resource
+##############################################################
+
+echo "---------------------------------------------------"
+echo "Primitive Resource Creation test"
+echo "---------------------------------------------------"
+RESOURCE_ID=test_primitive_resource
+ATTRIBUTE_ID=${RESOURCE_ID}_ip
+
+create_primitive_resource "IPaddr" "$RESOURCE_ID"
+create_attribute $RESOURCE_ID $ATTRIBUTE_ID "ip" "127.0.0.111"
+
+cib_add_resource $RESOURCE_ID
+sleep 2
+
+rc=0
+resource_query $RESOURCE_ID
+resource_query $RESOURCE_ID | grep "$RESOURCE_ID">/dev/null \
+ || { echo "[FAILED] $RESOURCE_ID not found." && rc=1; }
+resource_query $RESOURCE_ID | grep "$ATTRIBUTE_ID">/dev/null\
+ || { echo "[FAILED] $ATTRIBUTE_ID not found." && rc=1; }
+if [ $rc = 0 ]; then
+ echo "[OK] create resource group:$GROUP_ID successfully."
fi
-#delete
-wbemcli di http://$USER:[EMAIL
PROTECTED]/root/cimv2:HA_PrimitiveResource.Id="test_resource_id",CreationClassName="HA_PrimitiveResource",SystemName="LinuxHACluster",SystemCreationClassName="HA_LinuxHA"
+delete_resource HA_PrimitiveResource $RESOURCE_ID
#############################################################
# resource group
#############################################################
+echo "---------------------------------------------------"
+echo "Resource Group Creation test"
+echo "---------------------------------------------------"
+SUB_RESOURCE_ID=sub_resource_1
+SUB_ATTRIBUTE_ID=${SUB_RESOURCE_ID}_ip
+GROUP_ID=test_resource_group
+
+create_primitive_resource "IPaddr" "$SUB_RESOURCE_ID"
+create_attribute $SUB_RESOURCE_ID $SUB_ATTRIBUTE_ID "ip" "127.0.0.111"
+
+create_resource_group $GROUP_ID
+group_add_resource $GROUP_ID $SUB_RESOURCE_ID
+
+cib_add_resource $GROUP_ID
+sleep 2
+resource_query $GROUP_ID
+
+rc=0
+resource_query $GROUP_ID | grep "$GROUP_ID" > /dev/null \
+ || { echo "[FAILED] $GROUP_ID not found in CIB." && rc=1; }
+resource_query $GROUP_ID | grep "$SUB_RESOURCE_ID" >/dev/null \
+ || { echo "[FAILED] $SUB_RESOURCE_ID not found in CIB." && rc=1; }
+resource_query $GROUP_ID | grep "$SUB_ATTRIBUTE_ID" >/dev/null \
+ || { echo "[FAILED] $SUB_ATTRIBUTE_ID not found in CIB." && rc=1; }
+
+if [ $rc = 0 ]; then
+ echo "[OK] create resource group:$GROUP_ID successfully."
+fi
+
+echo "---------------------------------------------------"
+echo "Resource Group Add Resource test"
+echo "---------------------------------------------------"
+SUB_RESOURCE_ID2=sub_resource_2
+SUB_ATTRIBUTE_ID2=${SUB_RESOURCE_ID2}_ip
+
+create_primitive_resource "IPaddr" $SUB_RESOURCE_ID2
+create_attribute $SUB_RESOURCE_ID2 $SUB_ATTRIBUTE_ID2 "ip" "127.0.0.112"
+group_add_resource $GROUP_ID $SUB_RESOURCE_ID2
+
+sleep 2
+resource_query $GROUP_ID
+resource_query $GROUP_ID | grep $SUB_RESOURCE_ID2 >/dev/null \
+ || { echo "[FAILED] $SUB_RESOURCE_ID2 not found in CIB." && rc=1; }
+
+delete_resource HA_ResourceGroup $GROUP_ID
+
------------------------------
Message: 3
Date: Tue, 25 Apr 2006 11:23:39 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat/lib
Modified Files:
BasicSanityCheck.in
Log Message:
In some environments, python may not be on the default PATH
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/lib/BasicSanityCheck.in,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -3 -r1.97 -r1.98
--- BasicSanityCheck.in 19 Apr 2006 12:22:08 -0000 1.97
+++ BasicSanityCheck.in 25 Apr 2006 17:23:38 -0000 1.98
@@ -42,7 +42,7 @@
MGMTDTEST=$HBLIB/mgmtdtest
LRMTEST=$HBLIB/lrmtest/LRMBasicSanityCheck
STONITHDTEST=$HBLIB/stonithdtest/STONITHDBasicSanityCheck
-CRMTEST="python $HBLIB/cts/CTSlab.py --bsc"
+CRMTEST="@PYTHON@ $HBLIB/cts/CTSlab.py --bsc"
SNMPAGENTTEST=$HBLIB/SNMPAgentSanityCheck
BASE64_MD5_TEST=$HBLIB/base64_md5_test
MALLOC_CHECK_=2; export MALLOC_CHECK_
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 128
*********************************************
