[libvirt] [test-API 05/17] Substitue guestobj with domobj

[Martin Kletzander]

On 04/20/2012 08:46 AM, Osier Yang wrote:
> ---
>  repos/domain/update_devflag.py                     |   10 +++++-----
>  .../multiple_thread_block_on_domain_create.py      |    4 ++--
>  2 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/repos/domain/update_devflag.py b/repos/domain/update_devflag.py
> index 6c75fd6..48efd72 100644
> --- a/repos/domain/update_devflag.py
> +++ b/repos/domain/update_devflag.py
> @@ -189,17 +189,17 @@ def update_devflag(params):
>          return 1
>  
>      guestxml = domobj.XMLDesc(0)
> -    guestobj = minidom.parseString(guestxml)
> +    domobj = minidom.parseString(guestxml)
>  
>      # Generat device XML for original use
>      origxmlobj = xml_builder.XmlBuilder()
>  
>      if devtype == 'cdrom':
> -        origxmlobj.add_cdrom(xmlargs, guestobj)
> -        guestxml = origxmlobj.build_domain(guestobj)
> +        origxmlobj.add_cdrom(xmlargs, domobj)
> +        guestxml = origxmlobj.build_domain(domobj)
>      elif devtype == 'floppy':
> -        origxmlobj.add_floppy(xmlargs, guestobj)
> -        guestxml = origxmlobj.build_domain(guestobj)
> +        origxmlobj.add_floppy(xmlargs, domobj)
> +        guestxml = origxmlobj.build_domain(domobj)
>  
>      try:
>          domobj.undefine()
> diff --git a/repos/regression/multiple_thread_block_on_domain_create.py b/repos/regression/multiple_thread_block_on_domain_create.py
> index 08a9190..4224510 100644
> --- a/repos/regression/multiple_thread_block_on_domain_create.py
> +++ b/repos/regression/multiple_thread_block_on_domain_create.py
> @@ -81,8 +81,8 @@ class domain_install(Thread):
>          self.logger.debug("guestxml is %s" % guestxml)
>          self.logger.info('create guest %sfrom xml description' % self.name)
>          try:
> -            guestobj = self.conn.createXML(guestxml, 0)
> -            self.logger.info('guest %s API createXML returned successfuly' % guestobj.name())
> +            domobj = self.conn.createXML(guestxml, 0)
> +            self.logger.info('guest %s API createXML returned successfuly' % domobj.name())
>          except libvirtError, e:
>              logger.error("API error message: %s, error code is %s" \
>                           % (e.message, e.get_error_code()))

ACK

Martin