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])
----------------------------------------------------------------------
Message: 1
Date: Mon, 10 Apr 2006 04:25:05 -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:
resource_clone_provider.c resource_group_provider.c
primitive_resource_provider.c masterslave_resource_provider.c
Log Message:
1. implemented resource creation and operations adding.
2. updated function's names.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/resource_clone_provider.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- resource_clone_provider.c 20 Mar 2006 03:14:10 -0000 1.3
+++ resource_clone_provider.c 10 Apr 2006 10:25:05 -0000 1.4
@@ -63,7 +63,7 @@
{
CMPIStatus rc;
PROVIDER_INIT_LOGGER();
- enumerate_resource(Broker, ClassName, ctx, rslt, ref, FALSE,
+ resource_enum_insts(Broker, ClassName, ctx, rslt, ref, FALSE,
TID_RES_CLONE, &rc);
return rc;
}
@@ -76,7 +76,7 @@
{
CMPIStatus rc;
PROVIDER_INIT_LOGGER();
- enumerate_resource(Broker, ClassName, ctx, rslt, ref, TRUE,
+ resource_enum_insts(Broker, ClassName, ctx, rslt, ref, TRUE,
TID_RES_CLONE, &rc);
return rc;
}
@@ -88,7 +88,7 @@
{
CMPIStatus rc;
PROVIDER_INIT_LOGGER();
- get_resource(Broker, ClassName, ctx, rslt, cop, properties,
+ resource_get_inst(Broker, ClassName, ctx, rslt, cop, properties,
TID_RES_CLONE, &rc);
return rc;
}
@@ -99,7 +99,7 @@
CMPIInstance * ci)
{
CMPIStatus rc = {CMPI_RC_OK, NULL};
- create_resource(Broker, ClassName, ctx, rslt, cop, ci,
+ resource_create_inst(Broker, ClassName, ctx, rslt, cop, ci,
TID_RES_CLONE, &rc);
return rc;
}
@@ -112,8 +112,8 @@
{
CMPIStatus rc = {CMPI_RC_OK, NULL};
PROVIDER_INIT_LOGGER();
- update_resource(Broker, ClassName, ctx, rslt, cop, ci, properties,
- TID_RES_CLONE, &rc);
+ resource_update_inst(Broker, ClassName, ctx, rslt, cop, ci,
+ properties, TID_RES_CLONE, &rc);
return rc;
}
@@ -124,7 +124,7 @@
{
CMPIStatus rc = {CMPI_RC_OK, NULL};
PROVIDER_INIT_LOGGER();
- delete_resource(Broker, ClassName, ctx, rslt, cop, &rc);
+ resource_del_inst(Broker, ClassName, ctx, rslt, cop, &rc);
return rc;
}
@@ -139,8 +139,44 @@
return rc;
}
+
+/************************************************
+ * method
+ ***********************************************/
+
+static CMPIStatus
+ResourceCloneInvokeMethod(CMPIMethodMI * mi, CMPIContext * ctx,
+ CMPIResult * rslt, CMPIObjectPath * ref,
+ const char * method_name, CMPIArgs * in, CMPIArgs * out)
+{
+ CMPIString * classname = NULL;
+ CMPIStatus rc = {CMPI_RC_OK, NULL};
+ int ret = 0;
+
+ PROVIDER_INIT_LOGGER();
+ DEBUG_ENTER();
+ classname = CMGetClassName(ref, &rc);
+ if(strcasecmp(CMGetCharPtr(classname), ClassName) == 0 &&
+ strcasecmp(METHOD_ADD_RESOURCE, method_name) == 0 ){
+ ret = resource_add_subrsc(Broker, ClassName, ctx, rslt,
+ ref, TID_RES_CLONE, in, out, &rc);
+ }
+
+ CMReturnData(rslt, &ret, CMPI_uint32);
+ CMReturnDone(rslt);
+ DEBUG_LEAVE();
+ CMReturn(CMPI_RC_OK);
+}
+
+
+static CMPIStatus
+ResourceCloneMethodCleanup(CMPIMethodMI * mi, CMPIContext * ctx)
+{
+ CMReturn(CMPI_RC_OK);
+}
/*****************************************************
* install provider
****************************************************/
DeclareInstanceMI(ResourceClone, HA_ResourceCloneProvider, Broker);
+DeclareMethodMI(ResourceClone, HA_ResourceCloneProvider, Broker);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/resource_group_provider.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- resource_group_provider.c 20 Mar 2006 03:14:10 -0000 1.2
+++ resource_group_provider.c 10 Apr 2006 10:25:05 -0000 1.3
@@ -61,7 +61,7 @@
{
CMPIStatus rc;
PROVIDER_INIT_LOGGER();
- enumerate_resource(Broker, ClassName, ctx, rslt, ref, FALSE,
+ resource_enum_insts(Broker, ClassName, ctx, rslt, ref, FALSE,
TID_RES_GROUP, &rc);
return rc;
}
@@ -73,7 +73,7 @@
{
CMPIStatus rc;
PROVIDER_INIT_LOGGER();
- enumerate_resource(Broker, ClassName, ctx, rslt, ref, TRUE,
+ resource_enum_insts(Broker, ClassName, ctx, rslt, ref, TRUE,
TID_RES_GROUP, &rc);
return rc;
}
@@ -85,7 +85,7 @@
{
CMPIStatus rc;
PROVIDER_INIT_LOGGER();
- get_resource(Broker, ClassName, ctx, rslt, cop,
+ resource_get_inst(Broker, ClassName, ctx, rslt, cop,
properties, TID_RES_GROUP, &rc);
return rc;
}
@@ -97,7 +97,7 @@
{
CMPIStatus rc = {CMPI_RC_OK, NULL};
PROVIDER_INIT_LOGGER();
- create_resource(Broker, ClassName, ctx, rslt, cop, ci,
+ resource_create_inst(Broker, ClassName, ctx, rslt, cop, ci,
TID_RES_GROUP, &rc);
return rc;
}
@@ -108,8 +108,8 @@
CMPIInstance * ci, char ** properties)
{
CMPIStatus rc = {CMPI_RC_OK, NULL};
- update_resource(Broker, ClassName, ctx, rslt, cop, ci, properties,
- TID_RES_GROUP, &rc);
+ resource_update_inst(Broker, ClassName, ctx, rslt, cop, ci,
+ properties, TID_RES_GROUP, &rc);
return rc;
}
@@ -119,7 +119,7 @@
{
CMPIStatus rc = {CMPI_RC_OK, NULL};
PROVIDER_INIT_LOGGER();
- delete_resource(Broker, ClassName, ctx, rslt, cop, &rc);
+ resource_del_inst(Broker, ClassName, ctx, rslt, cop, &rc);
return rc;
}
@@ -133,9 +133,41 @@
"CIM_ERR_NOT_SUPPORTED");
return rc;
}
-
+
+/************************************************
+ * method
+ ***********************************************/
+
+static CMPIStatus
+ResourceGroupInvokeMethod(CMPIMethodMI * mi, CMPIContext * ctx,
+ CMPIResult * rslt, CMPIObjectPath * ref,
+ const char * method_name, CMPIArgs * in, CMPIArgs * out)
+{
+ CMPIString * classname = NULL;
+ CMPIStatus rc = {CMPI_RC_OK, NULL};
+ int ret = 0;
+
+ classname = CMGetClassName(ref, &rc);
+ if(strcasecmp(CMGetCharPtr(classname), ClassName) == 0 &&
+ strcasecmp(METHOD_ADD_PRIMITIVE_RESOURCE, method_name) == 0){
+ ret = resource_add_subrsc(Broker, ClassName, ctx, rslt,
+ ref, TID_RES_GROUP, in, out, &rc);
+ }
+
+ CMReturnData(rslt, &ret, CMPI_uint32);
+ CMReturnDone(rslt);
+ CMReturn(CMPI_RC_OK);
+}
+
+
+static CMPIStatus
+ResourceGroupMethodCleanup(CMPIMethodMI * mi, CMPIContext * ctx)
+{
+ CMReturn(CMPI_RC_OK);
+}
/**************************************************************
* Entry
*************************************************************/
DeclareInstanceMI(ResourceGroup, HA_ResourceGroupProvider, Broker);
+DeclareMethodMI(ResourceGroup, HA_ResourceGroupProvider, Broker);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/primitive_resource_provider.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- primitive_resource_provider.c 20 Mar 2006 03:14:10 -0000 1.2
+++ primitive_resource_provider.c 10 Apr 2006 10:25:05 -0000 1.3
@@ -39,6 +39,7 @@
static const char * PROVIDER_ID = "cim-rsc";
static CMPIBroker * Broker = NULL;
static char ClassName [] = "HA_PrimitiveResource";
+static const char * METHOD_ADD_OPERATION = "AddOperation";
DeclareInstanceFunctions(PrimitiveResource);
@@ -56,7 +57,7 @@
{
CMPIStatus rc = {CMPI_RC_OK, NULL};
PROVIDER_INIT_LOGGER();
- enumerate_resource(Broker, ClassName, ctx, rslt, ref, FALSE,
+ resource_enum_insts(Broker, ClassName, ctx, rslt, ref, FALSE,
TID_RES_PRIMITIVE, &rc);
return rc;
}
@@ -68,7 +69,7 @@
{
CMPIStatus rc = {CMPI_RC_OK, NULL};
PROVIDER_INIT_LOGGER();
- enumerate_resource(Broker, ClassName, ctx, rslt, ref, TRUE,
+ resource_enum_insts(Broker, ClassName, ctx, rslt, ref, TRUE,
TID_RES_PRIMITIVE, &rc);
return rc;
}
@@ -80,7 +81,7 @@
{
CMPIStatus rc = {CMPI_RC_OK, NULL};
PROVIDER_INIT_LOGGER();
- get_resource(Broker, ClassName, ctx, rslt, cop,
+ resource_get_inst(Broker, ClassName, ctx, rslt, cop,
properties, TID_RES_PRIMITIVE, &rc);
return rc;
}
@@ -92,7 +93,7 @@
{
CMPIStatus rc = {CMPI_RC_OK, NULL};
PROVIDER_INIT_LOGGER();
- create_resource(Broker, ClassName, ctx, rslt, cop, ci,
+ resource_create_inst(Broker, ClassName, ctx, rslt, cop, ci,
TID_RES_PRIMITIVE, &rc);
return rc;
}
@@ -105,8 +106,8 @@
{
CMPIStatus rc = {CMPI_RC_OK, NULL};
PROVIDER_INIT_LOGGER();
- update_resource(Broker, ClassName, ctx, rslt, cop, ci, properties,
- TID_RES_PRIMITIVE, &rc);
+ resource_update_inst(Broker, ClassName, ctx, rslt, cop, ci,
+ properties, TID_RES_PRIMITIVE, &rc);
return rc;
}
@@ -118,7 +119,7 @@
{
CMPIStatus rc = {CMPI_RC_OK, NULL};
PROVIDER_INIT_LOGGER();
- delete_resource(Broker, ClassName, ctx, rslt, cop, &rc);
+ resource_del_inst(Broker, ClassName, ctx, rslt, cop, &rc);
return rc;
}
@@ -133,9 +134,41 @@
return rc;
}
+/***********************************************
+ * method
+ ***********************************************/
+
+static CMPIStatus
+PrimitiveResourceInvokeMethod(CMPIMethodMI * mi, CMPIContext * ctx,
+ CMPIResult * rslt, CMPIObjectPath * ref,
+ const char * method_name, CMPIArgs * in, CMPIArgs * out)
+{
+ CMPIString * classname = NULL;
+ CMPIStatus rc = {CMPI_RC_OK, NULL};
+ int ret = 0;
+
+ classname = CMGetClassName(ref, &rc);
+ if(strcasecmp(CMGetCharPtr(classname), ClassName) == 0 &&
+ strcasecmp(METHOD_ADD_OPERATION, method_name) == 0 ){
+ ret = resource_add_operation(Broker, ClassName, ctx, rslt,
+ ref, TID_RES_PRIMITIVE, in, out, &rc);
+ }
+
+ CMReturnData(rslt, &ret, CMPI_uint32);
+ CMReturnDone(rslt);
+ CMReturn(CMPI_RC_OK);
+}
+
+
+static CMPIStatus
+PrimitiveResourceMethodCleanup(CMPIMethodMI * mi, CMPIContext * ctx)
+{
+ CMReturn(CMPI_RC_OK);
+}
/*****************************************************
* instance MI
****************************************************/
DeclareInstanceMI(PrimitiveResource, HA_PrimitiveResourceProvider, Broker);
+DeclareMethodMI(PrimitiveResource, HA_PrimitiveResourceProvider, Broker);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/masterslave_resource_provider.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- masterslave_resource_provider.c 20 Mar 2006 03:14:10 -0000 1.3
+++ masterslave_resource_provider.c 10 Apr 2006 10:25:05 -0000 1.4
@@ -61,7 +61,7 @@
{
CMPIStatus rc;
PROVIDER_INIT_LOGGER();
- enumerate_resource(Broker, ClassName, ctx, rslt, ref, FALSE,
+ resource_enum_insts(Broker, ClassName, ctx, rslt, ref, FALSE,
TID_RES_MASTER, &rc);
return rc;
}
@@ -74,7 +74,7 @@
{
CMPIStatus rc;
PROVIDER_INIT_LOGGER();
- enumerate_resource(Broker, ClassName, ctx, rslt, ref, TRUE,
+ resource_enum_insts(Broker, ClassName, ctx, rslt, ref, TRUE,
TID_RES_MASTER, &rc);
return rc;
}
@@ -86,7 +86,7 @@
{
CMPIStatus rc;
PROVIDER_INIT_LOGGER();
- get_resource(Broker, ClassName, ctx, rslt, cop,
+ resource_get_inst(Broker, ClassName, ctx, rslt, cop,
properties, TID_RES_MASTER, &rc);
return rc;
}
@@ -98,7 +98,7 @@
{
CMPIStatus rc = {CMPI_RC_OK, NULL};
PROVIDER_INIT_LOGGER();
- create_resource(Broker, ClassName, ctx, rslt, cop, ci,
+ resource_create_inst(Broker, ClassName, ctx, rslt, cop, ci,
TID_RES_MASTER, &rc);
return rc;
}
@@ -111,8 +111,8 @@
{
CMPIStatus rc = {CMPI_RC_OK, NULL};
PROVIDER_INIT_LOGGER();
- update_resource(Broker, ClassName, ctx, rslt, cop, ci, properties,
- TID_RES_MASTER, &rc);
+ resource_update_inst(Broker, ClassName, ctx, rslt, cop, ci,
+ properties, TID_RES_MASTER, &rc);
return rc;
}
@@ -123,7 +123,7 @@
{
CMPIStatus rc = {CMPI_RC_OK, NULL};
PROVIDER_INIT_LOGGER();
- delete_resource(Broker, ClassName, ctx, rslt, cop, &rc);
+ resource_del_inst(Broker, ClassName, ctx, rslt, cop, &rc);
return rc;
}
@@ -138,9 +138,42 @@
return rc;
}
+/************************************************
+ * method
+ ***********************************************/
+
+static CMPIStatus
+MasterSlaveResourceInvokeMethod(CMPIMethodMI * mi, CMPIContext * ctx,
+ CMPIResult * rslt, CMPIObjectPath * ref,
+ const char * method_name, CMPIArgs * in, CMPIArgs * out)
+{
+ CMPIString * classname = NULL;
+ CMPIStatus rc = {CMPI_RC_OK, NULL};
+ int ret = 0;
+
+ PROVIDER_INIT_LOGGER();
+ classname = CMGetClassName(ref, &rc);
+ if(strcasecmp(CMGetCharPtr(classname), ClassName) == 0 &&
+ strcasecmp(METHOD_ADD_RESOURCE, method_name) == 0 ){
+ ret = resource_add_subrsc(Broker, ClassName, ctx, rslt,
+ ref, TID_RES_GROUP, in, out, &rc);
+ }
+
+ CMReturnData(rslt, &ret, CMPI_uint32);
+ CMReturnDone(rslt);
+ CMReturn(CMPI_RC_OK);
+}
+
+
+static CMPIStatus
+MasterSlaveResourceMethodCleanup(CMPIMethodMI * mi, CMPIContext * ctx)
+{
+ CMReturn(CMPI_RC_OK);
+}
/*****************************************************
* install provider
****************************************************/
DeclareInstanceMI(MasterSlaveResource, HA_MasterSlaveResourceProvider, Broker);
+DeclareMethodMI(MasterSlaveResource, HA_MasterSlaveResourceProvider, Broker);
------------------------------
_______________________________________________
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 61
********************************************
