cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mtutkow...@apache.org
Subject git commit: updated refs/heads/master to 89a326a
Date Tue, 08 Jul 2014 21:04:56 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 63ba1ddfb -> 89a326a87


Update to retrieve additional properties for testing.

Signed-off-by: Mike Tutkowski <mike.tutkowski@solidfire.com>


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

Branch: refs/heads/master
Commit: 89a326a878ee6fce098e1a9d198ceb8d44c2eada
Parents: 63ba1dd
Author: Vania Xu <vxu@vxu-lt.users.solidfire.net>
Authored: Tue Jul 8 14:42:52 2014 -0600
Committer: Mike Tutkowski <mike.tutkowski@solidfire.com>
Committed: Tue Jul 8 15:01:50 2014 -0600

----------------------------------------------------------------------
 tools/marvin/marvin/lib/base.py | 68 +++++++++++++++++++++++++++++++++---
 1 file changed, 63 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/89a326a8/tools/marvin/marvin/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index 445faba..fe257f0 100755
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -618,8 +618,8 @@ class VirtualMachine:
         cmd.id = self.id
         apiclient.destroyVirtualMachine(cmd)
 
-    def expung(self, apiclient):
-        """Expung an Instance"""
+    def expunge(self, apiclient):
+        """Expunge an Instance"""
         cmd = expungeVirtualMachine.expungeVirtualMachineCmd()
         cmd.id = self.id
         apiclient.expungeVirtualMachine(cmd)
@@ -1876,6 +1876,15 @@ class ServiceOffering:
         if "isvolatile" in services:
             cmd.isvolatile = services["isvolatile"]
 
+        if "miniops" in services:
+            cmd.miniops = services["miniops"]
+
+        if "maxiops" in services:
+            cmd.maxiops = services["maxiops"]
+
+        if "customizediops" in services:
+            cmd.customizediops = services["customizediops"]
+
         if "offerha" in services:
             cmd.offerha = services["offerha"]
 
@@ -1927,6 +1936,24 @@ class DiskOffering:
         if "storagetype" in services:
             cmd.storagetype = services["storagetype"]
 
+        if "customizediops" in services:
+            cmd.customizediops = services["customizediops"]
+
+        if "disksize" in services:
+            cmd.disksize = services["disksize"]
+
+        if "maxiops" in services:
+            cmd.maxiops = services["maxiops"]
+
+        if "miniops" in services:
+            cmd.miniops = services["miniops"]
+
+        if "storagetype" in services:
+            cmd.storagetype = services["storagetype"]
+
+        if "tags" in services:
+            cmd.tags = services["tags"]
+
         return DiskOffering(apiclient.createDiskOffering(cmd).__dict__)
 
     def delete(self, apiclient):
@@ -2409,8 +2436,9 @@ class StoragePool:
         self.__dict__.update(items)
 
     @classmethod
-    def create(cls, apiclient, services, clusterid=None,
-               zoneid=None, podid=None):
+    def create(cls, apiclient, services, scope=None, clusterid=None,
+               zoneid=None, podid=None, provider=None, tags=None,
+               capacityiops=None, capacitybytes=None, hypervisor=None):
         """Create Storage pool (Primary Storage)"""
 
         cmd = createStoragePool.createStoragePoolCmd()
@@ -2418,7 +2446,7 @@ class StoragePool:
 
         if podid:
             cmd.podid = podid
-        else:
+        elif "podid" in services:
             cmd.podid = services["podid"]
 
         cmd.url = services["url"]
@@ -2432,6 +2460,36 @@ class StoragePool:
         else:
             cmd.zoneid = services["zoneid"]
 
+        if scope:
+            cmd.scope = scope
+        elif "scope" in services:
+            cmd.scope = services["scope"]
+
+        if provider:
+            cmd.provider = provider
+        elif "provider" in services:
+            cmd.provider = services["provider"]
+
+        if tags:
+            cmd.tags = tags
+        elif "tags" in services:
+            cmd.tags = services["tags"]
+
+        if capacityiops:
+            cmd.capacityiops = capacityiops
+        elif "capacityiops" in services:
+            cmd.capacityiops = services["capacityiops"]
+
+        if capacitybytes:
+            cmd.capacitybytes = capacitybytes
+        elif "capacitybytes" in services:
+            cmd.capacitybytes = services["capacitybytes"]
+
+        if hypervisor:
+            cmd.hypervisor = hypervisor
+        elif "hypervisor" in services:
+            cmd.hypervisor = services["hypervisor"]
+
         return StoragePool(apiclient.createStoragePool(cmd).__dict__)
 
     def delete(self, apiclient):


Mime
View raw message