You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/06/25 19:42:54 UTC
git commit: updated refs/heads/master to 477a812
Repository: cloudstack
Updated Branches:
refs/heads/master 3268f5bd1 -> 477a812a6
CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/477a812a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/477a812a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/477a812a
Branch: refs/heads/master
Commit: 477a812a6f7aaab74122c11488713f417dfe4d89
Parents: 3268f5b
Author: John Dilley <jo...@citrix.com>
Authored: Mon Jun 23 15:45:08 2014 +0000
Committer: Daan Hoogland <da...@onecht.net>
Committed: Wed Jun 25 19:42:43 2014 +0200
----------------------------------------------------------------------
tools/marvin/marvin/configGenerator.py | 1 +
tools/marvin/marvin/deployDataCenter.py | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/477a812a/tools/marvin/marvin/configGenerator.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/configGenerator.py b/tools/marvin/marvin/configGenerator.py
index 191f08e..8daaaa9 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/477a812a/tools/marvin/marvin/deployDataCenter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
index 5b9c93b..a2fbd4a 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: