marvin_refactor: base dict object updated as **kwargs from factory

Signed-off-by: Prasanna Santhanam <tsp@apache.org>

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

@@ -23,11 +23,11 @@ from marvin.cloudstackAPI import updateAccount
 from marvin.cloudstackAPI import disableAccount
 from marvin.cloudstackAPI import deleteAccount
 
-class Account(CloudStackEntity):
+class Account(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def enable(self, apiclient, **kwargs):

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import deleteAccountFromProject
 
-class AccountFromProject(CloudStackEntity):
+class AccountFromProject(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def delete(self, apiclient, projectid, account, **kwargs):

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import addAccountToProject
 
-class AccountToProject(CloudStackEntity):
+class AccountToProject(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def add(self, apiclient, projectid, **kwargs):

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

@@ -16,12 +16,13 @@
 # under the License.
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listAlerts
+from marvin.cloudstackAPI import deleteAlerts
 
-class Alerts(CloudStackEntity):
+class Alerts(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod
@@ -30,3 +31,9 @@ class Alerts(CloudStackEntity):
         [setattr(cmd, key, value) for key,value in kwargs.items]
         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]
+        alerts = apiclient.deleteAlerts(cmd)

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

@@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import resetApiLimit
 from marvin.cloudstackAPI import getApiLimit
 
-class ApiLimit(CloudStackEntity):
+class ApiLimit(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def reset(self, apiclient, **kwargs):

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listApis
 
-class Apis(CloudStackEntity):
+class Apis(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import queryAsyncJobResult
 
-class AsyncJobResult(CloudStackEntity):
+class AsyncJobResult(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def query(self, apiclient, jobid, **kwargs):

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listAsyncJobs
 
-class AsyncJobs(CloudStackEntity):
+class AsyncJobs(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listAutoScalePolicies
 
-class AutoScalePolicies(CloudStackEntity):
+class AutoScalePolicies(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createAutoScalePolicy
 from marvin.cloudstackAPI import updateAutoScalePolicy
 from marvin.cloudstackAPI import deleteAutoScalePolicy
 
-class AutoScalePolicy(CloudStackEntity):
+class AutoScalePolicy(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -22,11 +22,11 @@ from marvin.cloudstackAPI import updateAutoScaleVmGroup
 from marvin.cloudstackAPI import disableAutoScaleVmGroup
 from marvin.cloudstackAPI import deleteAutoScaleVmGroup
 
-class AutoScaleVmGroup(CloudStackEntity):
+class AutoScaleVmGroup(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def enable(self, apiclient, id, **kwargs):

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

@@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listAutoScaleVmProfiles
 from marvin.cloudstackAPI import updateAutoScaleVmProfile
 from marvin.cloudstackAPI import deleteAutoScaleVmProfile
 
-class AutoScaleVmProfile(CloudStackEntity):
+class AutoScaleVmProfile(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -19,11 +19,11 @@ from marvin.cloudstackAPI import addBigSwitchVnsDevice
 from marvin.cloudstackAPI import listBigSwitchVnsDevices
 from marvin.cloudstackAPI import deleteBigSwitchVnsDevice
 
-class BigSwitchVnsDevice(CloudStackEntity):
+class BigSwitchVnsDevice(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def add(self, apiclient, physicalnetworkid, hostname, **kwargs):

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listCapabilities
 
-class Capabilities(CloudStackEntity):
+class Capabilities(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listCapacity
 
-class Capacity(CloudStackEntity):
+class Capacity(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import getCloudIdentifier
 
-class CloudIdentifier(CloudStackEntity):
+class CloudIdentifier(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def get(self, apiclient, userid, **kwargs):

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

@@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listClusters
 from marvin.cloudstackAPI import updateCluster
 from marvin.cloudstackAPI import deleteCluster
 
-class Cluster(CloudStackEntity):
+class Cluster(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def add(self, apiclient, clustername, hypervisor, zoneid, clustertype, podid, **kwargs):

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

@@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createCondition
 from marvin.cloudstackAPI import listConditions
 from marvin.cloudstackAPI import deleteCondition
 
-class Condition(CloudStackEntity):
+class Condition(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,17 +17,14 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import ldapConfig
 
-class Config(CloudStackEntity):
+class Config(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
-    def ldap(self, apiclient, queryfilter, hostname, searchbase, **kwargs):
+    def ldap(self, apiclient, **kwargs):
         cmd = ldapConfig.ldapConfigCmd()
-        cmd.hostname = hostname
-        cmd.queryfilter = queryfilter
-        cmd.searchbase = searchbase
         [setattr(cmd, key, value) for key,value in kwargs.items]
         config = apiclient.ldapConfig(cmd)

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

@@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listConfigurations
 from marvin.cloudstackAPI import updateConfiguration
 
-class Configuration(CloudStackEntity):
+class Configuration(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createCounter
 from marvin.cloudstackAPI import listCounters
 from marvin.cloudstackAPI import deleteCounter
 
-class Counter(CloudStackEntity):
+class Counter(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import uploadCustomCertificate
 
-class CustomCertificate(CloudStackEntity):
+class CustomCertificate(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def upload(self, apiclient, domainsuffix, certificate, **kwargs):

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import updateDefaultNicForVirtualMachine
 
-class DefaultNicForVirtualMachine(CloudStackEntity):
+class DefaultNicForVirtualMachine(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def update(self, apiclient, nicid, virtualmachineid, **kwargs):

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import markDefaultZoneForAccount
 
-class DefaultZoneForAccount(CloudStackEntity):
+class DefaultZoneForAccount(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def mark(self, apiclient, account, domainid, zoneid, **kwargs):

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

@@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listDiskOfferings
 from marvin.cloudstackAPI import updateDiskOffering
 from marvin.cloudstackAPI import deleteDiskOffering
 
-class DiskOffering(CloudStackEntity):
+class DiskOffering(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listDomains
 from marvin.cloudstackAPI import updateDomain
 from marvin.cloudstackAPI import deleteDomain
 
-class Domain(CloudStackEntity):
+class Domain(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listDomainChildren
 
-class DomainChildren(CloudStackEntity):
+class DomainChildren(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createEgressFirewallRule
 from marvin.cloudstackAPI import listEgressFirewallRules
 from marvin.cloudstackAPI import deleteEgressFirewallRule
 
-class EgressFirewallRule(CloudStackEntity):
+class EgressFirewallRule(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listEventTypes
 
-class EventTypes(CloudStackEntity):
+class EventTypes(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -16,12 +16,13 @@
 # under the License.
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listEvents
+from marvin.cloudstackAPI import deleteEvents
 
-class Events(CloudStackEntity):
+class Events(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod
@@ -30,3 +31,9 @@ class Events(CloudStackEntity):
         [setattr(cmd, key, value) for key,value in kwargs.items]
         events = apiclient.listEvents(cmd)
         return map(lambda e: Events(e.__dict__), events)
+
+
+    def delete(self, apiclient, **kwargs):
+        cmd = deleteEvents.deleteEventsCmd()
+        [setattr(cmd, key, value) for key,value in kwargs.items]
+        events = apiclient.deleteEvents(cmd)

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

@@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createFirewallRule
 from marvin.cloudstackAPI import listFirewallRules
 from marvin.cloudstackAPI import deleteFirewallRule
 
-class FirewallRule(CloudStackEntity):
+class FirewallRule(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import removeFromLoadBalancerRule
 
-class FromLoadBalancerRule(CloudStackEntity):
+class FromLoadBalancerRule(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def remove(self, apiclient, id, virtualmachineids, **kwargs):

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

@@ -21,11 +21,11 @@ from marvin.cloudstackAPI import updateHost
 from marvin.cloudstackAPI import reconnectHost
 from marvin.cloudstackAPI import deleteHost
 
-class Host(CloudStackEntity):
+class Host(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def add(self, apiclient, username, podid, url, hypervisor, zoneid, password, **kwargs):

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import prepareHostForMaintenance
 
-class HostForMaintenance(CloudStackEntity):
+class HostForMaintenance(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def prepare(self, apiclient, id, **kwargs):

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import cancelHostMaintenance
 
-class HostMaintenance(CloudStackEntity):
+class HostMaintenance(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def cancel(self, apiclient, id, **kwargs):

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import updateHostPassword
 
-class HostPassword(CloudStackEntity):
+class HostPassword(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def update(self, apiclient, username, password, **kwargs):

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

@@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listHypervisorCapabilities
 from marvin.cloudstackAPI import updateHypervisorCapabilities
 
-class HypervisorCapabilities(CloudStackEntity):
+class HypervisorCapabilities(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listHypervisors
 
-class Hypervisors(CloudStackEntity):
+class Hypervisors(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listInstanceGroups
 from marvin.cloudstackAPI import updateInstanceGroup
 from marvin.cloudstackAPI import deleteInstanceGroup
 
-class InstanceGroup(CloudStackEntity):
+class InstanceGroup(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import disassociateIpAddress
 from marvin.cloudstackAPI import associateIpAddress
 
-class IpAddress(CloudStackEntity):
+class IpAddress(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def disassociate(self, apiclient, id, **kwargs):

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

@@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createIpForwardingRule
 from marvin.cloudstackAPI import listIpForwardingRules
 from marvin.cloudstackAPI import deleteIpForwardingRule
 
-class IpForwardingRule(CloudStackEntity):
+class IpForwardingRule(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import removeIpFromNic
 
-class IpFromNic(CloudStackEntity):
+class IpFromNic(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def remove(self, apiclient, id, **kwargs):

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import addIpToNic
 
-class IpToNic(CloudStackEntity):
+class IpToNic(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def add(self, apiclient, nicid, **kwargs):

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

@@ -24,11 +24,11 @@ from marvin.cloudstackAPI import detachIso
 from marvin.cloudstackAPI import extractIso
 from marvin.cloudstackAPI import deleteIso
 
-class Iso(CloudStackEntity):
+class Iso(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def copy(self, apiclient, sourcezoneid, id, destzoneid, **kwargs):

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

@@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listIsoPermissions
 from marvin.cloudstackAPI import updateIsoPermissions
 
-class IsoPermissions(CloudStackEntity):
+class IsoPermissions(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listLBStickinessPolicies
 
-class LBStickinessPolicies(CloudStackEntity):
+class LBStickinessPolicies(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import createLBStickinessPolicy
 from marvin.cloudstackAPI import deleteLBStickinessPolicy
 
-class LBStickinessPolicy(CloudStackEntity):
+class LBStickinessPolicy(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listLoadBalancerRules
 from marvin.cloudstackAPI import updateLoadBalancerRule
 from marvin.cloudstackAPI import deleteLoadBalancerRule
 
-class LoadBalancerRule(CloudStackEntity):
+class LoadBalancerRule(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listLoadBalancerRuleInstances
 
-class LoadBalancerRuleInstances(CloudStackEntity):
+class LoadBalancerRuleInstances(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -21,11 +21,11 @@ from marvin.cloudstackAPI import updateNetwork
 from marvin.cloudstackAPI import restartNetwork
 from marvin.cloudstackAPI import deleteNetwork
 
-class Network(CloudStackEntity):
+class Network(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createNetworkACL
 from marvin.cloudstackAPI import listNetworkACLs
 from marvin.cloudstackAPI import deleteNetworkACL
 
-class NetworkACL(CloudStackEntity):
+class NetworkACL(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -19,11 +19,11 @@ from marvin.cloudstackAPI import addNetworkDevice
 from marvin.cloudstackAPI import listNetworkDevice
 from marvin.cloudstackAPI import deleteNetworkDevice
 
-class NetworkDevice(CloudStackEntity):
+class NetworkDevice(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def add(self, apiclient, **kwargs):

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

@@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listNetworkOfferings
 from marvin.cloudstackAPI import updateNetworkOffering
 from marvin.cloudstackAPI import deleteNetworkOffering
 
-class NetworkOffering(CloudStackEntity):
+class NetworkOffering(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listNetworkServiceProviders
 from marvin.cloudstackAPI import updateNetworkServiceProvider
 from marvin.cloudstackAPI import deleteNetworkServiceProvider
 
-class NetworkServiceProvider(CloudStackEntity):
+class NetworkServiceProvider(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def add(self, apiclient, physicalnetworkid, name, **kwargs):

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import removeNicFromVirtualMachine
 
-class NicFromVirtualMachine(CloudStackEntity):
+class NicFromVirtualMachine(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def remove(self, apiclient, nicid, virtualmachineid, **kwargs):

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import addNicToVirtualMachine
 
-class NicToVirtualMachine(CloudStackEntity):
+class NicToVirtualMachine(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def add(self, apiclient, networkid, virtualmachineid, **kwargs):

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

@@ -19,11 +19,11 @@ from marvin.cloudstackAPI import addNiciraNvpDevice
 from marvin.cloudstackAPI import listNiciraNvpDevices
 from marvin.cloudstackAPI import deleteNiciraNvpDevice
 
-class NiciraNvpDevice(CloudStackEntity):
+class NiciraNvpDevice(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def add(self, apiclient, username, physicalnetworkid, password, hostname, transportzoneuuid, **kwargs):

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listNiciraNvpDeviceNetworks
 
-class NiciraNvpDeviceNetworks(CloudStackEntity):
+class NiciraNvpDeviceNetworks(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listNics
 
-class Nics(CloudStackEntity):
+class Nics(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listOsCategories
 
-class OsCategories(CloudStackEntity):
+class OsCategories(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listOsTypes
 
-class OsTypes(CloudStackEntity):
+class OsTypes(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import resetPasswordForVirtualMachine
 
-class PasswordForVirtualMachine(CloudStackEntity):
+class PasswordForVirtualMachine(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def reset(self, apiclient, id, **kwargs):

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

@@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listPhysicalNetworks
 from marvin.cloudstackAPI import updatePhysicalNetwork
 from marvin.cloudstackAPI import deletePhysicalNetwork
 
-class PhysicalNetwork(CloudStackEntity):
+class PhysicalNetwork(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listPods
 from marvin.cloudstackAPI import updatePod
 from marvin.cloudstackAPI import deletePod
 
-class Pod(CloudStackEntity):
+class Pod(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listPortForwardingRules
 from marvin.cloudstackAPI import updatePortForwardingRule
 from marvin.cloudstackAPI import deletePortForwardingRule
 
-class PortForwardingRule(CloudStackEntity):
+class PortForwardingRule(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createPrivateGateway
 from marvin.cloudstackAPI import listPrivateGateways
 from marvin.cloudstackAPI import deletePrivateGateway
 
-class PrivateGateway(CloudStackEntity):
+class PrivateGateway(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -22,11 +22,11 @@ from marvin.cloudstackAPI import updateProject
 from marvin.cloudstackAPI import activateProject
 from marvin.cloudstackAPI import deleteProject
 
-class Project(CloudStackEntity):
+class Project(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def suspend(self, apiclient, id, **kwargs):

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listProjectAccounts
 
-class ProjectAccounts(CloudStackEntity):
+class ProjectAccounts(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -19,11 +19,11 @@ from marvin.cloudstackAPI import listProjectInvitations
 from marvin.cloudstackAPI import updateProjectInvitation
 from marvin.cloudstackAPI import deleteProjectInvitation
 
-class ProjectInvitation(CloudStackEntity):
+class ProjectInvitation(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listPublicIpAddresses
 
-class PublicIpAddresses(CloudStackEntity):
+class PublicIpAddresses(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listRegions
 from marvin.cloudstackAPI import updateRegion
 from marvin.cloudstackAPI import removeRegion
 
-class Region(CloudStackEntity):
+class Region(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def add(self, apiclient, endpoint, id, name, **kwargs):

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

@@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createRemoteAccessVpn
 from marvin.cloudstackAPI import listRemoteAccessVpns
 from marvin.cloudstackAPI import deleteRemoteAccessVpn
 
-class RemoteAccessVpn(CloudStackEntity):
+class RemoteAccessVpn(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import ldapRemove
 
-class Remove(CloudStackEntity):
+class Remove(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def ldap(self, apiclient, **kwargs):

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import updateResourceCount
 
-class ResourceCount(CloudStackEntity):
+class ResourceCount(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def update(self, apiclient, domainid, **kwargs):

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

@@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listResourceLimits
 from marvin.cloudstackAPI import updateResourceLimit
 
-class ResourceLimit(CloudStackEntity):
+class ResourceLimit(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -21,11 +21,11 @@ from marvin.cloudstackAPI import stopRouter
 from marvin.cloudstackAPI import rebootRouter
 from marvin.cloudstackAPI import startRouter
 
-class Router(CloudStackEntity):
+class Router(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def destroy(self, apiclient, id, **kwargs):

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

@@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import addS3
 from marvin.cloudstackAPI import listS3s
 
-class S3(CloudStackEntity):
+class S3(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def add(self, apiclient, secretkey, accesskey, bucket, **kwargs):

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import resetSSHKeyForVirtualMachine
 
-class SSHKeyForVirtualMachine(CloudStackEntity):
+class SSHKeyForVirtualMachine(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def reset(self, apiclient, keypair, id, **kwargs):

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

@@ -20,11 +20,11 @@ from marvin.cloudstackAPI import registerSSHKeyPair
 from marvin.cloudstackAPI import listSSHKeyPairs
 from marvin.cloudstackAPI import deleteSSHKeyPair
 
-class SSHKeyPair(CloudStackEntity):
+class SSHKeyPair(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import addSecondaryStorage
 
-class SecondaryStorage(CloudStackEntity):
+class SecondaryStorage(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def add(self, apiclient, url, **kwargs):

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

@@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createSecurityGroup
 from marvin.cloudstackAPI import listSecurityGroups
 from marvin.cloudstackAPI import deleteSecurityGroup
 
-class SecurityGroup(CloudStackEntity):
+class SecurityGroup(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import authorizeSecurityGroupEgress
 from marvin.cloudstackAPI import revokeSecurityGroupEgress
 
-class SecurityGroupEgress(CloudStackEntity):
+class SecurityGroupEgress(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def authorize(self, apiclient, **kwargs):

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

@@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import authorizeSecurityGroupIngress
 from marvin.cloudstackAPI import revokeSecurityGroupIngress
 
-class SecurityGroupIngress(CloudStackEntity):
+class SecurityGroupIngress(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def authorize(self, apiclient, **kwargs):

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import changeServiceForRouter
 
-class ServiceForRouter(CloudStackEntity):
+class ServiceForRouter(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def change(self, apiclient, id, serviceofferingid, **kwargs):

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import changeServiceForSystemVm
 
-class ServiceForSystemVm(CloudStackEntity):
+class ServiceForSystemVm(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def change(self, apiclient, id, serviceofferingid, **kwargs):

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import changeServiceForVirtualMachine
 
-class ServiceForVirtualMachine(CloudStackEntity):
+class ServiceForVirtualMachine(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def change(self, apiclient, id, serviceofferingid, **kwargs):

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

@@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listServiceOfferings
 from marvin.cloudstackAPI import updateServiceOffering
 from marvin.cloudstackAPI import deleteServiceOffering
 
-class ServiceOffering(CloudStackEntity):
+class ServiceOffering(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import configureSimulator
 
-class Simulator(CloudStackEntity):
+class Simulator(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def configure(self, apiclient, name, value, **kwargs):

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

@@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createSnapshot
 from marvin.cloudstackAPI import listSnapshots
 from marvin.cloudstackAPI import deleteSnapshot
 
-class Snapshot(CloudStackEntity):
+class Snapshot(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listSnapshotPolicies
 from marvin.cloudstackAPI import deleteSnapshotPolicies
 
-class SnapshotPolicies(CloudStackEntity):
+class SnapshotPolicies(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import createSnapshotPolicy
 
-class SnapshotPolicy(CloudStackEntity):
+class SnapshotPolicy(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import enableStaticNat
 from marvin.cloudstackAPI import disableStaticNat
 
-class StaticNat(CloudStackEntity):
+class StaticNat(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def enable(self, apiclient, ipaddressid, virtualmachineid, **kwargs):

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

@@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createStaticRoute
 from marvin.cloudstackAPI import listStaticRoutes
 from marvin.cloudstackAPI import deleteStaticRoute
 
-class StaticRoute(CloudStackEntity):
+class StaticRoute(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import cancelStorageMaintenance
 from marvin.cloudstackAPI import enableStorageMaintenance
 
-class StorageMaintenance(CloudStackEntity):
+class StorageMaintenance(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def cancel(self, apiclient, id, **kwargs):

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

@@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listStorageNetworkIpRange
 from marvin.cloudstackAPI import updateStorageNetworkIpRange
 from marvin.cloudstackAPI import deleteStorageNetworkIpRange
 
-class StorageNetworkIpRange(CloudStackEntity):
+class StorageNetworkIpRange(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listStoragePools
 from marvin.cloudstackAPI import updateStoragePool
 from marvin.cloudstackAPI import deleteStoragePool
 
-class StoragePool(CloudStackEntity):
+class StoragePool(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -17,11 +17,11 @@
 from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import listSupportedNetworkServices
 
-class SupportedNetworkServices(CloudStackEntity):
+class SupportedNetworkServices(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod

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

@@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity
 from marvin.cloudstackAPI import addSwift
 from marvin.cloudstackAPI import listSwifts
 
-class Swift(CloudStackEntity):
+class Swift(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def add(self, apiclient, url, **kwargs):

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

@@ -22,11 +22,11 @@ from marvin.cloudstackAPI import rebootSystemVm
 from marvin.cloudstackAPI import startSystemVm
 from marvin.cloudstackAPI import destroySystemVm
 
-class SystemVm(CloudStackEntity):
+class SystemVm(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     def migrate(self, apiclient, hostid, virtualmachineid, **kwargs):

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

@@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createTags
 from marvin.cloudstackAPI import listTags
 from marvin.cloudstackAPI import deleteTags
 
-class Tags(CloudStackEntity):
+class Tags(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, items):
-        self.__dict__.update(items)
+    def __init__(self, **kwargs):
+        self.__dict__.update(**kwargs)
 
 
     @classmethod