add required provider for NFS storage

Prasanna Santhanam · Prasanna Santhanam · commit 694391ad042d · 2013-06-20T16:44:49.000+05:30
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 &lt;tsp@apache.org&gt;
diff --git 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
@@ -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
@@ -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
@@ -181,13 +181,13 @@ def __init__(self):
 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
@@ -140,7 +140,7 @@ def createSecondaryStorages(self, secondaryStorages, zoneId):
         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 @@ def createCacheStorages(self, cacheStorages, zoneId):
         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 @@ def copyAttributesToCommand(self, source, command):
 
 
     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
@@ -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
@@ -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
@@ -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'''

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,8 @@`
`125`	`125`	`"internaldns1": "10.147.28.6",`
`126`	`126`	`"secondaryStorages": [`
`127`	`127`	`{`
`128`		`- "url": "nfs://10.147.28.6:/export/home/sandbox/secondary"`
	`128`	`+ "url": "nfs://10.147.28.6:/export/home/sandbox/secondary",`
	`129`	`+ "provider" : "NFS"`
`129`	`130`	`}`
`130`	`131`	`]`
`131`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,8 @@`
`94`	`94`	`"internaldns1": "10.147.28.6",`
`95`	`95`	`"secondaryStorages": [`
`96`	`96`	`{`
`97`		`- "url": "nfs://10.147.28.6:/export/home/sandbox/sstor"`
	`97`	`+ "url": "nfs://10.147.28.6:/export/home/sandbox/sstor",`
	`98`	`+ "provider" : "NFS"`
`98`	`99`	`}`
`99`	`100`	`]`
`100`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,8 @@`
`90`	`90`	`"internaldns1": "8.8.8.8",`
`91`	`91`	`"secondaryStorages": [`
`92`	`92`	`{`
`93`		`- "url": "nfs://nfsstor:/export/home/sandbox/secondary"`
	`93`	`+ "url": "nfs://nfsstor:/export/home/sandbox/secondary",`
	`94`	`+ "provider" : "NFS"`
`94`	`95`	`}`
`95`	`96`	`]`
`96`	`97`	`}`