[libvirt] [test-API 06/17] Substitute guestxml with domxml

2012-04-20 Thread Osier Yang 
---
 repos/domain/balloon_memory.py |   12 ++--
 repos/domain/cpu_affinity.py   |   12 ++--
 repos/domain/cpu_topology.py   |6 +++---
 repos/domain/install_image.py  |6 +++---
 repos/domain/install_linux_cdrom.py|   14 +++---
 repos/domain/install_linux_net.py  |   14 +++---
 repos/domain/install_windows_cdrom.py  |   14 +++---
 repos/domain/update_devflag.py |   10 +-
 .../multiple_thread_block_on_domain_create.py  |6 +++---
 utils/xml_builder.py   |2 +-
 10 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/repos/domain/balloon_memory.py b/repos/domain/balloon_memory.py
index 642c1fa..11d4565 100644
--- a/repos/domain/balloon_memory.py
+++ b/repos/domain/balloon_memory.py
@@ -42,10 +42,10 @@ def redefine_memory_size(domobj, domname, memsize):
  dump domain xml description to change the memory size,
 then, define the domain again
 
-guestxml = domobj.XMLDesc(0)
-logger.debug('''original guest %s xml :\n%s''' % (domname, guestxml))
+domxml = domobj.XMLDesc(0)
+logger.debug('''original guest %s xml :\n%s''' % (domname, domxml))
 
-doc = minidom.parseString(guestxml)
+doc = minidom.parseString(domxml)
 
 newmem = doc.createElement('memory')
 newmemval = doc.createTextNode(str(memsize))
@@ -166,8 +166,8 @@ def balloon_memory(params):
 return 1
 
 # Redefine domain with specified memory size
-newguestxml = redefine_memory_size(domobj, domname, maxmem)
-logger.debug('''new guest %s xml :\n%s''' %(domname, newguestxml))
+newdomxml = redefine_memory_size(domobj, domname, maxmem)
+logger.debug('''new guest %s xml :\n%s''' %(domname, newdomxml))
 
 logger.info(undefine the original guest)
 try:
@@ -180,7 +180,7 @@ def balloon_memory(params):
 
 logger.info(define guest with new xml)
 try:
-conn.defineXML(newguestxml)
+conn.defineXML(newdomxml)
 except libvirtError, e:
 logger.error(API error message: %s, error code is %s \
  % (e.message, e.get_error_code()))
diff --git a/repos/domain/cpu_affinity.py b/repos/domain/cpu_affinity.py
index fc99664..1b300dc 100644
--- a/repos/domain/cpu_affinity.py
+++ b/repos/domain/cpu_affinity.py
@@ -22,10 +22,10 @@ def redefine_vcpu_number(domobj, domain_name, vcpu):
 dump domain xml description to change the vcpu number,
then, define the domain again
 
-guestxml = domobj.XMLDesc(0)
-logger.debug('''original guest %s xml :\n%s''' %(domain_name, guestxml))
+domxml = domobj.XMLDesc(0)
+logger.debug('''original guest %s xml :\n%s''' %(domain_name, domxml))
 
-doc = minidom.parseString(guestxml)
+doc = minidom.parseString(domxml)
 
 newvcpu = doc.createElement('vcpu')
 newvcpuval = doc.createTextNode(vcpu)
