From 5ee671fc9a76d48894d3bad24e24476252121d13 Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Mon, 18 Mar 2013 18:09:43 +0530 Subject: [PATCH] marvin_refactor: base dict object updated as **kwargs from factory Signed-off-by: Prasanna Santhanam --- tools/marvin/marvin/integration/lib/base/Account.py | 6 +++--- .../integration/lib/base/AccountFromProject.py | 6 +++--- .../marvin/integration/lib/base/AccountToProject.py | 6 +++--- tools/marvin/marvin/integration/lib/base/Alerts.py | 13 ++++++++++--- .../marvin/marvin/integration/lib/base/ApiLimit.py | 6 +++--- tools/marvin/marvin/integration/lib/base/Apis.py | 6 +++--- .../marvin/integration/lib/base/AsyncJobResult.py | 6 +++--- .../marvin/marvin/integration/lib/base/AsyncJobs.py | 6 +++--- .../integration/lib/base/AutoScalePolicies.py | 6 +++--- .../marvin/integration/lib/base/AutoScalePolicy.py | 6 +++--- .../marvin/integration/lib/base/AutoScaleVmGroup.py | 6 +++--- .../integration/lib/base/AutoScaleVmProfile.py | 6 +++--- .../integration/lib/base/BigSwitchVnsDevice.py | 6 +++--- .../marvin/integration/lib/base/Capabilities.py | 6 +++--- .../marvin/marvin/integration/lib/base/Capacity.py | 6 +++--- .../marvin/integration/lib/base/CloudIdentifier.py | 6 +++--- tools/marvin/marvin/integration/lib/base/Cluster.py | 6 +++--- .../marvin/marvin/integration/lib/base/Condition.py | 6 +++--- tools/marvin/marvin/integration/lib/base/Config.py | 11 ++++------- .../marvin/integration/lib/base/Configuration.py | 6 +++--- tools/marvin/marvin/integration/lib/base/Counter.py | 6 +++--- .../integration/lib/base/CustomCertificate.py | 6 +++--- .../lib/base/DefaultNicForVirtualMachine.py | 6 +++--- .../integration/lib/base/DefaultZoneForAccount.py | 6 +++--- .../marvin/integration/lib/base/DiskOffering.py | 6 +++--- tools/marvin/marvin/integration/lib/base/Domain.py | 6 +++--- .../marvin/integration/lib/base/DomainChildren.py | 6 +++--- .../integration/lib/base/EgressFirewallRule.py | 6 +++--- .../marvin/integration/lib/base/EventTypes.py | 6 +++--- tools/marvin/marvin/integration/lib/base/Events.py | 13 ++++++++++--- .../marvin/integration/lib/base/FirewallRule.py | 6 +++--- .../integration/lib/base/FromLoadBalancerRule.py | 6 +++--- tools/marvin/marvin/integration/lib/base/Host.py | 6 +++--- .../integration/lib/base/HostForMaintenance.py | 6 +++--- .../marvin/integration/lib/base/HostMaintenance.py | 6 +++--- .../marvin/integration/lib/base/HostPassword.py | 6 +++--- .../integration/lib/base/HypervisorCapabilities.py | 6 +++--- .../marvin/integration/lib/base/Hypervisors.py | 6 +++--- .../marvin/integration/lib/base/InstanceGroup.py | 6 +++--- .../marvin/marvin/integration/lib/base/IpAddress.py | 6 +++--- .../marvin/integration/lib/base/IpForwardingRule.py | 6 +++--- .../marvin/marvin/integration/lib/base/IpFromNic.py | 6 +++--- tools/marvin/marvin/integration/lib/base/IpToNic.py | 6 +++--- tools/marvin/marvin/integration/lib/base/Iso.py | 6 +++--- .../marvin/integration/lib/base/IsoPermissions.py | 6 +++--- .../integration/lib/base/LBStickinessPolicies.py | 6 +++--- .../integration/lib/base/LBStickinessPolicy.py | 6 +++--- .../marvin/integration/lib/base/LoadBalancerRule.py | 6 +++--- .../lib/base/LoadBalancerRuleInstances.py | 6 +++--- tools/marvin/marvin/integration/lib/base/Network.py | 6 +++--- .../marvin/integration/lib/base/NetworkACL.py | 6 +++--- .../marvin/integration/lib/base/NetworkDevice.py | 6 +++--- .../marvin/integration/lib/base/NetworkOffering.py | 6 +++--- .../integration/lib/base/NetworkServiceProvider.py | 6 +++--- .../integration/lib/base/NicFromVirtualMachine.py | 6 +++--- .../integration/lib/base/NicToVirtualMachine.py | 6 +++--- .../marvin/integration/lib/base/NiciraNvpDevice.py | 6 +++--- .../integration/lib/base/NiciraNvpDeviceNetworks.py | 6 +++--- tools/marvin/marvin/integration/lib/base/Nics.py | 6 +++--- .../marvin/integration/lib/base/OsCategories.py | 6 +++--- tools/marvin/marvin/integration/lib/base/OsTypes.py | 6 +++--- .../lib/base/PasswordForVirtualMachine.py | 6 +++--- .../marvin/integration/lib/base/PhysicalNetwork.py | 6 +++--- tools/marvin/marvin/integration/lib/base/Pod.py | 6 +++--- .../integration/lib/base/PortForwardingRule.py | 6 +++--- .../marvin/integration/lib/base/PrivateGateway.py | 6 +++--- tools/marvin/marvin/integration/lib/base/Project.py | 6 +++--- .../marvin/integration/lib/base/ProjectAccounts.py | 6 +++--- .../integration/lib/base/ProjectInvitation.py | 6 +++--- .../integration/lib/base/PublicIpAddresses.py | 6 +++--- tools/marvin/marvin/integration/lib/base/Region.py | 6 +++--- .../marvin/integration/lib/base/RemoteAccessVpn.py | 6 +++--- tools/marvin/marvin/integration/lib/base/Remove.py | 6 +++--- .../marvin/integration/lib/base/ResourceCount.py | 6 +++--- .../marvin/integration/lib/base/ResourceLimit.py | 6 +++--- tools/marvin/marvin/integration/lib/base/Router.py | 6 +++--- tools/marvin/marvin/integration/lib/base/S3.py | 6 +++--- .../integration/lib/base/SSHKeyForVirtualMachine.py | 6 +++--- .../marvin/integration/lib/base/SSHKeyPair.py | 6 +++--- .../marvin/integration/lib/base/SecondaryStorage.py | 6 +++--- .../marvin/integration/lib/base/SecurityGroup.py | 6 +++--- .../integration/lib/base/SecurityGroupEgress.py | 6 +++--- .../integration/lib/base/SecurityGroupIngress.py | 6 +++--- .../marvin/integration/lib/base/ServiceForRouter.py | 6 +++--- .../integration/lib/base/ServiceForSystemVm.py | 6 +++--- .../lib/base/ServiceForVirtualMachine.py | 6 +++--- .../marvin/integration/lib/base/ServiceOffering.py | 6 +++--- .../marvin/marvin/integration/lib/base/Simulator.py | 6 +++--- .../marvin/marvin/integration/lib/base/Snapshot.py | 6 +++--- .../marvin/integration/lib/base/SnapshotPolicies.py | 6 +++--- .../marvin/integration/lib/base/SnapshotPolicy.py | 6 +++--- .../marvin/marvin/integration/lib/base/StaticNat.py | 6 +++--- .../marvin/integration/lib/base/StaticRoute.py | 6 +++--- .../integration/lib/base/StorageMaintenance.py | 6 +++--- .../integration/lib/base/StorageNetworkIpRange.py | 6 +++--- .../marvin/integration/lib/base/StoragePool.py | 6 +++--- .../lib/base/SupportedNetworkServices.py | 6 +++--- tools/marvin/marvin/integration/lib/base/Swift.py | 6 +++--- .../marvin/marvin/integration/lib/base/SystemVm.py | 6 +++--- tools/marvin/marvin/integration/lib/base/Tags.py | 6 +++--- .../marvin/marvin/integration/lib/base/Template.py | 6 +++--- .../integration/lib/base/TemplatePermissions.py | 6 +++--- .../integration/lib/base/ToLoadBalancerRule.py | 6 +++--- .../marvin/integration/lib/base/TrafficMonitor.py | 6 +++--- .../marvin/integration/lib/base/TrafficType.py | 6 +++--- .../integration/lib/base/TrafficTypeImplementors.py | 6 +++--- .../marvin/integration/lib/base/UsageRecords.py | 6 +++--- .../marvin/integration/lib/base/UsageTypes.py | 6 +++--- tools/marvin/marvin/integration/lib/base/User.py | 6 +++--- .../marvin/marvin/integration/lib/base/UserKeys.py | 6 +++--- .../marvin/integration/lib/base/VMPassword.py | 6 +++--- .../marvin/integration/lib/base/VMSnapshot.py | 6 +++--- tools/marvin/marvin/integration/lib/base/VPC.py | 6 +++--- .../marvin/integration/lib/base/VPCOffering.py | 6 +++--- .../marvin/integration/lib/base/VirtualMachine.py | 6 +++--- .../integration/lib/base/VirtualRouterElement.py | 6 +++--- .../marvin/integration/lib/base/VlanIpRange.py | 6 +++--- tools/marvin/marvin/integration/lib/base/Volume.py | 6 +++--- .../marvin/integration/lib/base/VpnConnection.py | 6 +++--- .../integration/lib/base/VpnCustomerGateway.py | 6 +++--- .../marvin/integration/lib/base/VpnGateway.py | 6 +++--- tools/marvin/marvin/integration/lib/base/VpnUser.py | 6 +++--- tools/marvin/marvin/integration/lib/base/Zone.py | 6 +++--- .../integration/lib/factory/test/testFactories.py | 12 +++++++++++- tools/marvin/marvin/integration/lib/generateBase.py | 6 +++--- 125 files changed, 398 insertions(+), 377 deletions(-) diff --git a/tools/marvin/marvin/integration/lib/base/Account.py b/tools/marvin/marvin/integration/lib/base/Account.py index 2dee6364d02..ae56cc0ec6e 100644 --- a/tools/marvin/marvin/integration/lib/base/Account.py +++ b/tools/marvin/marvin/integration/lib/base/Account.py @@ -23,11 +23,11 @@ from marvin.cloudstackAPI import updateAccount from marvin.cloudstackAPI import disableAccount from marvin.cloudstackAPI import deleteAccount -class Account(CloudStackEntity): +class Account(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def enable(self, apiclient, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/AccountFromProject.py b/tools/marvin/marvin/integration/lib/base/AccountFromProject.py index 34ccb19d006..393082bae16 100644 --- a/tools/marvin/marvin/integration/lib/base/AccountFromProject.py +++ b/tools/marvin/marvin/integration/lib/base/AccountFromProject.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import deleteAccountFromProject -class AccountFromProject(CloudStackEntity): +class AccountFromProject(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def delete(self, apiclient, projectid, account, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/AccountToProject.py b/tools/marvin/marvin/integration/lib/base/AccountToProject.py index 7fac6ebee5f..b0c61e13064 100644 --- a/tools/marvin/marvin/integration/lib/base/AccountToProject.py +++ b/tools/marvin/marvin/integration/lib/base/AccountToProject.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import addAccountToProject -class AccountToProject(CloudStackEntity): +class AccountToProject(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def add(self, apiclient, projectid, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/Alerts.py b/tools/marvin/marvin/integration/lib/base/Alerts.py index 2c09c630de9..b4e51c47361 100644 --- a/tools/marvin/marvin/integration/lib/base/Alerts.py +++ b/tools/marvin/marvin/integration/lib/base/Alerts.py @@ -16,12 +16,13 @@ # under the License. from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listAlerts +from marvin.cloudstackAPI import deleteAlerts -class Alerts(CloudStackEntity): +class Alerts(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod @@ -30,3 +31,9 @@ class Alerts(CloudStackEntity): [setattr(cmd, key, value) for key,value in kwargs.items] alerts = apiclient.listAlerts(cmd) return map(lambda e: Alerts(e.__dict__), alerts) + + + def delete(self, apiclient, **kwargs): + cmd = deleteAlerts.deleteAlertsCmd() + [setattr(cmd, key, value) for key,value in kwargs.items] + alerts = apiclient.deleteAlerts(cmd) diff --git a/tools/marvin/marvin/integration/lib/base/ApiLimit.py b/tools/marvin/marvin/integration/lib/base/ApiLimit.py index c3ec02593ed..5144be164e5 100644 --- a/tools/marvin/marvin/integration/lib/base/ApiLimit.py +++ b/tools/marvin/marvin/integration/lib/base/ApiLimit.py @@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import resetApiLimit from marvin.cloudstackAPI import getApiLimit -class ApiLimit(CloudStackEntity): +class ApiLimit(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def reset(self, apiclient, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/Apis.py b/tools/marvin/marvin/integration/lib/base/Apis.py index e6f9c79cace..9d9a40f5e45 100644 --- a/tools/marvin/marvin/integration/lib/base/Apis.py +++ b/tools/marvin/marvin/integration/lib/base/Apis.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listApis -class Apis(CloudStackEntity): +class Apis(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/AsyncJobResult.py b/tools/marvin/marvin/integration/lib/base/AsyncJobResult.py index 079865d2040..c42257ec39f 100644 --- a/tools/marvin/marvin/integration/lib/base/AsyncJobResult.py +++ b/tools/marvin/marvin/integration/lib/base/AsyncJobResult.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import queryAsyncJobResult -class AsyncJobResult(CloudStackEntity): +class AsyncJobResult(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def query(self, apiclient, jobid, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/AsyncJobs.py b/tools/marvin/marvin/integration/lib/base/AsyncJobs.py index 1ef632e2dba..0a64110c1c0 100644 --- a/tools/marvin/marvin/integration/lib/base/AsyncJobs.py +++ b/tools/marvin/marvin/integration/lib/base/AsyncJobs.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listAsyncJobs -class AsyncJobs(CloudStackEntity): +class AsyncJobs(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/AutoScalePolicies.py b/tools/marvin/marvin/integration/lib/base/AutoScalePolicies.py index af5a5530aed..1a23578467e 100644 --- a/tools/marvin/marvin/integration/lib/base/AutoScalePolicies.py +++ b/tools/marvin/marvin/integration/lib/base/AutoScalePolicies.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listAutoScalePolicies -class AutoScalePolicies(CloudStackEntity): +class AutoScalePolicies(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/AutoScalePolicy.py b/tools/marvin/marvin/integration/lib/base/AutoScalePolicy.py index 062a58d5fcd..2da9105f409 100644 --- a/tools/marvin/marvin/integration/lib/base/AutoScalePolicy.py +++ b/tools/marvin/marvin/integration/lib/base/AutoScalePolicy.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createAutoScalePolicy from marvin.cloudstackAPI import updateAutoScalePolicy from marvin.cloudstackAPI import deleteAutoScalePolicy -class AutoScalePolicy(CloudStackEntity): +class AutoScalePolicy(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/AutoScaleVmGroup.py b/tools/marvin/marvin/integration/lib/base/AutoScaleVmGroup.py index 232af505e57..4d6db86d12f 100644 --- a/tools/marvin/marvin/integration/lib/base/AutoScaleVmGroup.py +++ b/tools/marvin/marvin/integration/lib/base/AutoScaleVmGroup.py @@ -22,11 +22,11 @@ from marvin.cloudstackAPI import updateAutoScaleVmGroup from marvin.cloudstackAPI import disableAutoScaleVmGroup from marvin.cloudstackAPI import deleteAutoScaleVmGroup -class AutoScaleVmGroup(CloudStackEntity): +class AutoScaleVmGroup(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def enable(self, apiclient, id, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/AutoScaleVmProfile.py b/tools/marvin/marvin/integration/lib/base/AutoScaleVmProfile.py index d6e5cdfb6d1..a7c7e742fe5 100644 --- a/tools/marvin/marvin/integration/lib/base/AutoScaleVmProfile.py +++ b/tools/marvin/marvin/integration/lib/base/AutoScaleVmProfile.py @@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listAutoScaleVmProfiles from marvin.cloudstackAPI import updateAutoScaleVmProfile from marvin.cloudstackAPI import deleteAutoScaleVmProfile -class AutoScaleVmProfile(CloudStackEntity): +class AutoScaleVmProfile(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/BigSwitchVnsDevice.py b/tools/marvin/marvin/integration/lib/base/BigSwitchVnsDevice.py index 3bccb351b57..29a6b7f6a49 100644 --- a/tools/marvin/marvin/integration/lib/base/BigSwitchVnsDevice.py +++ b/tools/marvin/marvin/integration/lib/base/BigSwitchVnsDevice.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import addBigSwitchVnsDevice from marvin.cloudstackAPI import listBigSwitchVnsDevices from marvin.cloudstackAPI import deleteBigSwitchVnsDevice -class BigSwitchVnsDevice(CloudStackEntity): +class BigSwitchVnsDevice(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def add(self, apiclient, physicalnetworkid, hostname, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/Capabilities.py b/tools/marvin/marvin/integration/lib/base/Capabilities.py index 48779103020..cee22bdc891 100644 --- a/tools/marvin/marvin/integration/lib/base/Capabilities.py +++ b/tools/marvin/marvin/integration/lib/base/Capabilities.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listCapabilities -class Capabilities(CloudStackEntity): +class Capabilities(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/Capacity.py b/tools/marvin/marvin/integration/lib/base/Capacity.py index b42367a9009..574bd2141e1 100644 --- a/tools/marvin/marvin/integration/lib/base/Capacity.py +++ b/tools/marvin/marvin/integration/lib/base/Capacity.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listCapacity -class Capacity(CloudStackEntity): +class Capacity(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/CloudIdentifier.py b/tools/marvin/marvin/integration/lib/base/CloudIdentifier.py index 1a7e8379dfc..85b530cb04d 100644 --- a/tools/marvin/marvin/integration/lib/base/CloudIdentifier.py +++ b/tools/marvin/marvin/integration/lib/base/CloudIdentifier.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import getCloudIdentifier -class CloudIdentifier(CloudStackEntity): +class CloudIdentifier(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def get(self, apiclient, userid, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/Cluster.py b/tools/marvin/marvin/integration/lib/base/Cluster.py index eff74ef582d..eb7d3b3b024 100644 --- a/tools/marvin/marvin/integration/lib/base/Cluster.py +++ b/tools/marvin/marvin/integration/lib/base/Cluster.py @@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listClusters from marvin.cloudstackAPI import updateCluster from marvin.cloudstackAPI import deleteCluster -class Cluster(CloudStackEntity): +class Cluster(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def add(self, apiclient, clustername, hypervisor, zoneid, clustertype, podid, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/Condition.py b/tools/marvin/marvin/integration/lib/base/Condition.py index 45c7e8036a4..ec1907d40ce 100644 --- a/tools/marvin/marvin/integration/lib/base/Condition.py +++ b/tools/marvin/marvin/integration/lib/base/Condition.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createCondition from marvin.cloudstackAPI import listConditions from marvin.cloudstackAPI import deleteCondition -class Condition(CloudStackEntity): +class Condition(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/Config.py b/tools/marvin/marvin/integration/lib/base/Config.py index b17d5ce8856..91eb397f240 100644 --- a/tools/marvin/marvin/integration/lib/base/Config.py +++ b/tools/marvin/marvin/integration/lib/base/Config.py @@ -17,17 +17,14 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import ldapConfig -class Config(CloudStackEntity): +class Config(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) - def ldap(self, apiclient, queryfilter, hostname, searchbase, **kwargs): + def ldap(self, apiclient, **kwargs): cmd = ldapConfig.ldapConfigCmd() - cmd.hostname = hostname - cmd.queryfilter = queryfilter - cmd.searchbase = searchbase [setattr(cmd, key, value) for key,value in kwargs.items] config = apiclient.ldapConfig(cmd) diff --git a/tools/marvin/marvin/integration/lib/base/Configuration.py b/tools/marvin/marvin/integration/lib/base/Configuration.py index f5973e4dbd5..05a57411deb 100644 --- a/tools/marvin/marvin/integration/lib/base/Configuration.py +++ b/tools/marvin/marvin/integration/lib/base/Configuration.py @@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listConfigurations from marvin.cloudstackAPI import updateConfiguration -class Configuration(CloudStackEntity): +class Configuration(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/Counter.py b/tools/marvin/marvin/integration/lib/base/Counter.py index cac0b584d4a..337591dbbf7 100644 --- a/tools/marvin/marvin/integration/lib/base/Counter.py +++ b/tools/marvin/marvin/integration/lib/base/Counter.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createCounter from marvin.cloudstackAPI import listCounters from marvin.cloudstackAPI import deleteCounter -class Counter(CloudStackEntity): +class Counter(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/CustomCertificate.py b/tools/marvin/marvin/integration/lib/base/CustomCertificate.py index 7c4653b1d66..73ddf7190d4 100644 --- a/tools/marvin/marvin/integration/lib/base/CustomCertificate.py +++ b/tools/marvin/marvin/integration/lib/base/CustomCertificate.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import uploadCustomCertificate -class CustomCertificate(CloudStackEntity): +class CustomCertificate(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def upload(self, apiclient, domainsuffix, certificate, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/DefaultNicForVirtualMachine.py b/tools/marvin/marvin/integration/lib/base/DefaultNicForVirtualMachine.py index 97d362d0227..33e5bfed832 100644 --- a/tools/marvin/marvin/integration/lib/base/DefaultNicForVirtualMachine.py +++ b/tools/marvin/marvin/integration/lib/base/DefaultNicForVirtualMachine.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import updateDefaultNicForVirtualMachine -class DefaultNicForVirtualMachine(CloudStackEntity): +class DefaultNicForVirtualMachine(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def update(self, apiclient, nicid, virtualmachineid, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/DefaultZoneForAccount.py b/tools/marvin/marvin/integration/lib/base/DefaultZoneForAccount.py index b5a87800d88..f10547d8033 100644 --- a/tools/marvin/marvin/integration/lib/base/DefaultZoneForAccount.py +++ b/tools/marvin/marvin/integration/lib/base/DefaultZoneForAccount.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import markDefaultZoneForAccount -class DefaultZoneForAccount(CloudStackEntity): +class DefaultZoneForAccount(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def mark(self, apiclient, account, domainid, zoneid, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/DiskOffering.py b/tools/marvin/marvin/integration/lib/base/DiskOffering.py index e93f5f74671..b2858f2306a 100644 --- a/tools/marvin/marvin/integration/lib/base/DiskOffering.py +++ b/tools/marvin/marvin/integration/lib/base/DiskOffering.py @@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listDiskOfferings from marvin.cloudstackAPI import updateDiskOffering from marvin.cloudstackAPI import deleteDiskOffering -class DiskOffering(CloudStackEntity): +class DiskOffering(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/Domain.py b/tools/marvin/marvin/integration/lib/base/Domain.py index 2c4b7c3e3f6..1c9beeed231 100644 --- a/tools/marvin/marvin/integration/lib/base/Domain.py +++ b/tools/marvin/marvin/integration/lib/base/Domain.py @@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listDomains from marvin.cloudstackAPI import updateDomain from marvin.cloudstackAPI import deleteDomain -class Domain(CloudStackEntity): +class Domain(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/DomainChildren.py b/tools/marvin/marvin/integration/lib/base/DomainChildren.py index 6527656ab11..aa82e053855 100644 --- a/tools/marvin/marvin/integration/lib/base/DomainChildren.py +++ b/tools/marvin/marvin/integration/lib/base/DomainChildren.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listDomainChildren -class DomainChildren(CloudStackEntity): +class DomainChildren(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/EgressFirewallRule.py b/tools/marvin/marvin/integration/lib/base/EgressFirewallRule.py index 750ccea2cf0..98fc9bba828 100644 --- a/tools/marvin/marvin/integration/lib/base/EgressFirewallRule.py +++ b/tools/marvin/marvin/integration/lib/base/EgressFirewallRule.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createEgressFirewallRule from marvin.cloudstackAPI import listEgressFirewallRules from marvin.cloudstackAPI import deleteEgressFirewallRule -class EgressFirewallRule(CloudStackEntity): +class EgressFirewallRule(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/EventTypes.py b/tools/marvin/marvin/integration/lib/base/EventTypes.py index 3565768cac9..c631d80965e 100644 --- a/tools/marvin/marvin/integration/lib/base/EventTypes.py +++ b/tools/marvin/marvin/integration/lib/base/EventTypes.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listEventTypes -class EventTypes(CloudStackEntity): +class EventTypes(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/Events.py b/tools/marvin/marvin/integration/lib/base/Events.py index 27c3099d7d4..9f0d4cd7e7d 100644 --- a/tools/marvin/marvin/integration/lib/base/Events.py +++ b/tools/marvin/marvin/integration/lib/base/Events.py @@ -16,12 +16,13 @@ # under the License. from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listEvents +from marvin.cloudstackAPI import deleteEvents -class Events(CloudStackEntity): +class Events(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod @@ -30,3 +31,9 @@ class Events(CloudStackEntity): [setattr(cmd, key, value) for key,value in kwargs.items] events = apiclient.listEvents(cmd) return map(lambda e: Events(e.__dict__), events) + + + def delete(self, apiclient, **kwargs): + cmd = deleteEvents.deleteEventsCmd() + [setattr(cmd, key, value) for key,value in kwargs.items] + events = apiclient.deleteEvents(cmd) diff --git a/tools/marvin/marvin/integration/lib/base/FirewallRule.py b/tools/marvin/marvin/integration/lib/base/FirewallRule.py index c052b2a1823..36572ba29a6 100644 --- a/tools/marvin/marvin/integration/lib/base/FirewallRule.py +++ b/tools/marvin/marvin/integration/lib/base/FirewallRule.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createFirewallRule from marvin.cloudstackAPI import listFirewallRules from marvin.cloudstackAPI import deleteFirewallRule -class FirewallRule(CloudStackEntity): +class FirewallRule(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/FromLoadBalancerRule.py b/tools/marvin/marvin/integration/lib/base/FromLoadBalancerRule.py index c3882c569d3..e996f7d3b6d 100644 --- a/tools/marvin/marvin/integration/lib/base/FromLoadBalancerRule.py +++ b/tools/marvin/marvin/integration/lib/base/FromLoadBalancerRule.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import removeFromLoadBalancerRule -class FromLoadBalancerRule(CloudStackEntity): +class FromLoadBalancerRule(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def remove(self, apiclient, id, virtualmachineids, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/Host.py b/tools/marvin/marvin/integration/lib/base/Host.py index b8524e4f646..23c71d5dcd5 100644 --- a/tools/marvin/marvin/integration/lib/base/Host.py +++ b/tools/marvin/marvin/integration/lib/base/Host.py @@ -21,11 +21,11 @@ from marvin.cloudstackAPI import updateHost from marvin.cloudstackAPI import reconnectHost from marvin.cloudstackAPI import deleteHost -class Host(CloudStackEntity): +class Host(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def add(self, apiclient, username, podid, url, hypervisor, zoneid, password, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/HostForMaintenance.py b/tools/marvin/marvin/integration/lib/base/HostForMaintenance.py index c277bd75acd..1123f17f087 100644 --- a/tools/marvin/marvin/integration/lib/base/HostForMaintenance.py +++ b/tools/marvin/marvin/integration/lib/base/HostForMaintenance.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import prepareHostForMaintenance -class HostForMaintenance(CloudStackEntity): +class HostForMaintenance(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def prepare(self, apiclient, id, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/HostMaintenance.py b/tools/marvin/marvin/integration/lib/base/HostMaintenance.py index b76eddcc61c..a6066b8d3f8 100644 --- a/tools/marvin/marvin/integration/lib/base/HostMaintenance.py +++ b/tools/marvin/marvin/integration/lib/base/HostMaintenance.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import cancelHostMaintenance -class HostMaintenance(CloudStackEntity): +class HostMaintenance(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def cancel(self, apiclient, id, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/HostPassword.py b/tools/marvin/marvin/integration/lib/base/HostPassword.py index fa5b636e115..bfd83b0f273 100644 --- a/tools/marvin/marvin/integration/lib/base/HostPassword.py +++ b/tools/marvin/marvin/integration/lib/base/HostPassword.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import updateHostPassword -class HostPassword(CloudStackEntity): +class HostPassword(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def update(self, apiclient, username, password, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/HypervisorCapabilities.py b/tools/marvin/marvin/integration/lib/base/HypervisorCapabilities.py index 7db42788c5c..c74e6284d25 100644 --- a/tools/marvin/marvin/integration/lib/base/HypervisorCapabilities.py +++ b/tools/marvin/marvin/integration/lib/base/HypervisorCapabilities.py @@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listHypervisorCapabilities from marvin.cloudstackAPI import updateHypervisorCapabilities -class HypervisorCapabilities(CloudStackEntity): +class HypervisorCapabilities(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/Hypervisors.py b/tools/marvin/marvin/integration/lib/base/Hypervisors.py index f7795dea4f3..9677b9bb6d7 100644 --- a/tools/marvin/marvin/integration/lib/base/Hypervisors.py +++ b/tools/marvin/marvin/integration/lib/base/Hypervisors.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listHypervisors -class Hypervisors(CloudStackEntity): +class Hypervisors(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/InstanceGroup.py b/tools/marvin/marvin/integration/lib/base/InstanceGroup.py index 82cffe44681..313ea34ddb4 100644 --- a/tools/marvin/marvin/integration/lib/base/InstanceGroup.py +++ b/tools/marvin/marvin/integration/lib/base/InstanceGroup.py @@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listInstanceGroups from marvin.cloudstackAPI import updateInstanceGroup from marvin.cloudstackAPI import deleteInstanceGroup -class InstanceGroup(CloudStackEntity): +class InstanceGroup(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/IpAddress.py b/tools/marvin/marvin/integration/lib/base/IpAddress.py index f4d0380b5f6..b60c0ad8aa3 100644 --- a/tools/marvin/marvin/integration/lib/base/IpAddress.py +++ b/tools/marvin/marvin/integration/lib/base/IpAddress.py @@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import disassociateIpAddress from marvin.cloudstackAPI import associateIpAddress -class IpAddress(CloudStackEntity): +class IpAddress(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def disassociate(self, apiclient, id, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/IpForwardingRule.py b/tools/marvin/marvin/integration/lib/base/IpForwardingRule.py index f80f2831438..876ef324fb5 100644 --- a/tools/marvin/marvin/integration/lib/base/IpForwardingRule.py +++ b/tools/marvin/marvin/integration/lib/base/IpForwardingRule.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createIpForwardingRule from marvin.cloudstackAPI import listIpForwardingRules from marvin.cloudstackAPI import deleteIpForwardingRule -class IpForwardingRule(CloudStackEntity): +class IpForwardingRule(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/IpFromNic.py b/tools/marvin/marvin/integration/lib/base/IpFromNic.py index 750e14217b8..c48f02696f6 100644 --- a/tools/marvin/marvin/integration/lib/base/IpFromNic.py +++ b/tools/marvin/marvin/integration/lib/base/IpFromNic.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import removeIpFromNic -class IpFromNic(CloudStackEntity): +class IpFromNic(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def remove(self, apiclient, id, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/IpToNic.py b/tools/marvin/marvin/integration/lib/base/IpToNic.py index 713c07db249..ce780159248 100644 --- a/tools/marvin/marvin/integration/lib/base/IpToNic.py +++ b/tools/marvin/marvin/integration/lib/base/IpToNic.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import addIpToNic -class IpToNic(CloudStackEntity): +class IpToNic(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def add(self, apiclient, nicid, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/Iso.py b/tools/marvin/marvin/integration/lib/base/Iso.py index b55f65b58a1..57009fc9177 100644 --- a/tools/marvin/marvin/integration/lib/base/Iso.py +++ b/tools/marvin/marvin/integration/lib/base/Iso.py @@ -24,11 +24,11 @@ from marvin.cloudstackAPI import detachIso from marvin.cloudstackAPI import extractIso from marvin.cloudstackAPI import deleteIso -class Iso(CloudStackEntity): +class Iso(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def copy(self, apiclient, sourcezoneid, id, destzoneid, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/IsoPermissions.py b/tools/marvin/marvin/integration/lib/base/IsoPermissions.py index 1e97b8149b4..d5a31fe34f6 100644 --- a/tools/marvin/marvin/integration/lib/base/IsoPermissions.py +++ b/tools/marvin/marvin/integration/lib/base/IsoPermissions.py @@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listIsoPermissions from marvin.cloudstackAPI import updateIsoPermissions -class IsoPermissions(CloudStackEntity): +class IsoPermissions(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/LBStickinessPolicies.py b/tools/marvin/marvin/integration/lib/base/LBStickinessPolicies.py index 6d25ce35085..a0971daaa89 100644 --- a/tools/marvin/marvin/integration/lib/base/LBStickinessPolicies.py +++ b/tools/marvin/marvin/integration/lib/base/LBStickinessPolicies.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listLBStickinessPolicies -class LBStickinessPolicies(CloudStackEntity): +class LBStickinessPolicies(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/LBStickinessPolicy.py b/tools/marvin/marvin/integration/lib/base/LBStickinessPolicy.py index 9d02914603b..01f218baaf5 100644 --- a/tools/marvin/marvin/integration/lib/base/LBStickinessPolicy.py +++ b/tools/marvin/marvin/integration/lib/base/LBStickinessPolicy.py @@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import createLBStickinessPolicy from marvin.cloudstackAPI import deleteLBStickinessPolicy -class LBStickinessPolicy(CloudStackEntity): +class LBStickinessPolicy(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/LoadBalancerRule.py b/tools/marvin/marvin/integration/lib/base/LoadBalancerRule.py index f5142ab071b..ac8c3f3bae1 100644 --- a/tools/marvin/marvin/integration/lib/base/LoadBalancerRule.py +++ b/tools/marvin/marvin/integration/lib/base/LoadBalancerRule.py @@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listLoadBalancerRules from marvin.cloudstackAPI import updateLoadBalancerRule from marvin.cloudstackAPI import deleteLoadBalancerRule -class LoadBalancerRule(CloudStackEntity): +class LoadBalancerRule(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/LoadBalancerRuleInstances.py b/tools/marvin/marvin/integration/lib/base/LoadBalancerRuleInstances.py index 8d1bbb8e081..2c9ef107a09 100644 --- a/tools/marvin/marvin/integration/lib/base/LoadBalancerRuleInstances.py +++ b/tools/marvin/marvin/integration/lib/base/LoadBalancerRuleInstances.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listLoadBalancerRuleInstances -class LoadBalancerRuleInstances(CloudStackEntity): +class LoadBalancerRuleInstances(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/Network.py b/tools/marvin/marvin/integration/lib/base/Network.py index cb9d364965c..093ce9e7cd3 100644 --- a/tools/marvin/marvin/integration/lib/base/Network.py +++ b/tools/marvin/marvin/integration/lib/base/Network.py @@ -21,11 +21,11 @@ from marvin.cloudstackAPI import updateNetwork from marvin.cloudstackAPI import restartNetwork from marvin.cloudstackAPI import deleteNetwork -class Network(CloudStackEntity): +class Network(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/NetworkACL.py b/tools/marvin/marvin/integration/lib/base/NetworkACL.py index ab3d9df4c9a..89e5e264dc7 100644 --- a/tools/marvin/marvin/integration/lib/base/NetworkACL.py +++ b/tools/marvin/marvin/integration/lib/base/NetworkACL.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createNetworkACL from marvin.cloudstackAPI import listNetworkACLs from marvin.cloudstackAPI import deleteNetworkACL -class NetworkACL(CloudStackEntity): +class NetworkACL(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/NetworkDevice.py b/tools/marvin/marvin/integration/lib/base/NetworkDevice.py index 0ab6d4d1132..ebea9a653de 100644 --- a/tools/marvin/marvin/integration/lib/base/NetworkDevice.py +++ b/tools/marvin/marvin/integration/lib/base/NetworkDevice.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import addNetworkDevice from marvin.cloudstackAPI import listNetworkDevice from marvin.cloudstackAPI import deleteNetworkDevice -class NetworkDevice(CloudStackEntity): +class NetworkDevice(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def add(self, apiclient, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/NetworkOffering.py b/tools/marvin/marvin/integration/lib/base/NetworkOffering.py index 804360a6755..6338e0453db 100644 --- a/tools/marvin/marvin/integration/lib/base/NetworkOffering.py +++ b/tools/marvin/marvin/integration/lib/base/NetworkOffering.py @@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listNetworkOfferings from marvin.cloudstackAPI import updateNetworkOffering from marvin.cloudstackAPI import deleteNetworkOffering -class NetworkOffering(CloudStackEntity): +class NetworkOffering(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/NetworkServiceProvider.py b/tools/marvin/marvin/integration/lib/base/NetworkServiceProvider.py index 887183b027a..6d19c862a77 100644 --- a/tools/marvin/marvin/integration/lib/base/NetworkServiceProvider.py +++ b/tools/marvin/marvin/integration/lib/base/NetworkServiceProvider.py @@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listNetworkServiceProviders from marvin.cloudstackAPI import updateNetworkServiceProvider from marvin.cloudstackAPI import deleteNetworkServiceProvider -class NetworkServiceProvider(CloudStackEntity): +class NetworkServiceProvider(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def add(self, apiclient, physicalnetworkid, name, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/NicFromVirtualMachine.py b/tools/marvin/marvin/integration/lib/base/NicFromVirtualMachine.py index 9a5685051f1..0705188192f 100644 --- a/tools/marvin/marvin/integration/lib/base/NicFromVirtualMachine.py +++ b/tools/marvin/marvin/integration/lib/base/NicFromVirtualMachine.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import removeNicFromVirtualMachine -class NicFromVirtualMachine(CloudStackEntity): +class NicFromVirtualMachine(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def remove(self, apiclient, nicid, virtualmachineid, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/NicToVirtualMachine.py b/tools/marvin/marvin/integration/lib/base/NicToVirtualMachine.py index 8d4f6c3c938..f4de36129e6 100644 --- a/tools/marvin/marvin/integration/lib/base/NicToVirtualMachine.py +++ b/tools/marvin/marvin/integration/lib/base/NicToVirtualMachine.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import addNicToVirtualMachine -class NicToVirtualMachine(CloudStackEntity): +class NicToVirtualMachine(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def add(self, apiclient, networkid, virtualmachineid, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/NiciraNvpDevice.py b/tools/marvin/marvin/integration/lib/base/NiciraNvpDevice.py index 2bb5257cb95..9dd0c0491dd 100644 --- a/tools/marvin/marvin/integration/lib/base/NiciraNvpDevice.py +++ b/tools/marvin/marvin/integration/lib/base/NiciraNvpDevice.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import addNiciraNvpDevice from marvin.cloudstackAPI import listNiciraNvpDevices from marvin.cloudstackAPI import deleteNiciraNvpDevice -class NiciraNvpDevice(CloudStackEntity): +class NiciraNvpDevice(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def add(self, apiclient, username, physicalnetworkid, password, hostname, transportzoneuuid, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/NiciraNvpDeviceNetworks.py b/tools/marvin/marvin/integration/lib/base/NiciraNvpDeviceNetworks.py index 6d15b9578fa..5ce30391798 100644 --- a/tools/marvin/marvin/integration/lib/base/NiciraNvpDeviceNetworks.py +++ b/tools/marvin/marvin/integration/lib/base/NiciraNvpDeviceNetworks.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listNiciraNvpDeviceNetworks -class NiciraNvpDeviceNetworks(CloudStackEntity): +class NiciraNvpDeviceNetworks(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/Nics.py b/tools/marvin/marvin/integration/lib/base/Nics.py index 57338cec210..6264d856828 100644 --- a/tools/marvin/marvin/integration/lib/base/Nics.py +++ b/tools/marvin/marvin/integration/lib/base/Nics.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listNics -class Nics(CloudStackEntity): +class Nics(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/OsCategories.py b/tools/marvin/marvin/integration/lib/base/OsCategories.py index 45c75311b64..878fc888966 100644 --- a/tools/marvin/marvin/integration/lib/base/OsCategories.py +++ b/tools/marvin/marvin/integration/lib/base/OsCategories.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listOsCategories -class OsCategories(CloudStackEntity): +class OsCategories(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/OsTypes.py b/tools/marvin/marvin/integration/lib/base/OsTypes.py index 361b1e76426..327406e60b3 100644 --- a/tools/marvin/marvin/integration/lib/base/OsTypes.py +++ b/tools/marvin/marvin/integration/lib/base/OsTypes.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listOsTypes -class OsTypes(CloudStackEntity): +class OsTypes(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/PasswordForVirtualMachine.py b/tools/marvin/marvin/integration/lib/base/PasswordForVirtualMachine.py index f297314661a..c58a0de5ae3 100644 --- a/tools/marvin/marvin/integration/lib/base/PasswordForVirtualMachine.py +++ b/tools/marvin/marvin/integration/lib/base/PasswordForVirtualMachine.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import resetPasswordForVirtualMachine -class PasswordForVirtualMachine(CloudStackEntity): +class PasswordForVirtualMachine(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def reset(self, apiclient, id, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/PhysicalNetwork.py b/tools/marvin/marvin/integration/lib/base/PhysicalNetwork.py index 1ba0d9e2cdc..5c56bb21e8c 100644 --- a/tools/marvin/marvin/integration/lib/base/PhysicalNetwork.py +++ b/tools/marvin/marvin/integration/lib/base/PhysicalNetwork.py @@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listPhysicalNetworks from marvin.cloudstackAPI import updatePhysicalNetwork from marvin.cloudstackAPI import deletePhysicalNetwork -class PhysicalNetwork(CloudStackEntity): +class PhysicalNetwork(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/Pod.py b/tools/marvin/marvin/integration/lib/base/Pod.py index 8064075fd89..18992479b13 100644 --- a/tools/marvin/marvin/integration/lib/base/Pod.py +++ b/tools/marvin/marvin/integration/lib/base/Pod.py @@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listPods from marvin.cloudstackAPI import updatePod from marvin.cloudstackAPI import deletePod -class Pod(CloudStackEntity): +class Pod(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/PortForwardingRule.py b/tools/marvin/marvin/integration/lib/base/PortForwardingRule.py index 2cb4febd305..de68cd611b7 100644 --- a/tools/marvin/marvin/integration/lib/base/PortForwardingRule.py +++ b/tools/marvin/marvin/integration/lib/base/PortForwardingRule.py @@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listPortForwardingRules from marvin.cloudstackAPI import updatePortForwardingRule from marvin.cloudstackAPI import deletePortForwardingRule -class PortForwardingRule(CloudStackEntity): +class PortForwardingRule(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/PrivateGateway.py b/tools/marvin/marvin/integration/lib/base/PrivateGateway.py index b567e0b039f..18a7c5c5de3 100644 --- a/tools/marvin/marvin/integration/lib/base/PrivateGateway.py +++ b/tools/marvin/marvin/integration/lib/base/PrivateGateway.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createPrivateGateway from marvin.cloudstackAPI import listPrivateGateways from marvin.cloudstackAPI import deletePrivateGateway -class PrivateGateway(CloudStackEntity): +class PrivateGateway(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/Project.py b/tools/marvin/marvin/integration/lib/base/Project.py index 0ba471a8665..974cc5f0b3e 100644 --- a/tools/marvin/marvin/integration/lib/base/Project.py +++ b/tools/marvin/marvin/integration/lib/base/Project.py @@ -22,11 +22,11 @@ from marvin.cloudstackAPI import updateProject from marvin.cloudstackAPI import activateProject from marvin.cloudstackAPI import deleteProject -class Project(CloudStackEntity): +class Project(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def suspend(self, apiclient, id, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/ProjectAccounts.py b/tools/marvin/marvin/integration/lib/base/ProjectAccounts.py index e17224eeba9..1a1f15bd5b3 100644 --- a/tools/marvin/marvin/integration/lib/base/ProjectAccounts.py +++ b/tools/marvin/marvin/integration/lib/base/ProjectAccounts.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listProjectAccounts -class ProjectAccounts(CloudStackEntity): +class ProjectAccounts(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/ProjectInvitation.py b/tools/marvin/marvin/integration/lib/base/ProjectInvitation.py index 9601acd7fd3..53908c9c5dc 100644 --- a/tools/marvin/marvin/integration/lib/base/ProjectInvitation.py +++ b/tools/marvin/marvin/integration/lib/base/ProjectInvitation.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import listProjectInvitations from marvin.cloudstackAPI import updateProjectInvitation from marvin.cloudstackAPI import deleteProjectInvitation -class ProjectInvitation(CloudStackEntity): +class ProjectInvitation(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/PublicIpAddresses.py b/tools/marvin/marvin/integration/lib/base/PublicIpAddresses.py index 36df7a223aa..d1e1d598188 100644 --- a/tools/marvin/marvin/integration/lib/base/PublicIpAddresses.py +++ b/tools/marvin/marvin/integration/lib/base/PublicIpAddresses.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listPublicIpAddresses -class PublicIpAddresses(CloudStackEntity): +class PublicIpAddresses(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/Region.py b/tools/marvin/marvin/integration/lib/base/Region.py index 03631abc067..33442a02160 100644 --- a/tools/marvin/marvin/integration/lib/base/Region.py +++ b/tools/marvin/marvin/integration/lib/base/Region.py @@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listRegions from marvin.cloudstackAPI import updateRegion from marvin.cloudstackAPI import removeRegion -class Region(CloudStackEntity): +class Region(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def add(self, apiclient, endpoint, id, name, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/RemoteAccessVpn.py b/tools/marvin/marvin/integration/lib/base/RemoteAccessVpn.py index 7400a52c8b4..c7e0a7d71ce 100644 --- a/tools/marvin/marvin/integration/lib/base/RemoteAccessVpn.py +++ b/tools/marvin/marvin/integration/lib/base/RemoteAccessVpn.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createRemoteAccessVpn from marvin.cloudstackAPI import listRemoteAccessVpns from marvin.cloudstackAPI import deleteRemoteAccessVpn -class RemoteAccessVpn(CloudStackEntity): +class RemoteAccessVpn(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/Remove.py b/tools/marvin/marvin/integration/lib/base/Remove.py index 2c52330eac0..930f399e430 100644 --- a/tools/marvin/marvin/integration/lib/base/Remove.py +++ b/tools/marvin/marvin/integration/lib/base/Remove.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import ldapRemove -class Remove(CloudStackEntity): +class Remove(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def ldap(self, apiclient, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/ResourceCount.py b/tools/marvin/marvin/integration/lib/base/ResourceCount.py index a9c52a9566e..1578f2e1246 100644 --- a/tools/marvin/marvin/integration/lib/base/ResourceCount.py +++ b/tools/marvin/marvin/integration/lib/base/ResourceCount.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import updateResourceCount -class ResourceCount(CloudStackEntity): +class ResourceCount(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def update(self, apiclient, domainid, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/ResourceLimit.py b/tools/marvin/marvin/integration/lib/base/ResourceLimit.py index a22ae994979..b97c0a2e15d 100644 --- a/tools/marvin/marvin/integration/lib/base/ResourceLimit.py +++ b/tools/marvin/marvin/integration/lib/base/ResourceLimit.py @@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listResourceLimits from marvin.cloudstackAPI import updateResourceLimit -class ResourceLimit(CloudStackEntity): +class ResourceLimit(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/Router.py b/tools/marvin/marvin/integration/lib/base/Router.py index 1afae0c0429..abcdbdc07bb 100644 --- a/tools/marvin/marvin/integration/lib/base/Router.py +++ b/tools/marvin/marvin/integration/lib/base/Router.py @@ -21,11 +21,11 @@ from marvin.cloudstackAPI import stopRouter from marvin.cloudstackAPI import rebootRouter from marvin.cloudstackAPI import startRouter -class Router(CloudStackEntity): +class Router(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def destroy(self, apiclient, id, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/S3.py b/tools/marvin/marvin/integration/lib/base/S3.py index ebc20a79306..28586586763 100644 --- a/tools/marvin/marvin/integration/lib/base/S3.py +++ b/tools/marvin/marvin/integration/lib/base/S3.py @@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import addS3 from marvin.cloudstackAPI import listS3s -class S3(CloudStackEntity): +class S3(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def add(self, apiclient, secretkey, accesskey, bucket, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/SSHKeyForVirtualMachine.py b/tools/marvin/marvin/integration/lib/base/SSHKeyForVirtualMachine.py index a55174b55c6..a7fd912155f 100644 --- a/tools/marvin/marvin/integration/lib/base/SSHKeyForVirtualMachine.py +++ b/tools/marvin/marvin/integration/lib/base/SSHKeyForVirtualMachine.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import resetSSHKeyForVirtualMachine -class SSHKeyForVirtualMachine(CloudStackEntity): +class SSHKeyForVirtualMachine(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def reset(self, apiclient, keypair, id, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/SSHKeyPair.py b/tools/marvin/marvin/integration/lib/base/SSHKeyPair.py index 152ae99374e..373e5fd42cc 100644 --- a/tools/marvin/marvin/integration/lib/base/SSHKeyPair.py +++ b/tools/marvin/marvin/integration/lib/base/SSHKeyPair.py @@ -20,11 +20,11 @@ from marvin.cloudstackAPI import registerSSHKeyPair from marvin.cloudstackAPI import listSSHKeyPairs from marvin.cloudstackAPI import deleteSSHKeyPair -class SSHKeyPair(CloudStackEntity): +class SSHKeyPair(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/SecondaryStorage.py b/tools/marvin/marvin/integration/lib/base/SecondaryStorage.py index b11401c6ee8..bc74e2a7ba3 100644 --- a/tools/marvin/marvin/integration/lib/base/SecondaryStorage.py +++ b/tools/marvin/marvin/integration/lib/base/SecondaryStorage.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import addSecondaryStorage -class SecondaryStorage(CloudStackEntity): +class SecondaryStorage(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def add(self, apiclient, url, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/SecurityGroup.py b/tools/marvin/marvin/integration/lib/base/SecurityGroup.py index 826003d6706..9ecac61d984 100644 --- a/tools/marvin/marvin/integration/lib/base/SecurityGroup.py +++ b/tools/marvin/marvin/integration/lib/base/SecurityGroup.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createSecurityGroup from marvin.cloudstackAPI import listSecurityGroups from marvin.cloudstackAPI import deleteSecurityGroup -class SecurityGroup(CloudStackEntity): +class SecurityGroup(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/SecurityGroupEgress.py b/tools/marvin/marvin/integration/lib/base/SecurityGroupEgress.py index d03c02ffb92..6a6aaffbab1 100644 --- a/tools/marvin/marvin/integration/lib/base/SecurityGroupEgress.py +++ b/tools/marvin/marvin/integration/lib/base/SecurityGroupEgress.py @@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import authorizeSecurityGroupEgress from marvin.cloudstackAPI import revokeSecurityGroupEgress -class SecurityGroupEgress(CloudStackEntity): +class SecurityGroupEgress(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def authorize(self, apiclient, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/SecurityGroupIngress.py b/tools/marvin/marvin/integration/lib/base/SecurityGroupIngress.py index 5f79934ecba..60981dc01a6 100644 --- a/tools/marvin/marvin/integration/lib/base/SecurityGroupIngress.py +++ b/tools/marvin/marvin/integration/lib/base/SecurityGroupIngress.py @@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import authorizeSecurityGroupIngress from marvin.cloudstackAPI import revokeSecurityGroupIngress -class SecurityGroupIngress(CloudStackEntity): +class SecurityGroupIngress(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def authorize(self, apiclient, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/ServiceForRouter.py b/tools/marvin/marvin/integration/lib/base/ServiceForRouter.py index b928fe06058..dca6c752bd0 100644 --- a/tools/marvin/marvin/integration/lib/base/ServiceForRouter.py +++ b/tools/marvin/marvin/integration/lib/base/ServiceForRouter.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import changeServiceForRouter -class ServiceForRouter(CloudStackEntity): +class ServiceForRouter(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def change(self, apiclient, id, serviceofferingid, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/ServiceForSystemVm.py b/tools/marvin/marvin/integration/lib/base/ServiceForSystemVm.py index 15f26e85eef..d6579d7e6b7 100644 --- a/tools/marvin/marvin/integration/lib/base/ServiceForSystemVm.py +++ b/tools/marvin/marvin/integration/lib/base/ServiceForSystemVm.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import changeServiceForSystemVm -class ServiceForSystemVm(CloudStackEntity): +class ServiceForSystemVm(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def change(self, apiclient, id, serviceofferingid, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/ServiceForVirtualMachine.py b/tools/marvin/marvin/integration/lib/base/ServiceForVirtualMachine.py index 716b8d9d8f9..fae4826b580 100644 --- a/tools/marvin/marvin/integration/lib/base/ServiceForVirtualMachine.py +++ b/tools/marvin/marvin/integration/lib/base/ServiceForVirtualMachine.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import changeServiceForVirtualMachine -class ServiceForVirtualMachine(CloudStackEntity): +class ServiceForVirtualMachine(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def change(self, apiclient, id, serviceofferingid, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/ServiceOffering.py b/tools/marvin/marvin/integration/lib/base/ServiceOffering.py index a865925e9c3..70af0d97e30 100644 --- a/tools/marvin/marvin/integration/lib/base/ServiceOffering.py +++ b/tools/marvin/marvin/integration/lib/base/ServiceOffering.py @@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listServiceOfferings from marvin.cloudstackAPI import updateServiceOffering from marvin.cloudstackAPI import deleteServiceOffering -class ServiceOffering(CloudStackEntity): +class ServiceOffering(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/Simulator.py b/tools/marvin/marvin/integration/lib/base/Simulator.py index 5c58ddee8dc..31a2dc78009 100644 --- a/tools/marvin/marvin/integration/lib/base/Simulator.py +++ b/tools/marvin/marvin/integration/lib/base/Simulator.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import configureSimulator -class Simulator(CloudStackEntity): +class Simulator(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def configure(self, apiclient, name, value, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/Snapshot.py b/tools/marvin/marvin/integration/lib/base/Snapshot.py index d6a56910ce0..030ba676976 100644 --- a/tools/marvin/marvin/integration/lib/base/Snapshot.py +++ b/tools/marvin/marvin/integration/lib/base/Snapshot.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createSnapshot from marvin.cloudstackAPI import listSnapshots from marvin.cloudstackAPI import deleteSnapshot -class Snapshot(CloudStackEntity): +class Snapshot(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/SnapshotPolicies.py b/tools/marvin/marvin/integration/lib/base/SnapshotPolicies.py index e1b68d46fe5..e892ff1b9dc 100644 --- a/tools/marvin/marvin/integration/lib/base/SnapshotPolicies.py +++ b/tools/marvin/marvin/integration/lib/base/SnapshotPolicies.py @@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listSnapshotPolicies from marvin.cloudstackAPI import deleteSnapshotPolicies -class SnapshotPolicies(CloudStackEntity): +class SnapshotPolicies(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/SnapshotPolicy.py b/tools/marvin/marvin/integration/lib/base/SnapshotPolicy.py index b082900e690..73d92ed74e5 100644 --- a/tools/marvin/marvin/integration/lib/base/SnapshotPolicy.py +++ b/tools/marvin/marvin/integration/lib/base/SnapshotPolicy.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import createSnapshotPolicy -class SnapshotPolicy(CloudStackEntity): +class SnapshotPolicy(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/StaticNat.py b/tools/marvin/marvin/integration/lib/base/StaticNat.py index c357be42468..33e20a6bc1d 100644 --- a/tools/marvin/marvin/integration/lib/base/StaticNat.py +++ b/tools/marvin/marvin/integration/lib/base/StaticNat.py @@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import enableStaticNat from marvin.cloudstackAPI import disableStaticNat -class StaticNat(CloudStackEntity): +class StaticNat(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def enable(self, apiclient, ipaddressid, virtualmachineid, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/StaticRoute.py b/tools/marvin/marvin/integration/lib/base/StaticRoute.py index dc87852115b..26150df9b26 100644 --- a/tools/marvin/marvin/integration/lib/base/StaticRoute.py +++ b/tools/marvin/marvin/integration/lib/base/StaticRoute.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createStaticRoute from marvin.cloudstackAPI import listStaticRoutes from marvin.cloudstackAPI import deleteStaticRoute -class StaticRoute(CloudStackEntity): +class StaticRoute(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/StorageMaintenance.py b/tools/marvin/marvin/integration/lib/base/StorageMaintenance.py index ebb75a0fed2..ac269969aff 100644 --- a/tools/marvin/marvin/integration/lib/base/StorageMaintenance.py +++ b/tools/marvin/marvin/integration/lib/base/StorageMaintenance.py @@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import cancelStorageMaintenance from marvin.cloudstackAPI import enableStorageMaintenance -class StorageMaintenance(CloudStackEntity): +class StorageMaintenance(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def cancel(self, apiclient, id, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/StorageNetworkIpRange.py b/tools/marvin/marvin/integration/lib/base/StorageNetworkIpRange.py index 37130ca93b5..a306949d0c5 100644 --- a/tools/marvin/marvin/integration/lib/base/StorageNetworkIpRange.py +++ b/tools/marvin/marvin/integration/lib/base/StorageNetworkIpRange.py @@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listStorageNetworkIpRange from marvin.cloudstackAPI import updateStorageNetworkIpRange from marvin.cloudstackAPI import deleteStorageNetworkIpRange -class StorageNetworkIpRange(CloudStackEntity): +class StorageNetworkIpRange(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/StoragePool.py b/tools/marvin/marvin/integration/lib/base/StoragePool.py index 3da065ff378..186198ce2e1 100644 --- a/tools/marvin/marvin/integration/lib/base/StoragePool.py +++ b/tools/marvin/marvin/integration/lib/base/StoragePool.py @@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listStoragePools from marvin.cloudstackAPI import updateStoragePool from marvin.cloudstackAPI import deleteStoragePool -class StoragePool(CloudStackEntity): +class StoragePool(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/SupportedNetworkServices.py b/tools/marvin/marvin/integration/lib/base/SupportedNetworkServices.py index 078d1b83c08..e6888ae6f9e 100644 --- a/tools/marvin/marvin/integration/lib/base/SupportedNetworkServices.py +++ b/tools/marvin/marvin/integration/lib/base/SupportedNetworkServices.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listSupportedNetworkServices -class SupportedNetworkServices(CloudStackEntity): +class SupportedNetworkServices(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/Swift.py b/tools/marvin/marvin/integration/lib/base/Swift.py index 5a09340be57..3710334a21e 100644 --- a/tools/marvin/marvin/integration/lib/base/Swift.py +++ b/tools/marvin/marvin/integration/lib/base/Swift.py @@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import addSwift from marvin.cloudstackAPI import listSwifts -class Swift(CloudStackEntity): +class Swift(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def add(self, apiclient, url, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/SystemVm.py b/tools/marvin/marvin/integration/lib/base/SystemVm.py index 18c40b73924..26691c6a16c 100644 --- a/tools/marvin/marvin/integration/lib/base/SystemVm.py +++ b/tools/marvin/marvin/integration/lib/base/SystemVm.py @@ -22,11 +22,11 @@ from marvin.cloudstackAPI import rebootSystemVm from marvin.cloudstackAPI import startSystemVm from marvin.cloudstackAPI import destroySystemVm -class SystemVm(CloudStackEntity): +class SystemVm(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) def migrate(self, apiclient, hostid, virtualmachineid, **kwargs): diff --git a/tools/marvin/marvin/integration/lib/base/Tags.py b/tools/marvin/marvin/integration/lib/base/Tags.py index 9e0093f7990..44ec2ebb2e1 100644 --- a/tools/marvin/marvin/integration/lib/base/Tags.py +++ b/tools/marvin/marvin/integration/lib/base/Tags.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createTags from marvin.cloudstackAPI import listTags from marvin.cloudstackAPI import deleteTags -class Tags(CloudStackEntity): +class Tags(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/Template.py b/tools/marvin/marvin/integration/lib/base/Template.py index 005125e88e1..7d62bbf2091 100644 --- a/tools/marvin/marvin/integration/lib/base/Template.py +++ b/tools/marvin/marvin/integration/lib/base/Template.py @@ -24,11 +24,11 @@ from marvin.cloudstackAPI import copyTemplate from marvin.cloudstackAPI import extractTemplate from marvin.cloudstackAPI import deleteTemplate -class Template(CloudStackEntity): +class Template(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) 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 769f1c640e9..c6405403324 100644 --- a/tools/marvin/marvin/integration/lib/base/TemplatePermissions.py +++ b/tools/marvin/marvin/integration/lib/base/TemplatePermissions.py @@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listTemplatePermissions from marvin.cloudstackAPI import updateTemplatePermissions -class TemplatePermissions(CloudStackEntity): +class TemplatePermissions(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/ToLoadBalancerRule.py b/tools/marvin/marvin/integration/lib/base/ToLoadBalancerRule.py index 605858f192b..d2177b62318 100644 --- a/tools/marvin/marvin/integration/lib/base/ToLoadBalancerRule.py +++ b/tools/marvin/marvin/integration/lib/base/ToLoadBalancerRule.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import assignToLoadBalancerRule -class ToLoadBalancerRule(CloudStackEntity): +class ToLoadBalancerRule(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) 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 e174fb585e9..127f741de45 100644 --- a/tools/marvin/marvin/integration/lib/base/TrafficMonitor.py +++ b/tools/marvin/marvin/integration/lib/base/TrafficMonitor.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import addTrafficMonitor from marvin.cloudstackAPI import listTrafficMonitors from marvin.cloudstackAPI import deleteTrafficMonitor -class TrafficMonitor(CloudStackEntity): +class TrafficMonitor(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) 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 a5928013025..d53094355ac 100644 --- a/tools/marvin/marvin/integration/lib/base/TrafficType.py +++ b/tools/marvin/marvin/integration/lib/base/TrafficType.py @@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listTrafficTypes from marvin.cloudstackAPI import updateTrafficType from marvin.cloudstackAPI import deleteTrafficType -class TrafficType(CloudStackEntity): +class TrafficType(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) 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 3a2b99d5424..9708463fd27 100644 --- a/tools/marvin/marvin/integration/lib/base/TrafficTypeImplementors.py +++ b/tools/marvin/marvin/integration/lib/base/TrafficTypeImplementors.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listTrafficTypeImplementors -class TrafficTypeImplementors(CloudStackEntity): +class TrafficTypeImplementors(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/UsageRecords.py b/tools/marvin/marvin/integration/lib/base/UsageRecords.py index 8c8dee70d3f..2549cdfecf1 100644 --- a/tools/marvin/marvin/integration/lib/base/UsageRecords.py +++ b/tools/marvin/marvin/integration/lib/base/UsageRecords.py @@ -18,11 +18,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listUsageRecords from marvin.cloudstackAPI import generateUsageRecords -class UsageRecords(CloudStackEntity): +class UsageRecords(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/UsageTypes.py b/tools/marvin/marvin/integration/lib/base/UsageTypes.py index 3e8b0eb85f4..f63e0701e19 100644 --- a/tools/marvin/marvin/integration/lib/base/UsageTypes.py +++ b/tools/marvin/marvin/integration/lib/base/UsageTypes.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import listUsageTypes -class UsageTypes(CloudStackEntity): +class UsageTypes(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/User.py b/tools/marvin/marvin/integration/lib/base/User.py index cd02f8ce23c..2d5d5911f2b 100644 --- a/tools/marvin/marvin/integration/lib/base/User.py +++ b/tools/marvin/marvin/integration/lib/base/User.py @@ -24,11 +24,11 @@ from marvin.cloudstackAPI import updateUser from marvin.cloudstackAPI import disableUser from marvin.cloudstackAPI import deleteUser -class User(CloudStackEntity): +class User(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) 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 8416f6734b8..7bbfcb1036c 100644 --- a/tools/marvin/marvin/integration/lib/base/UserKeys.py +++ b/tools/marvin/marvin/integration/lib/base/UserKeys.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import registerUserKeys -class UserKeys(CloudStackEntity): +class UserKeys(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) 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 dd4c8fcdaa9..5288cf01360 100644 --- a/tools/marvin/marvin/integration/lib/base/VMPassword.py +++ b/tools/marvin/marvin/integration/lib/base/VMPassword.py @@ -17,11 +17,11 @@ from marvin.integration.lib.base import CloudStackEntity from marvin.cloudstackAPI import getVMPassword -class VMPassword(CloudStackEntity): +class VMPassword(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) 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 66a17071669..cf179bf7866 100644 --- a/tools/marvin/marvin/integration/lib/base/VMSnapshot.py +++ b/tools/marvin/marvin/integration/lib/base/VMSnapshot.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createVMSnapshot from marvin.cloudstackAPI import listVMSnapshot from marvin.cloudstackAPI import deleteVMSnapshot -class VMSnapshot(CloudStackEntity): +class VMSnapshot(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/VPC.py b/tools/marvin/marvin/integration/lib/base/VPC.py index 164f7dd4792..f0b7e38e1c6 100644 --- a/tools/marvin/marvin/integration/lib/base/VPC.py +++ b/tools/marvin/marvin/integration/lib/base/VPC.py @@ -21,11 +21,11 @@ from marvin.cloudstackAPI import updateVPC from marvin.cloudstackAPI import restartVPC from marvin.cloudstackAPI import deleteVPC -class VPC(CloudStackEntity): +class VPC(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/VPCOffering.py b/tools/marvin/marvin/integration/lib/base/VPCOffering.py index 3b34eb337f0..c6a408e7873 100644 --- a/tools/marvin/marvin/integration/lib/base/VPCOffering.py +++ b/tools/marvin/marvin/integration/lib/base/VPCOffering.py @@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listVPCOfferings from marvin.cloudstackAPI import updateVPCOffering from marvin.cloudstackAPI import deleteVPCOffering -class VPCOffering(CloudStackEntity): +class VPCOffering(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/VirtualMachine.py b/tools/marvin/marvin/integration/lib/base/VirtualMachine.py index f6d9368b84d..e5cc141c711 100644 --- a/tools/marvin/marvin/integration/lib/base/VirtualMachine.py +++ b/tools/marvin/marvin/integration/lib/base/VirtualMachine.py @@ -26,11 +26,11 @@ from marvin.cloudstackAPI import startVirtualMachine from marvin.cloudstackAPI import destroyVirtualMachine from marvin.cloudstackAPI import assignVirtualMachine -class VirtualMachine(CloudStackEntity): +class VirtualMachine(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) 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 74c2d0c6cb1..42f0cf4fe4e 100644 --- a/tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py +++ b/tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createVirtualRouterElement from marvin.cloudstackAPI import listVirtualRouterElements from marvin.cloudstackAPI import configureVirtualRouterElement -class VirtualRouterElement(CloudStackEntity): +class VirtualRouterElement(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/VlanIpRange.py b/tools/marvin/marvin/integration/lib/base/VlanIpRange.py index 55ca5d8c7a4..9e035bd2032 100644 --- a/tools/marvin/marvin/integration/lib/base/VlanIpRange.py +++ b/tools/marvin/marvin/integration/lib/base/VlanIpRange.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createVlanIpRange from marvin.cloudstackAPI import listVlanIpRanges from marvin.cloudstackAPI import deleteVlanIpRange -class VlanIpRange(CloudStackEntity): +class VlanIpRange(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/Volume.py b/tools/marvin/marvin/integration/lib/base/Volume.py index 160a09244c8..9fa329da9e7 100644 --- a/tools/marvin/marvin/integration/lib/base/Volume.py +++ b/tools/marvin/marvin/integration/lib/base/Volume.py @@ -24,11 +24,11 @@ from marvin.cloudstackAPI import detachVolume from marvin.cloudstackAPI import extractVolume from marvin.cloudstackAPI import deleteVolume -class Volume(CloudStackEntity): +class Volume(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) 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 62062114dba..3b5c61cf6f9 100644 --- a/tools/marvin/marvin/integration/lib/base/VpnConnection.py +++ b/tools/marvin/marvin/integration/lib/base/VpnConnection.py @@ -20,11 +20,11 @@ from marvin.cloudstackAPI import createVpnConnection from marvin.cloudstackAPI import listVpnConnections from marvin.cloudstackAPI import deleteVpnConnection -class VpnConnection(CloudStackEntity): +class VpnConnection(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) 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 a718ddb1d79..9fbce9149ed 100644 --- a/tools/marvin/marvin/integration/lib/base/VpnCustomerGateway.py +++ b/tools/marvin/marvin/integration/lib/base/VpnCustomerGateway.py @@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listVpnCustomerGateways from marvin.cloudstackAPI import updateVpnCustomerGateway from marvin.cloudstackAPI import deleteVpnCustomerGateway -class VpnCustomerGateway(CloudStackEntity): +class VpnCustomerGateway(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/VpnGateway.py b/tools/marvin/marvin/integration/lib/base/VpnGateway.py index 3d7f4f72978..424622cc3e4 100644 --- a/tools/marvin/marvin/integration/lib/base/VpnGateway.py +++ b/tools/marvin/marvin/integration/lib/base/VpnGateway.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import createVpnGateway from marvin.cloudstackAPI import listVpnGateways from marvin.cloudstackAPI import deleteVpnGateway -class VpnGateway(CloudStackEntity): +class VpnGateway(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/base/VpnUser.py b/tools/marvin/marvin/integration/lib/base/VpnUser.py index edb7dc26f6f..8698e3931f3 100644 --- a/tools/marvin/marvin/integration/lib/base/VpnUser.py +++ b/tools/marvin/marvin/integration/lib/base/VpnUser.py @@ -19,11 +19,11 @@ from marvin.cloudstackAPI import addVpnUser from marvin.cloudstackAPI import listVpnUsers from marvin.cloudstackAPI import removeVpnUser -class VpnUser(CloudStackEntity): +class VpnUser(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) 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 aca473dfa32..31f4eaf2898 100644 --- a/tools/marvin/marvin/integration/lib/base/Zone.py +++ b/tools/marvin/marvin/integration/lib/base/Zone.py @@ -20,11 +20,11 @@ from marvin.cloudstackAPI import listZones from marvin.cloudstackAPI import updateZone from marvin.cloudstackAPI import deleteZone -class Zone(CloudStackEntity): +class Zone(CloudStackEntity.CloudStackEntity): - def __init__(self, items): - self.__dict__.update(items) + def __init__(self, **kwargs): + self.__dict__.update(**kwargs) @classmethod diff --git a/tools/marvin/marvin/integration/lib/factory/test/testFactories.py b/tools/marvin/marvin/integration/lib/factory/test/testFactories.py index eec44de4a21..b5a20ddd809 100644 --- a/tools/marvin/marvin/integration/lib/factory/test/testFactories.py +++ b/tools/marvin/marvin/integration/lib/factory/test/testFactories.py @@ -25,7 +25,17 @@ class AccountFactoryTest(unittest.TestCase): self.apiClient = cloudstackTestClient(mgtSvr='localhost') def test_userAccountFactory(self): - af = AccountFactory.AdminAccountFactory() + af = AccountFactory.AccountFactory() + accnt = Account.Account.create(apiclient=self.apiClient, AccountFactory=af) + self.assertTrue(accnt is not None, msg="no account created by factory") + + 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") + + 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") diff --git a/tools/marvin/marvin/integration/lib/generateBase.py b/tools/marvin/marvin/integration/lib/generateBase.py index f94043eab69..9eeba073562 100644 --- a/tools/marvin/marvin/integration/lib/generateBase.py +++ b/tools/marvin/marvin/integration/lib/generateBase.py @@ -114,10 +114,10 @@ def write_entity_classes(entities): body = [] imports = [] imports.append('from marvin.integration.lib.base import CloudStackEntity') - body.append('class %s(CloudStackEntity):'%entity) + body.append('class %s(CloudStackEntity.CloudStackEntity):'%entity) body.append('\n') - body.append(tabspace + 'def __init__(self, items):') - body.append(tabspace*2 + 'self.__dict__.update(items)') + body.append(tabspace + 'def __init__(self, **kwargs):') + body.append(tabspace*2 + 'self.__dict__.update(**kwargs)') body.append('\n') for action, details in actions.iteritems(): imports.append('from marvin.cloudstackAPI import %s'%details['apimodule'])