You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/04/09 15:20:43 UTC
[06/50] [abbrv] git commit: updated refs/heads/marvin_refactor to
2a99064
base dict object updated as **kwargs from factory
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/51172782
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/51172782
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/51172782
Branch: refs/heads/marvin_refactor
Commit: 511727822f4d80c3f0e3a980727593530c0ab527
Parents: 9ebc6f9
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Mon Mar 18 18:09:43 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Sun Mar 31 22:00:35 2013 +0530
----------------------------------------------------------------------
.../marvin/marvin/integration/lib/base/Account.py | 6 +++---
.../integration/lib/base/AccountFromProject.py | 6 +++---
.../integration/lib/base/AccountToProject.py | 6 +++---
tools/marvin/marvin/integration/lib/base/Alerts.py | 12 +++++++++---
.../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/integration/lib/base/AsyncJobs.py | 6 +++---
.../integration/lib/base/AutoScalePolicies.py | 6 +++---
.../marvin/integration/lib/base/AutoScalePolicy.py | 6 +++---
.../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 +++---
.../marvin/marvin/integration/lib/base/Cluster.py | 6 +++---
.../marvin/integration/lib/base/Condition.py | 6 +++---
tools/marvin/marvin/integration/lib/base/Config.py | 11 ++++-------
.../marvin/integration/lib/base/Configuration.py | 6 +++---
.../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 | 12 +++++++++---
.../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/integration/lib/base/IpAddress.py | 6 +++---
.../integration/lib/base/IpForwardingRule.py | 6 +++---
.../marvin/integration/lib/base/IpFromNic.py | 6 +++---
.../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 +++---
.../integration/lib/base/LoadBalancerRule.py | 6 +++---
.../lib/base/LoadBalancerRuleInstances.py | 6 +++---
.../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 +++---
.../lib/base/NiciraNvpDeviceNetworks.py | 6 +++---
tools/marvin/marvin/integration/lib/base/Nics.py | 6 +++---
.../marvin/integration/lib/base/OsCategories.py | 6 +++---
.../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 +++---
.../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 +++---
.../lib/base/SSHKeyForVirtualMachine.py | 6 +++---
.../marvin/integration/lib/base/SSHKeyPair.py | 6 +++---
.../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 +++---
.../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/integration/lib/base/Simulator.py | 6 +++---
.../marvin/marvin/integration/lib/base/Snapshot.py | 6 +++---
.../integration/lib/base/SnapshotPolicies.py | 6 +++---
.../marvin/integration/lib/base/SnapshotPolicy.py | 6 +++---
.../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 +++---
.../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 +++---
.../marvin/marvin/integration/lib/base/VpnUser.py | 6 +++---
tools/marvin/marvin/integration/lib/base/Zone.py | 6 +++---
.../integration/lib/factory/test/testFactories.py | 12 +++++++++++-
.../marvin/marvin/integration/lib/generateBase.py | 6 +++---
125 files changed, 396 insertions(+), 377 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/Account.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Account.py b/tools/marvin/marvin/integration/lib/base/Account.py
index b5ad12a..39852ef 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/AccountFromProject.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/AccountFromProject.py b/tools/marvin/marvin/integration/lib/base/AccountFromProject.py
index c90efb2..4801412 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/AccountToProject.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/AccountToProject.py b/tools/marvin/marvin/integration/lib/base/AccountToProject.py
index a35c851..3778ffb 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/Alerts.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Alerts.py b/tools/marvin/marvin/integration/lib/base/Alerts.py
index ebd15e1..b4e51c4 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
@@ -31,3 +32,8 @@ class Alerts(CloudStackEntity):
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)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/ApiLimit.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/ApiLimit.py b/tools/marvin/marvin/integration/lib/base/ApiLimit.py
index c3ec025..5144be1 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/Apis.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Apis.py b/tools/marvin/marvin/integration/lib/base/Apis.py
index 6677763..c215930 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/AsyncJobResult.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/AsyncJobResult.py b/tools/marvin/marvin/integration/lib/base/AsyncJobResult.py
index 8d81c21..c8e57e4 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/AsyncJobs.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/AsyncJobs.py b/tools/marvin/marvin/integration/lib/base/AsyncJobs.py
index 87dde3f..9b6b7aa 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/AutoScalePolicies.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/AutoScalePolicies.py b/tools/marvin/marvin/integration/lib/base/AutoScalePolicies.py
index e0f3251..62b1887 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/AutoScalePolicy.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/AutoScalePolicy.py b/tools/marvin/marvin/integration/lib/base/AutoScalePolicy.py
index 5655b48..b202bb1 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/AutoScaleVmGroup.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/AutoScaleVmGroup.py b/tools/marvin/marvin/integration/lib/base/AutoScaleVmGroup.py
index 43aed7a..13aa7c7 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/AutoScaleVmProfile.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/AutoScaleVmProfile.py b/tools/marvin/marvin/integration/lib/base/AutoScaleVmProfile.py
index 36adbb1..bce8375 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/BigSwitchVnsDevice.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/BigSwitchVnsDevice.py b/tools/marvin/marvin/integration/lib/base/BigSwitchVnsDevice.py
index 3bccb35..29a6b7f 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/Capabilities.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Capabilities.py b/tools/marvin/marvin/integration/lib/base/Capabilities.py
index c8424f4..1969a44 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/Capacity.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Capacity.py b/tools/marvin/marvin/integration/lib/base/Capacity.py
index 51ffbda..bb633ed 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/CloudIdentifier.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/CloudIdentifier.py b/tools/marvin/marvin/integration/lib/base/CloudIdentifier.py
index 6a6f237..9dfe2db 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/Cluster.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Cluster.py b/tools/marvin/marvin/integration/lib/base/Cluster.py
index da1130d..72bfcdc 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/Condition.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Condition.py b/tools/marvin/marvin/integration/lib/base/Condition.py
index 5973956..93d203d 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/Config.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Config.py b/tools/marvin/marvin/integration/lib/base/Config.py
index fc6ce9d..51d00ac 100644
--- a/tools/marvin/marvin/integration/lib/base/Config.py
+++ b/tools/marvin/marvin/integration/lib/base/Config.py
@@ -17,18 +17,15 @@
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)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/Configuration.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Configuration.py b/tools/marvin/marvin/integration/lib/base/Configuration.py
index 72d267f..865f4e1 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/Counter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Counter.py b/tools/marvin/marvin/integration/lib/base/Counter.py
index e41ce12..383d184 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/CustomCertificate.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/CustomCertificate.py b/tools/marvin/marvin/integration/lib/base/CustomCertificate.py
index 3dcbd73..472e8a2 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/DefaultNicForVirtualMachine.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/DefaultNicForVirtualMachine.py b/tools/marvin/marvin/integration/lib/base/DefaultNicForVirtualMachine.py
index 97d362d..33e5bfe 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/DefaultZoneForAccount.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/DefaultZoneForAccount.py b/tools/marvin/marvin/integration/lib/base/DefaultZoneForAccount.py
index d31b5cc..1c636c9 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/DiskOffering.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/DiskOffering.py b/tools/marvin/marvin/integration/lib/base/DiskOffering.py
index a94412a..005adde 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/Domain.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Domain.py b/tools/marvin/marvin/integration/lib/base/Domain.py
index 2d66d2e..c1d4fc2 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/DomainChildren.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/DomainChildren.py b/tools/marvin/marvin/integration/lib/base/DomainChildren.py
index bb8d3a1..f276538 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/EgressFirewallRule.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/EgressFirewallRule.py b/tools/marvin/marvin/integration/lib/base/EgressFirewallRule.py
index 750ccea..98fc9bb 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/EventTypes.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/EventTypes.py b/tools/marvin/marvin/integration/lib/base/EventTypes.py
index 85bf201..46b8da0 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/Events.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Events.py b/tools/marvin/marvin/integration/lib/base/Events.py
index e860eb5..9f0d4cd 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
@@ -31,3 +32,8 @@ class Events(CloudStackEntity):
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)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/FirewallRule.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/FirewallRule.py b/tools/marvin/marvin/integration/lib/base/FirewallRule.py
index 2e90907..6744edc 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/FromLoadBalancerRule.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/FromLoadBalancerRule.py b/tools/marvin/marvin/integration/lib/base/FromLoadBalancerRule.py
index a849d1e..38da697 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/Host.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Host.py b/tools/marvin/marvin/integration/lib/base/Host.py
index 4ab0ab6..dbc1ef6 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/HostForMaintenance.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/HostForMaintenance.py b/tools/marvin/marvin/integration/lib/base/HostForMaintenance.py
index 6f6fe16..663da86 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/HostMaintenance.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/HostMaintenance.py b/tools/marvin/marvin/integration/lib/base/HostMaintenance.py
index 7b2de90..9dba5fc 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/HostPassword.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/HostPassword.py b/tools/marvin/marvin/integration/lib/base/HostPassword.py
index d2d183f..0c64f2a 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/HypervisorCapabilities.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/HypervisorCapabilities.py b/tools/marvin/marvin/integration/lib/base/HypervisorCapabilities.py
index 0b5ba5b..4ee57b5 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/Hypervisors.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Hypervisors.py b/tools/marvin/marvin/integration/lib/base/Hypervisors.py
index 1849334..5e34aed 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/InstanceGroup.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/InstanceGroup.py b/tools/marvin/marvin/integration/lib/base/InstanceGroup.py
index 852b7f4..24c768a 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/IpAddress.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/IpAddress.py b/tools/marvin/marvin/integration/lib/base/IpAddress.py
index aedb8d8..74f59b1 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/IpForwardingRule.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/IpForwardingRule.py b/tools/marvin/marvin/integration/lib/base/IpForwardingRule.py
index 0279f15..69cc343 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/IpFromNic.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/IpFromNic.py b/tools/marvin/marvin/integration/lib/base/IpFromNic.py
index 750e142..c48f026 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/IpToNic.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/IpToNic.py b/tools/marvin/marvin/integration/lib/base/IpToNic.py
index 713c07d..ce78015 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/Iso.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Iso.py b/tools/marvin/marvin/integration/lib/base/Iso.py
index b8ab501..5865a2d 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/IsoPermissions.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/IsoPermissions.py b/tools/marvin/marvin/integration/lib/base/IsoPermissions.py
index 8df2e48..b77f1aa 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/LBStickinessPolicies.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/LBStickinessPolicies.py b/tools/marvin/marvin/integration/lib/base/LBStickinessPolicies.py
index 30a077d..fd93b51 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/LBStickinessPolicy.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/LBStickinessPolicy.py b/tools/marvin/marvin/integration/lib/base/LBStickinessPolicy.py
index f5b5613..49a59aa 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/LoadBalancerRule.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/LoadBalancerRule.py b/tools/marvin/marvin/integration/lib/base/LoadBalancerRule.py
index dc2c8ea..cd2af16 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/LoadBalancerRuleInstances.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/LoadBalancerRuleInstances.py b/tools/marvin/marvin/integration/lib/base/LoadBalancerRuleInstances.py
index 2ea5545..f4b6a54 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/Network.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Network.py b/tools/marvin/marvin/integration/lib/base/Network.py
index 1abfbc8..9f1a86e 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/NetworkACL.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/NetworkACL.py b/tools/marvin/marvin/integration/lib/base/NetworkACL.py
index 82e0f25..74ca402 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/NetworkDevice.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/NetworkDevice.py b/tools/marvin/marvin/integration/lib/base/NetworkDevice.py
index 073a328..6674111 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/NetworkOffering.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/NetworkOffering.py b/tools/marvin/marvin/integration/lib/base/NetworkOffering.py
index 41a57d4..e020de0 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/NetworkServiceProvider.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/NetworkServiceProvider.py b/tools/marvin/marvin/integration/lib/base/NetworkServiceProvider.py
index e2b3ac8..6135a93 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/NicFromVirtualMachine.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/NicFromVirtualMachine.py b/tools/marvin/marvin/integration/lib/base/NicFromVirtualMachine.py
index 9a56850..0705188 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/NicToVirtualMachine.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/NicToVirtualMachine.py b/tools/marvin/marvin/integration/lib/base/NicToVirtualMachine.py
index 8d4f6c3..f4de361 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/NiciraNvpDevice.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/NiciraNvpDevice.py b/tools/marvin/marvin/integration/lib/base/NiciraNvpDevice.py
index 706f944..2c5ddbb 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/NiciraNvpDeviceNetworks.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/NiciraNvpDeviceNetworks.py b/tools/marvin/marvin/integration/lib/base/NiciraNvpDeviceNetworks.py
index 070eb00..0a7bf39 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/Nics.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Nics.py b/tools/marvin/marvin/integration/lib/base/Nics.py
index 57338ce..6264d85 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/OsCategories.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/OsCategories.py b/tools/marvin/marvin/integration/lib/base/OsCategories.py
index f773211..aee9d51 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/OsTypes.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/OsTypes.py b/tools/marvin/marvin/integration/lib/base/OsTypes.py
index 5f3a3fd..1d8c3f1 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/PasswordForVirtualMachine.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/PasswordForVirtualMachine.py b/tools/marvin/marvin/integration/lib/base/PasswordForVirtualMachine.py
index 020959b..ec40385 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/PhysicalNetwork.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/PhysicalNetwork.py b/tools/marvin/marvin/integration/lib/base/PhysicalNetwork.py
index 69be06b..050e3d6 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/Pod.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Pod.py b/tools/marvin/marvin/integration/lib/base/Pod.py
index d3d822f..db2b307 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/PortForwardingRule.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/PortForwardingRule.py b/tools/marvin/marvin/integration/lib/base/PortForwardingRule.py
index 5d69a1a..2fd8817 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/PrivateGateway.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/PrivateGateway.py b/tools/marvin/marvin/integration/lib/base/PrivateGateway.py
index c121cc0..9a8949b 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/Project.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Project.py b/tools/marvin/marvin/integration/lib/base/Project.py
index 8ca176e..82665c0 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/ProjectAccounts.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/ProjectAccounts.py b/tools/marvin/marvin/integration/lib/base/ProjectAccounts.py
index 5eb1394..f3dd837 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/ProjectInvitation.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/ProjectInvitation.py b/tools/marvin/marvin/integration/lib/base/ProjectInvitation.py
index e93fc66..b907d65 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/PublicIpAddresses.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/PublicIpAddresses.py b/tools/marvin/marvin/integration/lib/base/PublicIpAddresses.py
index 092ceba..8952635 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/Region.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Region.py b/tools/marvin/marvin/integration/lib/base/Region.py
index 03631ab..33442a0 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/RemoteAccessVpn.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/RemoteAccessVpn.py b/tools/marvin/marvin/integration/lib/base/RemoteAccessVpn.py
index 047559f..8d8f2d0 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/Remove.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Remove.py b/tools/marvin/marvin/integration/lib/base/Remove.py
index 39e26b0..e15da60 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/ResourceCount.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/ResourceCount.py b/tools/marvin/marvin/integration/lib/base/ResourceCount.py
index b6aaf7c..4a0fb36 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/ResourceLimit.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/ResourceLimit.py b/tools/marvin/marvin/integration/lib/base/ResourceLimit.py
index 7d1f3d8..6269c00 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/Router.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Router.py b/tools/marvin/marvin/integration/lib/base/Router.py
index 7499593..22e9c63 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/S3.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/S3.py b/tools/marvin/marvin/integration/lib/base/S3.py
index 3d6f820..1da8f94 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/SSHKeyForVirtualMachine.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/SSHKeyForVirtualMachine.py b/tools/marvin/marvin/integration/lib/base/SSHKeyForVirtualMachine.py
index a55174b..a7fd912 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/SSHKeyPair.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/SSHKeyPair.py b/tools/marvin/marvin/integration/lib/base/SSHKeyPair.py
index 88859d5..416134b 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/SecondaryStorage.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/SecondaryStorage.py b/tools/marvin/marvin/integration/lib/base/SecondaryStorage.py
index 785506a..51cbd9d 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/SecurityGroup.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/SecurityGroup.py b/tools/marvin/marvin/integration/lib/base/SecurityGroup.py
index 9103538..0790404 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/SecurityGroupEgress.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/SecurityGroupEgress.py b/tools/marvin/marvin/integration/lib/base/SecurityGroupEgress.py
index dc37e7c..f97077f 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/SecurityGroupIngress.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/SecurityGroupIngress.py b/tools/marvin/marvin/integration/lib/base/SecurityGroupIngress.py
index 4548f0d..492aea6 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/ServiceForRouter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/ServiceForRouter.py b/tools/marvin/marvin/integration/lib/base/ServiceForRouter.py
index be20600..871f69c 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51172782/tools/marvin/marvin/integration/lib/base/ServiceForSystemVm.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/ServiceForSystemVm.py b/tools/marvin/marvin/integration/lib/base/ServiceForSystemVm.py
index be0e9fe..0821f8b 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):