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 alan from ([email protected])
2. Linux-HA CVS: mgmt by alan from ([email protected])
3. Linux-HA CVS: mgmt by zhenh from
([email protected])
4. Linux-HA CVS: cim by panjiam from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 21 Dec 2005 01:27:54 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
Makefile.am
Log Message:
Added a missing header to a missing macro...
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Makefile.am 12 Dec 2005 20:17:26 -0000 1.8
+++ Makefile.am 21 Dec 2005 08:27:53 -0000 1.9
@@ -27,6 +27,7 @@
COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la \
$(GLIBLIB)
+noinst_HEADERS = mgmt_internal.h
LRM_DIR = lrm
------------------------------
Message: 2
Date: Wed, 21 Dec 2005 01:36:11 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
Makefile.am
Log Message:
Put in the missing mgmtd.pam file into the makefile
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Makefile.am 21 Dec 2005 08:27:53 -0000 1.9
+++ Makefile.am 21 Dec 2005 08:36:11 -0000 1.10
@@ -28,6 +28,7 @@
COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la \
$(GLIBLIB)
noinst_HEADERS = mgmt_internal.h
+EXTRA_DIST = mgmtd.pam
LRM_DIR = lrm
------------------------------
Message: 3
Date: Wed, 21 Dec 2005 01:56:01 -0700 (MST)
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
Log Message:
imporve the behave of dialogs
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- haclient.py.in 20 Dec 2005 08:16:05 -0000 1.6
+++ haclient.py.in 21 Dec 2005 08:56:01 -0000 1.7
@@ -116,13 +116,15 @@
def confirmbox(msg, parent = None) :
if parent == None :
parent = window.win_widget
- dialog = gtk.Dialog(_("Confirm"), parent, gtk.DIALOG_MODAL,
(gtk.STOCK_YES, True, gtk.STOCK_NO, False))
+ dialog = gtk.Dialog(_("Confirm"), parent, gtk.DIALOG_MODAL,
+ (gtk.STOCK_YES, gtk.RESPONSE_YES, gtk.STOCK_NO,
gtk.RESPONSE_NO))
label = gtk.Label(msg)
dialog.vbox.add(label)
+ dialog.set_default_response(gtk.RESPONSE_YES)
label.show()
ret = dialog.run()
dialog.destroy()
- return ret
+ return ret == gtk.RESPONSE_YES
def on_label_active(event, widget, url) :
webbrowser.open(url)
@@ -1155,7 +1157,7 @@
def on_login(self, action) :
dialog = gtk.Dialog(_("Login"),self.win_widget,
gtk.DIALOG_MODAL,
- (gtk.STOCK_OK, True, gtk.STOCK_CANCEL, False))
+ (gtk.STOCK_OK, gtk.RESPONSE_OK, gtk.STOCK_CANCEL,
gtk.RESPONSE_CANCEL))
glade = gtk.glade.XML(UI_FILE, "logindlg_main", "haclient")
main = glade.get_widget("logindlg_main")
@@ -1173,7 +1175,7 @@
dialog.destroy()
- if ret :
+ if ret == gtk.RESPONSE_OK:
if not manager.login(server, user, password):
msgbox(_("login failed"))
------------------------------
Message: 4
Date: Wed, 21 Dec 2005 03:04:55 -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/tests
Modified Files:
runtest.sh
Log Message:
updated for new classes, simpilfied the association test case
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/tests/runtest.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- runtest.sh 4 Nov 2005 08:55:19 -0000 1.4
+++ runtest.sh 21 Dec 2005 10:04:54 -0000 1.5
@@ -21,8 +21,10 @@
fi
#set to your username, password, host
-USERNAME=root
-PASSWD=hadev
+echo -en "user: "
+read USERNAME
+echo -en "password: "
+read PASSWD
HOST=localhost
NAMESPACE=root/cimv2
@@ -36,17 +38,22 @@
WBEMCLI="$WBEMCLI -nl"
-INST_CLASSES="LinuxHA_Cluster
- LinuxHA_SoftwareIdentity
- LinuxHA_ClusterNode
- LinuxHA_ClusterResource
- LinuxHA_ClusterResourceGroup"
-
-ASSOC_CLASSES="LinuxHA_ParticipatingNode
- LinuxHA_HostedResource
- LinuxHA_SubResource
- LinuxHA_InstalledSoftwareIdentity"
-
+INST_CLASSES="HA_Cluster
+ HA_SoftwareIdentity
+ HA_ClusterNode
+ HA_ResourceGroup
+ HA_ResourceClone
+ HA_PrimitiveResource
+ HA_MasterSlaveResource
+ HA_OrderConstraint
+ HA_LocationConstraint
+ HA_ColocationConstraint"
+
+ASSOC_CLASSES="HA_ParticipatingNode
+ HA_InstalledSoftwareIdentity
+ HA_SubResource
+ HA_ResourceInstance
+ HA_OperationOnResource"
ALL_CLASSES="$INST_CLASSES $ASSOC_CLASSES"
@@ -118,46 +125,12 @@
return $SUCCESS
}
-function test_relation ()
-{
- assoc_class=$1
- inst_class=$2
- l=""
- r=""
-
- case $assoc_class in
- LinuxHA_ParticipatingNode)
- l="LinuxHA_Cluster"
- r="LinuxHA_ClusterNode";;
- LinuxHA_HostedResource)
- l="LinuxHA_ClusterNode"
- r="LinuxHA_ClusterResource";;
- LinuxHA_SubResource)
- l="LinuxHA_ClusterResource"
- r="LinuxHA_ClsterResourceGroup";;
- LinuxHA_InstalledSoftwareIdentity)
- l="LinuxHA_Cluster"
- r="LinuxHA_SoftwareIdentity";;
- esac
-
- if test x"$inst_class" = x"$l"; then
- return $SUCCESS
- fi
-
- if test x"$inst_class" = x"$r"; then
- return $SUCCESS
- fi
-
- return $ERROR
-}
-
-
################################################################
function cim_get_instance ()
{
ref=$1
- echo -en gi$'\t'$HL"http://$USERNAME:$PASSWD@"$ref$END
+ echo -en gi$'\t'$HL"http://$USERNAME:"*PASSWD*"@"$ref$END
result=`$WBEMCLI gi http://$USERNAME:[EMAIL PROTECTED] >$TMP 2>&1`
check_result
@@ -181,28 +154,21 @@
{
op=$1
ref=$2
- assoc_class=$3
-
- echo -en $op$'\t'$HL$assoc_class$'\t'http://$USERNAME:[EMAIL
PROTECTED]
- result=`$WBEMCLI $op http://$USERNAME:[EMAIL PROTECTED] -ac
$assoc_class >$TMP 2>&1`
+ echo -en $op$'\t'$HL"http://"$USERNAME:"*PASSWD*"@$ref$END
+ result=`$WBEMCLI $op http://$USERNAME:[EMAIL PROTECTED] >$TMP 2>&1`
check_result
-
return $?
-
}
function cim_enum_references ()
{
op=$1
ref=$2
- assoc_class=$3
- echo -en $op$'\t'$HL$assoc_class$'\t'http://$USERNAME:[EMAIL
PROTECTED]
- result=`$WBEMCLI $op http://$USERNAME:[EMAIL PROTECTED] -arc
$assoc_class >$TMP 2>&1`
-
+ echo -en $op$'\t'$HL"http://"$USERNAME:"*PASSWD*"@$ref$END
+ result=`$WBEMCLI $op http://$USERNAME:[EMAIL PROTECTED] >$TMP 2>&1`
check_result
-
return $?
}
@@ -224,29 +190,22 @@
function assoc_test ()
{
- for assoc_class in $ASSOC_CLASSES; do
- for inst_class in $INST_CLASSES; do
- test_relation $assoc_class $inst_class
- if [ ! $? -eq $SUCCESS ]; then
- continue
- fi
-
- result=""
- cim_enum_instances "ein" $inst_class
- if [ $? -eq $SUCCESS ]; then
- result=`cat $TMP`
- else
- echo Failed to enum instances: $inst_class
- continue
- fi
+ for inst_class in $INST_CLASSES; do
+ result=""
+ cim_enum_instances "ein" $inst_class
+ if [ $? -eq $SUCCESS ]; then
+ result=`cat $TMP`
+ else
+ echo Failed to enum instances: $inst_class
+ continue
+ fi
- for ref in $result; do
- cim_enum_associators ain $ref $assoc_class
- cim_enum_associators ai $ref $assoc_class
+ for ref in $result; do
+ cim_enum_associators ain $ref
+ cim_enum_associators ai $ref
- cim_enum_references rin $ref $assoc_class
- cim_enum_references ri $ref $assoc_class
- done
+ cim_enum_references rin $ref
+ cim_enum_references ri $ref
done
done
}
@@ -256,7 +215,7 @@
## Main ################
for i in `seq $iteration`; do
- instance_test
+# instance_test
assoc_test
done
------------------------------
_______________________________________________
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 53
********************************************
