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: cim by davidlee from
([email protected])
4. Linux-HA CVS: cim by panjiam from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 21 Dec 2005 04:23:37 -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
Removed Files:
linuxha_info.h
Log Message:
removed.
------------------------------
Message: 2
Date: Wed, 21 Dec 2005 07:12:59 -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
Modified Files:
simple_demo.c
Added Files:
assoc_utils.c assoc_utils.h cluster_indication_provider.c
cluster_info.c cluster_info.h cluster_node_provider.c
cluster_provider.c colocation_constraint_provider.c
constraint_common.c constraint_common.h
hosted_resource_provider.c inst_attribute_provider.c
installed_software_provider.c location_constraint_provider.c
masterslave_resource_provider.c operation_on_provider.c
operation_provider.c order_constraint_provider.c
participating_node_provider.c primitive_resource_provider.c
resource_clone_provider.c resource_common.c resource_common.h
resource_group_provider.c resource_instance_provider.c
resource_provider.c rule_provider.c
software_identity_provider.c sub_resource_provider.c
Removed Files:
cmpi_cluster.c cmpi_cluster.h cmpi_cluster_provider.c
cmpi_ha_indication.c cmpi_ha_indication.h
cmpi_ha_indication_provider.c cmpi_hosted_resource.c
cmpi_hosted_resource.h cmpi_hosted_resource_provider.c
cmpi_installed_software_provider.c cmpi_node.c cmpi_node.h
cmpi_node_provider.c cmpi_participating_node_provider.c
cmpi_resource.c cmpi_resource.h cmpi_resource_provider.c
cmpi_rsc_attribute_provider.c cmpi_rsc_group.c
cmpi_rsc_group.h cmpi_rsc_group_provider.c
cmpi_rsc_instance_provider.c cmpi_software_identity_provider.c
cmpi_sub_resource.c cmpi_sub_resource.h
cmpi_sub_resource_provider.c ha_resource.c ha_resource.h
linuxha_info.c
Log Message:
1. renamed and combined files:
originally each provider had a cmpi_xxx.h, a cmpi_xxx.c and a
cmpi_xxx_provider.c, which result in a lot of files in the directory.
So i combined these tree files into one and removed the cmpi_
prefix from the file names.
2. added providers for new classes, these classes are: operation,
constraints, resouce clone and master-slave resource.
3. updated all providers to use the mgmt lib.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/simple_demo.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- simple_demo.c 15 Nov 2005 06:41:00 -0000 1.5
+++ simple_demo.c 21 Dec 2005 14:12:59 -0000 1.6
@@ -26,78 +26,37 @@
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <regex.h>
#include <glib.h>
-#include <clplumbing/cl_malloc.h>
-
-#include "cmpi_cluster.h"
-#include "linuxha_info.h"
#include "cmpi_utils.h"
-#include "ha_resource.h"
-
-
-void print_for_each (gpointer data, gpointer user);
-int tree_print_for_each ( GNode * node, gpointer user);
-
-int tree_print_for_each ( GNode * node, gpointer user) {
- print_for_each(node->data, user );
- return 0;
-}
+#include "cluster_info.h"
+#include <ha_msg.h>
+#include <hb_api.h>
+#include <unistd.h>
-void
-print_for_each (gpointer data, gpointer user)
+int main(int argc, char * argv[])
{
- struct res_node_data * node = NULL;
- node = (struct res_node_data *) data;
+ char * msg;
+ int i;
+ char * result;
+
+ if ( argc < 2 ) return 0;
+ ci_lib_initialize();
+ if ( (msg = mgmt_new_msg(argv[1], NULL)) == NULL ) {
+ return 0;
+ }
- if ( node == NULL ) {
- return;
+ for (i = 2; i < argc; i++ ) {
+ msg = mgmt_msg_append(msg, argv[i]);
}
-
- if ( node->type == GROUP ) {
- struct cluster_resource_group_info * info = NULL;
- info = (struct cluster_resource_group_info *)
- node->res;
- cl_log(LOG_INFO, "---- %d: %s", node->type, info->id);
- /* g_list_foreach(info->res_list, print_for_each, NULL);
- cl_log(LOG_INFO, "---- %s END", info->id); */
-
- } else {
- struct cluster_resource_info * info = NULL;
- info = (struct cluster_resource_info *)
- node->res;
- cl_log(LOG_INFO, "---- %d: %s", node->type, info->name);
+ printf("msg: [%s]\n", msg);
+ result = process_msg(msg);
+ printf("result: [%s]\n", result);
- }
-}
+ ci_lib_finalize();
-int main(void)
-{
-/*
- GList * list = NULL;
- GList * p = NULL;
-*/
- GNode * root = NULL;
-
- init_logger ("cim-demo");
-/*
- list = get_res_list ();
-
- g_list_foreach(list, print_for_each, NULL);
-
- for ( p = list; ; p = g_list_next(p) ){
- cl_log(LOG_INFO, "p @ 0x%0x", (unsigned int)p);
- if ( p == g_list_last(list) ) {
- break;
- }
- }
+ mgmt_del_msg(msg);
+ mgmt_del_msg(result);
- free_res_list(list);
-*/
- root = get_res_tree ();
- g_node_traverse( root, G_POST_ORDER, (GTraverseFlags) 0x3, 10,
- tree_print_for_each, NULL);
return 0;
-
}
------------------------------
Message: 3
Date: Wed, 21 Dec 2005 09:08:02 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cim by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Project : linux-ha
Module : cim
Dir : linux-ha/cim
Modified Files:
cluster_info.h
Log Message:
portability fix
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/cluster_info.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- cluster_info.h 21 Dec 2005 14:12:58 -0000 1.1
+++ cluster_info.h 21 Dec 2005 16:08:02 -0000 1.2
@@ -2,7 +2,9 @@
#ifndef _CLUSTER_INFO_H
#define _CLUSTER_INFO_H
+#ifdef HAVE_STDINT_H
#include <stdint.h>
+#endif /* HAVE_STDINT_H */
#include <glib.h>
#include <hb_api.h>
#include <saf/ais.h>
------------------------------
Message: 4
Date: Wed, 21 Dec 2005 10:00:34 -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/mof
Modified Files:
LinuxHA.reg
Log Message:
fixed some spell errors
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/mof/LinuxHA.reg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- LinuxHA.reg 21 Dec 2005 10:15:44 -0000 1.4
+++ LinuxHA.reg 21 Dec 2005 17:00:34 -0000 1.5
@@ -4,7 +4,7 @@
# HA Cluster Node
HA_ClusterNode root/cimv2 HA_ClusterNodeProvider HA_ClusterNodeProvider
instance
#Primitve Resource
-HA_Resource root/cimv2 HA_PrimitiveResourceProvider
HA_PrimitiveResourceProvider instance
+HA_PrimitiveResource root/cimv2 HA_PrimitiveResourceProvider
HA_PrimitiveResourceProvider instance
#Resource Group
HA_ResourceGroup root/cimv2 HA_ResourceGroupProvider HA_ResourceGroupProvider
instance
# Resource Clone
@@ -30,7 +30,7 @@
# Association, between Cluster and Software
HA_InstalledSoftwareIdentity root/cimv2 HA_InstalledSoftwareIdentityProvider
HA_InstalledSoftwareIdentityProvider instance association
# Association, between Resource and its instance attribute
-HA_ResrouceInstance root/cimv2 HA_ResourceInstanceProvider
HA_ResrouceInstanceProvider instance association
+HA_ResourceInstance root/cimv2 HA_ResourceInstanceProvider
HA_ResourceInstanceProvider instance association
# Association, between Resource (Group/MasterSlave/Clone) and its sub resource
HA_SubResource root/cimv2 HA_SubResourceProvider HA_SubResourceProvider
instance association
# Association, operation and resource
------------------------------
_______________________________________________
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 57
********************************************
