[Cluster-devel] conga/luci/site/luci/Extensions StorageReport.py

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	EXPERIMENTAL
Changes by:	rmccabe at sourceware.org	2007-06-15 20:12:23

Modified files:
	luci/site/luci/Extensions: StorageReport.py 

Log message:
	Fix mismatched parens that caused some storage operations to fail.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/StorageReport.py.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.23.2.7&r2=1.23.2.8

--- conga/luci/site/luci/Extensions/StorageReport.py	2007/06/14 22:43:24	1.23.2.7
+++ conga/luci/site/luci/Extensions/StorageReport.py	2007/06/15 20:12:23	1.23.2.8
@@ -11,7 +11,16 @@
 
 from Variable import parse_variable, Variable, VariableList
 
-from ricci_defines import *
+from ricci_defines import BD_TEMPLATE, BD_TYPE, CONTENT_FS_TYPE, \
+	CONTENT_HIDDEN_TYPE, CONTENT_MS_TYPE, CONTENT_NONE_TYPE, \
+	CONTENT_TYPE, FUNC_RESP_TAG, MAPPER_ATARAID_TYPE, MAPPER_CRYPTO_TYPE, \
+	MAPPER_iSCSI_TYPE, MAPPER_MDRAID_TYPE, MAPPER_MULTIPATH_TYPE, \
+	MAPPER_NEW_SOURCES_TAG, MAPPER_NEW_TARGETS_TAG, MAPPER_PT_TYPE, \
+	MAPPER_SOURCES_TAG, MAPPER_SYS_TYPE, MAPPER_TARGETS_TAG, \
+	MAPPER_VG_TYPE, PROPS_TAG, RESPONSE_TAG, VARIABLE_TAG, \
+	VARIABLE_TYPE_BOOL, VARIABLE_TYPE_INT, VARIABLE_TYPE_INT_SEL, \
+	VARIABLE_TYPE_LISTENTRY, VARIABLE_TYPE_LIST_INT, VARIABLE_TYPE_LIST_STR, \
+	VARIABLE_TYPE_LIST_XML, VARIABLE_TYPE_STRING, VARIABLE_TYPE_STRING_SEL
 
 from conga_storage_constants import ADD_SOURCES, get_fs_icon, \
 	get_mapper_icons, get_pretty_fs_name, get_pretty_mapper_info, \
@@ -829,7 +838,7 @@
             f_call = doc.createElement("function_call")
             f_call.setAttribute('name', 'remove_bd')
             #f_call.appendChild(Variable('bd', bd_xml.cloneNode(True)).export_xml(doc))
-            f_call.appendChild(Variable('bd', bd_xml.export_xml(doc)))
+            f_call.appendChild(Variable('bd', bd_xml).export_xml(doc))
 
             req.appendChild(f_call)
             module.appendChild(req)
@@ -1231,7 +1240,7 @@
             f_call = doc.createElement("function_call")
             f_call.setAttribute('name', 'create_mapper')
 #            f_call.appendChild(Variable('mapper', mapper_xml.cloneNode(True)).export_xml(doc))
-            f_call.appendChild(Variable('mapper', mapper_xml.export_xml(doc)))
+            f_call.appendChild(Variable('mapper', mapper_xml).export_xml(doc))
 
             req.appendChild(f_call)
             module.appendChild(req)
@@ -2088,6 +2097,3 @@
     ret['js']             = high_list_js
 
     return ret
-
-
-