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

marvin_refactor: remove redundant assignment 

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Prasanna Santhanam 2013-04-12 17:26:05 +05:30
parent d2b3c7f100
commit ea9019abd8
44 changed files with 83 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,10 +84,9 @@ class Account(CloudStackEntity.CloudStackEntity):
return account
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteAccount.deleteAccountCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
account = apiclient.deleteAccount(cmd)
return account

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

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

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

@ -29,10 +29,9 @@ class AutoScaleVmGroup(CloudStackEntity.CloudStackEntity):
self.__dict__.update(items)
def enable(self, apiclient, id, **kwargs):
def enable(self, apiclient, **kwargs):
cmd = enableAutoScaleVmGroup.enableAutoScaleVmGroupCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
autoscalevmgroup = apiclient.enableAutoScaleVmGroup(cmd)
return autoscalevmgroup
@ -55,28 +54,25 @@ class AutoScaleVmGroup(CloudStackEntity.CloudStackEntity):
return map(lambda e: AutoScaleVmGroup(e.__dict__), autoscalevmgroup)
def update(self, apiclient, id, **kwargs):
def update(self, apiclient, **kwargs):
cmd = updateAutoScaleVmGroup.updateAutoScaleVmGroupCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
autoscalevmgroup = apiclient.updateAutoScaleVmGroup(cmd)
return autoscalevmgroup
def disable(self, apiclient, id, **kwargs):
def disable(self, apiclient, **kwargs):
cmd = disableAutoScaleVmGroup.disableAutoScaleVmGroupCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
autoscalevmgroup = apiclient.disableAutoScaleVmGroup(cmd)
return autoscalevmgroup
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteAutoScaleVmGroup.deleteAutoScaleVmGroupCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
autoscalevmgroup = apiclient.deleteAutoScaleVmGroup(cmd)
return autoscalevmgroup

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

@ -44,19 +44,17 @@ class AutoScaleVmProfile(CloudStackEntity.CloudStackEntity):
return map(lambda e: AutoScaleVmProfile(e.__dict__), autoscalevmprofile)
def update(self, apiclient, id, **kwargs):
def update(self, apiclient, **kwargs):
cmd = updateAutoScaleVmProfile.updateAutoScaleVmProfileCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
autoscalevmprofile = apiclient.updateAutoScaleVmProfile(cmd)
return autoscalevmprofile
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteAutoScaleVmProfile.deleteAutoScaleVmProfileCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
autoscalevmprofile = apiclient.deleteAutoScaleVmProfile(cmd)
return autoscalevmprofile

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

@ -48,19 +48,17 @@ class Cluster(CloudStackEntity.CloudStackEntity):
return map(lambda e: Cluster(e.__dict__), cluster)
def update(self, apiclient, id, **kwargs):
def update(self, apiclient, **kwargs):
cmd = updateCluster.updateClusterCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
cluster = apiclient.updateCluster(cmd)
return cluster
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteCluster.deleteClusterCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
cluster = apiclient.deleteCluster(cmd)
return cluster

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

@ -43,10 +43,9 @@ class Condition(CloudStackEntity.CloudStackEntity):
return map(lambda e: Condition(e.__dict__), condition)
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteCondition.deleteConditionCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
condition = apiclient.deleteCondition(cmd)
return condition

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

@ -43,10 +43,9 @@ class Counter(CloudStackEntity.CloudStackEntity):
return map(lambda e: Counter(e.__dict__), counter)
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteCounter.deleteCounterCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
counter = apiclient.deleteCounter(cmd)
return counter

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

@ -44,19 +44,17 @@ class DiskOffering(CloudStackEntity.CloudStackEntity):
return map(lambda e: DiskOffering(e.__dict__), diskoffering)
def update(self, apiclient, id, **kwargs):
def update(self, apiclient, **kwargs):
cmd = updateDiskOffering.updateDiskOfferingCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
diskoffering = apiclient.updateDiskOffering(cmd)
return diskoffering
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteDiskOffering.deleteDiskOfferingCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
diskoffering = apiclient.deleteDiskOffering(cmd)
return diskoffering

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

