marvin_refactor: update the entity dict but not through optional kwargs

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

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

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

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

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

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import addAccountToProject
 class AccountToProject(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     def add(self, apiclient, projectid, **kwargs):

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

@@ -21,8 +21,8 @@ from marvin.cloudstackAPI import deleteAlerts
 class Alerts(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

@@ -21,8 +21,8 @@ from marvin.cloudstackAPI import getApiLimit
 class ApiLimit(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     def reset(self, apiclient, **kwargs):

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import listApis
 class Apis(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import queryAsyncJobResult
 class AsyncJobResult(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     def query(self, apiclient, jobid, **kwargs):

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import listAsyncJobs
 class AsyncJobs(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import listAutoScalePolicies
 class AutoScalePolicies(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

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

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

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

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

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

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

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

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import listCapabilities
 class Capabilities(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import listCapacity
 class Capacity(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import getCloudIdentifier
 class CloudIdentifier(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     def get(self, apiclient, userid, **kwargs):

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

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

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

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

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import ldapConfig
 class Config(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     def ldap(self, apiclient, **kwargs):

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

@@ -21,8 +21,8 @@ from marvin.cloudstackAPI import updateConfiguration
 class Configuration(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

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

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

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

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import updateDefaultNicForVirtualMachine
 class DefaultNicForVirtualMachine(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     def update(self, apiclient, nicid, virtualmachineid, **kwargs):

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

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

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

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

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

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

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import listDomainChildren
 class DomainChildren(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

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

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import listEventTypes
 class EventTypes(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

@@ -21,8 +21,8 @@ from marvin.cloudstackAPI import deleteEvents
 class Events(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

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

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

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

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

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

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import prepareHostForMaintenance
 class HostForMaintenance(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     def prepare(self, apiclient, id, **kwargs):

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import cancelHostMaintenance
 class HostMaintenance(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     def cancel(self, apiclient, id, **kwargs):

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import updateHostPassword
 class HostPassword(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     def update(self, apiclient, username, password, **kwargs):

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

@@ -21,8 +21,8 @@ from marvin.cloudstackAPI import updateHypervisorCapabilities
 class HypervisorCapabilities(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import listHypervisors
 class Hypervisors(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

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

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

@@ -21,8 +21,8 @@ from marvin.cloudstackAPI import associateIpAddress
 class IpAddress(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     def disassociate(self, apiclient, id, **kwargs):

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

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

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import removeIpFromNic
 class IpFromNic(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     def remove(self, apiclient, id, **kwargs):

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import addIpToNic
 class IpToNic(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     def add(self, apiclient, nicid, **kwargs):

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

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

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

@@ -21,8 +21,8 @@ from marvin.cloudstackAPI import updateIsoPermissions
 class IsoPermissions(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import listLBStickinessPolicies
 class LBStickinessPolicies(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

@@ -21,8 +21,8 @@ from marvin.cloudstackAPI import deleteLBStickinessPolicy
 class LBStickinessPolicy(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

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

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import listLoadBalancerRuleInstances
 class LoadBalancerRuleInstances(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import listNiciraNvpDeviceNetworks
 class NiciraNvpDeviceNetworks(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import listNics
 class Nics(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import listOsCategories
 class OsCategories(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import listOsTypes
 class OsTypes(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import resetPasswordForVirtualMachine
 class PasswordForVirtualMachine(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     def reset(self, apiclient, id, **kwargs):

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

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

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

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

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

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

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

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

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

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

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import listProjectAccounts
 class ProjectAccounts(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

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

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import listPublicIpAddresses
 class PublicIpAddresses(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

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

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

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

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import ldapRemove
 class Remove(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     def ldap(self, apiclient, **kwargs):

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import updateResourceCount
 class ResourceCount(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     def update(self, apiclient, domainid, **kwargs):

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

@@ -21,8 +21,8 @@ from marvin.cloudstackAPI import updateResourceLimit
 class ResourceLimit(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

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

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

@@ -21,8 +21,8 @@ from marvin.cloudstackAPI import listS3s
 class S3(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     def add(self, apiclient, secretkey, accesskey, bucket, **kwargs):

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

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

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

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

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import addSecondaryStorage
 class SecondaryStorage(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     def add(self, apiclient, url, **kwargs):

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

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

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

@@ -21,8 +21,8 @@ from marvin.cloudstackAPI import revokeSecurityGroupEgress
 class SecurityGroupEgress(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     def authorize(self, apiclient, **kwargs):

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

@@ -21,8 +21,8 @@ from marvin.cloudstackAPI import revokeSecurityGroupIngress
 class SecurityGroupIngress(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     def authorize(self, apiclient, **kwargs):

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -21,8 +21,8 @@ from marvin.cloudstackAPI import deleteSnapshotPolicies
 class SnapshotPolicies(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import createSnapshotPolicy
 class SnapshotPolicy(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

@@ -21,8 +21,8 @@ from marvin.cloudstackAPI import disableStaticNat
 class StaticNat(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     def enable(self, apiclient, ipaddressid, virtualmachineid, **kwargs):

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

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

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

@@ -21,8 +21,8 @@ from marvin.cloudstackAPI import enableStorageMaintenance
 class StorageMaintenance(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     def cancel(self, apiclient, id, **kwargs):

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

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

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

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

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

@@ -20,8 +20,8 @@ from marvin.cloudstackAPI import listSupportedNetworkServices
 class SupportedNetworkServices(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     @classmethod

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

@@ -21,8 +21,8 @@ from marvin.cloudstackAPI import listSwifts
 class Swift(CloudStackEntity.CloudStackEntity):
 
 
-    def __init__(self, **kwargs):
-        self.__dict__.update(**kwargs)
+    def __init__(self, items):
+        self.__dict__.update(items)
 
 
     def add(self, apiclient, url, **kwargs):

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

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

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

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