etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

marvin_refactor: actions on entity object require id for performing the action 

For eg:
1. nf = NetworkOffering.create(apiClient, NetworkOfferingFactory())
2. nf.update(apiClient, state='Enabled')

Operation #2 requires that nf's id be supplied to enable the network
offering

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Prasanna Santhanam 2013-03-31 19:23:49 +05:30
parent b4ecf77de2
commit 0f8a9ae4b9
132 changed files with 1011 additions and 390 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/marvin/marvin/integration/lib/base/Account.py
View File

@ -32,16 +32,20 @@ class Account(CloudStackEntity.CloudStackEntity):
def enable(self, apiclient, **kwargs):
cmd = enableAccount.enableAccountCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
cmd.id = self.id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
account = apiclient.enableAccount(cmd)
return account
def lock(self, apiclient, account, domainid, **kwargs):
cmd = lockAccount.lockAccountCmd()
cmd.id = self.id
cmd.account = account
cmd.domainid = domainid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
account = apiclient.lockAccount(cmd)
return account
@classmethod
@ -56,27 +60,33 @@ class Account(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listAccounts.listAccountsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
account = apiclient.listAccounts(cmd)
return map(lambda e: Account(e.__dict__), account)
def update(self, apiclient, newname, **kwargs):
cmd = updateAccount.updateAccountCmd()
cmd.id = self.id
cmd.newname = newname
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
account = apiclient.updateAccount(cmd)
return account
def disable(self, apiclient, lock, **kwargs):
cmd = disableAccount.disableAccountCmd()
cmd.id = self.id
cmd.lock = lock
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
account = apiclient.disableAccount(cmd)
return account
def delete(self, apiclient, id, **kwargs):
cmd = deleteAccount.deleteAccountCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
account = apiclient.deleteAccount(cmd)
return account

8
tools/marvin/marvin/integration/lib/base/AccountFromProject.py
View File

@ -20,17 +20,15 @@ from marvin.cloudstackAPI import deleteAccountFromProject
class AccountFromProject(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def __init__(self, items):
self.__dict__.update(items)
def delete(self, apiclient, projectid, account, **kwargs):
cmd = deleteAccountFromProject.deleteAccountFromProjectCmd()
cmd.id = self.id
cmd.account = account
cmd.projectid = projectid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
accountfromproject = apiclient.deleteAccountFromProject(cmd)
return accountfromproject

8
tools/marvin/marvin/integration/lib/base/AccountToProject.py
View File

@ -20,16 +20,14 @@ from marvin.cloudstackAPI import addAccountToProject
class AccountToProject(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def __init__(self, items):
self.__dict__.update(items)
def add(self, apiclient, projectid, **kwargs):
cmd = addAccountToProject.addAccountToProjectCmd()
cmd.id = self.id
cmd.projectid = projectid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
accounttoproject = apiclient.addAccountToProject(cmd)
return accounttoproject

6
tools/marvin/marvin/integration/lib/base/Alerts.py
View File

@ -28,12 +28,14 @@ class Alerts(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listAlerts.listAlertsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
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]
cmd.id = self.id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
alerts = apiclient.deleteAlerts(cmd)
return alerts

12
tools/marvin/marvin/integration/lib/base/ApiLimit.py
View File

@ -21,22 +21,22 @@ from marvin.cloudstackAPI import getApiLimit
class ApiLimit(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def __init__(self, items):
self.__dict__.update(items)
def reset(self, apiclient, **kwargs):
cmd = resetApiLimit.resetApiLimitCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
cmd.id = self.id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
apilimit = apiclient.resetApiLimit(cmd)
return apilimit
def get(self, apiclient, **kwargs):
cmd = getApiLimit.getApiLimitCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
cmd.id = self.id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
apilimit = apiclient.getApiLimit(cmd)
return apilimit

2
tools/marvin/marvin/integration/lib/base/Apis.py
View File

@ -27,6 +27,6 @@ class Apis(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listApis.listApisCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
apis = apiclient.listApis(cmd)
return map(lambda e: Apis(e.__dict__), apis)

8
tools/marvin/marvin/integration/lib/base/AsyncJobResult.py
View File

@ -20,16 +20,14 @@ from marvin.cloudstackAPI import queryAsyncJobResult
class AsyncJobResult(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def __init__(self, items):
self.__dict__.update(items)
def query(self, apiclient, jobid, **kwargs):
cmd = queryAsyncJobResult.queryAsyncJobResultCmd()
cmd.id = self.id
cmd.jobid = jobid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
asyncjobresult = apiclient.queryAsyncJobResult(cmd)
return asyncjobresult

2
tools/marvin/marvin/integration/lib/base/AsyncJobs.py
View File

@ -27,6 +27,6 @@ class AsyncJobs(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listAsyncJobs.listAsyncJobsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
asyncjobs = apiclient.listAsyncJobs(cmd)
return map(lambda e: AsyncJobs(e.__dict__), asyncjobs)

2
tools/marvin/marvin/integration/lib/base/AutoScalePolicies.py
View File

@ -27,6 +27,6 @@ class AutoScalePolicies(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listAutoScalePolicies.listAutoScalePoliciesCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
autoscalepolicies = apiclient.listAutoScalePolicies(cmd)
return map(lambda e: AutoScalePolicies(e.__dict__), autoscalepolicies)

8
tools/marvin/marvin/integration/lib/base/AutoScalePolicy.py
View File

@ -37,13 +37,17 @@ class AutoScalePolicy(CloudStackEntity.CloudStackEntity):
def update(self, apiclient, id, **kwargs):
cmd = updateAutoScalePolicy.updateAutoScalePolicyCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
autoscalepolicy = apiclient.updateAutoScalePolicy(cmd)
return autoscalepolicy
def delete(self, apiclient, id, **kwargs):
cmd = deleteAutoScalePolicy.deleteAutoScalePolicyCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
autoscalepolicy = apiclient.deleteAutoScalePolicy(cmd)
return autoscalepolicy

18
tools/marvin/marvin/integration/lib/base/AutoScaleVmGroup.py
View File

@ -31,9 +31,11 @@ class AutoScaleVmGroup(CloudStackEntity.CloudStackEntity):
def enable(self, apiclient, id, **kwargs):
cmd = enableAutoScaleVmGroup.enableAutoScaleVmGroupCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
autoscalevmgroup = apiclient.enableAutoScaleVmGroup(cmd)
return autoscalevmgroup
@classmethod
@ -48,27 +50,33 @@ class AutoScaleVmGroup(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listAutoScaleVmGroups.listAutoScaleVmGroupsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
autoscalevmgroup = apiclient.listAutoScaleVmGroups(cmd)
return map(lambda e: AutoScaleVmGroup(e.__dict__), autoscalevmgroup)
def update(self, apiclient, id, **kwargs):
cmd = updateAutoScaleVmGroup.updateAutoScaleVmGroupCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
autoscalevmgroup = apiclient.updateAutoScaleVmGroup(cmd)
return autoscalevmgroup
def disable(self, apiclient, id, **kwargs):
cmd = disableAutoScaleVmGroup.disableAutoScaleVmGroupCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
autoscalevmgroup = apiclient.disableAutoScaleVmGroup(cmd)
return autoscalevmgroup
def delete(self, apiclient, id, **kwargs):
cmd = deleteAutoScaleVmGroup.deleteAutoScaleVmGroupCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
autoscalevmgroup = apiclient.deleteAutoScaleVmGroup(cmd)
return autoscalevmgroup

10
tools/marvin/marvin/integration/lib/base/AutoScaleVmProfile.py
View File

@ -39,20 +39,24 @@ class AutoScaleVmProfile(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listAutoScaleVmProfiles.listAutoScaleVmProfilesCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
autoscalevmprofile = apiclient.listAutoScaleVmProfiles(cmd)
return map(lambda e: AutoScaleVmProfile(e.__dict__), autoscalevmprofile)
def update(self, apiclient, id, **kwargs):
cmd = updateAutoScaleVmProfile.updateAutoScaleVmProfileCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
autoscalevmprofile = apiclient.updateAutoScaleVmProfile(cmd)
return autoscalevmprofile
def delete(self, apiclient, id, **kwargs):
cmd = deleteAutoScaleVmProfile.deleteAutoScaleVmProfileCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
autoscalevmprofile = apiclient.deleteAutoScaleVmProfile(cmd)
return autoscalevmprofile

10
tools/marvin/marvin/integration/lib/base/BigSwitchVnsDevice.py
View File

@ -28,22 +28,26 @@ class BigSwitchVnsDevice(CloudStackEntity.CloudStackEntity):
def add(self, apiclient, physicalnetworkid, hostname, **kwargs):
cmd = addBigSwitchVnsDevice.addBigSwitchVnsDeviceCmd()
cmd.id = self.id
cmd.hostname = hostname
cmd.physicalnetworkid = physicalnetworkid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
bigswitchvnsdevice = apiclient.addBigSwitchVnsDevice(cmd)
return bigswitchvnsdevice
@classmethod
def list(self, apiclient, **kwargs):
cmd = listBigSwitchVnsDevices.listBigSwitchVnsDevicesCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
bigswitchvnsdevice = apiclient.listBigSwitchVnsDevices(cmd)
return map(lambda e: BigSwitchVnsDevice(e.__dict__), bigswitchvnsdevice)
def delete(self, apiclient, vnsdeviceid, **kwargs):
cmd = deleteBigSwitchVnsDevice.deleteBigSwitchVnsDeviceCmd()
cmd.id = self.id
cmd.vnsdeviceid = vnsdeviceid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
bigswitchvnsdevice = apiclient.deleteBigSwitchVnsDevice(cmd)
return bigswitchvnsdevice

2
tools/marvin/marvin/integration/lib/base/Capabilities.py
View File

@ -27,6 +27,6 @@ class Capabilities(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listCapabilities.listCapabilitiesCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
capabilities = apiclient.listCapabilities(cmd)
return map(lambda e: Capabilities(e.__dict__), capabilities)

2
tools/marvin/marvin/integration/lib/base/Capacity.py
View File

@ -27,6 +27,6 @@ class Capacity(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listCapacity.listCapacityCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
capacity = apiclient.listCapacity(cmd)
return map(lambda e: Capacity(e.__dict__), capacity)

8
tools/marvin/marvin/integration/lib/base/CloudIdentifier.py
View File

@ -20,16 +20,14 @@ from marvin.cloudstackAPI import getCloudIdentifier
class CloudIdentifier(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def __init__(self, items):
self.__dict__.update(items)
def get(self, apiclient, userid, **kwargs):
cmd = getCloudIdentifier.getCloudIdentifierCmd()
cmd.id = self.id
cmd.userid = userid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
cloudidentifier = apiclient.getCloudIdentifier(cmd)
return cloudidentifier

14
tools/marvin/marvin/integration/lib/base/Cluster.py
View File

@ -29,32 +29,38 @@ class Cluster(CloudStackEntity.CloudStackEntity):
def add(self, apiclient, clustername, hypervisor, zoneid, clustertype, podid, **kwargs):
cmd = addCluster.addClusterCmd()
cmd.id = self.id
cmd.clustername = clustername
cmd.clustertype = clustertype
cmd.hypervisor = hypervisor
cmd.podid = podid
cmd.zoneid = zoneid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
cluster = apiclient.addCluster(cmd)
return cluster
@classmethod
def list(self, apiclient, **kwargs):
cmd = listClusters.listClustersCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
cluster = apiclient.listClusters(cmd)
return map(lambda e: Cluster(e.__dict__), cluster)
def update(self, apiclient, id, **kwargs):
cmd = updateCluster.updateClusterCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
cluster = apiclient.updateCluster(cmd)
return cluster
def delete(self, apiclient, id, **kwargs):
cmd = deleteCluster.deleteClusterCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
cluster = apiclient.deleteCluster(cmd)
return cluster

6
tools/marvin/marvin/integration/lib/base/Condition.py
View File

@ -38,13 +38,15 @@ class Condition(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listConditions.listConditionsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
condition = apiclient.listConditions(cmd)
return map(lambda e: Condition(e.__dict__), condition)
def delete(self, apiclient, id, **kwargs):
cmd = deleteCondition.deleteConditionCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
condition = apiclient.deleteCondition(cmd)
return condition

4
tools/marvin/marvin/integration/lib/base/Config.py
View File

@ -26,5 +26,7 @@ class Config(CloudStackEntity.CloudStackEntity):
def ldap(self, apiclient, **kwargs):
cmd = ldapConfig.ldapConfigCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
cmd.id = self.id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
config = apiclient.ldapConfig(cmd)
return config

6
tools/marvin/marvin/integration/lib/base/Configuration.py
View File

@ -28,13 +28,15 @@ class Configuration(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listConfigurations.listConfigurationsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
configuration = apiclient.listConfigurations(cmd)
return map(lambda e: Configuration(e.__dict__), configuration)
def update(self, apiclient, name, **kwargs):
cmd = updateConfiguration.updateConfigurationCmd()
cmd.id = self.id
cmd.name = name
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
configuration = apiclient.updateConfiguration(cmd)
return configuration

6
tools/marvin/marvin/integration/lib/base/Counter.py
View File

@ -38,13 +38,15 @@ class Counter(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listCounters.listCountersCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
counter = apiclient.listCounters(cmd)
return map(lambda e: Counter(e.__dict__), counter)
def delete(self, apiclient, id, **kwargs):
cmd = deleteCounter.deleteCounterCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
counter = apiclient.deleteCounter(cmd)
return counter

8
tools/marvin/marvin/integration/lib/base/CustomCertificate.py
View File

@ -20,17 +20,15 @@ from marvin.cloudstackAPI import uploadCustomCertificate
class CustomCertificate(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def __init__(self, items):
self.__dict__.update(items)
def upload(self, apiclient, domainsuffix, certificate, **kwargs):
cmd = uploadCustomCertificate.uploadCustomCertificateCmd()
cmd.id = self.id
cmd.certificate = certificate
cmd.domainsuffix = domainsuffix
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
customcertificate = apiclient.uploadCustomCertificate(cmd)
return customcertificate

4
tools/marvin/marvin/integration/lib/base/DefaultNicForVirtualMachine.py
View File

@ -26,7 +26,9 @@ class DefaultNicForVirtualMachine(CloudStackEntity.CloudStackEntity):
def update(self, apiclient, nicid, virtualmachineid, **kwargs):
cmd = updateDefaultNicForVirtualMachine.updateDefaultNicForVirtualMachineCmd()
cmd.id = self.id
cmd.nicid = nicid
cmd.virtualmachineid = virtualmachineid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
defaultnicforvirtualmachine = apiclient.updateDefaultNicForVirtualMachine(cmd)
return defaultnicforvirtualmachine

8
tools/marvin/marvin/integration/lib/base/DefaultZoneForAccount.py
View File

@ -20,18 +20,16 @@ from marvin.cloudstackAPI import markDefaultZoneForAccount
class DefaultZoneForAccount(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def __init__(self, items):
self.__dict__.update(items)
def mark(self, apiclient, account, domainid, zoneid, **kwargs):
cmd = markDefaultZoneForAccount.markDefaultZoneForAccountCmd()
cmd.id = self.id
cmd.account = account
cmd.domainid = domainid
cmd.zoneid = zoneid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
defaultzoneforaccount = apiclient.markDefaultZoneForAccount(cmd)
return defaultzoneforaccount

10
tools/marvin/marvin/integration/lib/base/DiskOffering.py
View File

@ -39,20 +39,24 @@ class DiskOffering(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listDiskOfferings.listDiskOfferingsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
diskoffering = apiclient.listDiskOfferings(cmd)
return map(lambda e: DiskOffering(e.__dict__), diskoffering)
def update(self, apiclient, id, **kwargs):
cmd = updateDiskOffering.updateDiskOfferingCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
diskoffering = apiclient.updateDiskOffering(cmd)
return diskoffering
def delete(self, apiclient, id, **kwargs):
cmd = deleteDiskOffering.deleteDiskOfferingCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
diskoffering = apiclient.deleteDiskOffering(cmd)
return diskoffering

10
tools/marvin/marvin/integration/lib/base/Domain.py
View File

@ -39,20 +39,24 @@ class Domain(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listDomains.listDomainsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
domain = apiclient.listDomains(cmd)
return map(lambda e: Domain(e.__dict__), domain)
def update(self, apiclient, id, **kwargs):
cmd = updateDomain.updateDomainCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
domain = apiclient.updateDomain(cmd)
return domain
def delete(self, apiclient, id, **kwargs):
cmd = deleteDomain.deleteDomainCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
domain = apiclient.deleteDomain(cmd)
return domain

2
tools/marvin/marvin/integration/lib/base/DomainChildren.py
View File

@ -27,6 +27,6 @@ class DomainChildren(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listDomainChildren.listDomainChildrenCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
domainchildren = apiclient.listDomainChildren(cmd)
return map(lambda e: DomainChildren(e.__dict__), domainchildren)

6
tools/marvin/marvin/integration/lib/base/EgressFirewallRule.py
View File

@ -38,13 +38,15 @@ class EgressFirewallRule(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listEgressFirewallRules.listEgressFirewallRulesCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
egressfirewallrule = apiclient.listEgressFirewallRules(cmd)
return map(lambda e: EgressFirewallRule(e.__dict__), egressfirewallrule)
def delete(self, apiclient, id, **kwargs):
cmd = deleteEgressFirewallRule.deleteEgressFirewallRuleCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
egressfirewallrule = apiclient.deleteEgressFirewallRule(cmd)
return egressfirewallrule

2
tools/marvin/marvin/integration/lib/base/EventTypes.py
View File

@ -27,6 +27,6 @@ class EventTypes(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listEventTypes.listEventTypesCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
eventtypes = apiclient.listEventTypes(cmd)
return map(lambda e: EventTypes(e.__dict__), eventtypes)

6
tools/marvin/marvin/integration/lib/base/Events.py
View File

@ -28,12 +28,14 @@ class Events(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listEvents.listEventsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
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]
cmd.id = self.id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
events = apiclient.deleteEvents(cmd)
return events

6
tools/marvin/marvin/integration/lib/base/FirewallRule.py
View File

@ -38,13 +38,15 @@ class FirewallRule(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listFirewallRules.listFirewallRulesCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
firewallrule = apiclient.listFirewallRules(cmd)
return map(lambda e: FirewallRule(e.__dict__), firewallrule)
def delete(self, apiclient, id, **kwargs):
cmd = deleteFirewallRule.deleteFirewallRuleCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
firewallrule = apiclient.deleteFirewallRule(cmd)
return firewallrule

34
tools/marvin/marvin/integration/lib/base/FromGlobalLoadBalancerRule.py Normal file
View File

@ -0,0 +1,34 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
from marvin.integration.lib.base import CloudStackEntity
from marvin.cloudstackAPI import removeFromGlobalLoadBalancerRule
class FromGlobalLoadBalancerRule(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def remove(self, apiclient, loadbalancerrulelist, id, **kwargs):
cmd = removeFromGlobalLoadBalancerRule.removeFromGlobalLoadBalancerRuleCmd()
cmd.id = self.id
cmd.id = id
cmd.loadbalancerrulelist = loadbalancerrulelist
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
fromgloballoadbalancerrule = apiclient.removeFromGlobalLoadBalancerRule(cmd)
return fromgloballoadbalancerrule

8
tools/marvin/marvin/integration/lib/base/FromLoadBalancerRule.py
View File

@ -20,17 +20,15 @@ from marvin.cloudstackAPI import removeFromLoadBalancerRule
class FromLoadBalancerRule(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def __init__(self, items):
self.__dict__.update(items)
def remove(self, apiclient, id, virtualmachineids, **kwargs):
cmd = removeFromLoadBalancerRule.removeFromLoadBalancerRuleCmd()
cmd.id = self.id
cmd.id = id
cmd.virtualmachineids = virtualmachineids
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
fromloadbalancerrule = apiclient.removeFromLoadBalancerRule(cmd)
return fromloadbalancerrule

62
tools/marvin/marvin/integration/lib/base/GlobalLoadBalancerRule.py Normal file
View File

@ -0,0 +1,62 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
from marvin.integration.lib.base import CloudStackEntity
from marvin.cloudstackAPI import createGlobalLoadBalancerRule
from marvin.cloudstackAPI import listGlobalLoadBalancerRules
from marvin.cloudstackAPI import updateGlobalLoadBalancerRule
from marvin.cloudstackAPI import deleteGlobalLoadBalancerRule
class GlobalLoadBalancerRule(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
@classmethod
def create(cls, apiclient, GlobalLoadBalancerRuleFactory, **kwargs):
cmd = createGlobalLoadBalancerRule.createGlobalLoadBalancerRuleCmd()
[setattr(cmd, factoryKey, factoryValue) for factoryKey, factoryValue in GlobalLoadBalancerRuleFactory.__dict__.iteritems()]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
globalloadbalancerrule = apiclient.createGlobalLoadBalancerRule(cmd)
return GlobalLoadBalancerRule(globalloadbalancerrule.__dict__)
@classmethod
def list(self, apiclient, **kwargs):
cmd = listGlobalLoadBalancerRules.listGlobalLoadBalancerRulesCmd()
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
globalloadbalancerrule = apiclient.listGlobalLoadBalancerRules(cmd)
return map(lambda e: GlobalLoadBalancerRule(e.__dict__), globalloadbalancerrule)
def update(self, apiclient, id, **kwargs):
cmd = updateGlobalLoadBalancerRule.updateGlobalLoadBalancerRuleCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
globalloadbalancerrule = apiclient.updateGlobalLoadBalancerRule(cmd)
return globalloadbalancerrule
def delete(self, apiclient, id, **kwargs):
cmd = deleteGlobalLoadBalancerRule.deleteGlobalLoadBalancerRuleCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
globalloadbalancerrule = apiclient.deleteGlobalLoadBalancerRule(cmd)
return globalloadbalancerrule

18
tools/marvin/marvin/integration/lib/base/Host.py
View File

@ -30,40 +30,48 @@ class Host(CloudStackEntity.CloudStackEntity):
def add(self, apiclient, username, podid, url, hypervisor, zoneid, password, **kwargs):
cmd = addHost.addHostCmd()
cmd.id = self.id
cmd.hypervisor = hypervisor
cmd.password = password
cmd.podid = podid
cmd.url = url
cmd.username = username
cmd.zoneid = zoneid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
host = apiclient.addHost(cmd)
return host
@classmethod
def list(self, apiclient, **kwargs):
cmd = listHosts.listHostsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
host = apiclient.listHosts(cmd)
return map(lambda e: Host(e.__dict__), host)
def update(self, apiclient, id, **kwargs):
cmd = updateHost.updateHostCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
host = apiclient.updateHost(cmd)
return host
def reconnect(self, apiclient, id, **kwargs):
cmd = reconnectHost.reconnectHostCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
host = apiclient.reconnectHost(cmd)
return host
def delete(self, apiclient, id, **kwargs):
cmd = deleteHost.deleteHostCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
host = apiclient.deleteHost(cmd)
return host

8
tools/marvin/marvin/integration/lib/base/HostForMaintenance.py
View File

@ -20,16 +20,14 @@ from marvin.cloudstackAPI import prepareHostForMaintenance
class HostForMaintenance(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def __init__(self, items):
self.__dict__.update(items)
def prepare(self, apiclient, id, **kwargs):
cmd = prepareHostForMaintenance.prepareHostForMaintenanceCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
hostformaintenance = apiclient.prepareHostForMaintenance(cmd)
return hostformaintenance

8
tools/marvin/marvin/integration/lib/base/HostMaintenance.py
View File

@ -20,16 +20,14 @@ from marvin.cloudstackAPI import cancelHostMaintenance
class HostMaintenance(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def __init__(self, items):
self.__dict__.update(items)
def cancel(self, apiclient, id, **kwargs):
cmd = cancelHostMaintenance.cancelHostMaintenanceCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
hostmaintenance = apiclient.cancelHostMaintenance(cmd)
return hostmaintenance

8
tools/marvin/marvin/integration/lib/base/HostPassword.py
View File

@ -20,17 +20,15 @@ from marvin.cloudstackAPI import updateHostPassword
class HostPassword(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def __init__(self, items):
self.__dict__.update(items)
def update(self, apiclient, username, password, **kwargs):
cmd = updateHostPassword.updateHostPasswordCmd()
cmd.id = self.id
cmd.password = password
cmd.username = username
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
hostpassword = apiclient.updateHostPassword(cmd)
return hostpassword

6
tools/marvin/marvin/integration/lib/base/HypervisorCapabilities.py
View File

@ -28,12 +28,14 @@ class HypervisorCapabilities(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listHypervisorCapabilities.listHypervisorCapabilitiesCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
hypervisorcapabilities = apiclient.listHypervisorCapabilities(cmd)
return map(lambda e: HypervisorCapabilities(e.__dict__), hypervisorcapabilities)
def update(self, apiclient, **kwargs):
cmd = updateHypervisorCapabilities.updateHypervisorCapabilitiesCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
cmd.id = self.id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
hypervisorcapabilities = apiclient.updateHypervisorCapabilities(cmd)
return hypervisorcapabilities

2
tools/marvin/marvin/integration/lib/base/Hypervisors.py
View File

@ -27,6 +27,6 @@ class Hypervisors(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listHypervisors.listHypervisorsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
hypervisors = apiclient.listHypervisors(cmd)
return map(lambda e: Hypervisors(e.__dict__), hypervisors)

10
tools/marvin/marvin/integration/lib/base/InstanceGroup.py
View File

@ -39,20 +39,24 @@ class InstanceGroup(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listInstanceGroups.listInstanceGroupsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
instancegroup = apiclient.listInstanceGroups(cmd)
return map(lambda e: InstanceGroup(e.__dict__), instancegroup)
def update(self, apiclient, id, **kwargs):
cmd = updateInstanceGroup.updateInstanceGroupCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
instancegroup = apiclient.updateInstanceGroup(cmd)
return instancegroup
def delete(self, apiclient, id, **kwargs):
cmd = deleteInstanceGroup.deleteInstanceGroupCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
instancegroup = apiclient.deleteInstanceGroup(cmd)
return instancegroup

12
tools/marvin/marvin/integration/lib/base/IpAddress.py
View File

@ -21,22 +21,22 @@ from marvin.cloudstackAPI import associateIpAddress
class IpAddress(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def __init__(self, items):
self.__dict__.update(items)
def disassociate(self, apiclient, id, **kwargs):
cmd = disassociateIpAddress.disassociateIpAddressCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
ipaddress = apiclient.disassociateIpAddress(cmd)
return ipaddress
def associate(self, apiclient, **kwargs):
cmd = associateIpAddress.associateIpAddressCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
cmd.id = self.id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
ipaddress = apiclient.associateIpAddress(cmd)
return ipaddress

6
tools/marvin/marvin/integration/lib/base/IpForwardingRule.py
View File

@ -38,13 +38,15 @@ class IpForwardingRule(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listIpForwardingRules.listIpForwardingRulesCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
ipforwardingrule = apiclient.listIpForwardingRules(cmd)
return map(lambda e: IpForwardingRule(e.__dict__), ipforwardingrule)
def delete(self, apiclient, id, **kwargs):
cmd = deleteIpForwardingRule.deleteIpForwardingRuleCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
ipforwardingrule = apiclient.deleteIpForwardingRule(cmd)
return ipforwardingrule

4
tools/marvin/marvin/integration/lib/base/IpFromNic.py
View File

@ -26,6 +26,8 @@ class IpFromNic(CloudStackEntity.CloudStackEntity):
def remove(self, apiclient, id, **kwargs):
cmd = removeIpFromNic.removeIpFromNicCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
ipfromnic = apiclient.removeIpFromNic(cmd)
return ipfromnic

4
tools/marvin/marvin/integration/lib/base/IpToNic.py
View File

@ -26,6 +26,8 @@ class IpToNic(CloudStackEntity.CloudStackEntity):
def add(self, apiclient, nicid, **kwargs):
cmd = addIpToNic.addIpToNicCmd()
cmd.id = self.id
cmd.nicid = nicid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
iptonic = apiclient.addIpToNic(cmd)
return iptonic

30
tools/marvin/marvin/integration/lib/base/Iso.py
View File

@ -33,63 +33,77 @@ class Iso(CloudStackEntity.CloudStackEntity):
def copy(self, apiclient, sourcezoneid, id, destzoneid, **kwargs):
cmd = copyIso.copyIsoCmd()
cmd.id = self.id
cmd.id = id
cmd.destzoneid = destzoneid
cmd.sourcezoneid = sourcezoneid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
iso = apiclient.copyIso(cmd)
return iso
def register(self, apiclient, url, displaytext, name, zoneid, **kwargs):
cmd = registerIso.registerIsoCmd()
cmd.id = self.id
cmd.displaytext = displaytext
cmd.name = name
cmd.url = url
cmd.zoneid = zoneid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
iso = apiclient.registerIso(cmd)
return iso
@classmethod
def list(self, apiclient, **kwargs):
cmd = listIsos.listIsosCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
iso = apiclient.listIsos(cmd)
return map(lambda e: Iso(e.__dict__), iso)
def update(self, apiclient, id, **kwargs):
cmd = updateIso.updateIsoCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
iso = apiclient.updateIso(cmd)
return iso
def attach(self, apiclient, id, virtualmachineid, **kwargs):
cmd = attachIso.attachIsoCmd()
cmd.id = self.id
cmd.id = id
cmd.virtualmachineid = virtualmachineid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
iso = apiclient.attachIso(cmd)
return iso
def detach(self, apiclient, virtualmachineid, **kwargs):
cmd = detachIso.detachIsoCmd()
cmd.id = self.id
cmd.virtualmachineid = virtualmachineid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
iso = apiclient.detachIso(cmd)
return iso
def extract(self, apiclient, id, mode, **kwargs):
cmd = extractIso.extractIsoCmd()
cmd.id = self.id
cmd.id = id
cmd.mode = mode
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
iso = apiclient.extractIso(cmd)
return iso
def delete(self, apiclient, id, **kwargs):
cmd = deleteIso.deleteIsoCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
iso = apiclient.deleteIso(cmd)
return iso

6
tools/marvin/marvin/integration/lib/base/IsoPermissions.py
View File

@ -29,13 +29,15 @@ class IsoPermissions(CloudStackEntity.CloudStackEntity):
def list(self, apiclient, id, **kwargs):
cmd = listIsoPermissions.listIsoPermissionsCmd()
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
isopermissions = apiclient.listIsoPermissions(cmd)
return map(lambda e: IsoPermissions(e.__dict__), isopermissions)
def update(self, apiclient, id, **kwargs):
cmd = updateIsoPermissions.updateIsoPermissionsCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
isopermissions = apiclient.updateIsoPermissions(cmd)
return isopermissions

33
tools/marvin/marvin/integration/lib/base/LBHealthCheckPolicies.py Normal file
View File

@ -0,0 +1,33 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
from marvin.integration.lib.base import CloudStackEntity
from marvin.cloudstackAPI import listLBHealthCheckPolicies
class LBHealthCheckPolicies(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
@classmethod
def list(self, apiclient, lbruleid, **kwargs):
cmd = listLBHealthCheckPolicies.listLBHealthCheckPoliciesCmd()
cmd.lbruleid = lbruleid
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
lbhealthcheckpolicies = apiclient.listLBHealthCheckPolicies(cmd)
return map(lambda e: LBHealthCheckPolicies(e.__dict__), lbhealthcheckpolicies)

43
tools/marvin/marvin/integration/lib/base/LBHealthCheckPolicy.py Normal file
View File

@ -0,0 +1,43 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
from marvin.integration.lib.base import CloudStackEntity
from marvin.cloudstackAPI import createLBHealthCheckPolicy
from marvin.cloudstackAPI import deleteLBHealthCheckPolicy
class LBHealthCheckPolicy(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
@classmethod
def create(cls, apiclient, LBHealthCheckPolicyFactory, **kwargs):
cmd = createLBHealthCheckPolicy.createLBHealthCheckPolicyCmd()
[setattr(cmd, factoryKey, factoryValue) for factoryKey, factoryValue in LBHealthCheckPolicyFactory.__dict__.iteritems()]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
lbhealthcheckpolicy = apiclient.createLBHealthCheckPolicy(cmd)
return LBHealthCheckPolicy(lbhealthcheckpolicy.__dict__)
def delete(self, apiclient, id, **kwargs):
cmd = deleteLBHealthCheckPolicy.deleteLBHealthCheckPolicyCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
lbhealthcheckpolicy = apiclient.deleteLBHealthCheckPolicy(cmd)
return lbhealthcheckpolicy

2
tools/marvin/marvin/integration/lib/base/LBStickinessPolicies.py
View File

@ -28,6 +28,6 @@ class LBStickinessPolicies(CloudStackEntity.CloudStackEntity):
def list(self, apiclient, lbruleid, **kwargs):
cmd = listLBStickinessPolicies.listLBStickinessPoliciesCmd()
cmd.lbruleid = lbruleid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
lbstickinesspolicies = apiclient.listLBStickinessPolicies(cmd)
return map(lambda e: LBStickinessPolicies(e.__dict__), lbstickinesspolicies)

4
tools/marvin/marvin/integration/lib/base/LBStickinessPolicy.py
View File

@ -36,6 +36,8 @@ class LBStickinessPolicy(CloudStackEntity.CloudStackEntity):
def delete(self, apiclient, id, **kwargs):
cmd = deleteLBStickinessPolicy.deleteLBStickinessPolicyCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
lbstickinesspolicy = apiclient.deleteLBStickinessPolicy(cmd)
return lbstickinesspolicy

10
tools/marvin/marvin/integration/lib/base/LoadBalancerRule.py
View File

@ -39,20 +39,24 @@ class LoadBalancerRule(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listLoadBalancerRules.listLoadBalancerRulesCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
loadbalancerrule = apiclient.listLoadBalancerRules(cmd)
return map(lambda e: LoadBalancerRule(e.__dict__), loadbalancerrule)
def update(self, apiclient, id, **kwargs):
cmd = updateLoadBalancerRule.updateLoadBalancerRuleCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
loadbalancerrule = apiclient.updateLoadBalancerRule(cmd)
return loadbalancerrule
def delete(self, apiclient, id, **kwargs):
cmd = deleteLoadBalancerRule.deleteLoadBalancerRuleCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
loadbalancerrule = apiclient.deleteLoadBalancerRule(cmd)
return loadbalancerrule

2
tools/marvin/marvin/integration/lib/base/LoadBalancerRuleInstances.py
View File

@ -28,6 +28,6 @@ class LoadBalancerRuleInstances(CloudStackEntity.CloudStackEntity):
def list(self, apiclient, id, **kwargs):
cmd = listLoadBalancerRuleInstances.listLoadBalancerRuleInstancesCmd()
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
loadbalancerruleinstances = apiclient.listLoadBalancerRuleInstances(cmd)
return map(lambda e: LoadBalancerRuleInstances(e.__dict__), loadbalancerruleinstances)

14
tools/marvin/marvin/integration/lib/base/Network.py
View File

@ -40,27 +40,33 @@ class Network(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listNetworks.listNetworksCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
network = apiclient.listNetworks(cmd)
return map(lambda e: Network(e.__dict__), network)
def update(self, apiclient, id, **kwargs):
cmd = updateNetwork.updateNetworkCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
network = apiclient.updateNetwork(cmd)
return network
def restart(self, apiclient, id, **kwargs):
cmd = restartNetwork.restartNetworkCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
network = apiclient.restartNetwork(cmd)
return network
def delete(self, apiclient, id, **kwargs):
cmd = deleteNetwork.deleteNetworkCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
network = apiclient.deleteNetwork(cmd)
return network

6
tools/marvin/marvin/integration/lib/base/NetworkACL.py
View File

@ -38,13 +38,15 @@ class NetworkACL(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listNetworkACLs.listNetworkACLsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
networkacl = apiclient.listNetworkACLs(cmd)
return map(lambda e: NetworkACL(e.__dict__), networkacl)
def delete(self, apiclient, id, **kwargs):
cmd = deleteNetworkACL.deleteNetworkACLCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
networkacl = apiclient.deleteNetworkACL(cmd)
return networkacl

10
tools/marvin/marvin/integration/lib/base/NetworkDevice.py
View File

@ -28,20 +28,24 @@ class NetworkDevice(CloudStackEntity.CloudStackEntity):
def add(self, apiclient, **kwargs):
cmd = addNetworkDevice.addNetworkDeviceCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
cmd.id = self.id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
networkdevice = apiclient.addNetworkDevice(cmd)
return networkdevice
@classmethod
def list(self, apiclient, **kwargs):
cmd = listNetworkDevice.listNetworkDeviceCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
networkdevice = apiclient.listNetworkDevice(cmd)
return map(lambda e: NetworkDevice(e.__dict__), networkdevice)
def delete(self, apiclient, id, **kwargs):
cmd = deleteNetworkDevice.deleteNetworkDeviceCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
networkdevice = apiclient.deleteNetworkDevice(cmd)
return networkdevice

10
tools/marvin/marvin/integration/lib/base/NetworkOffering.py
View File

@ -39,19 +39,23 @@ class NetworkOffering(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listNetworkOfferings.listNetworkOfferingsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
networkoffering = apiclient.listNetworkOfferings(cmd)
return map(lambda e: NetworkOffering(e.__dict__), networkoffering)
def update(self, apiclient, **kwargs):
cmd = updateNetworkOffering.updateNetworkOfferingCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
cmd.id = self.id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
networkoffering = apiclient.updateNetworkOffering(cmd)
return networkoffering
def delete(self, apiclient, id, **kwargs):
cmd = deleteNetworkOffering.deleteNetworkOfferingCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
networkoffering = apiclient.deleteNetworkOffering(cmd)
return networkoffering

14
tools/marvin/marvin/integration/lib/base/NetworkServiceProvider.py
View File

@ -29,29 +29,35 @@ class NetworkServiceProvider(CloudStackEntity.CloudStackEntity):
def add(self, apiclient, physicalnetworkid, name, **kwargs):
cmd = addNetworkServiceProvider.addNetworkServiceProviderCmd()
cmd.id = self.id
cmd.name = name
cmd.physicalnetworkid = physicalnetworkid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
networkserviceprovider = apiclient.addNetworkServiceProvider(cmd)
return networkserviceprovider
@classmethod
def list(self, apiclient, **kwargs):
cmd = listNetworkServiceProviders.listNetworkServiceProvidersCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
networkserviceprovider = apiclient.listNetworkServiceProviders(cmd)
return map(lambda e: NetworkServiceProvider(e.__dict__), networkserviceprovider)
def update(self, apiclient, id, **kwargs):
cmd = updateNetworkServiceProvider.updateNetworkServiceProviderCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
networkserviceprovider = apiclient.updateNetworkServiceProvider(cmd)
return networkserviceprovider
def delete(self, apiclient, id, **kwargs):
cmd = deleteNetworkServiceProvider.deleteNetworkServiceProviderCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
networkserviceprovider = apiclient.deleteNetworkServiceProvider(cmd)
return networkserviceprovider

4
tools/marvin/marvin/integration/lib/base/NicFromVirtualMachine.py
View File

@ -26,7 +26,9 @@ class NicFromVirtualMachine(CloudStackEntity.CloudStackEntity):
def remove(self, apiclient, nicid, virtualmachineid, **kwargs):
cmd = removeNicFromVirtualMachine.removeNicFromVirtualMachineCmd()
cmd.id = self.id
cmd.nicid = nicid
cmd.virtualmachineid = virtualmachineid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
nicfromvirtualmachine = apiclient.removeNicFromVirtualMachine(cmd)
return nicfromvirtualmachine

4
tools/marvin/marvin/integration/lib/base/NicToVirtualMachine.py
View File

@ -26,7 +26,9 @@ class NicToVirtualMachine(CloudStackEntity.CloudStackEntity):
def add(self, apiclient, networkid, virtualmachineid, **kwargs):
cmd = addNicToVirtualMachine.addNicToVirtualMachineCmd()
cmd.id = self.id
cmd.networkid = networkid
cmd.virtualmachineid = virtualmachineid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
nictovirtualmachine = apiclient.addNicToVirtualMachine(cmd)
return nictovirtualmachine

10
tools/marvin/marvin/integration/lib/base/NiciraNvpDevice.py
View File

@ -28,25 +28,29 @@ class NiciraNvpDevice(CloudStackEntity.CloudStackEntity):
def add(self, apiclient, username, physicalnetworkid, password, hostname, transportzoneuuid, **kwargs):
cmd = addNiciraNvpDevice.addNiciraNvpDeviceCmd()
cmd.id = self.id
cmd.hostname = hostname
cmd.password = password
cmd.physicalnetworkid = physicalnetworkid
cmd.transportzoneuuid = transportzoneuuid
cmd.username = username
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
niciranvpdevice = apiclient.addNiciraNvpDevice(cmd)
return niciranvpdevice
@classmethod
def list(self, apiclient, **kwargs):
cmd = listNiciraNvpDevices.listNiciraNvpDevicesCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
niciranvpdevice = apiclient.listNiciraNvpDevices(cmd)
return map(lambda e: NiciraNvpDevice(e.__dict__), niciranvpdevice)
def delete(self, apiclient, nvpdeviceid, **kwargs):
cmd = deleteNiciraNvpDevice.deleteNiciraNvpDeviceCmd()
cmd.id = self.id
cmd.nvpdeviceid = nvpdeviceid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
niciranvpdevice = apiclient.deleteNiciraNvpDevice(cmd)
return niciranvpdevice

2
tools/marvin/marvin/integration/lib/base/NiciraNvpDeviceNetworks.py
View File

@ -28,6 +28,6 @@ class NiciraNvpDeviceNetworks(CloudStackEntity.CloudStackEntity):
def list(self, apiclient, nvpdeviceid, **kwargs):
cmd = listNiciraNvpDeviceNetworks.listNiciraNvpDeviceNetworksCmd()
cmd.nvpdeviceid = nvpdeviceid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
niciranvpdevicenetworks = apiclient.listNiciraNvpDeviceNetworks(cmd)
return map(lambda e: NiciraNvpDeviceNetworks(e.__dict__), niciranvpdevicenetworks)

2
tools/marvin/marvin/integration/lib/base/Nics.py
View File

@ -28,6 +28,6 @@ class Nics(CloudStackEntity.CloudStackEntity):
def list(self, apiclient, virtualmachineid, **kwargs):
cmd = listNics.listNicsCmd()
cmd.virtualmachineid = virtualmachineid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
nics = apiclient.listNics(cmd)
return map(lambda e: Nics(e.__dict__), nics)

2
tools/marvin/marvin/integration/lib/base/OsCategories.py
View File

@ -27,6 +27,6 @@ class OsCategories(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listOsCategories.listOsCategoriesCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
oscategories = apiclient.listOsCategories(cmd)
return map(lambda e: OsCategories(e.__dict__), oscategories)

2
tools/marvin/marvin/integration/lib/base/OsTypes.py
View File

@ -27,6 +27,6 @@ class OsTypes(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listOsTypes.listOsTypesCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
ostypes = apiclient.listOsTypes(cmd)
return map(lambda e: OsTypes(e.__dict__), ostypes)

8
tools/marvin/marvin/integration/lib/base/PasswordForVirtualMachine.py
View File

@ -20,16 +20,14 @@ from marvin.cloudstackAPI import resetPasswordForVirtualMachine
class PasswordForVirtualMachine(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def __init__(self, items):
self.__dict__.update(items)
def reset(self, apiclient, id, **kwargs):
cmd = resetPasswordForVirtualMachine.resetPasswordForVirtualMachineCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
passwordforvirtualmachine = apiclient.resetPasswordForVirtualMachine(cmd)
return passwordforvirtualmachine

10
tools/marvin/marvin/integration/lib/base/PhysicalNetwork.py
View File

@ -39,20 +39,24 @@ class PhysicalNetwork(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listPhysicalNetworks.listPhysicalNetworksCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
physicalnetwork = apiclient.listPhysicalNetworks(cmd)
return map(lambda e: PhysicalNetwork(e.__dict__), physicalnetwork)
def update(self, apiclient, id, **kwargs):
cmd = updatePhysicalNetwork.updatePhysicalNetworkCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
physicalnetwork = apiclient.updatePhysicalNetwork(cmd)
return physicalnetwork
def delete(self, apiclient, id, **kwargs):
cmd = deletePhysicalNetwork.deletePhysicalNetworkCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
physicalnetwork = apiclient.deletePhysicalNetwork(cmd)
return physicalnetwork

10
tools/marvin/marvin/integration/lib/base/Pod.py
View File

@ -39,20 +39,24 @@ class Pod(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listPods.listPodsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
pod = apiclient.listPods(cmd)
return map(lambda e: Pod(e.__dict__), pod)
def update(self, apiclient, id, **kwargs):
cmd = updatePod.updatePodCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
pod = apiclient.updatePod(cmd)
return pod
def delete(self, apiclient, id, **kwargs):
cmd = deletePod.deletePodCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
pod = apiclient.deletePod(cmd)
return pod

10
tools/marvin/marvin/integration/lib/base/PortForwardingRule.py
View File

@ -39,23 +39,27 @@ class PortForwardingRule(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listPortForwardingRules.listPortForwardingRulesCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
portforwardingrule = apiclient.listPortForwardingRules(cmd)
return map(lambda e: PortForwardingRule(e.__dict__), portforwardingrule)
def update(self, apiclient, publicport, protocol, ipaddressid, privateport, **kwargs):
cmd = updatePortForwardingRule.updatePortForwardingRuleCmd()
cmd.id = self.id
cmd.ipaddressid = ipaddressid
cmd.privateport = privateport
cmd.protocol = protocol
cmd.publicport = publicport
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
portforwardingrule = apiclient.updatePortForwardingRule(cmd)
return portforwardingrule
def delete(self, apiclient, id, **kwargs):
cmd = deletePortForwardingRule.deletePortForwardingRuleCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
portforwardingrule = apiclient.deletePortForwardingRule(cmd)
return portforwardingrule

6
tools/marvin/marvin/integration/lib/base/PrivateGateway.py
View File

@ -38,13 +38,15 @@ class PrivateGateway(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listPrivateGateways.listPrivateGatewaysCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
privategateway = apiclient.listPrivateGateways(cmd)
return map(lambda e: PrivateGateway(e.__dict__), privategateway)
def delete(self, apiclient, id, **kwargs):
cmd = deletePrivateGateway.deletePrivateGatewayCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
privategateway = apiclient.deletePrivateGateway(cmd)
return privategateway

18
tools/marvin/marvin/integration/lib/base/Project.py
View File

@ -31,9 +31,11 @@ class Project(CloudStackEntity.CloudStackEntity):
def suspend(self, apiclient, id, **kwargs):
cmd = suspendProject.suspendProjectCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
project = apiclient.suspendProject(cmd)
return project
@classmethod
@ -48,27 +50,33 @@ class Project(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listProjects.listProjectsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
project = apiclient.listProjects(cmd)
return map(lambda e: Project(e.__dict__), project)
def update(self, apiclient, id, **kwargs):
cmd = updateProject.updateProjectCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
project = apiclient.updateProject(cmd)
return project
def activate(self, apiclient, id, **kwargs):
cmd = activateProject.activateProjectCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
project = apiclient.activateProject(cmd)
return project
def delete(self, apiclient, id, **kwargs):
cmd = deleteProject.deleteProjectCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
project = apiclient.deleteProject(cmd)
return project

2
tools/marvin/marvin/integration/lib/base/ProjectAccounts.py
View File

@ -28,6 +28,6 @@ class ProjectAccounts(CloudStackEntity.CloudStackEntity):
def list(self, apiclient, projectid, **kwargs):
cmd = listProjectAccounts.listProjectAccountsCmd()
cmd.projectid = projectid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
projectaccounts = apiclient.listProjectAccounts(cmd)
return map(lambda e: ProjectAccounts(e.__dict__), projectaccounts)

10
tools/marvin/marvin/integration/lib/base/ProjectInvitation.py
View File

@ -29,20 +29,24 @@ class ProjectInvitation(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listProjectInvitations.listProjectInvitationsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
projectinvitation = apiclient.listProjectInvitations(cmd)
return map(lambda e: ProjectInvitation(e.__dict__), projectinvitation)
def update(self, apiclient, projectid, **kwargs):
cmd = updateProjectInvitation.updateProjectInvitationCmd()
cmd.id = self.id
cmd.projectid = projectid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
projectinvitation = apiclient.updateProjectInvitation(cmd)
return projectinvitation
def delete(self, apiclient, id, **kwargs):
cmd = deleteProjectInvitation.deleteProjectInvitationCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
projectinvitation = apiclient.deleteProjectInvitation(cmd)
return projectinvitation

2
tools/marvin/marvin/integration/lib/base/PublicIpAddresses.py
View File

@ -27,6 +27,6 @@ class PublicIpAddresses(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listPublicIpAddresses.listPublicIpAddressesCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
publicipaddresses = apiclient.listPublicIpAddresses(cmd)
return map(lambda e: PublicIpAddresses(e.__dict__), publicipaddresses)

14
tools/marvin/marvin/integration/lib/base/Region.py
View File

@ -29,30 +29,36 @@ class Region(CloudStackEntity.CloudStackEntity):
def add(self, apiclient, endpoint, id, name, **kwargs):
cmd = addRegion.addRegionCmd()
cmd.id = self.id
cmd.id = id
cmd.endpoint = endpoint
cmd.name = name
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
region = apiclient.addRegion(cmd)
return region
@classmethod
def list(self, apiclient, **kwargs):
cmd = listRegions.listRegionsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
region = apiclient.listRegions(cmd)
return map(lambda e: Region(e.__dict__), region)
def update(self, apiclient, id, **kwargs):
cmd = updateRegion.updateRegionCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
region = apiclient.updateRegion(cmd)
return region
def remove(self, apiclient, id, **kwargs):
cmd = removeRegion.removeRegionCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
region = apiclient.removeRegion(cmd)
return region

6
tools/marvin/marvin/integration/lib/base/RemoteAccessVpn.py
View File

@ -39,13 +39,15 @@ class RemoteAccessVpn(CloudStackEntity.CloudStackEntity):
def list(self, apiclient, publicipid, **kwargs):
cmd = listRemoteAccessVpns.listRemoteAccessVpnsCmd()
cmd.publicipid = publicipid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
remoteaccessvpn = apiclient.listRemoteAccessVpns(cmd)
return map(lambda e: RemoteAccessVpn(e.__dict__), remoteaccessvpn)
def delete(self, apiclient, publicipid, **kwargs):
cmd = deleteRemoteAccessVpn.deleteRemoteAccessVpnCmd()
cmd.id = self.id
cmd.publicipid = publicipid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
remoteaccessvpn = apiclient.deleteRemoteAccessVpn(cmd)
return remoteaccessvpn

4
tools/marvin/marvin/integration/lib/base/Remove.py
View File

@ -26,5 +26,7 @@ class Remove(CloudStackEntity.CloudStackEntity):
def ldap(self, apiclient, **kwargs):
cmd = ldapRemove.ldapRemoveCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
cmd.id = self.id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
remove = apiclient.ldapRemove(cmd)
return remove

8
tools/marvin/marvin/integration/lib/base/ResourceCount.py
View File

@ -20,16 +20,14 @@ from marvin.cloudstackAPI import updateResourceCount
class ResourceCount(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def __init__(self, items):
self.__dict__.update(items)
def update(self, apiclient, domainid, **kwargs):
cmd = updateResourceCount.updateResourceCountCmd()
cmd.id = self.id
cmd.domainid = domainid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
resourcecount = apiclient.updateResourceCount(cmd)
return resourcecount

6
tools/marvin/marvin/integration/lib/base/ResourceLimit.py
View File

@ -28,13 +28,15 @@ class ResourceLimit(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listResourceLimits.listResourceLimitsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
resourcelimit = apiclient.listResourceLimits(cmd)
return map(lambda e: ResourceLimit(e.__dict__), resourcelimit)
def update(self, apiclient, resourcetype, **kwargs):
cmd = updateResourceLimit.updateResourceLimitCmd()
cmd.id = self.id
cmd.resourcetype = resourcetype
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
resourcelimit = apiclient.updateResourceLimit(cmd)
return resourcelimit

18
tools/marvin/marvin/integration/lib/base/Router.py
View File

@ -30,35 +30,43 @@ class Router(CloudStackEntity.CloudStackEntity):
def destroy(self, apiclient, id, **kwargs):
cmd = destroyRouter.destroyRouterCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
router = apiclient.destroyRouter(cmd)
return router
@classmethod
def list(self, apiclient, **kwargs):
cmd = listRouters.listRoutersCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
router = apiclient.listRouters(cmd)
return map(lambda e: Router(e.__dict__), router)
def stop(self, apiclient, id, **kwargs):
cmd = stopRouter.stopRouterCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
router = apiclient.stopRouter(cmd)
return router
def reboot(self, apiclient, id, **kwargs):
cmd = rebootRouter.rebootRouterCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
router = apiclient.rebootRouter(cmd)
return router
def start(self, apiclient, id, **kwargs):
cmd = startRouter.startRouterCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
router = apiclient.startRouter(cmd)
return router

6
tools/marvin/marvin/integration/lib/base/S3.py
View File

@ -27,16 +27,18 @@ class S3(CloudStackEntity.CloudStackEntity):
def add(self, apiclient, secretkey, accesskey, bucket, **kwargs):
cmd = addS3.addS3Cmd()
cmd.id = self.id
cmd.accesskey = accesskey
cmd.bucket = bucket
cmd.secretkey = secretkey
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
s3 = apiclient.addS3(cmd)
return s3
@classmethod
def list(self, apiclient, **kwargs):
cmd = listS3s.listS3sCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
s3 = apiclient.listS3s(cmd)
return map(lambda e: S3(e.__dict__), s3)

4
tools/marvin/marvin/integration/lib/base/SSHKeyForVirtualMachine.py
View File

@ -26,7 +26,9 @@ class SSHKeyForVirtualMachine(CloudStackEntity.CloudStackEntity):
def reset(self, apiclient, keypair, id, **kwargs):
cmd = resetSSHKeyForVirtualMachine.resetSSHKeyForVirtualMachineCmd()
cmd.id = self.id
cmd.id = id
cmd.keypair = keypair
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
sshkeyforvirtualmachine = apiclient.resetSSHKeyForVirtualMachine(cmd)
return sshkeyforvirtualmachine

10
tools/marvin/marvin/integration/lib/base/SSHKeyPair.py
View File

@ -38,22 +38,26 @@ class SSHKeyPair(CloudStackEntity.CloudStackEntity):
def register(self, apiclient, publickey, name, **kwargs):
cmd = registerSSHKeyPair.registerSSHKeyPairCmd()
cmd.id = self.id
cmd.name = name
cmd.publickey = publickey
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
sshkeypair = apiclient.registerSSHKeyPair(cmd)
return sshkeypair
@classmethod
def list(self, apiclient, **kwargs):
cmd = listSSHKeyPairs.listSSHKeyPairsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
sshkeypair = apiclient.listSSHKeyPairs(cmd)
return map(lambda e: SSHKeyPair(e.__dict__), sshkeypair)
def delete(self, apiclient, name, **kwargs):
cmd = deleteSSHKeyPair.deleteSSHKeyPairCmd()
cmd.id = self.id
cmd.name = name
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
sshkeypair = apiclient.deleteSSHKeyPair(cmd)
return sshkeypair

8
tools/marvin/marvin/integration/lib/base/SecondaryStorage.py
View File

@ -20,16 +20,14 @@ from marvin.cloudstackAPI import addSecondaryStorage
class SecondaryStorage(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def __init__(self, items):
self.__dict__.update(items)
def add(self, apiclient, url, **kwargs):
cmd = addSecondaryStorage.addSecondaryStorageCmd()
cmd.id = self.id
cmd.url = url
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
secondarystorage = apiclient.addSecondaryStorage(cmd)
return secondarystorage

6
tools/marvin/marvin/integration/lib/base/SecurityGroup.py
View File

@ -38,12 +38,14 @@ class SecurityGroup(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listSecurityGroups.listSecurityGroupsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
securitygroup = apiclient.listSecurityGroups(cmd)
return map(lambda e: SecurityGroup(e.__dict__), securitygroup)
def delete(self, apiclient, **kwargs):
cmd = deleteSecurityGroup.deleteSecurityGroupCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
cmd.id = self.id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
securitygroup = apiclient.deleteSecurityGroup(cmd)
return securitygroup

12
tools/marvin/marvin/integration/lib/base/SecurityGroupEgress.py
View File

@ -21,22 +21,22 @@ from marvin.cloudstackAPI import revokeSecurityGroupEgress
class SecurityGroupEgress(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def __init__(self, items):
self.__dict__.update(items)
def authorize(self, apiclient, **kwargs):
cmd = authorizeSecurityGroupEgress.authorizeSecurityGroupEgressCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
cmd.id = self.id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
securitygroupegress = apiclient.authorizeSecurityGroupEgress(cmd)
return securitygroupegress
def revoke(self, apiclient, id, **kwargs):
cmd = revokeSecurityGroupEgress.revokeSecurityGroupEgressCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
securitygroupegress = apiclient.revokeSecurityGroupEgress(cmd)
return securitygroupegress

12
tools/marvin/marvin/integration/lib/base/SecurityGroupIngress.py
View File

@ -21,22 +21,22 @@ from marvin.cloudstackAPI import revokeSecurityGroupIngress
class SecurityGroupIngress(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def __init__(self, items):
self.__dict__.update(items)
def authorize(self, apiclient, **kwargs):
cmd = authorizeSecurityGroupIngress.authorizeSecurityGroupIngressCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
cmd.id = self.id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
securitygroupingress = apiclient.authorizeSecurityGroupIngress(cmd)
return securitygroupingress
def revoke(self, apiclient, id, **kwargs):
cmd = revokeSecurityGroupIngress.revokeSecurityGroupIngressCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
securitygroupingress = apiclient.revokeSecurityGroupIngress(cmd)
return securitygroupingress

8
tools/marvin/marvin/integration/lib/base/ServiceForRouter.py
View File

@ -20,17 +20,15 @@ from marvin.cloudstackAPI import changeServiceForRouter
class ServiceForRouter(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def __init__(self, items):
self.__dict__.update(items)
def change(self, apiclient, id, serviceofferingid, **kwargs):
cmd = changeServiceForRouter.changeServiceForRouterCmd()
cmd.id = self.id
cmd.id = id
cmd.serviceofferingid = serviceofferingid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
serviceforrouter = apiclient.changeServiceForRouter(cmd)
return serviceforrouter

8
tools/marvin/marvin/integration/lib/base/ServiceForSystemVm.py
View File

@ -20,17 +20,15 @@ from marvin.cloudstackAPI import changeServiceForSystemVm
class ServiceForSystemVm(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def __init__(self, items):
self.__dict__.update(items)
def change(self, apiclient, id, serviceofferingid, **kwargs):
cmd = changeServiceForSystemVm.changeServiceForSystemVmCmd()
cmd.id = self.id
cmd.id = id
cmd.serviceofferingid = serviceofferingid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
serviceforsystemvm = apiclient.changeServiceForSystemVm(cmd)
return serviceforsystemvm

8
tools/marvin/marvin/integration/lib/base/ServiceForVirtualMachine.py
View File

@ -20,17 +20,15 @@ from marvin.cloudstackAPI import changeServiceForVirtualMachine
class ServiceForVirtualMachine(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def __init__(self, items):
self.__dict__.update(items)
def change(self, apiclient, id, serviceofferingid, **kwargs):
cmd = changeServiceForVirtualMachine.changeServiceForVirtualMachineCmd()
cmd.id = self.id
cmd.id = id
cmd.serviceofferingid = serviceofferingid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
serviceforvirtualmachine = apiclient.changeServiceForVirtualMachine(cmd)
return serviceforvirtualmachine

10
tools/marvin/marvin/integration/lib/base/ServiceOffering.py
View File

@ -39,20 +39,24 @@ class ServiceOffering(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listServiceOfferings.listServiceOfferingsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
serviceoffering = apiclient.listServiceOfferings(cmd)
return map(lambda e: ServiceOffering(e.__dict__), serviceoffering)
def update(self, apiclient, id, **kwargs):
cmd = updateServiceOffering.updateServiceOfferingCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
serviceoffering = apiclient.updateServiceOffering(cmd)
return serviceoffering
def delete(self, apiclient, id, **kwargs):
cmd = deleteServiceOffering.deleteServiceOfferingCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
serviceoffering = apiclient.deleteServiceOffering(cmd)
return serviceoffering

4
tools/marvin/marvin/integration/lib/base/Simulator.py
View File

@ -26,7 +26,9 @@ class Simulator(CloudStackEntity.CloudStackEntity):
def configure(self, apiclient, name, value, **kwargs):
cmd = configureSimulator.configureSimulatorCmd()
cmd.id = self.id
cmd.name = name
cmd.value = value
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
simulator = apiclient.configureSimulator(cmd)
return simulator

6
tools/marvin/marvin/integration/lib/base/Snapshot.py
View File

@ -38,13 +38,15 @@ class Snapshot(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listSnapshots.listSnapshotsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
snapshot = apiclient.listSnapshots(cmd)
return map(lambda e: Snapshot(e.__dict__), snapshot)
def delete(self, apiclient, id, **kwargs):
cmd = deleteSnapshot.deleteSnapshotCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
snapshot = apiclient.deleteSnapshot(cmd)
return snapshot

6
tools/marvin/marvin/integration/lib/base/SnapshotPolicies.py
View File

@ -29,12 +29,14 @@ class SnapshotPolicies(CloudStackEntity.CloudStackEntity):
def list(self, apiclient, volumeid, **kwargs):
cmd = listSnapshotPolicies.listSnapshotPoliciesCmd()
cmd.volumeid = volumeid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
snapshotpolicies = apiclient.listSnapshotPolicies(cmd)
return map(lambda e: SnapshotPolicies(e.__dict__), snapshotpolicies)
def delete(self, apiclient, **kwargs):
cmd = deleteSnapshotPolicies.deleteSnapshotPoliciesCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
cmd.id = self.id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
snapshotpolicies = apiclient.deleteSnapshotPolicies(cmd)
return snapshotpolicies

12
tools/marvin/marvin/integration/lib/base/StaticNat.py
View File

@ -21,24 +21,24 @@ from marvin.cloudstackAPI import disableStaticNat
class StaticNat(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def __init__(self, items):
self.__dict__.update(items)
def enable(self, apiclient, ipaddressid, virtualmachineid, **kwargs):
cmd = enableStaticNat.enableStaticNatCmd()
cmd.id = self.id
cmd.ipaddressid = ipaddressid
cmd.virtualmachineid = virtualmachineid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
staticnat = apiclient.enableStaticNat(cmd)
return staticnat
def disable(self, apiclient, ipaddressid, **kwargs):
cmd = disableStaticNat.disableStaticNatCmd()
cmd.id = self.id
cmd.ipaddressid = ipaddressid
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
staticnat = apiclient.disableStaticNat(cmd)
return staticnat

6
tools/marvin/marvin/integration/lib/base/StaticRoute.py
View File

@ -38,13 +38,15 @@ class StaticRoute(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listStaticRoutes.listStaticRoutesCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
staticroute = apiclient.listStaticRoutes(cmd)
return map(lambda e: StaticRoute(e.__dict__), staticroute)
def delete(self, apiclient, id, **kwargs):
cmd = deleteStaticRoute.deleteStaticRouteCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
staticroute = apiclient.deleteStaticRoute(cmd)
return staticroute

12
tools/marvin/marvin/integration/lib/base/StorageMaintenance.py
View File

@ -21,23 +21,23 @@ from marvin.cloudstackAPI import enableStorageMaintenance
class StorageMaintenance(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
def __init__(self, items):
self.__dict__.update(items)
def cancel(self, apiclient, id, **kwargs):
cmd = cancelStorageMaintenance.cancelStorageMaintenanceCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
storagemaintenance = apiclient.cancelStorageMaintenance(cmd)
return storagemaintenance
def enable(self, apiclient, id, **kwargs):
cmd = enableStorageMaintenance.enableStorageMaintenanceCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
storagemaintenance = apiclient.enableStorageMaintenance(cmd)
return storagemaintenance

10
tools/marvin/marvin/integration/lib/base/StorageNetworkIpRange.py
View File

@ -39,20 +39,24 @@ class StorageNetworkIpRange(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listStorageNetworkIpRange.listStorageNetworkIpRangeCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
storagenetworkiprange = apiclient.listStorageNetworkIpRange(cmd)
return map(lambda e: StorageNetworkIpRange(e.__dict__), storagenetworkiprange)
def update(self, apiclient, id, **kwargs):
cmd = updateStorageNetworkIpRange.updateStorageNetworkIpRangeCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
storagenetworkiprange = apiclient.updateStorageNetworkIpRange(cmd)
return storagenetworkiprange
def delete(self, apiclient, id, **kwargs):
cmd = deleteStorageNetworkIpRange.deleteStorageNetworkIpRangeCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
storagenetworkiprange = apiclient.deleteStorageNetworkIpRange(cmd)
return storagenetworkiprange

10
tools/marvin/marvin/integration/lib/base/StoragePool.py
View File

@ -39,20 +39,24 @@ class StoragePool(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, **kwargs):
cmd = listStoragePools.listStoragePoolsCmd()
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
storagepool = apiclient.listStoragePools(cmd)
return map(lambda e: StoragePool(e.__dict__), storagepool)
def update(self, apiclient, id, **kwargs):
cmd = updateStoragePool.updateStoragePoolCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
storagepool = apiclient.updateStoragePool(cmd)
return storagepool
def delete(self, apiclient, id, **kwargs):
cmd = deleteStoragePool.deleteStoragePoolCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.items]
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
storagepool = apiclient.deleteStoragePool(cmd)
return storagepool

33
tools/marvin/marvin/integration/lib/base/StorageProviders.py Normal file
View File

@ -0,0 +1,33 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
from marvin.integration.lib.base import CloudStackEntity
from marvin.cloudstackAPI import listStorageProviders
class StorageProviders(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
@classmethod
def list(self, apiclient, type, **kwargs):
cmd = listStorageProviders.listStorageProvidersCmd()
cmd.type = type
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
storageproviders = apiclient.listStorageProviders(cmd)
return map(lambda e: StorageProviders(e.__dict__), storageproviders)

Some files were not shown because too many files have changed in this diff Show More