@ -44,19 +44,17 @@ class Domain(CloudStackEntity.CloudStackEntity):
return map(lambda e: Domain(e.__dict__), domain)
def update(self, apiclient, id, **kwargs):
def update(self, apiclient, **kwargs):
cmd = updateDomain.updateDomainCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
domain = apiclient.updateDomain(cmd)
return domain
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteDomain.deleteDomainCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
domain = apiclient.deleteDomain(cmd)
return domain

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

@ -43,10 +43,9 @@ class EgressFirewallRule(CloudStackEntity.CloudStackEntity):
return map(lambda e: EgressFirewallRule(e.__dict__), egressfirewallrule)
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteEgressFirewallRule.deleteEgressFirewallRuleCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
egressfirewallrule = apiclient.deleteEgressFirewallRule(cmd)
return egressfirewallrule

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

@ -43,10 +43,9 @@ class FirewallRule(CloudStackEntity.CloudStackEntity):
return map(lambda e: FirewallRule(e.__dict__), firewallrule)
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteFirewallRule.deleteFirewallRuleCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
firewallrule = apiclient.deleteFirewallRule(cmd)
return firewallrule

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

@ -53,28 +53,25 @@ class Host(CloudStackEntity.CloudStackEntity):
return map(lambda e: Host(e.__dict__), host)
def update(self, apiclient, id, **kwargs):
def update(self, apiclient, **kwargs):
cmd = updateHost.updateHostCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
host = apiclient.updateHost(cmd)
return host
def reconnect(self, apiclient, id, **kwargs):
def reconnect(self, apiclient, **kwargs):
cmd = reconnectHost.reconnectHostCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
host = apiclient.reconnectHost(cmd)
return host
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteHost.deleteHostCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
host = apiclient.deleteHost(cmd)
return host

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

@ -44,19 +44,17 @@ class InstanceGroup(CloudStackEntity.CloudStackEntity):
return map(lambda e: InstanceGroup(e.__dict__), instancegroup)
def update(self, apiclient, id, **kwargs):
def update(self, apiclient, **kwargs):
cmd = updateInstanceGroup.updateInstanceGroupCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
instancegroup = apiclient.updateInstanceGroup(cmd)
return instancegroup
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteInstanceGroup.deleteInstanceGroupCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
instancegroup = apiclient.deleteInstanceGroup(cmd)
return instancegroup

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

@ -26,10 +26,9 @@ class IpAddress(CloudStackEntity.CloudStackEntity):
self.__dict__.update(items)
def disassociate(self, apiclient, id, **kwargs):
def disassociate(self, apiclient, **kwargs):
cmd = disassociateIpAddress.disassociateIpAddressCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
ipaddress = apiclient.disassociateIpAddress(cmd)
return ipaddress

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

@ -43,10 +43,9 @@ class IpForwardingRule(CloudStackEntity.CloudStackEntity):
return map(lambda e: IpForwardingRule(e.__dict__), ipforwardingrule)
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteIpForwardingRule.deleteIpForwardingRuleCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
ipforwardingrule = apiclient.deleteIpForwardingRule(cmd)
return ipforwardingrule

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

@ -31,10 +31,9 @@ class Iso(CloudStackEntity.CloudStackEntity):
self.__dict__.update(items)
def copy(self, apiclient, sourcezoneid, id, destzoneid, **kwargs):
def copy(self, apiclient, sourcezoneid, 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.iteritems()]
@ -62,19 +61,17 @@ class Iso(CloudStackEntity.CloudStackEntity):
return map(lambda e: Iso(e.__dict__), iso)
def update(self, apiclient, id, **kwargs):
def update(self, apiclient, **kwargs):
cmd = updateIso.updateIsoCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
iso = apiclient.updateIso(cmd)
return iso
def attach(self, apiclient, id, virtualmachineid, **kwargs):
def attach(self, apiclient, virtualmachineid, **kwargs):
cmd = attachIso.attachIsoCmd()
cmd.id = self.id
cmd.id = id
cmd.virtualmachineid = virtualmachineid
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
iso = apiclient.attachIso(cmd)
@ -90,20 +87,18 @@ class Iso(CloudStackEntity.CloudStackEntity):
return iso
def extract(self, apiclient, id, mode, **kwargs):
def extract(self, apiclient, mode, **kwargs):
cmd = extractIso.extractIsoCmd()
cmd.id = self.id
cmd.id = id
cmd.mode = mode
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
iso = apiclient.extractIso(cmd)
return iso
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteIso.deleteIsoCmd()
cmd.id = self.id
cmd.id = id
[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

@ -26,18 +26,16 @@ class IsoPermissions(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, id, **kwargs):
def list(self, apiclient, **kwargs):
cmd = listIsoPermissions.listIsoPermissionsCmd()
cmd.id = id
[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):
def update(self, apiclient, **kwargs):
cmd = updateIsoPermissions.updateIsoPermissionsCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
isopermissions = apiclient.updateIsoPermissions(cmd)
return isopermissions

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

@ -38,7 +38,7 @@ 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.iteritems()]
lbstickinesspolicy = apiclient.deleteLBStickinessPolicy(cmd)
return lbstickinesspolicy

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

