bug 7270: added strip xml support to cloud-tool.

alena11081 · alena11081 · commit 33c062473d71 · 2010-11-24T17:31:52.000-08:00
status 7270: resolved fixed

Specify --stripxml=true if you want to enable this option. It set to "false" by default. Example with tags stripped:

$ cloud-tool listDomains --server=localhost:8096 --stripxml=true

domain
id=1
name=ROOT
level=0
haschild=true

domain
id=2
name=hello
level=1
parentdomainid=1
parentdomainname=ROOT
haschild=false

Example with original xml format:

$ cloud-tool listDomains --server=localhost:8096

&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;&lt;listdomainsresponse cloud-stack-version="1.9.1"&gt;&lt;domain&gt;&lt;id&gt;1&lt;/id&gt;&lt;name&gt;ROOT&lt;/name&gt;&lt;level&gt;0&lt;/level&gt;&lt;haschild&gt;true&lt;/haschild&gt;&lt;/domain&gt;&lt;domain&gt;&lt;id&gt;2&lt;/id&gt;&lt;name&gt;hello"&lt;/name&gt;&lt;level&gt;1&lt;/level&gt;&lt;parentdomainid&gt;1&lt;/parentdomainid&gt;&lt;parentdomainname&gt;ROOT&lt;/parentdomainname&gt;&lt;haschild&gt;false&lt;/haschild&gt;&lt;/domain&gt;&lt;/listdomainsresponse&gt;
diff --git a/cloud-cli/cloudapis/cloud.py b/cloud-cli/cloudapis/cloud.py
@@ -6,14 +6,17 @@
 import urllib2
 import os
 import xml.dom.minidom
+import re
 
 class CloudAPI:
     
 	@describe("server", "Management Server host name or address")
 	@describe("responseformat", "Response format: xml or json")
+	@describe("stripxml", "True if xml tags have to be stripped in the output, false otherwise")
 	def __init__(self,
 			server="127.0.0.1:8096",
 			responseformat="xml",
+			stripxml="false"
 			):
 		self.__dict__.update(locals())
         
@@ -35,9 +38,19 @@ def _make_request(self,command,parameters=None):
 		url += querystring
 		
 		f = urllib2.urlopen(url)
-		
 		data = f.read()
-		
+		if self.stripxml == "true":
+			data=re.sub("<\?.*\?>", "\n", data);
+			data=re.sub("</[a-z]*>", "\n", data);
+			data=data.replace(">", "=");
+			data=data.replace("=<", "\n");
+			data=data.replace("\n<", "\n");
+			data=re.sub("\n.*cloud-stack-version=.*", "", data);
+			data=data.replace("\n\n\n", "\n");
+                else:
+                        data="\n"+data+"\n"
+                return data
+
 		return data
 
 
