cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [23/24] git commit: updated refs/heads/4.4 to e33d4a5
Date Mon, 28 Jul 2014 15:44:50 GMT
CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage

Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit 477a812a6f7aaab74122c11488713f417dfe4d89)
(cherry picked from commit 2498f65683bd529b2b03bac9a6cfd2fdbf65aca2)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2fdf789a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2fdf789a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2fdf789a

Branch: refs/heads/4.4
Commit: 2fdf789a28ce01571eabd5ccb8edfea72624ea3c
Parents: b848c02
Author: John Dilley <john.dilley@citrix.com>
Authored: Mon Jun 23 15:45:08 2014 +0000
Committer: Daan Hoogland <daan@onecht.net>
Committed: Mon Jul 28 17:43:39 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/2fdf789a/tools/marvin/marvin/configGenerator.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/configGenerator.py b/tools/marvin/marvin/configGenerator.py
index 8b50d84..bc77153 100644
--- a/tools/marvin/marvin/configGenerator.py
+++ b/tools/marvin/marvin/configGenerator.py
@@ -215,6 +215,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/2fdf789a/tools/marvin/marvin/deployDataCenter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
index 31f663e..9cbb95d 100644
--- a/tools/marvin/marvin/deployDataCenter.py
+++ b/tools/marvin/marvin/deployDataCenter.py
@@ -233,7 +233,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
@@ -330,14 +332,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:


Mime
View raw message