cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [55/76] [abbrv] Revert "CLOUSTACK-5099: Utils.py-has-wrong-reference, cleaned it. As well added Uniform naming convention"
Date Fri, 08 Nov 2013 18:09:11 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/attachIso.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/attachIso.py b/tools/marvin/build/lib/marvin/cloudstackAPI/attachIso.py
deleted file mode 100644
index 68159da..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/attachIso.py
+++ /dev/null
@@ -1,372 +0,0 @@
-# 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.
-
-
-"""Attaches an ISO to a virtual machine."""
-from baseCmd import *
-from baseResponse import *
-class attachIsoCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the ISO file"""
-        """Required"""
-        self.id = None
-        """the ID of the virtual machine"""
-        """Required"""
-        self.virtualmachineid = None
-        self.required = ["id","virtualmachineid",]
-
-class attachIsoResponse (baseResponse):
-    def __init__(self):
-        """the ID of the virtual machine"""
-        self.id = None
-        """the account associated with the virtual machine"""
-        self.account = None
-        """the number of cpu this virtual machine is running with"""
-        self.cpunumber = None
-        """the speed of each cpu"""
-        self.cpuspeed = None
-        """the amount of the vm's CPU currently used"""
-        self.cpuused = None
-        """the date when this virtual machine was created"""
-        self.created = None
-        """the read (io) of disk on the vm"""
-        self.diskioread = None
-        """the write (io) of disk on the vm"""
-        self.diskiowrite = None
-        """the read (bytes) of disk on the vm"""
-        self.diskkbsread = None
-        """the write (bytes) of disk on the vm"""
-        self.diskkbswrite = None
-        """user generated name. The name of the virtual machine is returned if no displayname exists."""
-        self.displayname = None
-        """an optional field whether to the display the vm to the end user or not."""
-        self.displayvm = None
-        """the name of the domain in which the virtual machine exists"""
-        self.domain = None
-        """the ID of the domain in which the virtual machine exists"""
-        self.domainid = None
-        """the virtual network for the service offering"""
-        self.forvirtualnetwork = None
-        """the group name of the virtual machine"""
-        self.group = None
-        """the group ID of the virtual machine"""
-        self.groupid = None
-        """Os type ID of the virtual machine"""
-        self.guestosid = None
-        """true if high-availability is enabled, false otherwise"""
-        self.haenable = None
-        """the ID of the host for the virtual machine"""
-        self.hostid = None
-        """the name of the host for the virtual machine"""
-        self.hostname = None
-        """the hypervisor on which the template runs"""
-        self.hypervisor = None
-        """instance name of the user vm; this parameter is returned to the ROOT admin only"""
-        self.instancename = None
-        """true if vm contains XS/VMWare tools inorder to support dynamic scaling of VM cpu/memory."""
-        self.isdynamicallyscalable = None
-        """an alternate display text of the ISO attached to the virtual machine"""
-        self.isodisplaytext = None
-        """the ID of the ISO attached to the virtual machine"""
-        self.isoid = None
-        """the name of the ISO attached to the virtual machine"""
-        self.isoname = None
-        """ssh key-pair"""
-        self.keypair = None
-        """the memory allocated for the virtual machine"""
-        self.memory = None
-        """the name of the virtual machine"""
-        self.name = None
-        """the incoming network traffic on the vm"""
-        self.networkkbsread = None
-        """the outgoing network traffic on the host"""
-        self.networkkbswrite = None
-        """the password (if exists) of the virtual machine"""
-        self.password = None
-        """true if the password rest feature is enabled, false otherwise"""
-        self.passwordenabled = None
-        """the project name of the vm"""
-        self.project = None
-        """the project id of the vm"""
-        self.projectid = None
-        """public IP address id associated with vm via Static nat rule"""
-        self.publicip = None
-        """public IP address id associated with vm via Static nat rule"""
-        self.publicipid = None
-        """device ID of the root volume"""
-        self.rootdeviceid = None
-        """device type of the root volume"""
-        self.rootdevicetype = None
-        """the ID of the service offering of the virtual machine"""
-        self.serviceofferingid = None
-        """the name of the service offering of the virtual machine"""
-        self.serviceofferingname = None
-        """State of the Service from LB rule"""
-        self.servicestate = None
-        """the state of the virtual machine"""
-        self.state = None
-        """an alternate display text of the template for the virtual machine"""
-        self.templatedisplaytext = None
-        """the ID of the template for the virtual machine. A -1 is returned if the virtual machine was created from an ISO file."""
-        self.templateid = None
-        """the name of the template for the virtual machine"""
-        self.templatename = None
-        """the ID of the availablility zone for the virtual machine"""
-        self.zoneid = None
-        """the name of the availability zone for the virtual machine"""
-        self.zonename = None
-        """list of affinity groups associated with the virtual machine"""
-        self.affinitygroup = []
-        """the list of nics associated with vm"""
-        self.nic = []
-        """list of security groups associated with the virtual machine"""
-        self.securitygroup = []
-        """the list of resource tags associated with vm"""
-        self.tags = []
-        """the ID of the latest async job acting on this object"""
-        self.jobid = None
-        """the current status of the latest async job acting on this object"""
-        self.jobstatus = None
-
-class affinitygroup:
-    def __init__(self):
-        """"the ID of the affinity group"""
-        self.id = None
-        """"the account owning the affinity group"""
-        self.account = None
-        """"the description of the affinity group"""
-        self.description = None
-        """"the domain name of the affinity group"""
-        self.domain = None
-        """"the domain ID of the affinity group"""
-        self.domainid = None
-        """"the name of the affinity group"""
-        self.name = None
-        """"the type of the affinity group"""
-        self.type = None
-        """"virtual machine Ids associated with this affinity group"""
-        self.virtualmachineIds = None
-
-class nic:
-    def __init__(self):
-        """"the ID of the nic"""
-        self.id = None
-        """"the broadcast uri of the nic"""
-        self.broadcasturi = None
-        """"the gateway of the nic"""
-        self.gateway = None
-        """"the IPv6 address of network"""
-        self.ip6address = None
-        """"the cidr of IPv6 network"""
-        self.ip6cidr = None
-        """"the gateway of IPv6 network"""
-        self.ip6gateway = None
-        """"the ip address of the nic"""
-        self.ipaddress = None
-        """"true if nic is default, false otherwise"""
-        self.isdefault = None
-        """"the isolation uri of the nic"""
-        self.isolationuri = None
-        """"true if nic is default, false otherwise"""
-        self.macaddress = None
-        """"the netmask of the nic"""
-        self.netmask = None
-        """"the ID of the corresponding network"""
-        self.networkid = None
-        """"the name of the corresponding network"""
-        self.networkname = None
-        """"the Secondary ipv4 addr of nic"""
-        self.secondaryip = None
-        """"the traffic type of the nic"""
-        self.traffictype = None
-        """"the type of the nic"""
-        self.type = None
-
-class egressrule:
-    def __init__(self):
-        """"account owning the security group rule"""
-        self.account = None
-        """"the CIDR notation for the base IP address of the security group rule"""
-        self.cidr = None
-        """"the ending IP of the security group rule"""
-        self.endport = None
-        """"the code for the ICMP message response"""
-        self.icmpcode = None
-        """"the type of the ICMP message response"""
-        self.icmptype = None
-        """"the protocol of the security group rule"""
-        self.protocol = None
-        """"the id of the security group rule"""
-        self.ruleid = None
-        """"security group name"""
-        self.securitygroupname = None
-        """"the starting IP of the security group rule"""
-        self.startport = None
-
-class ingressrule:
-    def __init__(self):
-        """"account owning the security group rule"""
-        self.account = None
-        """"the CIDR notation for the base IP address of the security group rule"""
-        self.cidr = None
-        """"the ending IP of the security group rule"""
-        self.endport = None
-        """"the code for the ICMP message response"""
-        self.icmpcode = None
-        """"the type of the ICMP message response"""
-        self.icmptype = None
-        """"the protocol of the security group rule"""
-        self.protocol = None
-        """"the id of the security group rule"""
-        self.ruleid = None
-        """"security group name"""
-        self.securitygroupname = None
-        """"the starting IP of the security group rule"""
-        self.startport = None
-
-class tags:
-    def __init__(self):
-        """"the account associated with the tag"""
-        self.account = None
-        """"customer associated with the tag"""
-        self.customer = None
-        """"the domain associated with the tag"""
-        self.domain = None
-        """"the ID of the domain associated with the tag"""
-        self.domainid = None
-        """"tag key name"""
-        self.key = None
-        """"the project name where tag belongs to"""
-        self.project = None
-        """"the project id the tag belongs to"""
-        self.projectid = None
-        """"id of the resource"""
-        self.resourceid = None
-        """"resource type"""
-        self.resourcetype = None
-        """"tag value"""
-        self.value = None
-
-class securitygroup:
-    def __init__(self):
-        """"the ID of the security group"""
-        self.id = None
-        """"the account owning the security group"""
-        self.account = None
-        """"the description of the security group"""
-        self.description = None
-        """"the domain name of the security group"""
-        self.domain = None
-        """"the domain ID of the security group"""
-        self.domainid = None
-        """"the name of the security group"""
-        self.name = None
-        """"the project name of the group"""
-        self.project = None
-        """"the project id of the group"""
-        self.projectid = None
-        """"the list of egress rules associated with the security group"""
-        self.egressrule = []
-        """"account owning the security group rule"""
-        self.account = None
-        """"the CIDR notation for the base IP address of the security group rule"""
-        self.cidr = None
-        """"the ending IP of the security group rule"""
-        self.endport = None
-        """"the code for the ICMP message response"""
-        self.icmpcode = None
-        """"the type of the ICMP message response"""
-        self.icmptype = None
-        """"the protocol of the security group rule"""
-        self.protocol = None
-        """"the id of the security group rule"""
-        self.ruleid = None
-        """"security group name"""
-        self.securitygroupname = None
-        """"the starting IP of the security group rule"""
-        self.startport = None
-        """"the list of ingress rules associated with the security group"""
-        self.ingressrule = []
-        """"account owning the security group rule"""
-        self.account = None
-        """"the CIDR notation for the base IP address of the security group rule"""
-        self.cidr = None
-        """"the ending IP of the security group rule"""
-        self.endport = None
-        """"the code for the ICMP message response"""
-        self.icmpcode = None
-        """"the type of the ICMP message response"""
-        self.icmptype = None
-        """"the protocol of the security group rule"""
-        self.protocol = None
-        """"the id of the security group rule"""
-        self.ruleid = None
-        """"security group name"""
-        self.securitygroupname = None
-        """"the starting IP of the security group rule"""
-        self.startport = None
-        """"the list of resource tags associated with the rule"""
-        self.tags = []
-        """"the account associated with the tag"""
-        self.account = None
-        """"customer associated with the tag"""
-        self.customer = None
-        """"the domain associated with the tag"""
-        self.domain = None
-        """"the ID of the domain associated with the tag"""
-        self.domainid = None
-        """"tag key name"""
-        self.key = None
-        """"the project name where tag belongs to"""
-        self.project = None
-        """"the project id the tag belongs to"""
-        self.projectid = None
-        """"id of the resource"""
-        self.resourceid = None
-        """"resource type"""
-        self.resourcetype = None
-        """"tag value"""
-        self.value = None
-        """"the ID of the latest async job acting on this object"""
-        self.jobid = None
-        """"the current status of the latest async job acting on this object"""
-        self.jobstatus = None
-
-class tags:
-    def __init__(self):
-        """"the account associated with the tag"""
-        self.account = None
-        """"customer associated with the tag"""
-        self.customer = None
-        """"the domain associated with the tag"""
-        self.domain = None
-        """"the ID of the domain associated with the tag"""
-        self.domainid = None
-        """"tag key name"""
-        self.key = None
-        """"the project name where tag belongs to"""
-        self.project = None
-        """"the project id the tag belongs to"""
-        self.projectid = None
-        """"id of the resource"""
-        self.resourceid = None
-        """"resource type"""
-        self.resourcetype = None
-        """"tag value"""
-        self.value = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/attachVolume.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/attachVolume.py b/tools/marvin/build/lib/marvin/cloudstackAPI/attachVolume.py
deleted file mode 100644
index 7298731..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/attachVolume.py
+++ /dev/null
@@ -1,148 +0,0 @@
-# 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.
-
-
-"""Attaches a disk volume to a virtual machine."""
-from baseCmd import *
-from baseResponse import *
-class attachVolumeCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the disk volume"""
-        """Required"""
-        self.id = None
-        """the ID of the virtual machine"""
-        """Required"""
-        self.virtualmachineid = None
-        """the ID of the device to map the volume to within the guest OS. If no deviceId is passed in, the next available deviceId will be chosen. Possible values for a Linux OS are:* 1 - /dev/xvdb* 2 - /dev/xvdc* 4 - /dev/xvde* 5 - /dev/xvdf* 6 - /dev/xvdg* 7 - /dev/xvdh* 8 - /dev/xvdi* 9 - /dev/xvdj"""
-        self.deviceid = None
-        self.required = ["id","virtualmachineid",]
-
-class attachVolumeResponse (baseResponse):
-    def __init__(self):
-        """ID of the disk volume"""
-        self.id = None
-        """the account associated with the disk volume"""
-        self.account = None
-        """the date the volume was attached to a VM instance"""
-        self.attached = None
-        """the date the disk volume was created"""
-        self.created = None
-        """the boolean state of whether the volume is destroyed or not"""
-        self.destroyed = None
-        """the ID of the device on user vm the volume is attahed to. This tag is not returned when the volume is detached."""
-        self.deviceid = None
-        """bytes read rate of the disk volume"""
-        self.diskBytesReadRate = None
-        """bytes write rate of the disk volume"""
-        self.diskBytesWriteRate = None
-        """io requests read rate of the disk volume"""
-        self.diskIopsReadRate = None
-        """io requests write rate of the disk volume"""
-        self.diskIopsWriteRate = None
-        """the display text of the disk offering"""
-        self.diskofferingdisplaytext = None
-        """ID of the disk offering"""
-        self.diskofferingid = None
-        """name of the disk offering"""
-        self.diskofferingname = None
-        """an optional field whether to the display the volume to the end user or not."""
-        self.displayvolume = None
-        """the domain associated with the disk volume"""
-        self.domain = None
-        """the ID of the domain associated with the disk volume"""
-        self.domainid = None
-        """Hypervisor the volume belongs to"""
-        self.hypervisor = None
-        """true if the volume is extractable, false otherwise"""
-        self.isextractable = None
-        """max iops of the disk volume"""
-        self.maxiops = None
-        """min iops of the disk volume"""
-        self.miniops = None
-        """name of the disk volume"""
-        self.name = None
-        """The path of the volume"""
-        self.path = None
-        """the project name of the vpn"""
-        self.project = None
-        """the project id of the vpn"""
-        self.projectid = None
-        """the display text of the service offering for root disk"""
-        self.serviceofferingdisplaytext = None
-        """ID of the service offering for root disk"""
-        self.serviceofferingid = None
-        """name of the service offering for root disk"""
-        self.serviceofferingname = None
-        """size of the disk volume"""
-        self.size = None
-        """ID of the snapshot from which this volume was created"""
-        self.snapshotid = None
-        """the state of the disk volume"""
-        self.state = None
-        """the status of the volume"""
-        self.status = None
-        """name of the primary storage hosting the disk volume"""
-        self.storage = None
-        """id of the primary storage hosting the disk volume; returned to admin user only"""
-        self.storageid = None
-        """shared or local storage"""
-        self.storagetype = None
-        """type of the disk volume (ROOT or DATADISK)"""
-        self.type = None
-        """id of the virtual machine"""
-        self.virtualmachineid = None
-        """display name of the virtual machine"""
-        self.vmdisplayname = None
-        """name of the virtual machine"""
-        self.vmname = None
-        """state of the virtual machine"""
-        self.vmstate = None
-        """ID of the availability zone"""
-        self.zoneid = None
-        """name of the availability zone"""
-        self.zonename = None
-        """the list of resource tags associated with volume"""
-        self.tags = []
-        """the ID of the latest async job acting on this object"""
-        self.jobid = None
-        """the current status of the latest async job acting on this object"""
-        self.jobstatus = None
-
-class tags:
-    def __init__(self):
-        """"the account associated with the tag"""
-        self.account = None
-        """"customer associated with the tag"""
-        self.customer = None
-        """"the domain associated with the tag"""
-        self.domain = None
-        """"the ID of the domain associated with the tag"""
-        self.domainid = None
-        """"tag key name"""
-        self.key = None
-        """"the project name where tag belongs to"""
-        self.project = None
-        """"the project id the tag belongs to"""
-        self.projectid = None
-        """"id of the resource"""
-        self.resourceid = None
-        """"resource type"""
-        self.resourcetype = None
-        """"tag value"""
-        self.value = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/authorizeSecurityGroupEgress.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/authorizeSecurityGroupEgress.py b/tools/marvin/build/lib/marvin/cloudstackAPI/authorizeSecurityGroupEgress.py
deleted file mode 100644
index 4214808..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/authorizeSecurityGroupEgress.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.
-
-
-"""Authorizes a particular egress rule for this security group"""
-from baseCmd import *
-from baseResponse import *
-class authorizeSecurityGroupEgressCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """an optional account for the security group. Must be used with domainId."""
-        self.account = None
-        """the cidr list associated"""
-        self.cidrlist = []
-        """an optional domainId for the security group. If the account parameter is used, domainId must also be used."""
-        self.domainid = None
-        """end port for this egress rule"""
-        self.endport = None
-        """error code for this icmp message"""
-        self.icmpcode = None
-        """type of the icmp message being sent"""
-        self.icmptype = None
-        """an optional project of the security group"""
-        self.projectid = None
-        """TCP is default. UDP is the other supported protocol"""
-        self.protocol = None
-        """The ID of the security group. Mutually exclusive with securityGroupName parameter"""
-        self.securitygroupid = None
-        """The name of the security group. Mutually exclusive with securityGroupName parameter"""
-        self.securitygroupname = None
-        """start port for this egress rule"""
-        self.startport = None
-        """user to security group mapping"""
-        self.usersecuritygrouplist = []
-        self.required = []
-
-class authorizeSecurityGroupEgressResponse (baseResponse):
-    def __init__(self):
-        """account owning the security group rule"""
-        self.account = None
-        """the CIDR notation for the base IP address of the security group rule"""
-        self.cidr = None
-        """the ending IP of the security group rule"""
-        self.endport = None
-        """the code for the ICMP message response"""
-        self.icmpcode = None
-        """the type of the ICMP message response"""
-        self.icmptype = None
-        """the protocol of the security group rule"""
-        self.protocol = None
-        """the id of the security group rule"""
-        self.ruleid = None
-        """security group name"""
-        self.securitygroupname = None
-        """the starting IP of the security group rule"""
-        self.startport = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/authorizeSecurityGroupIngress.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/authorizeSecurityGroupIngress.py b/tools/marvin/build/lib/marvin/cloudstackAPI/authorizeSecurityGroupIngress.py
deleted file mode 100644
index 50c1650..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/authorizeSecurityGroupIngress.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.
-
-
-"""Authorizes a particular ingress rule for this security group"""
-from baseCmd import *
-from baseResponse import *
-class authorizeSecurityGroupIngressCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """an optional account for the security group. Must be used with domainId."""
-        self.account = None
-        """the cidr list associated"""
-        self.cidrlist = []
-        """an optional domainId for the security group. If the account parameter is used, domainId must also be used."""
-        self.domainid = None
-        """end port for this ingress rule"""
-        self.endport = None
-        """error code for this icmp message"""
-        self.icmpcode = None
-        """type of the icmp message being sent"""
-        self.icmptype = None
-        """an optional project of the security group"""
-        self.projectid = None
-        """TCP is default. UDP is the other supported protocol"""
-        self.protocol = None
-        """The ID of the security group. Mutually exclusive with securityGroupName parameter"""
-        self.securitygroupid = None
-        """The name of the security group. Mutually exclusive with securityGroupName parameter"""
-        self.securitygroupname = None
-        """start port for this ingress rule"""
-        self.startport = None
-        """user to security group mapping"""
-        self.usersecuritygrouplist = []
-        self.required = []
-
-class authorizeSecurityGroupIngressResponse (baseResponse):
-    def __init__(self):
-        """account owning the security group rule"""
-        self.account = None
-        """the CIDR notation for the base IP address of the security group rule"""
-        self.cidr = None
-        """the ending IP of the security group rule"""
-        self.endport = None
-        """the code for the ICMP message response"""
-        self.icmpcode = None
-        """the type of the ICMP message response"""
-        self.icmptype = None
-        """the protocol of the security group rule"""
-        self.protocol = None
-        """the id of the security group rule"""
-        self.ruleid = None
-        """security group name"""
-        self.securitygroupname = None
-        """the starting IP of the security group rule"""
-        self.startport = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/baseCmd.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/baseCmd.py b/tools/marvin/build/lib/marvin/cloudstackAPI/baseCmd.py
deleted file mode 100644
index f03f42d..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/baseCmd.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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.
-
-"""Base Command"""
-class baseCmd(object):
-    pass

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/baseResponse.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/baseResponse.py b/tools/marvin/build/lib/marvin/cloudstackAPI/baseResponse.py
deleted file mode 100644
index 8c5742f..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/baseResponse.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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.
-
-"""Base class for response"""
-class baseResponse(object):
-    pass

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/cancelHostMaintenance.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/cancelHostMaintenance.py b/tools/marvin/build/lib/marvin/cloudstackAPI/cancelHostMaintenance.py
deleted file mode 100644
index b5b9976..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/cancelHostMaintenance.py
+++ /dev/null
@@ -1,122 +0,0 @@
-# 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.
-
-
-"""Cancels host maintenance."""
-from baseCmd import *
-from baseResponse import *
-class cancelHostMaintenanceCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the host ID"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class cancelHostMaintenanceResponse (baseResponse):
-    def __init__(self):
-        """the ID of the host"""
-        self.id = None
-        """the cpu average load on the host"""
-        self.averageload = None
-        """capabilities of the host"""
-        self.capabilities = None
-        """the cluster ID of the host"""
-        self.clusterid = None
-        """the cluster name of the host"""
-        self.clustername = None
-        """the cluster type of the cluster that host belongs to"""
-        self.clustertype = None
-        """the amount of the host's CPU currently allocated"""
-        self.cpuallocated = None
-        """the CPU number of the host"""
-        self.cpunumber = None
-        """the CPU speed of the host"""
-        self.cpuspeed = None
-        """the amount of the host's CPU currently used"""
-        self.cpuused = None
-        """the amount of the host's CPU after applying the cpu.overprovisioning.factor"""
-        self.cpuwithoverprovisioning = None
-        """the date and time the host was created"""
-        self.created = None
-        """true if the host is disconnected. False otherwise."""
-        self.disconnected = None
-        """the host's currently allocated disk size"""
-        self.disksizeallocated = None
-        """the total disk size of the host"""
-        self.disksizetotal = None
-        """events available for the host"""
-        self.events = None
-        """true if the host is Ha host (dedicated to vms started by HA process; false otherwise"""
-        self.hahost = None
-        """true if this host has enough CPU and RAM capacity to migrate a VM to it, false otherwise"""
-        self.hasenoughcapacity = None
-        """comma-separated list of tags for the host"""
-        self.hosttags = None
-        """the host hypervisor"""
-        self.hypervisor = None
-        """the hypervisor version"""
-        self.hypervisorversion = None
-        """the IP address of the host"""
-        self.ipaddress = None
-        """true if local storage is active, false otherwise"""
-        self.islocalstorageactive = None
-        """the date and time the host was last pinged"""
-        self.lastpinged = None
-        """the management server ID of the host"""
-        self.managementserverid = None
-        """the amount of the host's memory currently allocated"""
-        self.memoryallocated = None
-        """the memory total of the host"""
-        self.memorytotal = None
-        """the amount of the host's memory currently used"""
-        self.memoryused = None
-        """the name of the host"""
-        self.name = None
-        """the incoming network traffic on the host"""
-        self.networkkbsread = None
-        """the outgoing network traffic on the host"""
-        self.networkkbswrite = None
-        """the OS category ID of the host"""
-        self.oscategoryid = None
-        """the OS category name of the host"""
-        self.oscategoryname = None
-        """the Pod ID of the host"""
-        self.podid = None
-        """the Pod name of the host"""
-        self.podname = None
-        """the date and time the host was removed"""
-        self.removed = None
-        """the resource state of the host"""
-        self.resourcestate = None
-        """the state of the host"""
-        self.state = None
-        """true if this host is suitable(has enough capacity and satisfies all conditions like hosttags, max guests vm limit etc) to migrate a VM to it , false otherwise"""
-        self.suitableformigration = None
-        """the host type"""
-        self.type = None
-        """the host version"""
-        self.version = None
-        """the Zone ID of the host"""
-        self.zoneid = None
-        """the Zone name of the host"""
-        self.zonename = None
-        """the ID of the latest async job acting on this object"""
-        self.jobid = None
-        """the current status of the latest async job acting on this object"""
-        self.jobstatus = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/cancelStorageMaintenance.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/cancelStorageMaintenance.py b/tools/marvin/build/lib/marvin/cloudstackAPI/cancelStorageMaintenance.py
deleted file mode 100644
index ccd9547..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/cancelStorageMaintenance.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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.
-
-
-"""Cancels maintenance for primary storage"""
-from baseCmd import *
-from baseResponse import *
-class cancelStorageMaintenanceCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the primary storage ID"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class cancelStorageMaintenanceResponse (baseResponse):
-    def __init__(self):
-        """the ID of the storage pool"""
-        self.id = None
-        """IOPS CloudStack can provision from this storage pool"""
-        self.capacityiops = None
-        """the ID of the cluster for the storage pool"""
-        self.clusterid = None
-        """the name of the cluster for the storage pool"""
-        self.clustername = None
-        """the date and time the storage pool was created"""
-        self.created = None
-        """the host's currently allocated disk size"""
-        self.disksizeallocated = None
-        """the total disk size of the storage pool"""
-        self.disksizetotal = None
-        """the host's currently used disk size"""
-        self.disksizeused = None
-        """the hypervisor type of the storage pool"""
-        self.hypervisor = None
-        """the IP address of the storage pool"""
-        self.ipaddress = None
-        """the name of the storage pool"""
-        self.name = None
-        """the storage pool path"""
-        self.path = None
-        """the Pod ID of the storage pool"""
-        self.podid = None
-        """the Pod name of the storage pool"""
-        self.podname = None
-        """the scope of the storage pool"""
-        self.scope = None
-        """the state of the storage pool"""
-        self.state = None
-        """true if this pool is suitable to migrate a volume, false otherwise"""
-        self.suitableformigration = None
-        """the tags for the storage pool"""
-        self.tags = None
-        """the storage pool type"""
-        self.type = None
-        """the Zone ID of the storage pool"""
-        self.zoneid = None
-        """the Zone name of the storage pool"""
-        self.zonename = None
-        """the ID of the latest async job acting on this object"""
-        self.jobid = None
-        """the current status of the latest async job acting on this object"""
-        self.jobstatus = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/changeServiceForRouter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/changeServiceForRouter.py b/tools/marvin/build/lib/marvin/cloudstackAPI/changeServiceForRouter.py
deleted file mode 100644
index a189633..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/changeServiceForRouter.py
+++ /dev/null
@@ -1,154 +0,0 @@
-# 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.
-
-
-"""Upgrades domain router to a new service offering"""
-from baseCmd import *
-from baseResponse import *
-class changeServiceForRouterCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "false"
-        """The ID of the router"""
-        """Required"""
-        self.id = None
-        """the service offering ID to apply to the domain router"""
-        """Required"""
-        self.serviceofferingid = None
-        self.required = ["id","serviceofferingid",]
-
-class changeServiceForRouterResponse (baseResponse):
-    def __init__(self):
-        """the id of the router"""
-        self.id = None
-        """the account associated with the router"""
-        self.account = None
-        """the date and time the router was created"""
-        self.created = None
-        """the first DNS for the router"""
-        self.dns1 = None
-        """the second DNS for the router"""
-        self.dns2 = None
-        """the domain associated with the router"""
-        self.domain = None
-        """the domain ID associated with the router"""
-        self.domainid = None
-        """the gateway for the router"""
-        self.gateway = None
-        """the guest IP address for the router"""
-        self.guestipaddress = None
-        """the guest MAC address for the router"""
-        self.guestmacaddress = None
-        """the guest netmask for the router"""
-        self.guestnetmask = None
-        """the ID of the corresponding guest network"""
-        self.guestnetworkid = None
-        """the host ID for the router"""
-        self.hostid = None
-        """the hostname for the router"""
-        self.hostname = None
-        """the first IPv6 DNS for the router"""
-        self.ip6dns1 = None
-        """the second IPv6 DNS for the router"""
-        self.ip6dns2 = None
-        """if this router is an redundant virtual router"""
-        self.isredundantrouter = None
-        """the link local IP address for the router"""
-        self.linklocalip = None
-        """the link local MAC address for the router"""
-        self.linklocalmacaddress = None
-        """the link local netmask for the router"""
-        self.linklocalnetmask = None
-        """the ID of the corresponding link local network"""
-        self.linklocalnetworkid = None
-        """the name of the router"""
-        self.name = None
-        """the network domain for the router"""
-        self.networkdomain = None
-        """the Pod ID for the router"""
-        self.podid = None
-        """the project name of the address"""
-        self.project = None
-        """the project id of the ipaddress"""
-        self.projectid = None
-        """the public IP address for the router"""
-        self.publicip = None
-        """the public MAC address for the router"""
-        self.publicmacaddress = None
-        """the public netmask for the router"""
-        self.publicnetmask = None
-        """the ID of the corresponding public network"""
-        self.publicnetworkid = None
-        """the state of redundant virtual router"""
-        self.redundantstate = None
-        """role of the domain router"""
-        self.role = None
-        """the version of scripts"""
-        self.scriptsversion = None
-        """the ID of the service offering of the virtual machine"""
-        self.serviceofferingid = None
-        """the name of the service offering of the virtual machine"""
-        self.serviceofferingname = None
-        """the state of the router"""
-        self.state = None
-        """the template ID for the router"""
-        self.templateid = None
-        """the version of template"""
-        self.templateversion = None
-        """VPC the router belongs to"""
-        self.vpcid = None
-        """the Zone ID for the router"""
-        self.zoneid = None
-        """the Zone name for the router"""
-        self.zonename = None
-        """the list of nics associated with the router"""
-        self.nic = []
-
-class nic:
-    def __init__(self):
-        """"the ID of the nic"""
-        self.id = None
-        """"the broadcast uri of the nic"""
-        self.broadcasturi = None
-        """"the gateway of the nic"""
-        self.gateway = None
-        """"the IPv6 address of network"""
-        self.ip6address = None
-        """"the cidr of IPv6 network"""
-        self.ip6cidr = None
-        """"the gateway of IPv6 network"""
-        self.ip6gateway = None
-        """"the ip address of the nic"""
-        self.ipaddress = None
-        """"true if nic is default, false otherwise"""
-        self.isdefault = None
-        """"the isolation uri of the nic"""
-        self.isolationuri = None
-        """"true if nic is default, false otherwise"""
-        self.macaddress = None
-        """"the netmask of the nic"""
-        self.netmask = None
-        """"the ID of the corresponding network"""
-        self.networkid = None
-        """"the name of the corresponding network"""
-        self.networkname = None
-        """"the Secondary ipv4 addr of nic"""
-        self.secondaryip = None
-        """"the traffic type of the nic"""
-        self.traffictype = None
-        """"the type of the nic"""
-        self.type = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/changeServiceForSystemVm.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/changeServiceForSystemVm.py b/tools/marvin/build/lib/marvin/cloudstackAPI/changeServiceForSystemVm.py
deleted file mode 100644
index 1a6c1b2..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/changeServiceForSystemVm.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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.
-
-
-"""Changes the service offering for a system vm (console proxy or secondary storage). The system vm must be in a "Stopped" state for this command to take effect."""
-from baseCmd import *
-from baseResponse import *
-class changeServiceForSystemVmCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "false"
-        """The ID of the system vm"""
-        """Required"""
-        self.id = None
-        """the service offering ID to apply to the system vm"""
-        """Required"""
-        self.serviceofferingid = None
-        self.required = ["id","serviceofferingid",]
-
-class changeServiceForSystemVmResponse (baseResponse):
-    def __init__(self):
-        """the ID of the system VM"""
-        self.id = None
-        """the number of active console sessions for the console proxy system vm"""
-        self.activeviewersessions = None
-        """the date and time the system VM was created"""
-        self.created = None
-        """the first DNS for the system VM"""
-        self.dns1 = None
-        """the second DNS for the system VM"""
-        self.dns2 = None
-        """the gateway for the system VM"""
-        self.gateway = None
-        """the host ID for the system VM"""
-        self.hostid = None
-        """the hostname for the system VM"""
-        self.hostname = None
-        """the job ID associated with the system VM. This is only displayed if the router listed is part of a currently running asynchronous job."""
-        self.jobid = None
-        """the job status associated with the system VM.  This is only displayed if the router listed is part of a currently running asynchronous job."""
-        self.jobstatus = None
-        """the link local IP address for the system vm"""
-        self.linklocalip = None
-        """the link local MAC address for the system vm"""
-        self.linklocalmacaddress = None
-        """the link local netmask for the system vm"""
-        self.linklocalnetmask = None
-        """the name of the system VM"""
-        self.name = None
-        """the network domain for the system VM"""
-        self.networkdomain = None
-        """the Pod ID for the system VM"""
-        self.podid = None
-        """the private IP address for the system VM"""
-        self.privateip = None
-        """the private MAC address for the system VM"""
-        self.privatemacaddress = None
-        """the private netmask for the system VM"""
-        self.privatenetmask = None
-        """the public IP address for the system VM"""
-        self.publicip = None
-        """the public MAC address for the system VM"""
-        self.publicmacaddress = None
-        """the public netmask for the system VM"""
-        self.publicnetmask = None
-        """the state of the system VM"""
-        self.state = None
-        """the system VM type"""
-        self.systemvmtype = None
-        """the template ID for the system VM"""
-        self.templateid = None
-        """the Zone ID for the system VM"""
-        self.zoneid = None
-        """the Zone name for the system VM"""
-        self.zonename = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/changeServiceForVirtualMachine.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/changeServiceForVirtualMachine.py b/tools/marvin/build/lib/marvin/cloudstackAPI/changeServiceForVirtualMachine.py
deleted file mode 100644
index e0d2ede..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/changeServiceForVirtualMachine.py
+++ /dev/null
@@ -1,372 +0,0 @@
-# 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.
-
-
-"""Changes the service offering for a virtual machine. The virtual machine must be in a "Stopped" state for this command to take effect."""
-from baseCmd import *
-from baseResponse import *
-class changeServiceForVirtualMachineCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "false"
-        """The ID of the virtual machine"""
-        """Required"""
-        self.id = None
-        """the service offering ID to apply to the virtual machine"""
-        """Required"""
-        self.serviceofferingid = None
-        self.required = ["id","serviceofferingid",]
-
-class changeServiceForVirtualMachineResponse (baseResponse):
-    def __init__(self):
-        """the ID of the virtual machine"""
-        self.id = None
-        """the account associated with the virtual machine"""
-        self.account = None
-        """the number of cpu this virtual machine is running with"""
-        self.cpunumber = None
-        """the speed of each cpu"""
-        self.cpuspeed = None
-        """the amount of the vm's CPU currently used"""
-        self.cpuused = None
-        """the date when this virtual machine was created"""
-        self.created = None
-        """the read (io) of disk on the vm"""
-        self.diskioread = None
-        """the write (io) of disk on the vm"""
-        self.diskiowrite = None
-        """the read (bytes) of disk on the vm"""
-        self.diskkbsread = None
-        """the write (bytes) of disk on the vm"""
-        self.diskkbswrite = None
-        """user generated name. The name of the virtual machine is returned if no displayname exists."""
-        self.displayname = None
-        """an optional field whether to the display the vm to the end user or not."""
-        self.displayvm = None
-        """the name of the domain in which the virtual machine exists"""
-        self.domain = None
-        """the ID of the domain in which the virtual machine exists"""
-        self.domainid = None
-        """the virtual network for the service offering"""
-        self.forvirtualnetwork = None
-        """the group name of the virtual machine"""
-        self.group = None
-        """the group ID of the virtual machine"""
-        self.groupid = None
-        """Os type ID of the virtual machine"""
-        self.guestosid = None
-        """true if high-availability is enabled, false otherwise"""
-        self.haenable = None
-        """the ID of the host for the virtual machine"""
-        self.hostid = None
-        """the name of the host for the virtual machine"""
-        self.hostname = None
-        """the hypervisor on which the template runs"""
-        self.hypervisor = None
-        """instance name of the user vm; this parameter is returned to the ROOT admin only"""
-        self.instancename = None
-        """true if vm contains XS/VMWare tools inorder to support dynamic scaling of VM cpu/memory."""
-        self.isdynamicallyscalable = None
-        """an alternate display text of the ISO attached to the virtual machine"""
-        self.isodisplaytext = None
-        """the ID of the ISO attached to the virtual machine"""
-        self.isoid = None
-        """the name of the ISO attached to the virtual machine"""
-        self.isoname = None
-        """ssh key-pair"""
-        self.keypair = None
-        """the memory allocated for the virtual machine"""
-        self.memory = None
-        """the name of the virtual machine"""
-        self.name = None
-        """the incoming network traffic on the vm"""
-        self.networkkbsread = None
-        """the outgoing network traffic on the host"""
-        self.networkkbswrite = None
-        """the password (if exists) of the virtual machine"""
-        self.password = None
-        """true if the password rest feature is enabled, false otherwise"""
-        self.passwordenabled = None
-        """the project name of the vm"""
-        self.project = None
-        """the project id of the vm"""
-        self.projectid = None
-        """public IP address id associated with vm via Static nat rule"""
-        self.publicip = None
-        """public IP address id associated with vm via Static nat rule"""
-        self.publicipid = None
-        """device ID of the root volume"""
-        self.rootdeviceid = None
-        """device type of the root volume"""
-        self.rootdevicetype = None
-        """the ID of the service offering of the virtual machine"""
-        self.serviceofferingid = None
-        """the name of the service offering of the virtual machine"""
-        self.serviceofferingname = None
-        """State of the Service from LB rule"""
-        self.servicestate = None
-        """the state of the virtual machine"""
-        self.state = None
-        """an alternate display text of the template for the virtual machine"""
-        self.templatedisplaytext = None
-        """the ID of the template for the virtual machine. A -1 is returned if the virtual machine was created from an ISO file."""
-        self.templateid = None
-        """the name of the template for the virtual machine"""
-        self.templatename = None
-        """the ID of the availablility zone for the virtual machine"""
-        self.zoneid = None
-        """the name of the availability zone for the virtual machine"""
-        self.zonename = None
-        """list of affinity groups associated with the virtual machine"""
-        self.affinitygroup = []
-        """the list of nics associated with vm"""
-        self.nic = []
-        """list of security groups associated with the virtual machine"""
-        self.securitygroup = []
-        """the list of resource tags associated with vm"""
-        self.tags = []
-        """the ID of the latest async job acting on this object"""
-        self.jobid = None
-        """the current status of the latest async job acting on this object"""
-        self.jobstatus = None
-
-class affinitygroup:
-    def __init__(self):
-        """"the ID of the affinity group"""
-        self.id = None
-        """"the account owning the affinity group"""
-        self.account = None
-        """"the description of the affinity group"""
-        self.description = None
-        """"the domain name of the affinity group"""
-        self.domain = None
-        """"the domain ID of the affinity group"""
-        self.domainid = None
-        """"the name of the affinity group"""
-        self.name = None
-        """"the type of the affinity group"""
-        self.type = None
-        """"virtual machine Ids associated with this affinity group"""
-        self.virtualmachineIds = None
-
-class nic:
-    def __init__(self):
-        """"the ID of the nic"""
-        self.id = None
-        """"the broadcast uri of the nic"""
-        self.broadcasturi = None
-        """"the gateway of the nic"""
-        self.gateway = None
-        """"the IPv6 address of network"""
-        self.ip6address = None
-        """"the cidr of IPv6 network"""
-        self.ip6cidr = None
-        """"the gateway of IPv6 network"""
-        self.ip6gateway = None
-        """"the ip address of the nic"""
-        self.ipaddress = None
-        """"true if nic is default, false otherwise"""
-        self.isdefault = None
-        """"the isolation uri of the nic"""
-        self.isolationuri = None
-        """"true if nic is default, false otherwise"""
-        self.macaddress = None
-        """"the netmask of the nic"""
-        self.netmask = None
-        """"the ID of the corresponding network"""
-        self.networkid = None
-        """"the name of the corresponding network"""
-        self.networkname = None
-        """"the Secondary ipv4 addr of nic"""
-        self.secondaryip = None
-        """"the traffic type of the nic"""
-        self.traffictype = None
-        """"the type of the nic"""
-        self.type = None
-
-class egressrule:
-    def __init__(self):
-        """"account owning the security group rule"""
-        self.account = None
-        """"the CIDR notation for the base IP address of the security group rule"""
-        self.cidr = None
-        """"the ending IP of the security group rule"""
-        self.endport = None
-        """"the code for the ICMP message response"""
-        self.icmpcode = None
-        """"the type of the ICMP message response"""
-        self.icmptype = None
-        """"the protocol of the security group rule"""
-        self.protocol = None
-        """"the id of the security group rule"""
-        self.ruleid = None
-        """"security group name"""
-        self.securitygroupname = None
-        """"the starting IP of the security group rule"""
-        self.startport = None
-
-class ingressrule:
-    def __init__(self):
-        """"account owning the security group rule"""
-        self.account = None
-        """"the CIDR notation for the base IP address of the security group rule"""
-        self.cidr = None
-        """"the ending IP of the security group rule"""
-        self.endport = None
-        """"the code for the ICMP message response"""
-        self.icmpcode = None
-        """"the type of the ICMP message response"""
-        self.icmptype = None
-        """"the protocol of the security group rule"""
-        self.protocol = None
-        """"the id of the security group rule"""
-        self.ruleid = None
-        """"security group name"""
-        self.securitygroupname = None
-        """"the starting IP of the security group rule"""
-        self.startport = None
-
-class tags:
-    def __init__(self):
-        """"the account associated with the tag"""
-        self.account = None
-        """"customer associated with the tag"""
-        self.customer = None
-        """"the domain associated with the tag"""
-        self.domain = None
-        """"the ID of the domain associated with the tag"""
-        self.domainid = None
-        """"tag key name"""
-        self.key = None
-        """"the project name where tag belongs to"""
-        self.project = None
-        """"the project id the tag belongs to"""
-        self.projectid = None
-        """"id of the resource"""
-        self.resourceid = None
-        """"resource type"""
-        self.resourcetype = None
-        """"tag value"""
-        self.value = None
-
-class securitygroup:
-    def __init__(self):
-        """"the ID of the security group"""
-        self.id = None
-        """"the account owning the security group"""
-        self.account = None
-        """"the description of the security group"""
-        self.description = None
-        """"the domain name of the security group"""
-        self.domain = None
-        """"the domain ID of the security group"""
-        self.domainid = None
-        """"the name of the security group"""
-        self.name = None
-        """"the project name of the group"""
-        self.project = None
-        """"the project id of the group"""
-        self.projectid = None
-        """"the list of egress rules associated with the security group"""
-        self.egressrule = []
-        """"account owning the security group rule"""
-        self.account = None
-        """"the CIDR notation for the base IP address of the security group rule"""
-        self.cidr = None
-        """"the ending IP of the security group rule"""
-        self.endport = None
-        """"the code for the ICMP message response"""
-        self.icmpcode = None
-        """"the type of the ICMP message response"""
-        self.icmptype = None
-        """"the protocol of the security group rule"""
-        self.protocol = None
-        """"the id of the security group rule"""
-        self.ruleid = None
-        """"security group name"""
-        self.securitygroupname = None
-        """"the starting IP of the security group rule"""
-        self.startport = None
-        """"the list of ingress rules associated with the security group"""
-        self.ingressrule = []
-        """"account owning the security group rule"""
-        self.account = None
-        """"the CIDR notation for the base IP address of the security group rule"""
-        self.cidr = None
-        """"the ending IP of the security group rule"""
-        self.endport = None
-        """"the code for the ICMP message response"""
-        self.icmpcode = None
-        """"the type of the ICMP message response"""
-        self.icmptype = None
-        """"the protocol of the security group rule"""
-        self.protocol = None
-        """"the id of the security group rule"""
-        self.ruleid = None
-        """"security group name"""
-        self.securitygroupname = None
-        """"the starting IP of the security group rule"""
-        self.startport = None
-        """"the list of resource tags associated with the rule"""
-        self.tags = []
-        """"the account associated with the tag"""
-        self.account = None
-        """"customer associated with the tag"""
-        self.customer = None
-        """"the domain associated with the tag"""
-        self.domain = None
-        """"the ID of the domain associated with the tag"""
-        self.domainid = None
-        """"tag key name"""
-        self.key = None
-        """"the project name where tag belongs to"""
-        self.project = None
-        """"the project id the tag belongs to"""
-        self.projectid = None
-        """"id of the resource"""
-        self.resourceid = None
-        """"resource type"""
-        self.resourcetype = None
-        """"tag value"""
-        self.value = None
-        """"the ID of the latest async job acting on this object"""
-        self.jobid = None
-        """"the current status of the latest async job acting on this object"""
-        self.jobstatus = None
-
-class tags:
-    def __init__(self):
-        """"the account associated with the tag"""
-        self.account = None
-        """"customer associated with the tag"""
-        self.customer = None
-        """"the domain associated with the tag"""
-        self.domain = None
-        """"the ID of the domain associated with the tag"""
-        self.domainid = None
-        """"tag key name"""
-        self.key = None
-        """"the project name where tag belongs to"""
-        self.project = None
-        """"the project id the tag belongs to"""
-        self.projectid = None
-        """"id of the resource"""
-        self.resourceid = None
-        """"resource type"""
-        self.resourcetype = None
-        """"tag value"""
-        self.value = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/cleanVMReservations.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/cleanVMReservations.py b/tools/marvin/build/lib/marvin/cloudstackAPI/cleanVMReservations.py
deleted file mode 100644
index 89113e2..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/cleanVMReservations.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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.
-
-
-"""Cleanups VM reservations in the database."""
-from baseCmd import *
-from baseResponse import *
-class cleanVMReservationsCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        self.required = []
-
-class cleanVMReservationsResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-


Mime
View raw message