marvin: check resource count of more types

Author: ustcweizhou

tools/marvin/marvin/codes.py

@@ -102,6 +102,14 @@
 XEN_SERVER = "XenServer"
 ADMIN_ACCOUNT = 'ADMIN_ACCOUNT'
 USER_ACCOUNT = 'USER_ACCOUNT'
+RESOURCE_USER_VM = 0
+RESOURCE_PUBLIC_IP = 1
+RESOURCE_VOLUME = 2
+RESOURCE_SNAPSHOT = 3
+RESOURCE_TEMPLATE = 4
+RESOURCE_PROJECT = 5
+RESOURCE_NETWORK = 6
+RESOURCE_VPC = 7
 RESOURCE_CPU = 8
 RESOURCE_MEMORY = 9
 RESOURCE_PRIMARY_STORAGE = 10

tools/marvin/marvin/lib/common.py

@@ -63,6 +63,9 @@
 from marvin.codes import (PASS, FAILED, ISOLATED_NETWORK, VPC_NETWORK,
                           BASIC_ZONE, FAIL, NAT_RULE, STATIC_NAT_RULE,
                           RESOURCE_PRIMARY_STORAGE, RESOURCE_SECONDARY_STORAGE,
+                          RESOURCE_USER_VM, RESOURCE_PUBLIC_IP, RESOURCE_VOLUME,
+                          RESOURCE_SNAPSHOT, RESOURCE_TEMPLATE, RESOURCE_PROJECT,
+                          RESOURCE_NETWORK, RESOURCE_VPC,
                           RESOURCE_CPU, RESOURCE_MEMORY, PUBLIC_TRAFFIC,
                           GUEST_TRAFFIC, MANAGEMENT_TRAFFIC, STORAGE_TRAFFIC,
                           VMWAREDVS)
@@ -1392,6 +1395,20 @@ def matchResourceCount(apiclient, expectedCount, resourceType,
             resourceCount = resourceholderlist[0].cputotal
         elif resourceType == RESOURCE_MEMORY:
             resourceCount = resourceholderlist[0].memorytotal
+        elif resourceType == RESOURCE_USER_VM:
+            resourceCount = resourceholderlist[0].vmtotal
+        elif resourceType == RESOURCE_PUBLIC_IP:
+            resourceCount = resourceholderlist[0].iptotal
+        elif resourceType == RESOURCE_VOLUME:
+            resourceCount = resourceholderlist[0].volumetotal
+        elif resourceType == RESOURCE_SNAPSHOT:
+            resourceCount = resourceholderlist[0].snapshottotal
+        elif resourceType == RESOURCE_TEMPLATE:
+            resourceCount = resourceholderlist[0].templatetotal
+        elif resourceType == RESOURCE_NETWORK:
+            resourceCount = resourceholderlist[0].networktotal
+        elif resourceType == RESOURCE_VPC:
+            resourceCount = resourceholderlist[0].vpctotal
         assert str(resourceCount) == str(expectedCount),\
                 "Resource count %s should match with the expected resource count %s" %\
                 (resourceCount, expectedCount)
@@ -1452,7 +1469,36 @@ def isDomainResourceCountEqualToExpectedCount(apiclient, domainid, expectedcount
         isExceptionOccured = True
         return [isExceptionOccured, reasonForException, isResourceCountEqual]
 
-    resourcecount = (response[0].resourcecount / (1024**3))
+    if resourcetype == RESOURCE_PRIMARY_STORAGE or resourcetype == RESOURCE_SECONDARY_STORAGE:
+        resourcecount = (response[0].resourcecount / (1024**3))
+    else:
+        resourcecount = response[0].resourcecount
+
+    if resourcecount == expectedcount:
+        isResourceCountEqual = True
+    return [isExceptionOccured, reasonForException, isResourceCountEqual]
+
+def isAccountResourceCountEqualToExpectedCount(apiclient, domainid, account, expectedcount,
+                                              resourcetype):
+    """Get the resource count of specific account and match
+    it with the expected count
+    Return list [isExceptionOccured, reasonForException, isResourceCountEqual]"""
+    isResourceCountEqual = False
+    isExceptionOccured = False
+    reasonForException = None
+    try:
+        response = Resources.updateCount(apiclient, domainid=domainid, account=account,
+                                         resourcetype=resourcetype)
+    except Exception as e:
+        reasonForException = "Failed while updating resource count: %s" % e
+        isExceptionOccured = True
+        return [isExceptionOccured, reasonForException, isResourceCountEqual]
+
+    if resourcetype == RESOURCE_PRIMARY_STORAGE or resourcetype == RESOURCE_SECONDARY_STORAGE:
+        resourcecount = (response[0].resourcecount / (1024**3))
+    else:
+        resourcecount = response[0].resourcecount
+
     if resourcecount == expectedcount:
         isResourceCountEqual = True
     return [isExceptionOccured, reasonForException, isResourceCountEqual]