# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
# Date 1176389724 -3600
# Node ID d3ed330f829212be18293db0b3bb044e8b49ffae
# Parent 74321599b8e84780968751042558fd579e21b839
# Parent e630c107988bd8bf7d04061c89729f36c74f7009
Merge
---
README | 4 ++++
tools/python/xen/xm/xenapi_create.py | 22 +++++++++++++++++++---
2 files changed, 23 insertions(+), 3 deletions(-)
diff -r 74321599b8e8 -r d3ed330f8292 README
--- a/README Thu Apr 12 15:54:59 2007 +0100
+++ b/README Thu Apr 12 15:55:24 2007 +0100
@@ -199,3 +199,7 @@ Xend (the Xen daemon) has the following
* For optional PAM support, PyPAM:
URL: http://www.pangalactic.org/PyPAM/
Debian: python-pam
+
+ * For optional XenAPI support in XM, PyXML:
+ URL: http://pyxml.sourceforge.net
+ YUM: PyXML
diff -r 74321599b8e8 -r d3ed330f8292 tools/python/xen/xm/xenapi_create.py
--- a/tools/python/xen/xm/xenapi_create.py Thu Apr 12 15:54:59 2007 +0100
+++ b/tools/python/xen/xm/xenapi_create.py Thu Apr 12 15:55:24 2007 +0100
@@ -48,7 +48,7 @@ def get_name_description(node):
def get_text_in_child_node(node, child):
tag_node = node.getElementsByTagName(child)[0]
- return tag_node.nodeValue
+ return " ".join([child.nodeValue for child in tag_node.childNodes])
def get_child_node_attribute(node, child, attribute):
tag_node = node.getElementsByTagName(child)[0]
@@ -264,7 +264,23 @@ class xenapi_create:
"platform":
get_child_nodes_as_dict(vm, "platform", "key", "value"),
"other_config":
- get_child_nodes_as_dict(vm, "other_config", "key", "value")
+ get_child_nodes_as_dict(vm, "other_config", "key", "value"),
+ "PV_bootloader":
+ "",
+ "PV_kernel":
+ "",
+ "PV_ramdisk":
+ "",
+ "PV_args":
+ "",
+ "PV_bootloader_args":
+ "",
+ "HVM_boot_policy":
+ "",
+ "HVM_boot_params":
+ {},
+ "PCI_bus":
+ ""
}
if len(vm.getElementsByTagName("pv")) > 0:
@@ -494,7 +510,7 @@ class sxp2xml:
# Make version tag
version = document.createElement("version")
- version.appendChild(document.createTextNode("1.0"))
+ version.appendChild(document.createTextNode("0"))
vm.appendChild(version)
# Make pv or hvm tag
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home