fence-agents: RHEL6 - fence_rhevm: Support new API used in RHEV-M 3.1

[Marek Grác]

Gitweb:       
http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=fec1c4...
Commit:        fec1c4b83857a302a8423ef2070977a7e900ca99
Parent:        99975a5ffa708a17139cc1d61234c650395197b5
Author:        Marek 'marx' Grac <mgrac(a)redhat.com&gt;
AuthorDate:    Mon Oct 8 10:52:46 2012 +0200
Committer:     Marek 'marx' Grac <mgrac(a)redhat.com&gt;
CommitterDate: Mon Oct 8 10:56:36 2012 +0200

fence_rhevm: Support new API used in RHEV-M 3.1

Resolves: rhbz#863568
---
 fence/agents/rhevm/fence_rhevm.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fence/agents/rhevm/fence_rhevm.py b/fence/agents/rhevm/fence_rhevm.py
index 3578b5f..fa75030 100644
--- a/fence/agents/rhevm/fence_rhevm.py
+++ b/fence/agents/rhevm/fence_rhevm.py
@@ -12,7 +12,7 @@ BUILD_DATE="March, 2008"
 #END_VERSION_GENERATION
 
 
-re_get_id = re.compile("<vm id=\"(.*?)\"", re.IGNORECASE);
+re_get_id = re.compile("<vm( .*)?  id=\"(.*?)\"", re.IGNORECASE);
 re_status = re.compile("<state>(.*?)</state>", re.IGNORECASE);
 re_get_name = re.compile("<name>(.*?)</name>", re.IGNORECASE); 
 
@@ -29,7 +29,7 @@ def get_power_status(conn, options):
 		# Unable to obtain ID needed to access virtual machine
 		fail(EC_STATUS)
 
-	options["id"] = result.group(1);
+	options["id"] = result.group(2);
 	
 	re_status.search(res)
 	result = re_status.search(res)