@ -45,28 +45,25 @@ class Network(CloudStackEntity.CloudStackEntity):
return map(lambda e: Network(e.__dict__), network)
def update(self, apiclient, id, **kwargs):
def update(self, apiclient, **kwargs):
cmd = updateNetwork.updateNetworkCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
network = apiclient.updateNetwork(cmd)
return network
def restart(self, apiclient, id, **kwargs):
def restart(self, apiclient, **kwargs):
cmd = restartNetwork.restartNetworkCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
network = apiclient.restartNetwork(cmd)
return network
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteNetwork.deleteNetworkCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
network = apiclient.deleteNetwork(cmd)
return network

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

@ -43,10 +43,9 @@ class NetworkACL(CloudStackEntity.CloudStackEntity):
return map(lambda e: NetworkACL(e.__dict__), networkacl)
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteNetworkACL.deleteNetworkACLCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
networkacl = apiclient.deleteNetworkACL(cmd)
return networkacl

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

@ -42,10 +42,9 @@ class NetworkDevice(CloudStackEntity.CloudStackEntity):
return map(lambda e: NetworkDevice(e.__dict__), networkdevice)
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteNetworkDevice.deleteNetworkDeviceCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
networkdevice = apiclient.deleteNetworkDevice(cmd)
return networkdevice

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

@ -52,10 +52,9 @@ class NetworkOffering(CloudStackEntity.CloudStackEntity):
return networkoffering
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteNetworkOffering.deleteNetworkOfferingCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
networkoffering = apiclient.deleteNetworkOffering(cmd)
return networkoffering

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

@ -45,19 +45,17 @@ class NetworkServiceProvider(CloudStackEntity.CloudStackEntity):
return map(lambda e: NetworkServiceProvider(e.__dict__), networkserviceprovider)
def update(self, apiclient, id, **kwargs):
def update(self, apiclient, **kwargs):
cmd = updateNetworkServiceProvider.updateNetworkServiceProviderCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
networkserviceprovider = apiclient.updateNetworkServiceProvider(cmd)
return networkserviceprovider
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteNetworkServiceProvider.deleteNetworkServiceProviderCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
networkserviceprovider = apiclient.deleteNetworkServiceProvider(cmd)
return networkserviceprovider

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

@ -27,10 +27,9 @@ class Region(CloudStackEntity.CloudStackEntity):
self.__dict__.update(items)
def add(self, apiclient, endpoint, id, name, **kwargs):
def add(self, apiclient, endpoint, 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.iteritems()]
@ -46,19 +45,17 @@ class Region(CloudStackEntity.CloudStackEntity):
return map(lambda e: Region(e.__dict__), region)
def update(self, apiclient, id, **kwargs):
def update(self, apiclient, **kwargs):
cmd = updateRegion.updateRegionCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
region = apiclient.updateRegion(cmd)
return region
def remove(self, apiclient, id, **kwargs):
def remove(self, apiclient, **kwargs):
cmd = removeRegion.removeRegionCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
region = apiclient.removeRegion(cmd)
return region

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

