[Linux-HA] crmsh and fencing_topology

2013-06-13 Thread Vladislav Bogdanov
Dejan,

here is the patch to fix parsing of fencing_topology:
--- a/modules/xmlutil.py2013-06-07 07:21:10.0 +
+++ b/modules/xmlutil.py2013-06-13 07:51:09.704924693 +
@@ -937,7 +937,7 @@ def get_set_nodes(e,setname,create = 0):

 def xml_noorder_hash(n):
 return sorted([ hash(etree.tostring(x)) \
-for x in n.iterchildren() if is_element(c) ])
+for x in n.iterchildren() if is_element(x) ])
 xml_hash_d = {
 fencing-topology: xml_noorder_hash,
 }
---

Unfortunately, that still doesn't fully fix the problem, because
fencing-topology / is inserted into an extra configuration / node:
cib ...
   configuration
  ...
  configuration
  fencing-topology /
  /configuration
   /configuration
/cib

Can you please look at this? I expect fix to be one-line patch as well ;)

Best,
Vladislav

___
Linux-HA mailing list
Linux-HA@lists.linux-ha.org
http://lists.linux-ha.org/mailman/listinfo/linux-ha
See also: http://linux-ha.org/ReportingProblems


Re: [Linux-HA] crmsh and fencing_topology

2013-06-13 Thread Dejan Muhamedagic
Hi,

On Thu, Jun 13, 2013 at 11:15:18AM +0300, Vladislav Bogdanov wrote:
 Dejan,
 
 here is the patch to fix parsing of fencing_topology:
 --- a/modules/xmlutil.py2013-06-07 07:21:10.0 +
 +++ b/modules/xmlutil.py2013-06-13 07:51:09.704924693 +
 @@ -937,7 +937,7 @@ def get_set_nodes(e,setname,create = 0):
 
  def xml_noorder_hash(n):
  return sorted([ hash(etree.tostring(x)) \
 -for x in n.iterchildren() if is_element(c) ])
 +for x in n.iterchildren() if is_element(x) ])
  xml_hash_d = {
  fencing-topology: xml_noorder_hash,
  }
 ---
 
 Unfortunately, that still doesn't fully fix the problem, because
 fencing-topology / is inserted into an extra configuration / node:
 cib ...
configuration
   ...
   configuration
   fencing-topology /
   /configuration
/configuration
 /cib
 
 Can you please look at this? I expect fix to be one-line patch as well ;)

I just fixed it yesterday. Will push the change sometimes today.
Thanks for reporting and the fix!

Cheers,

Dejan

 Best,
 Vladislav
 
 ___
 Linux-HA mailing list
 Linux-HA@lists.linux-ha.org
 http://lists.linux-ha.org/mailman/listinfo/linux-ha
 See also: http://linux-ha.org/ReportingProblems
___
Linux-HA mailing list
Linux-HA@lists.linux-ha.org
http://lists.linux-ha.org/mailman/listinfo/linux-ha
See also: http://linux-ha.org/ReportingProblems