From 694391ad042dad9f3a363b4bd2cd664f579a9fd8 Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Thu, 20 Jun 2013 15:50:48 +0530 Subject: [PATCH] add required provider for NFS storage Changing the sandbox scripts and the marvin-checkin-test configurations to include the required 'provider' argument when adding an image store (secondary storage) Signed-off-by: Prasanna Santhanam --- setup/dev/advanced.cfg | 3 ++- setup/dev/advancedsg.cfg | 3 ++- setup/dev/basic.cfg | 3 ++- tools/marvin/marvin/configGenerator.py | 4 ++-- tools/marvin/marvin/deployDataCenter.py | 7 ++----- tools/marvin/marvin/sandbox/advanced/advanced_env.py | 1 + tools/marvin/marvin/sandbox/advancedsg/advancedsg_env.py | 1 + tools/marvin/marvin/sandbox/basic/basic_env.py | 1 + 8 files changed, 13 insertions(+), 10 deletions(-) diff --git a/setup/dev/advanced.cfg b/setup/dev/advanced.cfg index 3d0854d8aa7..4a483995f48 100644 --- a/setup/dev/advanced.cfg +++ b/setup/dev/advanced.cfg @@ -125,7 +125,8 @@ "internaldns1": "10.147.28.6", "secondaryStorages": [ { - "url": "nfs://10.147.28.6:/export/home/sandbox/secondary" + "url": "nfs://10.147.28.6:/export/home/sandbox/secondary", + "provider" : "NFS" } ] } diff --git a/setup/dev/advancedsg.cfg b/setup/dev/advancedsg.cfg index e6922b639e5..c6a1f597ad8 100644 --- a/setup/dev/advancedsg.cfg +++ b/setup/dev/advancedsg.cfg @@ -94,7 +94,8 @@ "internaldns1": "10.147.28.6", "secondaryStorages": [ { - "url": "nfs://10.147.28.6:/export/home/sandbox/sstor" + "url": "nfs://10.147.28.6:/export/home/sandbox/sstor", + "provider" : "NFS" } ] } diff --git a/setup/dev/basic.cfg b/setup/dev/basic.cfg index 326874d1f19..e91c87aba81 100644 --- a/setup/dev/basic.cfg +++ b/setup/dev/basic.cfg @@ -90,7 +90,8 @@ "internaldns1": "8.8.8.8", "secondaryStorages": [ { - "url": "nfs://nfsstor:/export/home/sandbox/secondary" + "url": "nfs://nfsstor:/export/home/sandbox/secondary", + "provider" : "NFS" } ] } diff --git a/tools/marvin/marvin/configGenerator.py b/tools/marvin/marvin/configGenerator.py index 7f6776a3559..b53c46e8ba9 100644 --- a/tools/marvin/marvin/configGenerator.py +++ b/tools/marvin/marvin/configGenerator.py @@ -181,13 +181,13 @@ class primaryStorage(): class secondaryStorage(): def __init__(self): self.url = None - self.providerName = None + self.provider = None self.details = None class cacheStorage(): def __init__(self): self.url = None - self.providerName = None + self.provider = None self.details = None class s3(): diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py index 66b3e322890..d6f19b01869 100644 --- a/tools/marvin/marvin/deployDataCenter.py +++ b/tools/marvin/marvin/deployDataCenter.py @@ -140,7 +140,7 @@ class deployDataCenters(): for secondary in secondaryStorages: secondarycmd = addImageStore.addImageStoreCmd() secondarycmd.url = secondary.url - secondarycmd.provider = secondary.providerName + secondarycmd.provider = secondary.provider secondarycmd.details = [] if isinstance(secondary.details, list): @@ -156,7 +156,7 @@ class deployDataCenters(): for cache in cacheStorages: cachecmd = createCacheStore.createCacheStoreCmd() cachecmd.url = cache.url - cachecmd.provider = cache.providerName + cachecmd.provider = cache.provider cachecmd.zoneid = zoneId cachecmd.details = [] for item in cache.details: @@ -507,14 +507,11 @@ class deployDataCenters(): def configureS3(self, s3): - if s3 is None: return command = addS3.addS3Cmd() - self.copyAttributesToCommand(s3, command) - self.apiClient.addS3(command) def deploy(self): diff --git a/tools/marvin/marvin/sandbox/advanced/advanced_env.py b/tools/marvin/marvin/sandbox/advanced/advanced_env.py index 6343293aa62..1728e61fb19 100644 --- a/tools/marvin/marvin/sandbox/advanced/advanced_env.py +++ b/tools/marvin/marvin/sandbox/advanced/advanced_env.py @@ -113,6 +113,7 @@ def describeResources(config): secondary = secondaryStorage() secondary.url = config.get('cloudstack', 'secondary.pool') + secondary.provider = "NFS" z.secondaryStorages.append(secondary) '''Add zone''' diff --git a/tools/marvin/marvin/sandbox/advancedsg/advancedsg_env.py b/tools/marvin/marvin/sandbox/advancedsg/advancedsg_env.py index f9edf4d5803..9cf4a0aa98f 100644 --- a/tools/marvin/marvin/sandbox/advancedsg/advancedsg_env.py +++ b/tools/marvin/marvin/sandbox/advancedsg/advancedsg_env.py @@ -97,6 +97,7 @@ def describeResources(config): secondary = secondaryStorage() secondary.url = config.get('cloudstack', 'secondary.pool') + secondary.provider = "NFS" z.secondaryStorages.append(secondary) '''Add zone''' diff --git a/tools/marvin/marvin/sandbox/basic/basic_env.py b/tools/marvin/marvin/sandbox/basic/basic_env.py index cf1869fa499..bf106fcb8de 100644 --- a/tools/marvin/marvin/sandbox/basic/basic_env.py +++ b/tools/marvin/marvin/sandbox/basic/basic_env.py @@ -95,6 +95,7 @@ def describeResources(config): secondary = secondaryStorage() secondary.url = config.get('cloudstack', 'secondary.pool') + secondary.provider = "NFS" z.secondaryStorages.append(secondary) '''Add zone'''