[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] conga/luci/site/luci/Extensions RicciQueries.p ...



CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe sourceware org	2007-10-09 20:20:03

Modified files:
	luci/site/luci/Extensions: RicciQueries.py conga_constants.py 
	                           conga_storage_constants.py 
	                           ricci_communicator.py 

Log message:
	Cleanup

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/RicciQueries.py.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/conga_constants.py.diff?cvsroot=cluster&r1=1.44&r2=1.45
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/conga_storage_constants.py.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ricci_communicator.py.diff?cvsroot=cluster&r1=1.30&r2=1.31

--- conga/luci/site/luci/Extensions/RicciQueries.py	2007/09/28 05:36:39	1.8
+++ conga/luci/site/luci/Extensions/RicciQueries.py	2007/10/09 20:20:02	1.9
@@ -429,7 +429,7 @@
 	disable_svc = 'true'
 	if disable_services is False:
 		disable_svc = 'false'
-		
+
 	batch_str = '<module name="cluster"><request API_version="1.0"><function_call name="stop_node"><var mutable="false" name="cluster_shutdown" type="boolean" value="%s"/><var mutable="false" name="purge_conf" type="boolean" value="%s"/><var mutable="false" name="disable_services" type="boolean" value="%s"/></function_call></request></module>' % (cshutdown, purge_conf, disable_svc)
 
 	ricci_xml = rc.batch_run(batch_str)
--- conga/luci/site/luci/Extensions/conga_constants.py	2007/09/24 21:19:42	1.44
+++ conga/luci/site/luci/Extensions/conga_constants.py	2007/10/09 20:20:02	1.45
@@ -74,26 +74,26 @@
 NODE_FORCE_DELETE		= '105'
 
 # General tasks
-BASECLUSTER	= '201'
-FENCEDAEMON	= '202'
-MULTICAST	= '203'
-QUORUMD		= '204'
-
-PROPERTIES_TAB = 'tab'
-
-PROP_GENERAL_TAB	= '1'
-PROP_FENCE_TAB		= '2'
-PROP_MCAST_TAB		= '3'
-PROP_QDISK_TAB		= '4'
-PROP_GULM_TAB		= '5'
-
-PAGETYPE	= 'pagetype'
-ACTIONTYPE	= 'actiontype'
-TASKTYPE	= 'tasktype'
-CLUNAME		= 'clustername'
-BATCH_ID	= 'batch_id'
-FLAG_DESC	= 'flag_desc'
-LAST_STATUS	= 'last_status'
+BASECLUSTER				= '201'
+FENCEDAEMON				= '202'
+MULTICAST				= '203'
+QUORUMD					= '204'
+
+PROPERTIES_TAB			= 'tab'
+
+PROP_GENERAL_TAB		= '1'
+PROP_FENCE_TAB			= '2'
+PROP_MCAST_TAB			= '3'
+PROP_QDISK_TAB			= '4'
+PROP_GULM_TAB			= '5'
+
+PAGETYPE				= 'pagetype'
+ACTIONTYPE				= 'actiontype'
+TASKTYPE				= 'tasktype'
+CLUNAME					= 'clustername'
+BATCH_ID				= 'batch_id'
+FLAG_DESC				= 'flag_desc'
+LAST_STATUS				= 'last_status'
 
 PATH_TO_PRIVKEY	= '/var/lib/luci/var/certs/privkey.pem'
 PATH_TO_CACERT	= '/var/lib/luci/var/certs/cacert.pem'
--- conga/luci/site/luci/Extensions/conga_storage_constants.py	2007/09/24 21:19:42	1.10
+++ conga/luci/site/luci/Extensions/conga_storage_constants.py	2007/10/09 20:20:02	1.11
@@ -11,13 +11,13 @@
 
 ## request vars ##
 
-PAGETYPE = 'pagetype'
-CLUNAME = 'clustername'
-STONAME = 'storagename'
-
-PT_MAPPER_ID = 'mapper_id'
-PT_MAPPER_TYPE = 'mapper_type'
-PT_PATH = 'bd_path'
+PAGETYPE		= 'pagetype'
+CLUNAME			= 'clustername'
+STONAME			= 'storagename'
+
+PT_MAPPER_ID	= 'mapper_id'
+PT_MAPPER_TYPE	= 'mapper_type'
+PT_PATH			= 'bd_path'
 
 STORAGE_COMMIT_CHANGES = 'commit_changes'
 