@@ -78,8 +78,8 @@ def set_vcpus(util, domobj, domain_name, vcpu):
 logger.error(the domain couldn't be destroied within 60 secs.)
 return 1
 
-newguestxml = redefine_vcpu_number(domobj, domain_name, vcpu)
-logger.debug('''new guest %s xml :\n%s''' %(domain_name, newguestxml))
+newdomxml = redefine_vcpu_number(domobj, domain_name, vcpu)
+logger.debug('''new guest %s xml :\n%s''' %(domain_name, newdomxml))
 
 logger.info(undefine the original guest)
 try:
@@ -93,7 +93,7 @@ def set_vcpus(util, domobj, domain_name, vcpu):
 logger.info(define guest with new xml)
 try:
 conn = domobj._conn
-conn.defineXML(newguestxml)
+conn.defineXML(newdomxml)
 except libvirtError, e:
 logger.error(API error message: %s, error code is %s \
  % (e.message, e.get_error_code()))
diff --git a/repos/domain/cpu_topology.py b/repos/domain/cpu_topology.py
index a463668..ccde97f 100644
--- a/repos/domain/cpu_topology.py
+++ b/repos/domain/cpu_topology.py
@@ -34,10 +34,10 @@ def check_domain_running(conn, guestname, logger):
 def add_cpu_xml(domobj, guestname, sockets, cores, threads, logger):
 edit domain xml description and insert cpu element
 
-guestxml = domobj.XMLDesc(0)
-logger.debug('''original guest %s xml :\n%s''' %(guestname, guestxml))
+domxml = domobj.XMLDesc(0)
+logger.debug('''original guest %s xml :\n%s''' %(guestname, domxml))
 
-doc = minidom.parseString(guestxml)
+doc = minidom.parseString(domxml)
 cpu = doc.createElement('cpu')
 topology = doc.createElement('topology')
 topology.setAttribute('sockets', sockets)
diff --git a/repos/domain/install_image.py b/repos/domain/install_image.py
index 84df56d..fe05ca8 100644
--- a/repos/domain/install_image.py
+++ b/repos/domain/install_image.py
@@ -77,10 +77,10 @@ def install_image(params):
 
 xmlobj.add_disk(params, domain)
 xmlobj.add_interface(params, domain)
-

Re: [libvirt] [test-API 06/17] Substitute guestxml with domxml

2012-04-20 Thread Martin Kletzander 
On 04/20/2012 08:46 AM, Osier Yang wrote:
 ---
  repos/domain/balloon_memory.py |   12 ++--
  repos/domain/cpu_affinity.py   |   12 ++--
  repos/domain/cpu_topology.py   |6 +++---
  repos/domain/install_image.py  |6 +++---
  repos/domain/install_linux_cdrom.py|   14 +++---
  repos/domain/install_linux_net.py  |   14 +++---
  repos/domain/install_windows_cdrom.py  |   14 +++---
  repos/domain/update_devflag.py |   10 +-
  .../multiple_thread_block_on_domain_create.py  |6 +++---
  utils/xml_builder.py   |2 +-
  10 files changed, 48 insertions(+), 48 deletions(-)
 
 diff --git a/repos/domain/balloon_memory.py b/repos/domain/balloon_memory.py
 index 642c1fa..11d4565 100644
 --- a/repos/domain/balloon_memory.py
 +++ b/repos/domain/balloon_memory.py
 @@ -42,10 +42,10 @@ def redefine_memory_size(domobj, domname, memsize):
   dump domain xml description to change the memory size,
  then, define the domain again
  
 -guestxml = domobj.XMLDesc(0)
 -logger.debug('''original guest %s xml :\n%s''' % (domname, guestxml))
 +domxml = domobj.XMLDesc(0)
 +logger.debug('''original guest %s xml :\n%s''' % (domname, domxml))
  
 -doc = minidom.parseString(guestxml)
 +doc = minidom.parseString(domxml)
  
  newmem = doc.createElement('memory')
  newmemval = doc.createTextNode(str(memsize))
 @@ -166,8 +166,8 @@ def balloon_memory(params):
  return 1
  
  # Redefine domain with specified memory size
 -newguestxml = redefine_memory_size(domobj, domname, maxmem)
 -logger.debug('''new guest %s xml :\n%s''' %(domname, newguestxml))
 +newdomxml = redefine_memory_size(domobj, domname, maxmem)
 +logger.debug('''new guest %s xml :\n%s''' %(domname, newdomxml))
  
  logger.info(undefine the original guest)
  try:
 @@ -180,7 +180,7 @@ def balloon_memory(params):
  
  logger.info(define guest with new xml)
  try:
 -conn.defineXML(newguestxml)
 +conn.defineXML(newdomxml)
  except libvirtError, e:
  logger.error(API error message: %s, error code is %s \
   % (e.message, e.get_error_code()))
 diff --git a/repos/domain/cpu_affinity.py b/repos/domain/cpu_affinity.py
 index fc99664..1b300dc 100644
 --- a/repos/domain/cpu_affinity.py
 +++ b/repos/domain/cpu_affinity.py
 @@ -22,10 +22,10 @@ def redefine_vcpu_number(domobj, domain_name, vcpu):
  dump domain xml description to change the vcpu number,
 then, define the domain again
  
 -guestxml = domobj.XMLDesc(0)
 -logger.debug('''original guest %s xml :\n%s''' %(domain_name, guestxml))
 +domxml = domobj.XMLDesc(0)
 +logger.debug('''original guest %s xml :\n%s''' %(domain_name, domxml))
  
 -doc = minidom.parseString(guestxml)
 +doc = minidom.parseString(domxml)
  
  newvcpu = doc.createElement('vcpu')
  newvcpuval = doc.createTextNode(vcpu)
 @@ -78,8 +78,8 @@ def set_vcpus(util, domobj, domain_name, vcpu):
  logger.error(the domain couldn't be destroied within 60 secs.)
  return 1
  
 -newguestxml = redefine_vcpu_number(domobj, domain_name, vcpu)
 -logger.debug('''new guest %s xml :\n%s''' %(domain_name, newguestxml))
 +newdomxml = redefine_vcpu_number(domobj, domain_name, vcpu)
 +logger.debug('''new guest %s xml :\n%s''' %(domain_name, newdomxml))
  
  logger.info(undefine the original guest)
  try:
 @@ -93,7 +93,7 @@ def set_vcpus(util, domobj, domain_name, vcpu):
  logger.info(define guest with new xml)
  try:
  conn = domobj._conn
 -conn.defineXML(newguestxml)
 +conn.defineXML(newdomxml)
  except libvirtError, e:
  logger.error(API error message: %s, error code is %s \
   % (e.message, e.get_error_code()))
 diff --git a/repos/domain/cpu_topology.py b/repos/domain/cpu_topology.py
 index a463668..ccde97f 100644
 --- a/repos/domain/cpu_topology.py
 +++ b/repos/domain/cpu_topology.py
 @@ -34,10 +34,10 @@ def check_domain_running(conn, guestname, logger):
  def add_cpu_xml(domobj, guestname, sockets, cores, threads, logger):
  edit domain xml description and insert cpu element
  
 -guestxml = domobj.XMLDesc(0)
 -logger.debug('''original guest %s xml :\n%s''' %(guestname, guestxml))
 +domxml = domobj.XMLDesc(0)
 +logger.debug('''original guest %s xml :\n%s''' %(guestname, domxml))
  
 -doc = minidom.parseString(guestxml)
 +doc = minidom.parseString(domxml)
  cpu = doc.createElement('cpu')
  topology = doc.createElement('topology')
  topology.setAttribute('sockets', sockets)
 diff --git a/repos/domain/install_image.py b/repos/domain/install_image.py
 index 84df56d..fe05ca8 100644
 --- a/repos/domain/install_image.py
 +++