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: mgmt by zhenh from
([email protected])
2. Linux-HA CVS: mgmt by zhenh from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 14 Jun 2006 01:31:31 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
mgmt_crm.c
Log Message:
use update for complex resource so we can add more than one primivate resources
to a clone or master/slave
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- mgmt_crm.c 13 Jun 2006 07:14:10 -0000 1.54
+++ mgmt_crm.c 14 Jun 2006 07:31:29 -0000 1.55
@@ -999,7 +999,7 @@
mgmt_log(LOG_INFO, "xml:%s",xml);
fragment = create_cib_fragment(cib_object, "resources");
- if (in_group) {
+ if (in_group || clone || master) {
rc = cib_conn->cmds->update(
cib_conn, "resources", fragment, &output,
cib_sync_call);
}
------------------------------
Message: 2
Date: Wed, 14 Jun 2006 01:36:22 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/client
Modified Files:
haclient.py.in haclient.glade
Log Message:
improve some labels, add the support to add more than one primivate resources
to clone or master/slave
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- haclient.py.in 13 Jun 2006 09:57:38 -0000 1.56
+++ haclient.py.in 14 Jun 2006 07:36:19 -0000 1.57
@@ -79,6 +79,14 @@
msgbox(label + _(" can't be empty"))
return False
return True
+
+def check_combo_value(glade, entry, label=None) :
+ if label == None :
+ label = entry
+ if glade.get_widget(entry).child.get_text() == "":
+ msgbox(label + _(" can't be empty"))
+ return False
+ return True
def pygtk_2_6_newer () :
if gtk.pygtk_version[0] > 2 :
@@ -1024,7 +1032,6 @@
self.param_list.insert(param)
def on_clone_changed(self, widget, glade) :
-
if glade.get_widget("is_clone").get_active() :
glade.get_widget("is_master").set_active(False)
glade.get_widget("advance_id").set_property("sensitive", True)
@@ -1032,6 +1039,12 @@
glade.get_widget("clone_node_max").set_property("sensitive", True)
glade.get_widget("master_max").set_property("sensitive", False)
glade.get_widget("master_node_max").set_property("sensitive", False)
+ store = glade.get_widget("advance_id").get_model()
+ store.clear()
+ for rsc in manager.get_all_rsc_id() :
+ if manager.get_rsc_type(rsc) == "clone" :
+ store.append([rsc])
+
else :
glade.get_widget("advance_id").set_property("sensitive", False)
glade.get_widget("clone_max").set_property("sensitive",
False)
@@ -1039,6 +1052,26 @@
glade.get_widget("master_max").set_property("sensitive", False)
glade.get_widget("master_node_max").set_property("sensitive", False)
+ def on_advance_id_changed(self, widget, glade) :
+ advance_id = glade.get_widget("advance_id").child.get_text()
+ if advance_id == None or advance_id == "":
+ return
+
+ if glade.get_widget("is_clone").get_active() :
+ attrs = manager.get_clone(advance_id)
+ if attrs == None :
+ return
+
glade.get_widget("clone_max").set_text(attrs["clone_max"])
+
glade.get_widget("clone_node_max").set_text(attrs["clone_node_max"])
+ elif glade.get_widget("is_master").get_active() :
+ attrs = manager.get_master(advance_id)
+ if attrs == None :
+ return
+
glade.get_widget("clone_max").set_text(attrs["clone_max"])
+
glade.get_widget("clone_node_max").set_text(attrs["clone_node_max"])
+
glade.get_widget("master_max").set_text(attrs["master_max"])
+
glade.get_widget("master_node_max").set_text(attrs["master_node_max"])
+
def on_master_changed(self, widget, glade) :
if glade.get_widget("is_master").get_active() :
glade.get_widget("is_clone").set_active(False)
@@ -1047,6 +1080,11 @@
glade.get_widget("clone_node_max").set_property("sensitive", True)
glade.get_widget("master_max").set_property("sensitive", True)
glade.get_widget("master_node_max").set_property("sensitive", True)
+ store = glade.get_widget("advance_id").get_model()
+ store.clear()
+ for rsc in manager.get_all_rsc_id() :
+ if manager.get_rsc_type(rsc) == "master" :
+ store.append([rsc])
else :
glade.get_widget("advance_id").set_property("sensitive", False)
glade.get_widget("clone_max").set_property("sensitive",
False)
@@ -1128,6 +1166,10 @@
glade.get_widget("is_clone").connect("toggled",
self.on_clone_changed, glade)
glade.get_widget("is_master").connect("toggled",
self.on_master_changed, glade)
+ glade.get_widget("advance_id").connect("changed",
self.on_advance_id_changed, glade)
+ store = gtk.ListStore(str)
+ glade.get_widget("advance_id").set_model(store)
+ glade.get_widget("advance_id").set_text_column(0)
glade.get_widget("advance_id").set_property("sensitive", False)
glade.get_widget("clone_max").set_property("sensitive", False)
@@ -1158,11 +1200,11 @@
passed = check_entry_value(glade, "id",_("ID"))
if glade.get_widget("is_clone").get_active() :
- passed = check_entry_value(glade,
"advance_id",_("ID"))
+ passed = check_combo_value(glade,
"advance_id",_("ID"))
passed = check_entry_value(glade,
"clone_max")
passed = check_entry_value(glade,
"clone_node_max")
if glade.get_widget("is_master").get_active() :
- passed = check_entry_value(glade,
"advance_id",_("ID"))
+ passed = check_combo_value(glade,
"advance_id",_("ID"))
passed = check_entry_value(glade,
"clone_max")
passed = check_entry_value(glade,
"clone_node_max")
passed = check_entry_value(glade,
"master_max")
@@ -1186,7 +1228,7 @@
rsc["advance"] = "master"
else :
rsc["advance"] = ""
- rsc["advance_id"] =
glade.get_widget("advance_id").get_text()
+ rsc["advance_id"] =
glade.get_widget("advance_id").child.get_text()
rsc["clone_max"] =
glade.get_widget("clone_max").get_text()
rsc["clone_node_max"] =
glade.get_widget("clone_node_max").get_text()
rsc["master_max"] =
glade.get_widget("master_max").get_text()
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.glade,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- haclient.glade 12 Jun 2006 10:36:37 -0000 1.16
+++ haclient.glade 14 Jun 2006 07:36:20 -0000 1.17
@@ -2037,7 +2037,8 @@
<child>
<widget class="GtkLabel" id="label200">
<property name="visible">True</property>
- <property name="label" translatable="yes">Group:</property>
+ <property name="label" translatable="yes">Belong to group:
+(type for new one)</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2067,7 +2068,7 @@
<property name="right_attach">4</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
- <property name="y_options">fill</property>
+ <property name="y_options"></property>
</packing>
</child>
</widget>
@@ -2325,10 +2326,11 @@
<child>
<widget class="GtkLabel" id="label159">
<property name="visible">True</property>
- <property name="label" translatable="yes">Advance
ID:</property>
+ <property name="label" translatable="yes">Clone or
Master/Slave ID:
+(type for new one)</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">1</property>
@@ -2446,28 +2448,6 @@
</child>
<child>
- <widget class="GtkEntry" id="advance_id">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char"
translatable="yes">*</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_padding">10</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
<widget class="GtkEntry" id="clone_node_max">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2577,6 +2557,19 @@
<property name="y_options"></property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkComboBoxEntry" id="advance_id">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
@@ -2585,7 +2578,7 @@
<child>
<widget class="GtkLabel" id="label158">
<property name="visible">True</property>
- <property name="label" translatable="yes">Advance:</property>
+ <property name="label" translatable="yes">If belong to Clone or
Master/Slave:</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 31, Issue 44
********************************************
