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])
----------------------------------------------------------------------
Message: 1
Date: Thu, 27 Apr 2006 02:11:38 -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:
order constraint and colocation constraint creation tests
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/tests/ResourceTest.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ResourceTest.sh 27 Apr 2006 06:58:06 -0000 1.8
+++ ResourceTest.sh 27 Apr 2006 08:11:38 -0000 1.9
@@ -169,16 +169,56 @@
}
+function create_order_constraint()
+{
+CONS_ID=$1
+FROM=$2
+TO=$3
+TYPE=$4
+
+echo "creating order_constraint $CONS_ID, $FROM, $TO, $TYPE"
+wbemcli ci http://$USER:[EMAIL
PROTECTED]/root/cimv2:HA_OrderConstraint.Id="$CONS_ID",\
+CreationClassName="HA_OrderConstraint",\
+SystemName="LinuxHACluster",\
+SystemCreationClassName="HA_LinuxHA" \
+Id="$CONS_ID",\
+CreationClassName="HA_OrderConstraint",\
+SystemName="LinuxHACluster",\
+SystemCreationClassName="HA_LinuxHA",\
+From="$FROM",\
+To="$TO",\
+OrderType=$TYPE
+}
+
+function create_colocation_constraint()
+{
+CONS_ID=$1
+FROM=$2
+TO=$3
+SCORE=$4
+
+echo "creating colocation_constraint $CONS_ID, $FROM, $TO, $SCORE"
+wbemcli ci http://$USER:[EMAIL
PROTECTED]/root/cimv2:HA_ColocationConstraint.Id="$CONS_ID",\
+CreationClassName="HA_ColocationConstraint",\
+SystemName="LinuxHACluster",\
+SystemCreationClassName="HA_LinuxHA" \
+Id="$CONS_ID",\
+CreationClassName="HA_ColocationConstraint",\
+SystemName="LinuxHACluster",\
+SystemCreationClassName="HA_LinuxHA",\
+From="$FROM",\
+To="$TO",\
+Score=$SCORE
+}
+
##############################################################
# primitive resource
##############################################################
-
echo "---------------------------------------------------"
echo "Primitive Resource Creation test"
echo "---------------------------------------------------"
RESOURCE_ID=test_primitive_resource
ATTRIBUTE_ID=${RESOURCE_ID}_ip
-
delete_resource HA_PrimitiveResource $RESOURCE_ID 2>/dev/null
create_primitive_resource "IPaddr" "$RESOURCE_ID"
create_attribute $RESOURCE_ID $ATTRIBUTE_ID "ip" "127.0.0.111"
@@ -187,29 +227,45 @@
create_attribute $RESOURCE_ID ${RESOURCE_ID}_netmask "netmask" "255.255.255.0"
create_operation $RESOURCE_ID ${RESOURCE_ID}_monitor "monitor" "10s" "20s"
wait_cib_updated
-
-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
+echo "---------------------------------------------------"
+echo "Primitive Resource Creation test 2"
+echo "---------------------------------------------------"
+RESOURCE_ID2=test_primitive_resource_2
+ATTRIBUTE_ID2=${RESOURCE_ID2}_ip
+delete_resource HA_PrimitiveResource $RESOURCE_ID2 2>/dev/null
+create_primitive_resource "IPaddr" "$RESOURCE_ID2"
+create_attribute $RESOURCE_ID2 $ATTRIBUTE_ID2 "ip" "127.0.0.112"
+cib_add_resource $RESOURCE_ID2
+wait_cib_updated
+resource_query $RESOURCE_ID
-#delete_resource HA_PrimitiveResource $RESOURCE_ID
echo "---------------------------------------------------"
echo "Location Constraint creation test"
echo "---------------------------------------------------"
delete_constraint HA_LocationConstraint ${RESOURCE_ID}_location_cons
create_location_constraint ${RESOURCE_ID}_location_cons ${RESOURCE_ID} "node1"
"1000"
+wait_cib_updated
+
+echo "---------------------------------------------------"
+echo "Location Constraint creation test"
+echo "---------------------------------------------------"
+delete_constraint HA_OrderConstraint test_order_cons
+create_order_constraint test_order_cons ${RESOURCE_ID} ${RESOURCE_ID2} "after"
+wait_cib_updated
+
+
+echo "---------------------------------------------------"
+echo "Colocation Constraint creation test"
+echo "---------------------------------------------------"
+delete_constraint HA_ColocationConstraint test_colocation_cons
+create_colocation_constraint test_colocation_cons ${RESOURCE_ID}
${RESOURCE_ID2} 1000
+wait_cib_updated
#############################################################
# resource group
#############################################################
-
GROUP_ID=test_resource_group
delete_resource HA_ResourceGroup $GROUP_ID 2>/dev/null
@@ -218,7 +274,6 @@
echo "---------------------------------------------------"
SUB_RESOURCE_ID=sub_resource_1
SUB_ATTRIBUTE_ID=${SUB_RESOURCE_ID}_ip
-
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
@@ -227,17 +282,6 @@
wait_cib_updated
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 "---------------------------------------------------"
@@ -249,10 +293,4 @@
group_add_resource $GROUP_ID $SUB_RESOURCE_ID2
wait_cib_updated
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: 2
Date: Thu, 27 Apr 2006 02:12:26 -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
Modified Files:
cluster_info.h constraint_common.c
Log Message:
minor updates
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/cluster_info.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- cluster_info.h 25 Apr 2006 17:46:45 -0000 1.7
+++ cluster_info.h 27 Apr 2006 08:12:26 -0000 1.8
@@ -148,8 +148,6 @@
/* get a resource's type: TID_RES_PRIMITIVE, etc */
int cim_get_rsctype(const char * rscid);
-
-/* resource list */
int cim_rsc_is_in_cib(const char *rscid);
/* not include sub resources */
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/constraint_common.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- constraint_common.c 27 Apr 2006 06:52:25 -0000 1.6
+++ constraint_common.c 27 Apr 2006 08:12:26 -0000 1.7
@@ -123,39 +123,35 @@
CMPIInstance* ci = NULL;
CMPIObjectPath * op = NULL;
char * consid = NULL;
- int ret = 0;
DEBUG_ENTER();
/* get the key from the object path */
if (( consid = CMGetKeyString(cop, "Id", rc)) == NULL ) {
- ret = HA_FAIL;
- goto out;
+ cl_log(LOG_ERR, "%s: Id is missing.", __FUNCTION__);
+ return HA_FAIL;
}
/* create a object path */
- op = CMNewObjectPath(broker, CMGetCharPtr(CMGetNameSpace(cop, rc)),
- classname, rc);
+ op = CMNewObjectPath(broker,
+ CMGetCharPtr(CMGetNameSpace(cop, rc)), classname, rc);
if ( CMIsNullObject(op) ){
- ret = HA_FAIL;
- cl_log(LOG_WARNING, "Could not create object path.");
- goto out;
+ cl_log(LOG_ERR, "%s: Could not create object path.",
+ __FUNCTION__);
+ return HA_FAIL;
}
/* make an instance */
ci = make_instance_byid(broker, classname, op, consid, type, rc);
if ( CMIsNullObject(ci) ) {
- ret = HA_FAIL;
- cl_log(LOG_WARNING, "Could not create instance.");
- goto out;
+ cl_log(LOG_ERR, "%s: Could not create instance.",
+ __FUNCTION__);
+ return HA_FAIL;
}
/* add the instance to result */
CMReturnInstance(rslt, ci);
CMReturnDone(rslt);
- ret = HA_OK;
-out:
- DEBUG_LEAVE();
- return ret;
+ return HA_OK;
}
int
------------------------------
_______________________________________________
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 142
*********************************************
