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: Mon, 10 Apr 2006 04:12:06 -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/mof
Modified Files:
LinuxHA.mof
Log Message:
added class HA_ClusteringService
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/mof/LinuxHA.mof,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- LinuxHA.mof 20 Mar 2006 03:24:34 -0000 1.8
+++ LinuxHA.mof 10 Apr 2006 10:12:06 -0000 1.9
@@ -290,67 +290,6 @@
};
-/*===========================================================================*/
-/*
-[ Provider("cmpi:HA_RuleProvider") ]
-class HA_Rule {
- [ Key, Description ("Rule's Id") ]
- string Id;
-
- [ Key ]
- string CreationClassName;
-
- [ Key ]
- string SystemName;
-
- [ Key ]
- string SystemCreationClassName;
-
- string DateExpression [];
- string Expression [];
-};
-*/
-
-//----------------------------------------------
-// HA_InstanceAttributes
-//----------------------------------------------
-/* in DTD, InstanceAttributes contain Attributes, Rules */
-
-/*
-[ Provider("cmpi:HA_InstanceAttributesProvider") ]
-class HA_InstanceAttributes {
- [ Key ]
- string Id;
-
- [ Key ]
- string CreationClassName;
-
- [ Key ]
- string SystemName;
-
- [ Key ]
- string SystemCreationClassName;
-
- string Caption;
-
- string InstAttributes [];
-
-};
-*/
-//----------------------------------------------
-// Association, HA_InstanceAttributesRule
-//----------------------------------------------
-/*
-[ Association, Aggregation, Provider("cmpi:HA_InstanceAttributesRule") ]
-class HA_InstanceAttributesRule {
- [ Key, Aggregate ]
- HA_InstanceAttributes REF Attributes;
-
- [ Key ]
- HA_Rule REF Rule;
-};
-*/
-
//-------------------------------------------------------------------
// HA_ClusterAbstractResource, Primitive Resource or ReousrceGroup
//-------------------------------------------------------------------
@@ -366,10 +305,10 @@
string CreationClassName;
[ Key, Description("Always LinuxHACluster.") ]
- string SystemName;
+ string SystemName = "LinuxHACluster";
[ Key, Description("Always HA_Cluster") ]
- string SystemCreationClassName;
+ string SystemCreationClassName = "HA_Cluster";
[ Description ("Status of the resource") ]
string ResourceStatus; /* running or not running */
@@ -385,8 +324,11 @@
string Caption;
- [ Description ("Instance attributes, in format: [key]=[value]") ]
- string InstanceAttributes[];
+ string Enabled = "false";
+
+ uint32 AddOperation(
+ [IN, Description("Resource to be added") ]
+ HA_Operation REF Operation);
};
//----------------------------------------
@@ -397,12 +339,13 @@
Provider("cmpi:HA_PrimitiveResourceProvider")
]
class HA_PrimitiveResource : HA_ClusterResource {
- string ResourceClass;
+ string ResourceClass = "ocf";
string Type;
- string Provider;
+ string Provider = "heartbeat";
string HostingNode;
- string GroupId;
-
+
+ [ Description ("Instance attributes, in format: key=value") ]
+ string InstanceAttributes[];
};
//------------------------------------------------
@@ -411,6 +354,9 @@
[ Provider("cmpi:HA_ResourceGroupProvider") ]
class HA_ResourceGroup : HA_ClusterResource {
+ uint32 AddPrimitiveResource(
+ [IN, Description("Resource to be added") ]
+ HA_PrimitiveResource REF Resource);
};
//----------------------------------------
@@ -423,6 +369,9 @@
string Interleave;
string CloneMax;
string CloneNodeMax;
+ uint32 AddResource(
+ [IN, Description("Resource to be added") ]
+ HA_Resource REF Resource);
};
//------------------------------------------------
@@ -434,6 +383,9 @@
string CloneNodeMax;
string MaxMasters;
string MaxNodeMasters;
+ uint32 AddResource(
+ [IN, Description("Resource to be added") ]
+ HA_Resource REF Resource);
};
//----------------------------------------
@@ -443,16 +395,10 @@
class HA_Operation {
[ Key, Description ("This operation's Id.") ]
String Id;
-
- [ Key, Description ("The resource name.") ]
- string SystemName;
-
- [ Key, Description ("System creation class name.") ]
- string SystemCreationClassName;
-
- [ Key, Description ("The class name thatct crated this instance.") ]
- string CreationClassName;
-
+
+ [ Key, Description ("The resource that this operation belongs to") ]
+ String ResourceId;
+
[ Description ("The name of the operation") ]
string Name; /* start|stop|monitor */
@@ -472,6 +418,7 @@
[ Description ("The action to take if this action fails") ]
string OnFail; /* nothing|block|stop|fence */
+ string Enabled = "true";
string Caption;
};
@@ -490,20 +437,6 @@
string Caption;
};
-//-----------------------------------------
-// Association, HA_OperationInstance
-//-----------------------------------------
-/*
-[ Association, Aggregation, Provider("cmpi:HA_OperationInstance") ]
-class HA_OperationInstance {
- [ Key, Aggregate ]
- HA_Operation REF Operation;
-
- [ Key, Description ("Attributes that belongs to this operation.") ]
- HA_InstanceAttributes REF Attributes;
-
-};
-*/
//------------------------------------------------
// HA_ResourceConstraint, Abstract
//------------------------------------------------
@@ -562,40 +495,11 @@
string Resource;
string Score;
- [ Description ("Rules, in format: [attribute]<[operation]>[value]") ]
+ [ Description ("Rules, in format: attribute<operation>value") ]
string Rule [];
};
//-----------------------------------------------
-// Association, HA_ResourceConstraintRules
-//-----------------------------------------------
-/*
-[ Association, Aggregation,
- Provider ("cmpi:HA_ResourceConstraintRulesProvider" ) ]
-class HA_ResourceConstraintRules {
- [ Key, Aggregate ]
- HA_ResourceConstraint REF Constraint;
-
- [ Key ]
- HA_Rule REF Rule;
-};
-*/
-//------------------------------------------------
-// Association, HA_ResourceInstance
-//------------------------------------------------
-/*
-[ Association, Aggregation,
- Provider("cmpi:HA_ResourceInstanceProvider") ]
-class HA_ResourceInstance {
- [ Key, Aggregate ]
- HA_ClusterResource REF Resource;
-
- [ Key, Description ( "Instance's attribute" ) ]
- HA_InstanceAttributes REF Attributes;
- String Caption;
-};
-*/
-//-----------------------------------------------
// Association, HA_SubResource
//-----------------------------------------------
@@ -665,6 +569,16 @@
};
+[ Provider ("cmpi:HA_ClusteringServiceProvider") ]
+class HA_ClusteringService {
+ [ Key ]
+ string Id;
+ string Caption;
+ uint32 AddResource(
+ [IN, Description ("The resource to be added.")]
+ HA_ClusterResource REF Resource);
+};
+
//-----------------------------------------
// End of File
//-----------------------------------------
------------------------------
Message: 2
Date: Mon, 10 Apr 2006 04:12:36 -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/mof
Modified Files:
LinuxHA.reg
Log Message:
added class HA_ClusteringService
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/mof/LinuxHA.reg,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- LinuxHA.reg 20 Mar 2006 03:24:34 -0000 1.6
+++ LinuxHA.reg 10 Apr 2006 10:12:35 -0000 1.7
@@ -37,3 +37,4 @@
HA_OperationOnResource root/cimv2 HA_OperationOnProvider
HA_OperationOnProvider instance association
#Indication
HA_Indication root/cimv2 HA_IndicationProvider HA_IndicationProvider indication
+HA_ClusteringService root/cimv2 HA_ClusteringServiceProvider
HA_ClusteringServiceProvider instance
------------------------------
_______________________________________________
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 57
********************************************
