<br><font size=2 face="sans-serif">+1. </font>
<br>
<br><font size=2 face="sans-serif">Best,<br>
Regards<br>
<br>
Daisy (Ô˹úÁ«)<br>
VSM Team, China Systems & Technology Labs (CSTL)<br>
E-mail: yunguol@cn.ibm.com<br>
TEL: (86)-21-60922403<br>
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203<br>
</font>
<br>
<br>
<br>
<table width=100%>
<tr valign=top>
<td width=40%><font size=1 face="sans-serif"><b>Kaitlin Rupert <kaitlin@linux.vnet.ibm.com></b>
</font>
<br><font size=1 face="sans-serif">Sent by: libvirt-cim-bounces@redhat.com</font>
<p><font size=1 face="sans-serif">2008-12-24 05:13</font>
<table border>
<tr valign=top>
<td bgcolor=white>
<div align=center><font size=1 face="sans-serif">Please respond to<br>
List for discussion and development of libvirt CIM
<libvirt-cim@redhat.com></font></div></table>
<br>
<td width=59%>
<table width=100%>
<tr valign=top>
<td>
<div align=right><font size=1 face="sans-serif">To</font></div>
<td><font size=1 face="sans-serif">libvirt-cim@redhat.com</font>
<tr valign=top>
<td>
<div align=right><font size=1 face="sans-serif">cc</font></div>
<td>
<tr valign=top>
<td>
<div align=right><font size=1 face="sans-serif">Subject</font></div>
<td><font size=1 face="sans-serif">[Libvirt-cim] [PATCH] [TEST] Update
CS 33_suspend_reboot.py to use cim_()
functions</font></table>
<br>
<table>
<tr valign=top>
<td>
<td></table>
<br></table>
<br>
<br>
<br><tt><font size=2># HG changeset patch<br>
# User Kaitlin Rupert <karupert@us.ibm.com><br>
# Date 1230066798 28800<br>
# Node ID 0e44ebb837b569aa33acce5724e1094ccc4486fe<br>
# Parent 0efe95dfa11a48f887900b41d5a83ecb1f07321f<br>
[TEST] Update CS 33_suspend_reboot.py to use cim_() functions.<br>
<br>
Note: Even though this test is called suspend, it was using the CIM<br>
RequestedState value for pause. The mof files call value 6 offline, but
the<br>
libvirt-cim code calls it suspend.<br>
<br>
Pause is supported by the provider, suspend is not. So there is a
change in<br>
bug number.<br>
<br>
Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com><br>
<br>
diff -r 0efe95dfa11a -r 0e44ebb837b5 suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py<br>
--- a/suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py
Tue Dec
23 13:10:38 2008 -0800<br>
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py
Tue Dec
23 13:13:18 2008 -0800<br>
@@ -35,32 +35,22 @@<br>
# ---------------------------------<br>
# Defined | 3<br>
# Active | 2<br>
-# Suspended | 9<br>
+# Suspended | 6<br>
# Rebooted | 10<br>
#<br>
#
Date: 06-03-2008<br>
<br>
import sys<br>
-import pywbem<br>
-from VirtLib import utils<br>
from CimTest.Globals import logger<br>
from XenKvmLib.const import do_main<br>
from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC<br>
-from XenKvmLib.test_doms import destroy_and_undefine_domain<br>
-from XenKvmLib.common_util import create_using_definesystem, \<br>
-
call_request_state_change,
\<br>
-
poll_for_state_change,
\<br>
-
try_request_state_change<br>
+from XenKvmLib.vxml import get_class<br>
<br>
sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']<br>
<br>
-bug_libvirt = "00005"<br>
-ACTIVE_STATE = 2<br>
-SUSPND_STATE = 9<br>
-REBOOT_STATE = 10<br>
+bug_libvirt = "00012"<br>
<br>
default_dom = 'test_domain'<br>
-TIME = "00000000000000.000000:000"<br>
<br>
@do_main(sup_types)<br>
def main():<br>
@@ -69,45 +59,41 @@<br>
server = options.ip<br>
virt = options.virt<br>
<br>
- tc_scen = [('Start', [ACTIVE_STATE, ACTIVE_STATE]),
<br>
- ('Suspend', [SUSPND_STATE,
SUSPND_STATE]),<br>
- ('Reboot', [SUSPND_STATE,
REBOOT_STATE])] <br>
+ tc_scen = ['Start', 'Suspend', 'Reboot'] <br>
<br>
+ action_passed = PASS <br>
try:<br>
# define the vs<br>
- status = create_using_definesystem(default_dom,
server,<br>
-
virt=virt)<br>
- if status != PASS:<br>
- logger.error("Unable to
define domain '%s' using DefineSystem()", <br>
-
default_dom)<br>
- return status<br>
+ cxml = get_class(options.virt)(default_dom)<br>
+ ret = cxml.cim_define(server)<br>
+ if not ret:<br>
+ raise Exception("Failed
to define the guest: %s" % default_dom)<br>
<br>
# start, suspend and reboot<br>
- for action, state in tc_scen:<br>
- en_state = state[0]<br>
- rq_state = state[1]<br>
- status = call_request_state_change(default_dom,
server,<br>
-
rq_state, TIME,<br>
-
virt=virt)<br>
+ for action in tc_scen:<br>
+ if action == "Start":<br>
+ status = cxml.cim_start(server)<br>
+ elif action == "Suspend":<br>
+ status = cxml.cim_suspend(server)<br>
+ elif action == "Reboot":<br>
+ status = cxml.cim_reboot(server)<br>
+ else:<br>
+ raise Exception("Unexpected
state change: %s" % action)<br>
+<br>
if status != PASS:<br>
- logger.error("Unable
to '%s' dom '%s' using RequestedStateChange()", <br>
-
action, default_dom)<br>
- status = XFAIL_RC(bug_libvirt)<br>
- break<br>
-<br>
- status, dom_cs = poll_for_state_change(server,
virt, default_dom, en_state,<br>
-
timeout=10)<br>
- if status != PASS or dom_cs.RequestedState
!= rq_state:<br>
- status = FAIL<br>
- logger.error("Attributes
for dom '%s' is not set as expected.",<br>
-
default_dom)<br>
- break<br>
+ action_passed
= FAIL<br>
+ raise Exception("Unable
%s dom '%s'" % (action, default_dom))<br>
<br>
except Exception, detail:<br>
logger.error("Exception: %s", detail)<br>
status = FAIL<br>
<br>
- destroy_and_undefine_domain(default_dom, server, virt)<br>
+ cxml.cim_destroy(server)<br>
+ cxml.undefine(server)<br>
+<br>
+ if action_passed == FAIL:<br>
+ return XFAIL_RC(bug_libvirt)<br>
+<br>
return status<br>
<br>
if __name__ == "__main__":<br>
<br>
_______________________________________________<br>
Libvirt-cim mailing list<br>
Libvirt-cim@redhat.com<br>
https://www.redhat.com/mailman/listinfo/libvirt-cim<br>
</font></tt>
<br>