marvin_refactor: actions on entity object require id for performing the action

For eg:
1. nf = NetworkOffering.create(apiClient, NetworkOfferingFactory())
2. nf.update(apiClient, state='Enabled')

Operation #2 requires that nf's id be supplied to enable the network
offering

Signed-off-by: Prasanna Santhanam <[email protected]>

Author: Prasanna Santhanam

tools/marvin/marvin/integration/lib/base/Account.py

@@ -32,16 +32,20 @@ def __init__(self, items):
 
     def enable(self, apiclient, **kwargs):
         cmd = enableAccount.enableAccountCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.items]
+        cmd.id = self.id
+        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
         account = apiclient.enableAccount(cmd)
+        return account
 
 
     def lock(self, apiclient, account, domainid, **kwargs):
         cmd = lockAccount.lockAccountCmd()
+        cmd.id = self.id
         cmd.account = account
         cmd.domainid = domainid
-        [setattr(cmd, key, value) for key,value in kwargs.items]
+        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
         account = apiclient.lockAccount(cmd)
+        return account
 
 
     @classmethod
@@ -56,27 +60,33 @@ def create(cls, apiclient, AccountFactory, **kwargs):
     @classmethod
     def list(self, apiclient, **kwargs):
         cmd = listAccounts.listAccountsCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.items]
+        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
         account = apiclient.listAccounts(cmd)
         return map(lambda e: Account(e.__dict__), account)
 
 
     def update(self, apiclient, newname, **kwargs):
         cmd = updateAccount.updateAccountCmd()
+        cmd.id = self.id
         cmd.newname = newname
-        [setattr(cmd, key, value) for key,value in kwargs.items]
+        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
         account = apiclient.updateAccount(cmd)
+        return account
 
 
     def disable(self, apiclient, lock, **kwargs):
         cmd = disableAccount.disableAccountCmd()
+        cmd.id = self.id
         cmd.lock = lock
-        [setattr(cmd, key, value) for key,value in kwargs.items]
+        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
         account = apiclient.disableAccount(cmd)
+        return account
 
 
     def delete(self, apiclient, id, **kwargs):
         cmd = deleteAccount.deleteAccountCmd()
+        cmd.id = self.id
         cmd.id = id
-        [setattr(cmd, key, value) for key,value in kwargs.items]
+        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
         account = apiclient.deleteAccount(cmd)
+        return account

tools/marvin/marvin/integration/lib/base/AccountFromProject.py

@@ -20,17 +20,15 @@
 class AccountFromProject(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
     def __init__(self, items):
         self.__dict__.update(items)
 
 
     def delete(self, apiclient, projectid, account, **kwargs):
         cmd = deleteAccountFromProject.deleteAccountFromProjectCmd()
+        cmd.id = self.id
         cmd.account = account
         cmd.projectid = projectid
-        [setattr(cmd, key, value) for key,value in kwargs.items]
+        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
         accountfromproject = apiclient.deleteAccountFromProject(cmd)
+        return accountfromproject

tools/marvin/marvin/integration/lib/base/AccountToProject.py

@@ -20,16 +20,14 @@
 class AccountToProject(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
     def __init__(self, items):
         self.__dict__.update(items)
 
 
     def add(self, apiclient, projectid, **kwargs):
         cmd = addAccountToProject.addAccountToProjectCmd()
+        cmd.id = self.id
         cmd.projectid = projectid
-        [setattr(cmd, key, value) for key,value in kwargs.items]
+        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
         accounttoproject = apiclient.addAccountToProject(cmd)
+        return accounttoproject

tools/marvin/marvin/integration/lib/base/Alerts.py

@@ -28,12 +28,14 @@ def __init__(self, items):
     @classmethod
     def list(self, apiclient, **kwargs):
         cmd = listAlerts.listAlertsCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.items]
+        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
         alerts = apiclient.listAlerts(cmd)
         return map(lambda e: Alerts(e.__dict__), alerts)
 
 
     def delete(self, apiclient, **kwargs):
         cmd = deleteAlerts.deleteAlertsCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.items]
+        cmd.id = self.id
+        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
         alerts = apiclient.deleteAlerts(cmd)
+        return alerts

tools/marvin/marvin/integration/lib/base/ApiLimit.py

@@ -21,22 +21,22 @@
 class ApiLimit(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
     def __init__(self, items):
         self.__dict__.update(items)
 
 
     def reset(self, apiclient, **kwargs):
         cmd = resetApiLimit.resetApiLimitCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.items]
+        cmd.id = self.id
+        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
         apilimit = apiclient.resetApiLimit(cmd)
+        return apilimit
 
 
     def get(self, apiclient, **kwargs):
         cmd = getApiLimit.getApiLimitCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.items]
+        cmd.id = self.id
+        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
         apilimit = apiclient.getApiLimit(cmd)
+        return apilimit
 

tools/marvin/marvin/integration/lib/base/Apis.py

@@ -27,6 +27,6 @@ def __init__(self, items):
     @classmethod
     def list(self, apiclient, **kwargs):
         cmd = listApis.listApisCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.items]
+        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
         apis = apiclient.listApis(cmd)
         return map(lambda e: Apis(e.__dict__), apis)

tools/marvin/marvin/integration/lib/base/AsyncJobResult.py

@@ -20,16 +20,14 @@
 class AsyncJobResult(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
     def __init__(self, items):
         self.__dict__.update(items)
 
 
     def query(self, apiclient, jobid, **kwargs):
         cmd = queryAsyncJobResult.queryAsyncJobResultCmd()
+        cmd.id = self.id
         cmd.jobid = jobid
-        [setattr(cmd, key, value) for key,value in kwargs.items]
+        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
         asyncjobresult = apiclient.queryAsyncJobResult(cmd)
+        return asyncjobresult

tools/marvin/marvin/integration/lib/base/AsyncJobs.py

@@ -27,6 +27,6 @@ def __init__(self, items):
     @classmethod
     def list(self, apiclient, **kwargs):
         cmd = listAsyncJobs.listAsyncJobsCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.items]
+        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
         asyncjobs = apiclient.listAsyncJobs(cmd)
         return map(lambda e: AsyncJobs(e.__dict__), asyncjobs)

tools/marvin/marvin/integration/lib/base/AutoScalePolicies.py

@@ -27,6 +27,6 @@ def __init__(self, items):
     @classmethod
     def list(self, apiclient, **kwargs):
         cmd = listAutoScalePolicies.listAutoScalePoliciesCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.items]
+        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
         autoscalepolicies = apiclient.listAutoScalePolicies(cmd)
         return map(lambda e: AutoScalePolicies(e.__dict__), autoscalepolicies)

tools/marvin/marvin/integration/lib/base/AutoScalePolicy.py

@@ -37,13 +37,17 @@ def create(cls, apiclient, AutoScalePolicyFactory, **kwargs):
 
     def update(self, apiclient, id, **kwargs):
         cmd = updateAutoScalePolicy.updateAutoScalePolicyCmd()
+        cmd.id = self.id
         cmd.id = id
-        [setattr(cmd, key, value) for key,value in kwargs.items]
+        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
         autoscalepolicy = apiclient.updateAutoScalePolicy(cmd)
+        return autoscalepolicy
 
 
     def delete(self, apiclient, id, **kwargs):
         cmd = deleteAutoScalePolicy.deleteAutoScalePolicyCmd()
+        cmd.id = self.id
         cmd.id = id
-        [setattr(cmd, key, value) for key,value in kwargs.items]
+        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
         autoscalepolicy = apiclient.deleteAutoScalePolicy(cmd)
+        return autoscalepolicy