Updated Branches: refs/heads/master 9b05d5551 -> e06a8569a
propagate storagetype fix from commit e49b3b to diskOffering Author: Prasanna Santhanam <[email protected]> Date: Sun Dec 9 23:13:24 2012 -0800 marvin: storagetype reference only when attr present reference the storagetype only when present. storagetype is reqd only for devcloud style tests Signed-off-by: Prasanna Santhanam <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e06a8569 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e06a8569 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e06a8569 Branch: refs/heads/master Commit: e06a8569a2140ed09f2f2e9c91dd5537c85abb32 Parents: 9b05d55 Author: Prasanna Santhanam <[email protected]> Authored: Thu Jan 31 16:03:15 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Thu Jan 31 16:03:43 2013 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/integration/lib/base.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e06a8569/tools/marvin/marvin/integration/lib/base.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py index 830914c..3751d98 100644 --- a/tools/marvin/marvin/integration/lib/base.py +++ b/tools/marvin/marvin/integration/lib/base.py @@ -1136,7 +1136,7 @@ class DiskOffering: if domainid: cmd.domainid = domainid - if services["storagetype"]: + if "storagetype" in services: cmd.storagetype = services["storagetype"] return DiskOffering(apiclient.createDiskOffering(cmd).__dict__)