@@ -35,19 +35,30 @@
 
 # mapper pretty names
 PRETTY_MAPPER_INFO = {
-	MAPPER_SYS_TYPE:		( 'Hard Drives',		'Hard Drive',		'BUG: source not defined' ),
-	MAPPER_VG_TYPE:			( 'Volume Group',		'Logical Volume',	'Physical Volume' ),
-	MAPPER_PT_TYPE:			( 'Partition Table',	'Partition',		'Disk' ),
-	MAPPER_MDRAID_TYPE:		( 'Software RAID',		'Volume',			'Disk' ),
-	MAPPER_ATARAID_TYPE:	( 'ATA-RAID',			'Volume', 			'Disk' ),
-	MAPPER_MULTIPATH_TYPE:	( 'Multipath', 			'Multipath',		'Path' ),
-	MAPPER_CRYPTO_TYPE:		( 'Encryption', 		'Volume',			'Device' ),
-	MAPPER_iSCSI_TYPE:		( 'iSCSI',				'Volume',			'BUG: source not defined' )
+	MAPPER_SYS_TYPE:
+		( 'Hard Drives',		'Hard Drive',		'BUG: source not defined' ),
+	MAPPER_VG_TYPE:
+		( 'Volume Group',		'Logical Volume',	'Physical Volume' ),
+	MAPPER_PT_TYPE:
+		( 'Partition Table',	'Partition',		'Disk' ),
+	MAPPER_MDRAID_TYPE:
+		( 'Software RAID',		'Volume',			'Disk' ),
+	MAPPER_ATARAID_TYPE:
+		( 'ATA-RAID',			'Volume',			'Disk' ),
+	MAPPER_MULTIPATH_TYPE:
+		( 'Multipath',			'Multipath',		'Path' ),
+	MAPPER_CRYPTO_TYPE:
+		( 'Encryption',			'Volume',			'Device' ),
+	MAPPER_iSCSI_TYPE:
+		( 'iSCSI',				'Volume',			'BUG: source not defined' )
 }
 
 def get_pretty_mapper_info(mapper_type):
 	return PRETTY_MAPPER_INFO.get(mapper_type) or \
-			( 'Mapper ' + mapper_type, mapper_type + '\s target', mapper_type + '\s source' )
+		(	'Mapper %s' % mapper_type,
+			'%s\s target' % mapper_type,
+			'%s\s source' % mapper_type
+		)
 
 PRETTY_PROP_NAMES = {
 	'active':					'Active',
@@ -148,14 +159,22 @@
 
 # icons
 MAPPER_ICONS = {
-	MAPPER_SYS_TYPE:		( '',							'icon_bd_ide.png',			''),
-	MAPPER_VG_TYPE:			( 'icon_mapper_VG.png',			'icon_bd_LV.png',			'icon_content_PV.png'),
-	MAPPER_PT_TYPE:			( 'icon_mapper_PT.png',			'icon_bd_partition.png',	''),
-	MAPPER_MDRAID_TYPE:		( 'icon_mapper_raid.png',		'icon_bd_raid.png',			''),
-	MAPPER_ATARAID_TYPE:	( 'icon_mapper_raid.png',		'icon_bd_raid.png',			''),
-	MAPPER_MULTIPATH_TYPE:	( 'icon_mapper_multipath.png',	'icon_bd_multipath.png',	''),
-	MAPPER_CRYPTO_TYPE:		( 'icon_mapper_crypto.png',		'icon_bd_crypto.png',		''),
-	MAPPER_iSCSI_TYPE:		( '',							'icon_bd_net.png',			'')
+	MAPPER_SYS_TYPE:
+		( '',							'icon_bd_ide.png',			''),
+	MAPPER_VG_TYPE:
+		( 'icon_mapper_VG.png',			'icon_bd_LV.png',			'icon_content_PV.png'),
+	MAPPER_PT_TYPE:
+		( 'icon_mapper_PT.png',			'icon_bd_partition.png',	''),
+	MAPPER_MDRAID_TYPE:
+		( 'icon_mapper_raid.png',		'icon_bd_raid.png',			''),
+	MAPPER_ATARAID_TYPE:
+		( 'icon_mapper_raid.png',		'icon_bd_raid.png',			''),
+	MAPPER_MULTIPATH_TYPE:
+		( 'icon_mapper_multipath.png',	'icon_bd_multipath.png',	''),
+	MAPPER_CRYPTO_TYPE:
+		( 'icon_mapper_crypto.png',		'icon_bd_crypto.png',		''),
+	MAPPER_iSCSI_TYPE:
+		( '',							'icon_bd_net.png',			'')
 }
 
 def get_mapper_icons(mapper_type):
--- conga/luci/site/luci/Extensions/ricci_communicator.py	2007/09/24 21:19:42	1.30
+++ conga/luci/site/luci/Extensions/ricci_communicator.py	2007/10/09 20:20:02	1.31
@@ -220,7 +220,7 @@
 
 			if LUCI_DEBUG_NET is True:
 				luci_log.debug_net_priv('RC:PB2: sending "%s" to %s:%d: %r %s' \
-					 % (doc.toxml(), self.__hostname, self.__port, e, str(e)))
+					% (doc.toxml(), self.__hostname, self.__port, e, str(e)))
 			raise RicciError, errstr
 
 		# receive response
@@ -480,11 +480,11 @@
 #		total number of modules in batch
 # * num:
 #		if num == total:
-#			 all modules in the batch completed successfuly
+#			all modules in the batch completed successfuly
 #		if num > 0:
-#			 last seq. number of module that successfuly finished
+#			last seq. number of module that successfuly finished
 #		if num < 0:
-#			 module (-num) failed (next module won't be processed)
+#			module (-num) failed (next module won't be processed)
 
 def batch_status(batch_xml):
 	if batch_xml.nodeName != 'batch':


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]