diff options
author | Keir Fraser <keir@xensource.com> | 2007-10-25 09:22:28 +0100 |
---|---|---|
committer | Keir Fraser <keir@xensource.com> | 2007-10-25 09:22:28 +0100 |
commit | 61d0b64c6c2ca2eda3867c2ea32d406418e67dba (patch) | |
tree | 63f7c021ecf485dd583d605ebe06e7c872fdf51e /tools/xm-test/lib | |
parent | 78c593d291e12ed70b75aa32b306a2e266cda2fe (diff) | |
download | xen-61d0b64c6c2ca2eda3867c2ea32d406418e67dba.tar.gz xen-61d0b64c6c2ca2eda3867c2ea32d406418e67dba.tar.bz2 xen-61d0b64c6c2ca2eda3867c2ea32d406418e67dba.zip |
xm-test: various fixes
- recently I added an other_config field to the VTPM record which now
needs to be accounted for otherwise the test determines a bad key
- the dry-run command was throwing a different type of exception
(ACMError) than what was caught (XSMError)
- the tests based on the raw Xen-API need to build the PV_args
parameters from the old 'root' and 'extra' parameters.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
Diffstat (limited to 'tools/xm-test/lib')
-rw-r--r-- | tools/xm-test/lib/XmTestLib/XenAPIDomain.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/xm-test/lib/XmTestLib/XenAPIDomain.py b/tools/xm-test/lib/XmTestLib/XenAPIDomain.py index 2c6ae016df..31b91eed68 100644 --- a/tools/xm-test/lib/XmTestLib/XenAPIDomain.py +++ b/tools/xm-test/lib/XmTestLib/XenAPIDomain.py @@ -38,7 +38,8 @@ class XenAPIConfig: 'memory_dynamic_max' ], 'kernel' : 'PV_kernel', 'ramdisk': 'PV_ramdisk', - 'root' : 'PV_args'} + 'root' : 'PV_args', + 'extra' : 'PV_args' } if isACMEnabled(): #A default so every VM can start with ACM enabled self.opts["security_label"] = "ACM:xm-test:red" @@ -47,6 +48,8 @@ class XenAPIConfig: """Set an option in the config""" if name == "memory": value <<= 20 + if name == "root": + value = "root=" + value if name in self.opttrlate.keys(): _name = self.opttrlate[name] else: @@ -56,7 +59,11 @@ class XenAPIConfig: for _n in _name: self.opts[_n] = value else: - self.opts[_name] = value + if not self.opts.get(_name) or \ + not _name in [ "PV_args" ]: + self.opts[_name] = value + else: + self.opts[_name] += " " + value def getOpt(self, name): """Return the value of a config option""" |