From 477a812a6f7aaab74122c11488713f417dfe4d89 Mon Sep 17 00:00:00 2001 From: John Dilley Date: Mon, 23 Jun 2014 15:45:08 +0000 Subject: [PATCH] CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage Signed-off-by: Daan Hoogland --- tools/marvin/marvin/configGenerator.py | 1 + tools/marvin/marvin/deployDataCenter.py | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/marvin/marvin/configGenerator.py b/tools/marvin/marvin/configGenerator.py index 191f08e070a..8daaaa9d59c 100644 --- a/tools/marvin/marvin/configGenerator.py +++ b/tools/marvin/marvin/configGenerator.py @@ -216,6 +216,7 @@ class primaryStorage(object): def __init__(self): self.name = None self.url = None + self.details = None class secondaryStorage(object): diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py index 5b9c93bc4cf..a2fbd4abbc6 100644 --- a/tools/marvin/marvin/deployDataCenter.py +++ b/tools/marvin/marvin/deployDataCenter.py @@ -236,7 +236,9 @@ class DeployDataCenters(object): return for primary in primaryStorages: primarycmd = createStoragePool.createStoragePoolCmd() - primarycmd.details = primary.details + if primary.details: + for key, value in vars(primary.details).iteritems(): + primarycmd.details.append({ key: value}) primarycmd.name = primary.name primarycmd.podid = podId primarycmd.tags = primary.tags @@ -333,14 +335,13 @@ class DeployDataCenters(object): secondarycmd.provider = secondary.provider secondarycmd.details = [] - if secondarycmd.provider == 'S3' \ - or secondarycmd.provider == "Swift": + if secondarycmd.provider.lower() in ('s3', "swift", "smb"): for key, value in vars(secondary.details).iteritems(): secondarycmd.details.append({ 'key': key, 'value': value }) - if secondarycmd.provider == "NFS": + if secondarycmd.provider.lower() in ("nfs", "smb"): secondarycmd.zoneid = zoneId ret = self.__apiClient.addImageStore(secondarycmd) if ret.id: