From a5bd827c2481d5d4f32755d302cd6a760d85d020 Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Tue, 19 Mar 2013 18:13:51 +0530 Subject: [PATCH] marvin_refactor: update the entity dict but not through optional kwargs Signed-off-by: Prasanna Santhanam --- tools/marvin/marvin/integration/lib/base/Account.py | 4 ++-- .../marvin/integration/lib/base/AccountFromProject.py | 4 ++-- .../marvin/marvin/integration/lib/base/AccountToProject.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Alerts.py | 4 ++-- tools/marvin/marvin/integration/lib/base/ApiLimit.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Apis.py | 4 ++-- tools/marvin/marvin/integration/lib/base/AsyncJobResult.py | 4 ++-- tools/marvin/marvin/integration/lib/base/AsyncJobs.py | 4 ++-- .../marvin/marvin/integration/lib/base/AutoScalePolicies.py | 4 ++-- tools/marvin/marvin/integration/lib/base/AutoScalePolicy.py | 4 ++-- .../marvin/marvin/integration/lib/base/AutoScaleVmGroup.py | 4 ++-- .../marvin/integration/lib/base/AutoScaleVmProfile.py | 4 ++-- .../marvin/integration/lib/base/BigSwitchVnsDevice.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Capabilities.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Capacity.py | 4 ++-- tools/marvin/marvin/integration/lib/base/CloudIdentifier.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Cluster.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Condition.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Config.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Configuration.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Counter.py | 4 ++-- .../marvin/marvin/integration/lib/base/CustomCertificate.py | 4 ++-- .../integration/lib/base/DefaultNicForVirtualMachine.py | 4 ++-- .../marvin/integration/lib/base/DefaultZoneForAccount.py | 4 ++-- tools/marvin/marvin/integration/lib/base/DiskOffering.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Domain.py | 4 ++-- tools/marvin/marvin/integration/lib/base/DomainChildren.py | 4 ++-- .../marvin/integration/lib/base/EgressFirewallRule.py | 4 ++-- tools/marvin/marvin/integration/lib/base/EventTypes.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Events.py | 4 ++-- tools/marvin/marvin/integration/lib/base/FirewallRule.py | 4 ++-- .../marvin/integration/lib/base/FromLoadBalancerRule.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Host.py | 4 ++-- .../marvin/integration/lib/base/HostForMaintenance.py | 4 ++-- tools/marvin/marvin/integration/lib/base/HostMaintenance.py | 4 ++-- tools/marvin/marvin/integration/lib/base/HostPassword.py | 4 ++-- .../marvin/integration/lib/base/HypervisorCapabilities.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Hypervisors.py | 4 ++-- tools/marvin/marvin/integration/lib/base/InstanceGroup.py | 4 ++-- tools/marvin/marvin/integration/lib/base/IpAddress.py | 4 ++-- .../marvin/marvin/integration/lib/base/IpForwardingRule.py | 4 ++-- tools/marvin/marvin/integration/lib/base/IpFromNic.py | 4 ++-- tools/marvin/marvin/integration/lib/base/IpToNic.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Iso.py | 4 ++-- tools/marvin/marvin/integration/lib/base/IsoPermissions.py | 4 ++-- .../marvin/integration/lib/base/LBStickinessPolicies.py | 4 ++-- .../marvin/integration/lib/base/LBStickinessPolicy.py | 4 ++-- .../marvin/marvin/integration/lib/base/LoadBalancerRule.py | 4 ++-- .../integration/lib/base/LoadBalancerRuleInstances.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Network.py | 4 ++-- tools/marvin/marvin/integration/lib/base/NetworkACL.py | 4 ++-- tools/marvin/marvin/integration/lib/base/NetworkDevice.py | 4 ++-- tools/marvin/marvin/integration/lib/base/NetworkOffering.py | 4 ++-- .../marvin/integration/lib/base/NetworkServiceProvider.py | 4 ++-- .../marvin/integration/lib/base/NicFromVirtualMachine.py | 4 ++-- .../marvin/integration/lib/base/NicToVirtualMachine.py | 4 ++-- tools/marvin/marvin/integration/lib/base/NiciraNvpDevice.py | 4 ++-- .../marvin/integration/lib/base/NiciraNvpDeviceNetworks.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Nics.py | 4 ++-- tools/marvin/marvin/integration/lib/base/OsCategories.py | 4 ++-- tools/marvin/marvin/integration/lib/base/OsTypes.py | 4 ++-- .../integration/lib/base/PasswordForVirtualMachine.py | 4 ++-- tools/marvin/marvin/integration/lib/base/PhysicalNetwork.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Pod.py | 4 ++-- .../marvin/integration/lib/base/PortForwardingRule.py | 4 ++-- tools/marvin/marvin/integration/lib/base/PrivateGateway.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Project.py | 4 ++-- tools/marvin/marvin/integration/lib/base/ProjectAccounts.py | 4 ++-- .../marvin/marvin/integration/lib/base/ProjectInvitation.py | 4 ++-- .../marvin/marvin/integration/lib/base/PublicIpAddresses.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Region.py | 4 ++-- tools/marvin/marvin/integration/lib/base/RemoteAccessVpn.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Remove.py | 4 ++-- tools/marvin/marvin/integration/lib/base/ResourceCount.py | 4 ++-- tools/marvin/marvin/integration/lib/base/ResourceLimit.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Router.py | 4 ++-- tools/marvin/marvin/integration/lib/base/S3.py | 4 ++-- .../marvin/integration/lib/base/SSHKeyForVirtualMachine.py | 4 ++-- tools/marvin/marvin/integration/lib/base/SSHKeyPair.py | 4 ++-- .../marvin/marvin/integration/lib/base/SecondaryStorage.py | 4 ++-- tools/marvin/marvin/integration/lib/base/SecurityGroup.py | 4 ++-- .../marvin/integration/lib/base/SecurityGroupEgress.py | 4 ++-- .../marvin/integration/lib/base/SecurityGroupIngress.py | 4 ++-- .../marvin/marvin/integration/lib/base/ServiceForRouter.py | 4 ++-- .../marvin/integration/lib/base/ServiceForSystemVm.py | 4 ++-- .../marvin/integration/lib/base/ServiceForVirtualMachine.py | 4 ++-- tools/marvin/marvin/integration/lib/base/ServiceOffering.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Simulator.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Snapshot.py | 4 ++-- .../marvin/marvin/integration/lib/base/SnapshotPolicies.py | 4 ++-- tools/marvin/marvin/integration/lib/base/SnapshotPolicy.py | 4 ++-- tools/marvin/marvin/integration/lib/base/StaticNat.py | 4 ++-- tools/marvin/marvin/integration/lib/base/StaticRoute.py | 4 ++-- .../marvin/integration/lib/base/StorageMaintenance.py | 4 ++-- .../marvin/integration/lib/base/StorageNetworkIpRange.py | 4 ++-- tools/marvin/marvin/integration/lib/base/StoragePool.py | 4 ++-- .../marvin/integration/lib/base/SupportedNetworkServices.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Swift.py | 4 ++-- tools/marvin/marvin/integration/lib/base/SystemVm.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Tags.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Template.py | 4 ++-- .../marvin/integration/lib/base/TemplatePermissions.py | 4 ++-- .../marvin/integration/lib/base/ToLoadBalancerRule.py | 4 ++-- tools/marvin/marvin/integration/lib/base/TrafficMonitor.py | 4 ++-- tools/marvin/marvin/integration/lib/base/TrafficType.py | 4 ++-- .../marvin/integration/lib/base/TrafficTypeImplementors.py | 4 ++-- tools/marvin/marvin/integration/lib/base/UsageRecords.py | 4 ++-- tools/marvin/marvin/integration/lib/base/UsageTypes.py | 4 ++-- tools/marvin/marvin/integration/lib/base/User.py | 4 ++-- tools/marvin/marvin/integration/lib/base/UserKeys.py | 4 ++-- tools/marvin/marvin/integration/lib/base/VMPassword.py | 4 ++-- tools/marvin/marvin/integration/lib/base/VMSnapshot.py | 4 ++-- tools/marvin/marvin/integration/lib/base/VPC.py | 4 ++-- tools/marvin/marvin/integration/lib/base/VPCOffering.py | 4 ++-- tools/marvin/marvin/integration/lib/base/VirtualMachine.py | 4 ++-- .../marvin/integration/lib/base/VirtualRouterElement.py | 4 ++-- tools/marvin/marvin/integration/lib/base/VlanIpRange.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Volume.py | 4 ++-- tools/marvin/marvin/integration/lib/base/VpnConnection.py | 4 ++-- .../marvin/integration/lib/base/VpnCustomerGateway.py | 4 ++-- tools/marvin/marvin/integration/lib/base/VpnGateway.py | 4 ++-- tools/marvin/marvin/integration/lib/base/VpnUser.py | 4 ++-- tools/marvin/marvin/integration/lib/base/Zone.py | 4 ++-- .../marvin/marvin/integration/lib/factory/AccountFactory.py | 6 +++--- .../marvin/integration/lib/factory/CloudStackBaseFactory.py | 2 ++ .../marvin/integration/lib/factory/test/testFactories.py | 3 +++ tools/marvin/marvin/integration/lib/generateBase.py | 4 ++-- 127 files changed, 256 insertions(+), 251 deletions(-) diff --git a/tools/marvin/marvin/integration/lib/base/Account.py b/tools/marvin/marvin/integration/lib/base/Account.py index ae56cc0ec6e..e0b494a44cc 100644 --- a/tools/marvin/marvin/integration/lib/base/Account.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/AccountFromProject.py b/tools/marvin/marvin/integration/lib/base/AccountFromProject.py index 393082bae16..88ba76d5e68 100644 --- a/tools/marvin/marvin/integration/lib/base/AccountFromProject.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/AccountToProject.py b/tools/marvin/marvin/integration/lib/base/AccountToProject.py index b0c61e13064..649073f016c 100644 --- a/tools/marvin/marvin/integration/lib/base/AccountToProject.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/Alerts.py b/tools/marvin/marvin/integration/lib/base/Alerts.py index b4e51c47361..e31451b4482 100644 --- a/tools/marvin/marvin/integration/lib/base/Alerts.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/ApiLimit.py b/tools/marvin/marvin/integration/lib/base/ApiLimit.py index 5144be164e5..48218011dc8 100644 --- a/tools/marvin/marvin/integration/lib/base/ApiLimit.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/Apis.py b/tools/marvin/marvin/integration/lib/base/Apis.py index 9d9a40f5e45..b4124006dfe 100644 --- a/tools/marvin/marvin/integration/lib/base/Apis.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/AsyncJobResult.py b/tools/marvin/marvin/integration/lib/base/AsyncJobResult.py index c42257ec39f..36ef31efffc 100644 --- a/tools/marvin/marvin/integration/lib/base/AsyncJobResult.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/AsyncJobs.py b/tools/marvin/marvin/integration/lib/base/AsyncJobs.py index 0a64110c1c0..49c01ae7caa 100644 --- a/tools/marvin/marvin/integration/lib/base/AsyncJobs.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/AutoScalePolicies.py b/tools/marvin/marvin/integration/lib/base/AutoScalePolicies.py index 1a23578467e..5cb714aa99d 100644 --- a/tools/marvin/marvin/integration/lib/base/AutoScalePolicies.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/AutoScalePolicy.py b/tools/marvin/marvin/integration/lib/base/AutoScalePolicy.py index 2da9105f409..a1fae4c8955 100644 --- a/tools/marvin/marvin/integration/lib/base/AutoScalePolicy.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/AutoScaleVmGroup.py b/tools/marvin/marvin/integration/lib/base/AutoScaleVmGroup.py index 4d6db86d12f..2d0a01aff10 100644 --- a/tools/marvin/marvin/integration/lib/base/AutoScaleVmGroup.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/AutoScaleVmProfile.py b/tools/marvin/marvin/integration/lib/base/AutoScaleVmProfile.py index a7c7e742fe5..ebd20b5fda2 100644 --- a/tools/marvin/marvin/integration/lib/base/AutoScaleVmProfile.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/BigSwitchVnsDevice.py b/tools/marvin/marvin/integration/lib/base/BigSwitchVnsDevice.py index 29a6b7f6a49..67b705465e1 100644 --- a/tools/marvin/marvin/integration/lib/base/BigSwitchVnsDevice.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/Capabilities.py b/tools/marvin/marvin/integration/lib/base/Capabilities.py index cee22bdc891..54326cbbbfe 100644 --- a/tools/marvin/marvin/integration/lib/base/Capabilities.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/Capacity.py b/tools/marvin/marvin/integration/lib/base/Capacity.py index 574bd2141e1..8dda9436f01 100644 --- a/tools/marvin/marvin/integration/lib/base/Capacity.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/CloudIdentifier.py b/tools/marvin/marvin/integration/lib/base/CloudIdentifier.py index 85b530cb04d..35c5f85bf36 100644 --- a/tools/marvin/marvin/integration/lib/base/CloudIdentifier.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/Cluster.py b/tools/marvin/marvin/integration/lib/base/Cluster.py index eb7d3b3b024..f92215575c8 100644 --- a/tools/marvin/marvin/integration/lib/base/Cluster.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/Condition.py b/tools/marvin/marvin/integration/lib/base/Condition.py index ec1907d40ce..2dc6d7cc3f5 100644 --- a/tools/marvin/marvin/integration/lib/base/Condition.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/Config.py b/tools/marvin/marvin/integration/lib/base/Config.py index 91eb397f240..0a963a28a43 100644 --- a/tools/marvin/marvin/integration/lib/base/Config.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/Configuration.py b/tools/marvin/marvin/integration/lib/base/Configuration.py index 05a57411deb..d43496383fc 100644 --- a/tools/marvin/marvin/integration/lib/base/Configuration.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/Counter.py b/tools/marvin/marvin/integration/lib/base/Counter.py index 337591dbbf7..ed698b82bbd 100644 --- a/tools/marvin/marvin/integration/lib/base/Counter.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/CustomCertificate.py b/tools/marvin/marvin/integration/lib/base/CustomCertificate.py index 73ddf7190d4..20109468655 100644 --- a/tools/marvin/marvin/integration/lib/base/CustomCertificate.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/DefaultNicForVirtualMachine.py b/tools/marvin/marvin/integration/lib/base/DefaultNicForVirtualMachine.py index 33e5bfed832..2d8521934d8 100644 --- a/tools/marvin/marvin/integration/lib/base/DefaultNicForVirtualMachine.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/DefaultZoneForAccount.py b/tools/marvin/marvin/integration/lib/base/DefaultZoneForAccount.py index f10547d8033..41b2b97ee37 100644 --- a/tools/marvin/marvin/integration/lib/base/DefaultZoneForAccount.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/DiskOffering.py b/tools/marvin/marvin/integration/lib/base/DiskOffering.py index b2858f2306a..f3102f093ee 100644 --- a/tools/marvin/marvin/integration/lib/base/DiskOffering.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/Domain.py b/tools/marvin/marvin/integration/lib/base/Domain.py index 1c9beeed231..d4f0ae34540 100644 --- a/tools/marvin/marvin/integration/lib/base/Domain.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/DomainChildren.py b/tools/marvin/marvin/integration/lib/base/DomainChildren.py index aa82e053855..43cecbab9de 100644 --- a/tools/marvin/marvin/integration/lib/base/DomainChildren.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/EgressFirewallRule.py b/tools/marvin/marvin/integration/lib/base/EgressFirewallRule.py index 98fc9bba828..998e0b4a5d2 100644 --- a/tools/marvin/marvin/integration/lib/base/EgressFirewallRule.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/EventTypes.py b/tools/marvin/marvin/integration/lib/base/EventTypes.py index c631d80965e..c14eea1cd1b 100644 --- a/tools/marvin/marvin/integration/lib/base/EventTypes.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/Events.py b/tools/marvin/marvin/integration/lib/base/Events.py index 9f0d4cd7e7d..935c6aaf662 100644 --- a/tools/marvin/marvin/integration/lib/base/Events.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/FirewallRule.py b/tools/marvin/marvin/integration/lib/base/FirewallRule.py index 36572ba29a6..6ed3df3bd5a 100644 --- a/tools/marvin/marvin/integration/lib/base/FirewallRule.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/FromLoadBalancerRule.py b/tools/marvin/marvin/integration/lib/base/FromLoadBalancerRule.py index e996f7d3b6d..6a8cc9964b2 100644 --- a/tools/marvin/marvin/integration/lib/base/FromLoadBalancerRule.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/Host.py b/tools/marvin/marvin/integration/lib/base/Host.py index 23c71d5dcd5..746faf3e417 100644 --- a/tools/marvin/marvin/integration/lib/base/Host.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/HostForMaintenance.py b/tools/marvin/marvin/integration/lib/base/HostForMaintenance.py index 1123f17f087..81c63af15ba 100644 --- a/tools/marvin/marvin/integration/lib/base/HostForMaintenance.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/HostMaintenance.py b/tools/marvin/marvin/integration/lib/base/HostMaintenance.py index a6066b8d3f8..0d3825dc508 100644 --- a/tools/marvin/marvin/integration/lib/base/HostMaintenance.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/HostPassword.py b/tools/marvin/marvin/integration/lib/base/HostPassword.py index bfd83b0f273..0d5d43af28c 100644 --- a/tools/marvin/marvin/integration/lib/base/HostPassword.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/HypervisorCapabilities.py b/tools/marvin/marvin/integration/lib/base/HypervisorCapabilities.py index c74e6284d25..bb97cb850e6 100644 --- a/tools/marvin/marvin/integration/lib/base/HypervisorCapabilities.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/Hypervisors.py b/tools/marvin/marvin/integration/lib/base/Hypervisors.py index 9677b9bb6d7..dc2901583e8 100644 --- a/tools/marvin/marvin/integration/lib/base/Hypervisors.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/InstanceGroup.py b/tools/marvin/marvin/integration/lib/base/InstanceGroup.py index 313ea34ddb4..29bc217e913 100644 --- a/tools/marvin/marvin/integration/lib/base/InstanceGroup.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/IpAddress.py b/tools/marvin/marvin/integration/lib/base/IpAddress.py index b60c0ad8aa3..304028e8d93 100644 --- a/tools/marvin/marvin/integration/lib/base/IpAddress.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/IpForwardingRule.py b/tools/marvin/marvin/integration/lib/base/IpForwardingRule.py index 876ef324fb5..351b8669df0 100644 --- a/tools/marvin/marvin/integration/lib/base/IpForwardingRule.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/IpFromNic.py b/tools/marvin/marvin/integration/lib/base/IpFromNic.py index c48f02696f6..ef5d90584f2 100644 --- a/tools/marvin/marvin/integration/lib/base/IpFromNic.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/IpToNic.py b/tools/marvin/marvin/integration/lib/base/IpToNic.py index ce780159248..dc95db43331 100644 --- a/tools/marvin/marvin/integration/lib/base/IpToNic.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/Iso.py b/tools/marvin/marvin/integration/lib/base/Iso.py index 57009fc9177..d5ec0df80c8 100644 --- a/tools/marvin/marvin/integration/lib/base/Iso.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/IsoPermissions.py b/tools/marvin/marvin/integration/lib/base/IsoPermissions.py index d5a31fe34f6..b4e43c38f4b 100644 --- a/tools/marvin/marvin/integration/lib/base/IsoPermissions.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/LBStickinessPolicies.py b/tools/marvin/marvin/integration/lib/base/LBStickinessPolicies.py index a0971daaa89..206ccb84465 100644 --- a/tools/marvin/marvin/integration/lib/base/LBStickinessPolicies.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/LBStickinessPolicy.py b/tools/marvin/marvin/integration/lib/base/LBStickinessPolicy.py index 01f218baaf5..78817297f9f 100644 --- a/tools/marvin/marvin/integration/lib/base/LBStickinessPolicy.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/LoadBalancerRule.py b/tools/marvin/marvin/integration/lib/base/LoadBalancerRule.py index ac8c3f3bae1..e4920263370 100644 --- a/tools/marvin/marvin/integration/lib/base/LoadBalancerRule.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/LoadBalancerRuleInstances.py b/tools/marvin/marvin/integration/lib/base/LoadBalancerRuleInstances.py index 2c9ef107a09..4bee62a50b0 100644 --- a/tools/marvin/marvin/integration/lib/base/LoadBalancerRuleInstances.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/Network.py b/tools/marvin/marvin/integration/lib/base/Network.py index 093ce9e7cd3..04f0e2b5c76 100644 --- a/tools/marvin/marvin/integration/lib/base/Network.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/NetworkACL.py b/tools/marvin/marvin/integration/lib/base/NetworkACL.py index 89e5e264dc7..708687aa774 100644 --- a/tools/marvin/marvin/integration/lib/base/NetworkACL.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/NetworkDevice.py b/tools/marvin/marvin/integration/lib/base/NetworkDevice.py index ebea9a653de..d7fc101d5f2 100644 --- a/tools/marvin/marvin/integration/lib/base/NetworkDevice.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/NetworkOffering.py b/tools/marvin/marvin/integration/lib/base/NetworkOffering.py index 6338e0453db..dd1dc8e5391 100644 --- a/tools/marvin/marvin/integration/lib/base/NetworkOffering.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/NetworkServiceProvider.py b/tools/marvin/marvin/integration/lib/base/NetworkServiceProvider.py index 6d19c862a77..87f68939d0f 100644 --- a/tools/marvin/marvin/integration/lib/base/NetworkServiceProvider.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/NicFromVirtualMachine.py b/tools/marvin/marvin/integration/lib/base/NicFromVirtualMachine.py index 0705188192f..409ac5bcd51 100644 --- a/tools/marvin/marvin/integration/lib/base/NicFromVirtualMachine.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/NicToVirtualMachine.py b/tools/marvin/marvin/integration/lib/base/NicToVirtualMachine.py index f4de36129e6..e5e501bd4fc 100644 --- a/tools/marvin/marvin/integration/lib/base/NicToVirtualMachine.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/NiciraNvpDevice.py b/tools/marvin/marvin/integration/lib/base/NiciraNvpDevice.py index 9dd0c0491dd..6aacd6accce 100644 --- a/tools/marvin/marvin/integration/lib/base/NiciraNvpDevice.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/NiciraNvpDeviceNetworks.py b/tools/marvin/marvin/integration/lib/base/NiciraNvpDeviceNetworks.py index 5ce30391798..6eb0b0361fd 100644 --- a/tools/marvin/marvin/integration/lib/base/NiciraNvpDeviceNetworks.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/Nics.py b/tools/marvin/marvin/integration/lib/base/Nics.py index 6264d856828..c121f7415d7 100644 --- a/tools/marvin/marvin/integration/lib/base/Nics.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/OsCategories.py b/tools/marvin/marvin/integration/lib/base/OsCategories.py index 878fc888966..923e20c40e7 100644 --- a/tools/marvin/marvin/integration/lib/base/OsCategories.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/OsTypes.py b/tools/marvin/marvin/integration/lib/base/OsTypes.py index 327406e60b3..579000204f7 100644 --- a/tools/marvin/marvin/integration/lib/base/OsTypes.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/PasswordForVirtualMachine.py b/tools/marvin/marvin/integration/lib/base/PasswordForVirtualMachine.py index c58a0de5ae3..50a88a5b762 100644 --- a/tools/marvin/marvin/integration/lib/base/PasswordForVirtualMachine.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/PhysicalNetwork.py b/tools/marvin/marvin/integration/lib/base/PhysicalNetwork.py index 5c56bb21e8c..94b595b0501 100644 --- a/tools/marvin/marvin/integration/lib/base/PhysicalNetwork.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/Pod.py b/tools/marvin/marvin/integration/lib/base/Pod.py index 18992479b13..067b6f461a4 100644 --- a/tools/marvin/marvin/integration/lib/base/Pod.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/PortForwardingRule.py b/tools/marvin/marvin/integration/lib/base/PortForwardingRule.py index de68cd611b7..3c1536f53b4 100644 --- a/tools/marvin/marvin/integration/lib/base/PortForwardingRule.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/PrivateGateway.py b/tools/marvin/marvin/integration/lib/base/PrivateGateway.py index 18a7c5c5de3..c4a75f7eeb1 100644 --- a/tools/marvin/marvin/integration/lib/base/PrivateGateway.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/Project.py b/tools/marvin/marvin/integration/lib/base/Project.py index 974cc5f0b3e..1b36b93ce49 100644 --- a/tools/marvin/marvin/integration/lib/base/Project.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/ProjectAccounts.py b/tools/marvin/marvin/integration/lib/base/ProjectAccounts.py index 1a1f15bd5b3..828f0004d8f 100644 --- a/tools/marvin/marvin/integration/lib/base/ProjectAccounts.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/ProjectInvitation.py b/tools/marvin/marvin/integration/lib/base/ProjectInvitation.py index 53908c9c5dc..c1872c16b14 100644 --- a/tools/marvin/marvin/integration/lib/base/ProjectInvitation.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/PublicIpAddresses.py b/tools/marvin/marvin/integration/lib/base/PublicIpAddresses.py index d1e1d598188..8f7b3a0281a 100644 --- a/tools/marvin/marvin/integration/lib/base/PublicIpAddresses.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/Region.py b/tools/marvin/marvin/integration/lib/base/Region.py index 33442a02160..cd0a07f68de 100644 --- a/tools/marvin/marvin/integration/lib/base/Region.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/RemoteAccessVpn.py b/tools/marvin/marvin/integration/lib/base/RemoteAccessVpn.py index c7e0a7d71ce..66b27dee1a2 100644 --- a/tools/marvin/marvin/integration/lib/base/RemoteAccessVpn.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/Remove.py b/tools/marvin/marvin/integration/lib/base/Remove.py index 930f399e430..a23eed40edf 100644 --- a/tools/marvin/marvin/integration/lib/base/Remove.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/ResourceCount.py b/tools/marvin/marvin/integration/lib/base/ResourceCount.py index 1578f2e1246..35d1d6af0e5 100644 --- a/tools/marvin/marvin/integration/lib/base/ResourceCount.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/ResourceLimit.py b/tools/marvin/marvin/integration/lib/base/ResourceLimit.py index b97c0a2e15d..69177f56d60 100644 --- a/tools/marvin/marvin/integration/lib/base/ResourceLimit.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/Router.py b/tools/marvin/marvin/integration/lib/base/Router.py index abcdbdc07bb..d582ca8a392 100644 --- a/tools/marvin/marvin/integration/lib/base/Router.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/S3.py b/tools/marvin/marvin/integration/lib/base/S3.py index 28586586763..de04fbdf2e0 100644 --- a/tools/marvin/marvin/integration/lib/base/S3.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/SSHKeyForVirtualMachine.py b/tools/marvin/marvin/integration/lib/base/SSHKeyForVirtualMachine.py index a7fd912155f..ed2f0e9a214 100644 --- a/tools/marvin/marvin/integration/lib/base/SSHKeyForVirtualMachine.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/SSHKeyPair.py b/tools/marvin/marvin/integration/lib/base/SSHKeyPair.py index 373e5fd42cc..442722e0cae 100644 --- a/tools/marvin/marvin/integration/lib/base/SSHKeyPair.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/SecondaryStorage.py b/tools/marvin/marvin/integration/lib/base/SecondaryStorage.py index bc74e2a7ba3..c5cdd094083 100644 --- a/tools/marvin/marvin/integration/lib/base/SecondaryStorage.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/SecurityGroup.py b/tools/marvin/marvin/integration/lib/base/SecurityGroup.py index 9ecac61d984..324823d9bbf 100644 --- a/tools/marvin/marvin/integration/lib/base/SecurityGroup.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/SecurityGroupEgress.py b/tools/marvin/marvin/integration/lib/base/SecurityGroupEgress.py index 6a6aaffbab1..34a7daf0659 100644 --- a/tools/marvin/marvin/integration/lib/base/SecurityGroupEgress.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/SecurityGroupIngress.py b/tools/marvin/marvin/integration/lib/base/SecurityGroupIngress.py index 60981dc01a6..eb4c9f2911d 100644 --- a/tools/marvin/marvin/integration/lib/base/SecurityGroupIngress.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/ServiceForRouter.py b/tools/marvin/marvin/integration/lib/base/ServiceForRouter.py index dca6c752bd0..5da4297c9df 100644 --- a/tools/marvin/marvin/integration/lib/base/ServiceForRouter.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/ServiceForSystemVm.py b/tools/marvin/marvin/integration/lib/base/ServiceForSystemVm.py index d6579d7e6b7..dc7ca381917 100644 --- a/tools/marvin/marvin/integration/lib/base/ServiceForSystemVm.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/ServiceForVirtualMachine.py b/tools/marvin/marvin/integration/lib/base/ServiceForVirtualMachine.py index fae4826b580..8f350107447 100644 --- a/tools/marvin/marvin/integration/lib/base/ServiceForVirtualMachine.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/ServiceOffering.py b/tools/marvin/marvin/integration/lib/base/ServiceOffering.py index 70af0d97e30..56ee50d70e6 100644 --- a/tools/marvin/marvin/integration/lib/base/ServiceOffering.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/Simulator.py b/tools/marvin/marvin/integration/lib/base/Simulator.py index 31a2dc78009..41cdcd275bc 100644 --- a/tools/marvin/marvin/integration/lib/base/Simulator.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/Snapshot.py b/tools/marvin/marvin/integration/lib/base/Snapshot.py index 030ba676976..fc68f662a1b 100644 --- a/tools/marvin/marvin/integration/lib/base/Snapshot.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/SnapshotPolicies.py b/tools/marvin/marvin/integration/lib/base/SnapshotPolicies.py index e892ff1b9dc..f878bbeb4b2 100644 --- a/tools/marvin/marvin/integration/lib/base/SnapshotPolicies.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/SnapshotPolicy.py b/tools/marvin/marvin/integration/lib/base/SnapshotPolicy.py index 73d92ed74e5..5641e031ac9 100644 --- a/tools/marvin/marvin/integration/lib/base/SnapshotPolicy.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/StaticNat.py b/tools/marvin/marvin/integration/lib/base/StaticNat.py index 33e20a6bc1d..60dec84ffe9 100644 --- a/tools/marvin/marvin/integration/lib/base/StaticNat.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/StaticRoute.py b/tools/marvin/marvin/integration/lib/base/StaticRoute.py index 26150df9b26..ec5284f05d8 100644 --- a/tools/marvin/marvin/integration/lib/base/StaticRoute.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/StorageMaintenance.py b/tools/marvin/marvin/integration/lib/base/StorageMaintenance.py index ac269969aff..658045133fb 100644 --- a/tools/marvin/marvin/integration/lib/base/StorageMaintenance.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/StorageNetworkIpRange.py b/tools/marvin/marvin/integration/lib/base/StorageNetworkIpRange.py index a306949d0c5..68fc0bedd08 100644 --- a/tools/marvin/marvin/integration/lib/base/StorageNetworkIpRange.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/StoragePool.py b/tools/marvin/marvin/integration/lib/base/StoragePool.py index 186198ce2e1..4820f0db4da 100644 --- a/tools/marvin/marvin/integration/lib/base/StoragePool.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/SupportedNetworkServices.py b/tools/marvin/marvin/integration/lib/base/SupportedNetworkServices.py index e6888ae6f9e..0d43e43e373 100644 --- a/tools/marvin/marvin/integration/lib/base/SupportedNetworkServices.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/Swift.py b/tools/marvin/marvin/integration/lib/base/Swift.py index 3710334a21e..8d368eb595f 100644 --- a/tools/marvin/marvin/integration/lib/base/Swift.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/SystemVm.py b/tools/marvin/marvin/integration/lib/base/SystemVm.py index 26691c6a16c..f694d8e18a3 100644 --- a/tools/marvin/marvin/integration/lib/base/SystemVm.py +++ b/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): diff --git a/tools/marvin/marvin/integration/lib/base/Tags.py b/tools/marvin/marvin/integration/lib/base/Tags.py index 44ec2ebb2e1..b8d88c91a94 100644 --- a/tools/marvin/marvin/integration/lib/base/Tags.py +++ b/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 diff --git a/tools/marvin/marvin/integration/lib/base/Template.py b/tools/marvin/marvin/integration/lib/base/Template.py index 7d62bbf2091..f3363eb72db 100644 --- a/tools/marvin/marvin/integration/lib/base/Template.py +++ b/tools/marvin/marvin/integration/lib/base/Template.py @@ -27,8 +27,8 @@ from marvin.cloudstackAPI import deleteTemplate class Template(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) def prepare(self, apiclient, zoneid, templateid, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/TemplatePermissions.py b/tools/marvin/marvin/integration/lib/base/TemplatePermissions.py index c6405403324..4154559beba 100644 --- a/tools/marvin/marvin/integration/lib/base/TemplatePermissions.py +++ b/tools/marvin/marvin/integration/lib/base/TemplatePermissions.py @@ -21,8 +21,8 @@ from marvin.cloudstackAPI import updateTemplatePermissions class TemplatePermissions(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/ToLoadBalancerRule.py b/tools/marvin/marvin/integration/lib/base/ToLoadBalancerRule.py index d2177b62318..e3ab42e5fa0 100644 --- a/tools/marvin/marvin/integration/lib/base/ToLoadBalancerRule.py +++ b/tools/marvin/marvin/integration/lib/base/ToLoadBalancerRule.py @@ -20,8 +20,8 @@ from marvin.cloudstackAPI import assignToLoadBalancerRule class ToLoadBalancerRule(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) def assign(self, apiclient, id, virtualmachineids, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/TrafficMonitor.py b/tools/marvin/marvin/integration/lib/base/TrafficMonitor.py index 127f741de45..6a8bc0fb8ce 100644 --- a/tools/marvin/marvin/integration/lib/base/TrafficMonitor.py +++ b/tools/marvin/marvin/integration/lib/base/TrafficMonitor.py @@ -22,8 +22,8 @@ from marvin.cloudstackAPI import deleteTrafficMonitor class TrafficMonitor(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) def add(self, apiclient, url, zoneid, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/TrafficType.py b/tools/marvin/marvin/integration/lib/base/TrafficType.py index d53094355ac..88cce860d4f 100644 --- a/tools/marvin/marvin/integration/lib/base/TrafficType.py +++ b/tools/marvin/marvin/integration/lib/base/TrafficType.py @@ -23,8 +23,8 @@ from marvin.cloudstackAPI import deleteTrafficType class TrafficType(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) def add(self, apiclient, traffictype, physicalnetworkid, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/TrafficTypeImplementors.py b/tools/marvin/marvin/integration/lib/base/TrafficTypeImplementors.py index 9708463fd27..ca30fafb0c0 100644 --- a/tools/marvin/marvin/integration/lib/base/TrafficTypeImplementors.py +++ b/tools/marvin/marvin/integration/lib/base/TrafficTypeImplementors.py @@ -20,8 +20,8 @@ from marvin.cloudstackAPI import listTrafficTypeImplementors class TrafficTypeImplementors(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/UsageRecords.py b/tools/marvin/marvin/integration/lib/base/UsageRecords.py index 2549cdfecf1..b0ba46d3efe 100644 --- a/tools/marvin/marvin/integration/lib/base/UsageRecords.py +++ b/tools/marvin/marvin/integration/lib/base/UsageRecords.py @@ -21,8 +21,8 @@ from marvin.cloudstackAPI import generateUsageRecords class UsageRecords(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/UsageTypes.py b/tools/marvin/marvin/integration/lib/base/UsageTypes.py index f63e0701e19..037caf211da 100644 --- a/tools/marvin/marvin/integration/lib/base/UsageTypes.py +++ b/tools/marvin/marvin/integration/lib/base/UsageTypes.py @@ -20,8 +20,8 @@ from marvin.cloudstackAPI import listUsageTypes class UsageTypes(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/User.py b/tools/marvin/marvin/integration/lib/base/User.py index 2d5d5911f2b..50f9b3a4e85 100644 --- a/tools/marvin/marvin/integration/lib/base/User.py +++ b/tools/marvin/marvin/integration/lib/base/User.py @@ -27,8 +27,8 @@ from marvin.cloudstackAPI import deleteUser class User(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) def enable(self, apiclient, id, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/UserKeys.py b/tools/marvin/marvin/integration/lib/base/UserKeys.py index 7bbfcb1036c..2466902876d 100644 --- a/tools/marvin/marvin/integration/lib/base/UserKeys.py +++ b/tools/marvin/marvin/integration/lib/base/UserKeys.py @@ -20,8 +20,8 @@ from marvin.cloudstackAPI import registerUserKeys class UserKeys(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) def register(self, apiclient, id, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/VMPassword.py b/tools/marvin/marvin/integration/lib/base/VMPassword.py index 5288cf01360..d9a6dc6da61 100644 --- a/tools/marvin/marvin/integration/lib/base/VMPassword.py +++ b/tools/marvin/marvin/integration/lib/base/VMPassword.py @@ -20,8 +20,8 @@ from marvin.cloudstackAPI import getVMPassword class VMPassword(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) def get(self, apiclient, id, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/VMSnapshot.py b/tools/marvin/marvin/integration/lib/base/VMSnapshot.py index cf179bf7866..ccc915ba09b 100644 --- a/tools/marvin/marvin/integration/lib/base/VMSnapshot.py +++ b/tools/marvin/marvin/integration/lib/base/VMSnapshot.py @@ -22,8 +22,8 @@ from marvin.cloudstackAPI import deleteVMSnapshot class VMSnapshot(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/VPC.py b/tools/marvin/marvin/integration/lib/base/VPC.py index f0b7e38e1c6..b9555cc137a 100644 --- a/tools/marvin/marvin/integration/lib/base/VPC.py +++ b/tools/marvin/marvin/integration/lib/base/VPC.py @@ -24,8 +24,8 @@ from marvin.cloudstackAPI import deleteVPC class VPC(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/VPCOffering.py b/tools/marvin/marvin/integration/lib/base/VPCOffering.py index c6a408e7873..be52a7050ad 100644 --- a/tools/marvin/marvin/integration/lib/base/VPCOffering.py +++ b/tools/marvin/marvin/integration/lib/base/VPCOffering.py @@ -23,8 +23,8 @@ from marvin.cloudstackAPI import deleteVPCOffering class VPCOffering(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/VirtualMachine.py b/tools/marvin/marvin/integration/lib/base/VirtualMachine.py index e5cc141c711..b3c9d642a21 100644 --- a/tools/marvin/marvin/integration/lib/base/VirtualMachine.py +++ b/tools/marvin/marvin/integration/lib/base/VirtualMachine.py @@ -29,8 +29,8 @@ from marvin.cloudstackAPI import assignVirtualMachine class VirtualMachine(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) def restore(self, apiclient, virtualmachineid, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py b/tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py index 42f0cf4fe4e..31d713a3c1f 100644 --- a/tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py +++ b/tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py @@ -22,8 +22,8 @@ from marvin.cloudstackAPI import configureVirtualRouterElement class VirtualRouterElement(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/VlanIpRange.py b/tools/marvin/marvin/integration/lib/base/VlanIpRange.py index 9e035bd2032..9981595a355 100644 --- a/tools/marvin/marvin/integration/lib/base/VlanIpRange.py +++ b/tools/marvin/marvin/integration/lib/base/VlanIpRange.py @@ -22,8 +22,8 @@ from marvin.cloudstackAPI import deleteVlanIpRange class VlanIpRange(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/Volume.py b/tools/marvin/marvin/integration/lib/base/Volume.py index 9fa329da9e7..e027a5b5049 100644 --- a/tools/marvin/marvin/integration/lib/base/Volume.py +++ b/tools/marvin/marvin/integration/lib/base/Volume.py @@ -27,8 +27,8 @@ from marvin.cloudstackAPI import deleteVolume class Volume(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) def migrate(self, apiclient, storageid, volumeid, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/VpnConnection.py b/tools/marvin/marvin/integration/lib/base/VpnConnection.py index 3b5c61cf6f9..1489eb703be 100644 --- a/tools/marvin/marvin/integration/lib/base/VpnConnection.py +++ b/tools/marvin/marvin/integration/lib/base/VpnConnection.py @@ -23,8 +23,8 @@ from marvin.cloudstackAPI import deleteVpnConnection class VpnConnection(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) def reset(self, apiclient, id, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/VpnCustomerGateway.py b/tools/marvin/marvin/integration/lib/base/VpnCustomerGateway.py index 9fbce9149ed..a94f424f726 100644 --- a/tools/marvin/marvin/integration/lib/base/VpnCustomerGateway.py +++ b/tools/marvin/marvin/integration/lib/base/VpnCustomerGateway.py @@ -23,8 +23,8 @@ from marvin.cloudstackAPI import deleteVpnCustomerGateway class VpnCustomerGateway(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/VpnGateway.py b/tools/marvin/marvin/integration/lib/base/VpnGateway.py index 424622cc3e4..28c57a92e97 100644 --- a/tools/marvin/marvin/integration/lib/base/VpnGateway.py +++ b/tools/marvin/marvin/integration/lib/base/VpnGateway.py @@ -22,8 +22,8 @@ from marvin.cloudstackAPI import deleteVpnGateway class VpnGateway(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/VpnUser.py b/tools/marvin/marvin/integration/lib/base/VpnUser.py index 8698e3931f3..beae36b4944 100644 --- a/tools/marvin/marvin/integration/lib/base/VpnUser.py +++ b/tools/marvin/marvin/integration/lib/base/VpnUser.py @@ -22,8 +22,8 @@ from marvin.cloudstackAPI import removeVpnUser class VpnUser(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) def add(self, apiclient, username, password, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/Zone.py b/tools/marvin/marvin/integration/lib/base/Zone.py index 31f4eaf2898..f25eb1a971c 100644 --- a/tools/marvin/marvin/integration/lib/base/Zone.py +++ b/tools/marvin/marvin/integration/lib/base/Zone.py @@ -23,8 +23,8 @@ from marvin.cloudstackAPI import deleteZone class Zone(CloudStackEntity.CloudStackEntity): - def __init__(self, **kwargs): - self.__dict__.update(**kwargs) + def __init__(self, items): + self.__dict__.update(items) @classmethod diff --git a/tools/marvin/marvin/integration/lib/factory/AccountFactory.py b/tools/marvin/marvin/integration/lib/factory/AccountFactory.py index dc543d4e97c..ebff3fe7162 100644 --- a/tools/marvin/marvin/integration/lib/factory/AccountFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/AccountFactory.py @@ -25,10 +25,10 @@ class AccountFactory(CloudStackBaseFactory): FACTORY_FOR = Account.Account accounttype = 0 + firstname = factory.Sequence(lambda n: random_gen()) + lastname = factory.Sequence(lambda n: random_gen()) email = factory.LazyAttribute(lambda e: '{0}.{1}@cloudstack.org'.format(e.firstname, e.lastname).lower()) - firstname = 'fname-'+random_gen() - lastname = 'lname-'+random_gen() - username = firstname + lastname + username = factory.Sequence(lambda n: random_gen()) # Password Encoding mdf = hashlib.md5() diff --git a/tools/marvin/marvin/integration/lib/factory/CloudStackBaseFactory.py b/tools/marvin/marvin/integration/lib/factory/CloudStackBaseFactory.py index 20185195ab0..57d77792e2d 100644 --- a/tools/marvin/marvin/integration/lib/factory/CloudStackBaseFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/CloudStackBaseFactory.py @@ -22,4 +22,6 @@ class CloudStackBaseFactory(factory.Factory): @classmethod def _create(cls, target_class, *args, **kwargs): + if len(args) == 0: + return target_class(kwargs) return target_class(*args, **kwargs) diff --git a/tools/marvin/marvin/integration/lib/factory/test/testFactories.py b/tools/marvin/marvin/integration/lib/factory/test/testFactories.py index 257239c934d..551d7f68405 100644 --- a/tools/marvin/marvin/integration/lib/factory/test/testFactories.py +++ b/tools/marvin/marvin/integration/lib/factory/test/testFactories.py @@ -28,16 +28,19 @@ class AccountFactoryTest(unittest.TestCase): af = AccountFactory.AccountFactory() accnt = Account.Account.create(apiclient=self.apiClient, AccountFactory=af) self.assertTrue(accnt is not None, msg="no account created by factory") + self.assertEqual(accnt.name, af.username, msg="account names are not same") def test_adminAccountFactory(self): af = AccountFactory.AccountFactory() accnt = Account.Account.create(apiclient=self.apiClient, AccountFactory=af) self.assertTrue(accnt is not None, msg="no account created by factory") + self.assertEqual(accnt.name, af.username, msg="account names are not same") def test_userAccountFactoryCustomArgs(self): af = AccountFactory.AccountFactory(firstname='test', lastname='test') accnt = Account.Account.create(apiclient=self.apiClient, AccountFactory=af) self.assertTrue(accnt is not None, msg="no account created by factory") + self.assertEqual(accnt.name, af.username, msg="account names are not same") def tearDown(self): pass diff --git a/tools/marvin/marvin/integration/lib/generateBase.py b/tools/marvin/marvin/integration/lib/generateBase.py index 9eeba073562..c2955d98a67 100644 --- a/tools/marvin/marvin/integration/lib/generateBase.py +++ b/tools/marvin/marvin/integration/lib/generateBase.py @@ -116,8 +116,8 @@ def write_entity_classes(entities): imports.append('from marvin.integration.lib.base import CloudStackEntity') body.append('class %s(CloudStackEntity.CloudStackEntity):'%entity) body.append('\n') - body.append(tabspace + 'def __init__(self, **kwargs):') - body.append(tabspace*2 + 'self.__dict__.update(**kwargs)') + body.append(tabspace + 'def __init__(self, items):') + body.append(tabspace*2 + 'self.__dict__.update(items)') body.append('\n') for action, details in actions.iteritems(): imports.append('from marvin.cloudstackAPI import %s'%details['apimodule'])