marvin: storagetype reference only when attr present

Prasanna Santhanam · Prasanna Santhanam · commit e49b3b27dee9 · 2012-12-09T23:13:24.000-08:00
reference the storagetype only when present. storagetype is reqd only for
devcloud style tests
diff --git a/test/integration/smoke/test_iso.py b/test/integration/smoke/test_iso.py
@@ -218,7 +218,7 @@ def setUpClass(cls):
         cls.services["account"] = cls.account.account.name
         # Finding the OsTypeId from Ostype
         ostypes = list_os_types(
-                    cls.apiclient,
+                    cls.api_client,
                     description=self.services["ostype"]
                     )
         if not isinstance(ostypes, list):
diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py
@@ -1039,7 +1039,8 @@ def create(cls, apiclient, services, domainid=None, **kwargs):
         cmd.displaytext = services["displaytext"]
         cmd.memory = services["memory"]
         cmd.name = services["name"]
-        cmd.storagetype = services["storagetype"]
+        if hasattr(cmd, "storagetype"):
+            cmd.storagetype = services["storagetype"]
 
         # Service Offering private to that domain
         if domainid:
diff --git a/tools/marvin/marvin/integration/lib/common.py b/tools/marvin/marvin/integration/lib/common.py
@@ -64,6 +64,7 @@ def get_domain(apiclient, services=None):
     domains = apiclient.listDomains(cmd)
 
     if isinstance(domains, list):
+        assert len(domains) > 0
         return domains[0]
     else:
         raise Exception("Failed to find specified domain.")
@@ -80,6 +81,7 @@ def get_zone(apiclient, services=None):
     zones = apiclient.listZones(cmd)
 
     if isinstance(zones, list):
+        assert len(zones) > 0
         return zones[0]
     else:
         raise Exception("Failed to find specified zone.")
@@ -98,6 +100,7 @@ def get_pod(apiclient, zoneid, services=None):
     pods = apiclient.listPods(cmd)
 
     if isinstance(pods, list):
+        assert len(pods) > 0
         return pods[0]
     else:
         raise Exception("Exception: Failed to find specified pod.")

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ def setUpClass(cls):`
`218`	`218`	`cls.services["account"] = cls.account.account.name`
`219`	`219`	`# Finding the OsTypeId from Ostype`
`220`	`220`	`ostypes = list_os_types(`
`221`		`- cls.apiclient,`
	`221`	`+ cls.api_client,`
`222`	`222`	`description=self.services["ostype"]`
`223`	`223`	`)`
`224`	`224`	`if not isinstance(ostypes, list):`