@ -28,10 +28,9 @@ class Router(CloudStackEntity.CloudStackEntity):
self.__dict__.update(items)
def destroy(self, apiclient, id, **kwargs):
def destroy(self, apiclient, **kwargs):
cmd = destroyRouter.destroyRouterCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
router = apiclient.destroyRouter(cmd)
return router
@ -45,28 +44,25 @@ class Router(CloudStackEntity.CloudStackEntity):
return map(lambda e: Router(e.__dict__), router)
def stop(self, apiclient, id, **kwargs):
def stop(self, apiclient, **kwargs):
cmd = stopRouter.stopRouterCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
router = apiclient.stopRouter(cmd)
return router
def reboot(self, apiclient, id, **kwargs):
def reboot(self, apiclient, **kwargs):
cmd = rebootRouter.rebootRouterCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
router = apiclient.rebootRouter(cmd)
return router
def start(self, apiclient, id, **kwargs):
def start(self, apiclient, **kwargs):
cmd = startRouter.startRouterCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
router = apiclient.startRouter(cmd)
return router

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

@ -24,10 +24,9 @@ class ServiceForRouter(CloudStackEntity.CloudStackEntity):
self.__dict__.update(items)
def change(self, apiclient, id, serviceofferingid, **kwargs):
def change(self, apiclient, serviceofferingid, **kwargs):
cmd = changeServiceForRouter.changeServiceForRouterCmd()
cmd.id = self.id
cmd.id = id
cmd.serviceofferingid = serviceofferingid
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
serviceforrouter = apiclient.changeServiceForRouter(cmd)

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

@ -24,10 +24,9 @@ class ServiceForSystemVm(CloudStackEntity.CloudStackEntity):
self.__dict__.update(items)
def change(self, apiclient, id, serviceofferingid, **kwargs):
def change(self, apiclient, serviceofferingid, **kwargs):
cmd = changeServiceForSystemVm.changeServiceForSystemVmCmd()
cmd.id = self.id
cmd.id = id
cmd.serviceofferingid = serviceofferingid
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
serviceforsystemvm = apiclient.changeServiceForSystemVm(cmd)

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

@ -24,10 +24,9 @@ class ServiceForVirtualMachine(CloudStackEntity.CloudStackEntity):
self.__dict__.update(items)
def change(self, apiclient, id, serviceofferingid, **kwargs):
def change(self, apiclient, serviceofferingid, **kwargs):
cmd = changeServiceForVirtualMachine.changeServiceForVirtualMachineCmd()
cmd.id = self.id
cmd.id = id
cmd.serviceofferingid = serviceofferingid
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
serviceforvirtualmachine = apiclient.changeServiceForVirtualMachine(cmd)

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

@ -44,19 +44,17 @@ class ServiceOffering(CloudStackEntity.CloudStackEntity):
return map(lambda e: ServiceOffering(e.__dict__), serviceoffering)
def update(self, apiclient, id, **kwargs):
def update(self, apiclient, **kwargs):
cmd = updateServiceOffering.updateServiceOfferingCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
serviceoffering = apiclient.updateServiceOffering(cmd)
return serviceoffering
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteServiceOffering.deleteServiceOfferingCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
serviceoffering = apiclient.deleteServiceOffering(cmd)
return serviceoffering

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

@ -43,10 +43,9 @@ class StaticRoute(CloudStackEntity.CloudStackEntity):
return map(lambda e: StaticRoute(e.__dict__), staticroute)
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteStaticRoute.deleteStaticRouteCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
staticroute = apiclient.deleteStaticRoute(cmd)
return staticroute

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

@ -44,19 +44,17 @@ class StorageNetworkIpRange(CloudStackEntity.CloudStackEntity):
return map(lambda e: StorageNetworkIpRange(e.__dict__), storagenetworkiprange)
def update(self, apiclient, id, **kwargs):
def update(self, apiclient, **kwargs):
cmd = updateStorageNetworkIpRange.updateStorageNetworkIpRangeCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
storagenetworkiprange = apiclient.updateStorageNetworkIpRange(cmd)
return storagenetworkiprange
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteStorageNetworkIpRange.deleteStorageNetworkIpRangeCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
storagenetworkiprange = apiclient.deleteStorageNetworkIpRange(cmd)
return storagenetworkiprange

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

@ -46,19 +46,17 @@ class StoragePool(CloudStackEntity.CloudStackEntity):
return map(lambda e: StoragePool(e.__dict__), storagepool)
def update(self, apiclient, id, **kwargs):
def update(self, apiclient, **kwargs):
cmd = updateStoragePool.updateStoragePoolCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
storagepool = apiclient.updateStoragePool(cmd)
return storagepool
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteStoragePool.deleteStoragePoolCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
storagepool = apiclient.deleteStoragePool(cmd)
return storagepool

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

