commit 69470dc063732be114c6faaf7ce6c734d2dc8357
Author: Ryan McCabe <rmccabe(a)redhat.com>
Date: Sat Apr 16 00:24:56 2011 -0400
Get rid of unused isModified/setModified code
luci/controllers/cluster.py | 20 --------------------
luci/lib/ClusterConf/ModelBuilder.py | 20 +-------------------
luci/validation/validate_fence.py | 2 --
luci/validation/validate_resource.py | 1 -
4 files changed, 1 insertions(+), 42 deletions(-)
---
diff --git a/luci/controllers/cluster.py b/luci/controllers/cluster.py
index 3dc7d81..92ebbde 100644
--- a/luci/controllers/cluster.py
+++ b/luci/controllers/cluster.py
@@ -184,7 +184,6 @@ class IndividualClusterController(BaseController):
if found_method is True:
log.info('User "%s" removed method "%s" from node
"%s" in cluster "%s"'
% (self.username, methodname, cur_nodename, self.name))
- self.model.setModified(True)
rh.update_cluster_conf(self.model)
else:
log.error('User "%s" failed to remove method "%s"
from node "%s" in cluster "%s"'
@@ -202,7 +201,6 @@ class IndividualClusterController(BaseController):
if found_instance is True:
log.info('User "%s" removed fence instance "%s"
from method "%s" from node "%s" in cluster "%s"'
% (self.username, fenceinst, methodname, cur_nodename, self.name))
- self.model.setModified(True)
rh.update_cluster_conf(self.model)
else:
log.error('User "%s" failed to remove fence instance
"%s" from method "%s" from node "%s" in cluster
"%s"'
@@ -216,7 +214,6 @@ class IndividualClusterController(BaseController):
mposition = fence_elem.findMethod(methodname)
if mposition is not None and mposition > 0:
fence_elem.moveMethodUp(mposition)
- self.model.setModified(True)
rh.update_cluster_conf(self.model)
log.info('User "%s" moved up fence method
"%s" for node "%s" in cluster "%s"'
% (self.username, methodname, cur_nodename, self.name))
@@ -230,7 +227,6 @@ class IndividualClusterController(BaseController):
mposition = fence_elem.findMethod(methodname)
if mposition is not None and mposition < len(levels) - 1:
fence_elem.moveMethodDown(mposition)
- self.model.setModified(True)
rh.update_cluster_conf(self.model)
log.info('User "%s" moved down fence method
"%s" for node "%s" in cluster "%s"'
% (self.username, methodname, cur_nodename, self.name))
@@ -272,7 +268,6 @@ class IndividualClusterController(BaseController):
flash(_('Updating fence settings for node "%s"' %
cur_nodename))
log.info('User "%s" added a fence instance to fence method
"%s" for node "%s" in cluster "%s"'
% (self.username, methodname, cur_nodename, self.name))
- self.model.setModified(True)
rh.update_cluster_conf(self.model)
else:
msgs = retobj
@@ -322,7 +317,6 @@ class IndividualClusterController(BaseController):
node.getFenceNode().children[int(method_num)].children[int(fence_instance_id)] = retobj
log.info('User "%s" edited "%s" fence instance of
fence method "%s" for node "%s" in cluster "%s"'
% (self.username, kw.get('fencedev'), method_num,
cur_nodename, self.name))
- self.model.setModified(True)
rh.update_cluster_conf(self.model)
elif command == "AddFenceMethod":
@@ -333,7 +327,6 @@ class IndividualClusterController(BaseController):
node.getFenceNode().addChild(method)
log.info('User "%s" added fence method "%s" to node
"%s" in cluster "%s"'
% (self.username, methodname, cur_nodename, self.name))
- self.model.setModified(True)
rh.update_cluster_conf(self.model)
redirect('%s%s' % (tmpl_context.cluster_url, cur_nodename))
@@ -414,7 +407,6 @@ class IndividualClusterController(BaseController):
flash2.warning(', '.join(msgs))
flash2.info(_('Updating properties of node: %s') % cur_list[0])
flash2.flush()
- self.model.setModified(True)
rh.update_cluster_conf(self.model)
else:
msgs = vret[1].get('errors')
@@ -483,7 +475,6 @@ class IndividualClusterController(BaseController):
flash(_("Deleting resources %s") % ',
'.join(cur_list),
status='info')
- self.model.setModified()
rh.update_cluster_conf(self.model)
elif command in ("Create", "Edit"):
if command == 'Create':
@@ -516,7 +507,6 @@ class IndividualClusterController(BaseController):
log.info('User "%s" %s global resource "%s" in
cluster "%s"'
% (self.username, cur_action, res_name, self.name))
flash(_('%s global resource "%s"') % (cur_action,
res_name))
- self.model.setModified(True)
rh.update_cluster_conf(self.model)
redirect(redir_fmt % (tmpl_context.cluster_url, res_name))
else:
@@ -577,7 +567,6 @@ class IndividualClusterController(BaseController):
for i in cur_list:
self.model.deleteService(i)
- self.model.setModified()
rh.update_cluster_conf(self.model)
redirect(tmpl_context.cluster_url)
if command == 'Start':
@@ -613,7 +602,6 @@ class IndividualClusterController(BaseController):
log.info('User "%s" %s cluster service "%s" in
cluster "%s"'
% (self.username, cur_action, svc_name, self.name))
flash(_('%s cluster service "%s"') % (cur_action,
svc_name))
- self.model.setModified(True)
rh.update_cluster_conf(self.model)
else:
msgs = vret[1].get('errors')
@@ -671,7 +659,6 @@ class IndividualClusterController(BaseController):
flash(_('Deleting failover domains %s') % ',
'.join(cur_list))
for i in cur_list:
self.model.deleteFailoverDomain(i)
- self.model.setModified(True)
rh.update_cluster_conf(self.model)
redirect(tmpl_context.cluster_url)
@@ -689,7 +676,6 @@ class IndividualClusterController(BaseController):
log.info('User "%s" updated the settings of failover domain
"%s" in cluster "%s"'
% (self.username, cur_list[0], self.name))
flash(_('Updating settings for failover domain "%s"') %
cur_list[0])
- self.model.setModified(True)
rh.update_cluster_conf(self.model)
else:
msgs = vret[1].get('errors')
@@ -702,7 +688,6 @@ class IndividualClusterController(BaseController):
log.info('User "%s" updated the properties of failover
domain "%s" in cluster "%s"'
% (self.username, cur_list[0], self.name))
flash(_('Updating properties for failover domain "%s"')
% cur_list[0])
- self.model.setModified(True)
rh.update_cluster_conf(self.model)
else:
msgs = vret[1].get('errors')
@@ -716,7 +701,6 @@ class IndividualClusterController(BaseController):
% (self.username, kw.get('fdom_name'), self.name))
flash(_('Creating failover domain "%s"') %
kw.get('fdom_name'))
- self.model.setModified(True)
rh.update_cluster_conf(self.model)
else:
msgs = vret[1].get('errors')
@@ -769,7 +753,6 @@ class IndividualClusterController(BaseController):
if command == 'Create':
fret = validateNewFenceDevice(self.model, **kw)
if fret[0] is True:
- self.model.setModified(True)
rh.update_cluster_conf(self.model)
log.info('User "%s" created fence devices "%s" in
cluster "%s"'
% (self.username, ', '.join(cur_list), self.name))
@@ -788,12 +771,10 @@ class IndividualClusterController(BaseController):
continue
updated |= self.model.deleteFenceDevice(cur_fencedev)
if updated:
- self.model.setModified()
rh.update_cluster_conf(self.model)
elif command == 'Update':
fret = validateFenceDevice(self.model, **kw)
if fret[0] is True:
- self.model.setModified(True)
rh.update_cluster_conf(self.model)
log.info('User "%s" updated fence device "%s" in
cluster "%s"'
% (self.username, ', '.join(cur_list), self.name))
@@ -832,7 +813,6 @@ class IndividualClusterController(BaseController):
msgs = vret[1].get('flash')
if msgs and len(msgs) > 0:
flash(', '.join(msgs), status="info")
- self.model.setModified(True)
rh.update_cluster_conf(self.model)
if vret[1].get('start_qdisk'):
log.info('Starting qdiskd for cluster "%s"' %
self.name)
diff --git a/luci/lib/ClusterConf/ModelBuilder.py b/luci/lib/ClusterConf/ModelBuilder.py
index aa0351d..1c2a806 100644
--- a/luci/lib/ClusterConf/ModelBuilder.py
+++ b/luci/lib/ClusterConf/ModelBuilder.py
@@ -139,7 +139,6 @@ class ModelBuilder:
raise Exception, 'No cluster configuration'
self.errors = False
self.errmsg = None
- self.isModified = False
self.lock_version = False
self.cluster_ptr = None
@@ -420,8 +419,6 @@ class ModelBuilder:
self.object_tree.generateXML(doc)
strbuf = doc.toprettyxml()
- self.isModified = False
-
##Need to restore model
self.parent = doc
@@ -499,7 +496,6 @@ class ModelBuilder:
def addNode(self, clusternode):
self.clusternodes_ptr.addChild(clusternode)
- self.isModified = True
def deleteNode(self, clusternode):
#1) delete any non-shared fence devices used by this node
@@ -529,8 +525,6 @@ class ModelBuilder:
found_one = True
break
- self.isModified = True
-
def retrieveNodeByName(self, name):
ret = filter(lambda x: x.getName() == name, self.clusternodes_ptr.getChildren())
if len(ret) != 1:
@@ -868,7 +862,7 @@ class ModelBuilder:
if not res or len(res) < 1:
raise KeyError, name
if len(res) > 1:
- raise KeyError, 'More than one resource is named "%s"' % name
+ raise ValueError, 'More than one resource is named "%s"' % name
return res[0]
def deleteResource(self, name):
@@ -912,7 +906,6 @@ class ModelBuilder:
if self.cman_ptr is None:
return False
self.cman_ptr.delBroadcast()
- self.isModified = True
def get_cluster_broadcast(self):
if self.cman_ptr is None:
@@ -926,7 +919,6 @@ class ModelBuilder:
if self.mcast_ptr is not None:
self.cman_ptr.removeChild(self.mcast_ptr)
self.mcast_ptr = None
- self.isModified = True
return True
def set_cluster_multicast(self, mcast_addr=None):
@@ -953,7 +945,6 @@ class ModelBuilder:
def del_cluster_udpu(self):
self.cman_ptr.delTransport()
- self.isModified = True
def check_fence_daemon(self):
if self.fence_daemon_ptr is None:
@@ -963,15 +954,6 @@ class ModelBuilder:
def getFenceDaemonPtr(self):
return self.fence_daemon_ptr
- def isFileModified(self):
- return self.isModified
-
- def setModified(self, modified=None):
- if modified is None:
- self.isModified = True
- else:
- self.isModified = modified
-
def rectifyNewNodenameWithFaildoms(self, oldname, newname):
fdoms = self.getFailoverDomains()
for fdom in fdoms:
diff --git a/luci/validation/validate_fence.py b/luci/validation/validate_fence.py
index dd193c8..d1dfaf3 100644
--- a/luci/validation/validate_fence.py
+++ b/luci/validation/validate_fence.py
@@ -32,7 +32,6 @@ def validateNewFenceDevice(model, **kw):
ret = validate_fencedevice(model, fencedev, **kw)
if len(ret) < 1:
model.addFenceDevice(fencedev)
- model.setModified(True)
return (True, fencedev.getAttribute('name'))
except Exception, e:
ret = [ FD_PROVIDE_AGENT ]
@@ -59,7 +58,6 @@ def validateFenceDevice(model, **kw):
kw['fence_edit'] = True
ret = validate_fencedevice(model, fencedev, **kw)
if len(ret) < 1:
- model.setModified(True)
return (True, fencedev.getAttribute('name'))
except Exception, e:
ret = [ FD_PROVIDE_NAME ]
diff --git a/luci/validation/validate_resource.py b/luci/validation/validate_resource.py
index 206a77a..1c5b3ce 100644
--- a/luci/validation/validate_resource.py
+++ b/luci/validation/validate_resource.py
@@ -833,7 +833,6 @@ def validate_clusvc_form(model, **kw):
model.resourcemanager_ptr.addChild(new_vm)
else:
model.resourcemanager_ptr.addChild(new_service)
- model.setModified(True)
return (len(errors) == 0, {'errors': errors})
def validate_resource_form(model, **kw):