@ -39,10 +39,9 @@ class SystemVm(CloudStackEntity.CloudStackEntity):
return systemvm
def stop(self, apiclient, id, **kwargs):
def stop(self, apiclient, **kwargs):
cmd = stopSystemVm.stopSystemVmCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
systemvm = apiclient.stopSystemVm(cmd)
return systemvm
@ -56,28 +55,25 @@ class SystemVm(CloudStackEntity.CloudStackEntity):
return map(lambda e: SystemVm(e.__dict__), systemvm)
def reboot(self, apiclient, id, **kwargs):
def reboot(self, apiclient, **kwargs):
cmd = rebootSystemVm.rebootSystemVmCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
systemvm = apiclient.rebootSystemVm(cmd)
return systemvm
def start(self, apiclient, id, **kwargs):
def start(self, apiclient, **kwargs):
cmd = startSystemVm.startSystemVmCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
systemvm = apiclient.startSystemVm(cmd)
return systemvm
def destroy(self, apiclient, id, **kwargs):
def destroy(self, apiclient, **kwargs):
cmd = destroySystemVm.destroySystemVmCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
systemvm = apiclient.destroySystemVm(cmd)
return systemvm

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

@ -74,19 +74,17 @@ class Template(CloudStackEntity.CloudStackEntity):
return map(lambda e: Template(e.__dict__), template)
def update(self, apiclient, id, **kwargs):
def update(self, apiclient, **kwargs):
cmd = updateTemplate.updateTemplateCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
template = apiclient.updateTemplate(cmd)
return template
def copy(self, apiclient, sourcezoneid, id, destzoneid, **kwargs):
def copy(self, apiclient, sourcezoneid, destzoneid, **kwargs):
cmd = copyTemplate.copyTemplateCmd()
cmd.id = self.id
cmd.id = id
cmd.destzoneid = destzoneid
cmd.sourcezoneid = sourcezoneid
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
@ -94,20 +92,18 @@ class Template(CloudStackEntity.CloudStackEntity):
return template
def extract(self, apiclient, id, mode, **kwargs):
def extract(self, apiclient, mode, **kwargs):
cmd = extractTemplate.extractTemplateCmd()
cmd.id = self.id
cmd.id = id
cmd.mode = mode
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
template = apiclient.extractTemplate(cmd)
return template
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteTemplate.deleteTemplateCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
template = apiclient.deleteTemplate(cmd)
return template

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

@ -26,18 +26,16 @@ class TemplatePermissions(CloudStackEntity.CloudStackEntity):
@classmethod
def list(self, apiclient, id, **kwargs):
def list(self, apiclient, **kwargs):
cmd = listTemplatePermissions.listTemplatePermissionsCmd()
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
templatepermissions = apiclient.listTemplatePermissions(cmd)
return map(lambda e: TemplatePermissions(e.__dict__), templatepermissions)
def update(self, apiclient, id, **kwargs):
def update(self, apiclient, **kwargs):
cmd = updateTemplatePermissions.updateTemplatePermissionsCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
templatepermissions = apiclient.updateTemplatePermissions(cmd)
return templatepermissions

3
tools/marvin/marvin/integration/lib/base/VMPassword.py
View File

@ -24,10 +24,9 @@ class VMPassword(CloudStackEntity.CloudStackEntity):
self.__dict__.update(items)
def get(self, apiclient, id, **kwargs):
def get(self, apiclient, **kwargs):
cmd = getVMPassword.getVMPasswordCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
vmpassword = apiclient.getVMPassword(cmd)
return vmpassword

3
tools/marvin/marvin/integration/lib/base/VPC.py
View File

@ -61,10 +61,9 @@ class VPC(CloudStackEntity.CloudStackEntity):
return vpc
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteVPC.deleteVPCCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
vpc = apiclient.deleteVPC(cmd)
return vpc

3
tools/marvin/marvin/integration/lib/base/VPCOffering.py
View File

@ -52,10 +52,9 @@ class VPCOffering(CloudStackEntity.CloudStackEntity):
return vpcoffering
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteVPCOffering.deleteVPCOfferingCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
vpcoffering = apiclient.deleteVPCOffering(cmd)
return vpcoffering

3
tools/marvin/marvin/integration/lib/base/VlanIpRange.py
View File

@ -43,10 +43,9 @@ class VlanIpRange(CloudStackEntity.CloudStackEntity):
return map(lambda e: VlanIpRange(e.__dict__), vlaniprange)
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteVlanIpRange.deleteVlanIpRangeCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
vlaniprange = apiclient.deleteVlanIpRange(cmd)
return vlaniprange

9
tools/marvin/marvin/integration/lib/base/Volume.py
View File

@ -70,10 +70,9 @@ class Volume(CloudStackEntity.CloudStackEntity):
return volume
def attach(self, apiclient, id, virtualmachineid, **kwargs):
def attach(self, apiclient, virtualmachineid, **kwargs):
cmd = attachVolume.attachVolumeCmd()
cmd.id = self.id
cmd.id = id
cmd.virtualmachineid = virtualmachineid
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
volume = apiclient.attachVolume(cmd)
@ -88,10 +87,9 @@ class Volume(CloudStackEntity.CloudStackEntity):
return volume
def extract(self, apiclient, zoneid, id, mode, **kwargs):
def extract(self, apiclient, zoneid, mode, **kwargs):
cmd = extractVolume.extractVolumeCmd()
cmd.id = self.id
cmd.id = id
cmd.mode = mode
cmd.zoneid = zoneid
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
@ -99,10 +97,9 @@ class Volume(CloudStackEntity.CloudStackEntity):
return volume
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteVolume.deleteVolumeCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
volume = apiclient.deleteVolume(cmd)
return volume

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

@ -27,10 +27,9 @@ class VpnConnection(CloudStackEntity.CloudStackEntity):
self.__dict__.update(items)
def reset(self, apiclient, id, **kwargs):
def reset(self, apiclient, **kwargs):
cmd = resetVpnConnection.resetVpnConnectionCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
vpnconnection = apiclient.resetVpnConnection(cmd)
return vpnconnection
@ -53,10 +52,9 @@ class VpnConnection(CloudStackEntity.CloudStackEntity):
return map(lambda e: VpnConnection(e.__dict__), vpnconnection)
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteVpnConnection.deleteVpnConnectionCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
vpnconnection = apiclient.deleteVpnConnection(cmd)
return vpnconnection

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

@ -44,10 +44,9 @@ class VpnCustomerGateway(CloudStackEntity.CloudStackEntity):
return map(lambda e: VpnCustomerGateway(e.__dict__), vpncustomergateway)
def update(self, apiclient, ikepolicy, cidrlist, gateway, ipsecpsk, esppolicy, id, **kwargs):
def update(self, apiclient, ikepolicy, cidrlist, gateway, ipsecpsk, esppolicy, **kwargs):
cmd = updateVpnCustomerGateway.updateVpnCustomerGatewayCmd()
cmd.id = self.id
cmd.id = id
cmd.cidrlist = cidrlist
cmd.esppolicy = esppolicy
cmd.gateway = gateway
@ -58,10 +57,9 @@ class VpnCustomerGateway(CloudStackEntity.CloudStackEntity):
return vpncustomergateway
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteVpnCustomerGateway.deleteVpnCustomerGatewayCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
vpncustomergateway = apiclient.deleteVpnCustomerGateway(cmd)
return vpncustomergateway

3
tools/marvin/marvin/integration/lib/base/VpnGateway.py
View File

@ -43,10 +43,9 @@ class VpnGateway(CloudStackEntity.CloudStackEntity):
return map(lambda e: VpnGateway(e.__dict__), vpngateway)
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteVpnGateway.deleteVpnGatewayCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
vpngateway = apiclient.deleteVpnGateway(cmd)
return vpngateway

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

@ -44,19 +44,17 @@ class Zone(CloudStackEntity.CloudStackEntity):
return map(lambda e: Zone(e.__dict__), zone)
def update(self, apiclient, id, **kwargs):
def update(self, apiclient, **kwargs):
cmd = updateZone.updateZoneCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
zone = apiclient.updateZone(cmd)
return zone
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteZone.deleteZoneCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
zone = apiclient.deleteZone(cmd)
return zone