You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ta...@apache.org on 2013/11/08 11:36:40 UTC

[21/29] Revert "CLOUSTACK-5099: Utils.py-has-wrong-reference, cleaned it. As well added Uniform naming convention"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/dedicateCluster.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/dedicateCluster.py b/tools/marvin/build/lib/marvin/cloudstackAPI/dedicateCluster.py
deleted file mode 100644
index e52e233..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/dedicateCluster.py
+++ /dev/null
@@ -1,49 +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.
-
-
-"""Dedicate an existing cluster"""
-from baseCmd import *
-from baseResponse import *
-class dedicateClusterCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the Cluster"""
-        """Required"""
-        self.clusterid = None
-        """the ID of the containing domain"""
-        """Required"""
-        self.domainid = None
-        """the name of the account which needs dedication. Must be used with domainId."""
-        self.account = None
-        self.required = ["clusterid","domainid",]
-
-class dedicateClusterResponse (baseResponse):
-    def __init__(self):
-        """the ID of the dedicated resource"""
-        self.id = None
-        """the Account ID of the cluster"""
-        self.accountid = None
-        """the Dedication Affinity Group ID of the cluster"""
-        self.affinitygroupid = None
-        """the ID of the cluster"""
-        self.clusterid = None
-        """the name of the cluster"""
-        self.clustername = None
-        """the domain ID of the cluster"""
-        self.domainid = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/dedicateGuestVlanRange.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/dedicateGuestVlanRange.py b/tools/marvin/build/lib/marvin/cloudstackAPI/dedicateGuestVlanRange.py
deleted file mode 100644
index 3c779a6..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/dedicateGuestVlanRange.py
+++ /dev/null
@@ -1,61 +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.
-
-
-"""Dedicates a guest vlan range to an account"""
-from baseCmd import *
-from baseResponse import *
-class dedicateGuestVlanRangeCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "false"
-        """account who will own the VLAN"""
-        """Required"""
-        self.account = None
-        """domain ID of the account owning a VLAN"""
-        """Required"""
-        self.domainid = None
-        """physical network ID of the vlan"""
-        """Required"""
-        self.physicalnetworkid = None
-        """guest vlan range to be dedicated"""
-        """Required"""
-        self.vlanrange = None
-        """project who will own the VLAN"""
-        self.projectid = None
-        self.required = ["account","domainid","physicalnetworkid","vlanrange",]
-
-class dedicateGuestVlanRangeResponse (baseResponse):
-    def __init__(self):
-        """the ID of the guest VLAN range"""
-        self.id = None
-        """the account of the guest VLAN range"""
-        self.account = None
-        """the domain name of the guest VLAN range"""
-        self.domain = None
-        """the domain ID of the guest VLAN range"""
-        self.domainid = None
-        """the guest VLAN range"""
-        self.guestvlanrange = None
-        """the physical network of the guest vlan range"""
-        self.physicalnetworkid = None
-        """the project name of the guest vlan range"""
-        self.project = None
-        """the project id of the guest vlan range"""
-        self.projectid = None
-        """the zone of the guest vlan range"""
-        self.zoneid = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/dedicateHost.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/dedicateHost.py b/tools/marvin/build/lib/marvin/cloudstackAPI/dedicateHost.py
deleted file mode 100644
index 122d3e2..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/dedicateHost.py
+++ /dev/null
@@ -1,49 +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.
-
-
-"""Dedicates a host."""
-from baseCmd import *
-from baseResponse import *
-class dedicateHostCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the containing domain"""
-        """Required"""
-        self.domainid = None
-        """the ID of the host to update"""
-        """Required"""
-        self.hostid = None
-        """the name of the account which needs dedication. Must be used with domainId."""
-        self.account = None
-        self.required = ["domainid","hostid",]
-
-class dedicateHostResponse (baseResponse):
-    def __init__(self):
-        """the ID of the dedicated resource"""
-        self.id = None
-        """the Account ID of the host"""
-        self.accountid = None
-        """the Dedication Affinity Group ID of the host"""
-        self.affinitygroupid = None
-        """the domain ID of the host"""
-        self.domainid = None
-        """the ID of the host"""
-        self.hostid = None
-        """the name of the host"""
-        self.hostname = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/dedicatePod.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/dedicatePod.py b/tools/marvin/build/lib/marvin/cloudstackAPI/dedicatePod.py
deleted file mode 100644
index 494d846..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/dedicatePod.py
+++ /dev/null
@@ -1,49 +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.
-
-
-"""Dedicates a Pod."""
-from baseCmd import *
-from baseResponse import *
-class dedicatePodCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the containing domain"""
-        """Required"""
-        self.domainid = None
-        """the ID of the Pod"""
-        """Required"""
-        self.podid = None
-        """the name of the account which needs dedication. Must be used with domainId."""
-        self.account = None
-        self.required = ["domainid","podid",]
-
-class dedicatePodResponse (baseResponse):
-    def __init__(self):
-        """the ID of the dedicated resource"""
-        self.id = None
-        """the Account Id to which the Pod is dedicated"""
-        self.accountid = None
-        """the Dedication Affinity Group ID of the pod"""
-        self.affinitygroupid = None
-        """the domain ID to which the Pod is dedicated"""
-        self.domainid = None
-        """the ID of the Pod"""
-        self.podid = None
-        """the Name of the Pod"""
-        self.podname = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/dedicatePublicIpRange.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/dedicatePublicIpRange.py b/tools/marvin/build/lib/marvin/cloudstackAPI/dedicatePublicIpRange.py
deleted file mode 100644
index ce4f768..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/dedicatePublicIpRange.py
+++ /dev/null
@@ -1,84 +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.
-
-
-"""Dedicates a Public IP range to an account"""
-from baseCmd import *
-from baseResponse import *
-class dedicatePublicIpRangeCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "false"
-        """the id of the VLAN IP range"""
-        """Required"""
-        self.id = None
-        """account who will own the VLAN"""
-        """Required"""
-        self.account = None
-        """domain ID of the account owning a VLAN"""
-        """Required"""
-        self.domainid = None
-        """project who will own the VLAN"""
-        self.projectid = None
-        self.required = ["id","account","domainid",]
-
-class dedicatePublicIpRangeResponse (baseResponse):
-    def __init__(self):
-        """the ID of the VLAN IP range"""
-        self.id = None
-        """the account of the VLAN IP range"""
-        self.account = None
-        """the description of the VLAN IP range"""
-        self.description = None
-        """the domain name of the VLAN IP range"""
-        self.domain = None
-        """the domain ID of the VLAN IP range"""
-        self.domainid = None
-        """the end ip of the VLAN IP range"""
-        self.endip = None
-        """the end ipv6 of the VLAN IP range"""
-        self.endipv6 = None
-        """the virtual network for the VLAN IP range"""
-        self.forvirtualnetwork = None
-        """the gateway of the VLAN IP range"""
-        self.gateway = None
-        """the cidr of IPv6 network"""
-        self.ip6cidr = None
-        """the gateway of IPv6 network"""
-        self.ip6gateway = None
-        """the netmask of the VLAN IP range"""
-        self.netmask = None
-        """the network id of vlan range"""
-        self.networkid = None
-        """the physical network this belongs to"""
-        self.physicalnetworkid = None
-        """the Pod ID for the VLAN IP range"""
-        self.podid = None
-        """the Pod name for the VLAN IP range"""
-        self.podname = None
-        """the project name of the vlan range"""
-        self.project = None
-        """the project id of the vlan range"""
-        self.projectid = None
-        """the start ip of the VLAN IP range"""
-        self.startip = None
-        """the start ipv6 of the VLAN IP range"""
-        self.startipv6 = None
-        """the ID or VID of the VLAN."""
-        self.vlan = None
-        """the Zone ID of the VLAN IP range"""
-        self.zoneid = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/dedicateZone.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/dedicateZone.py b/tools/marvin/build/lib/marvin/cloudstackAPI/dedicateZone.py
deleted file mode 100644
index caf901e..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/dedicateZone.py
+++ /dev/null
@@ -1,49 +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.
-
-
-"""Dedicates a zones."""
-from baseCmd import *
-from baseResponse import *
-class dedicateZoneCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the containing domain"""
-        """Required"""
-        self.domainid = None
-        """the ID of the zone"""
-        """Required"""
-        self.zoneid = None
-        """the name of the account which needs dedication. Must be used with domainId."""
-        self.account = None
-        self.required = ["domainid","zoneid",]
-
-class dedicateZoneResponse (baseResponse):
-    def __init__(self):
-        """the ID of the dedicated resource"""
-        self.id = None
-        """the Account Id to which the Zone is dedicated"""
-        self.accountid = None
-        """the Dedication Affinity Group ID of the zone"""
-        self.affinitygroupid = None
-        """the domain ID to which the Zone is dedicated"""
-        self.domainid = None
-        """the ID of the Zone"""
-        self.zoneid = None
-        """the Name of the Zone"""
-        self.zonename = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAccount.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAccount.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAccount.py
deleted file mode 100644
index 84810c8..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAccount.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes a account, and all users associated with this account"""
-from baseCmd import *
-from baseResponse import *
-class deleteAccountCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """Account id"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteAccountResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAccountFromProject.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAccountFromProject.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAccountFromProject.py
deleted file mode 100644
index e7e32fc..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAccountFromProject.py
+++ /dev/null
@@ -1,39 +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.
-
-
-"""Deletes account from the project"""
-from baseCmd import *
-from baseResponse import *
-class deleteAccountFromProjectCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """name of the account to be removed from the project"""
-        """Required"""
-        self.account = None
-        """id of the project to remove the account from"""
-        """Required"""
-        self.projectid = None
-        self.required = ["account","projectid",]
-
-class deleteAccountFromProjectResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAffinityGroup.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAffinityGroup.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAffinityGroup.py
deleted file mode 100644
index 059dd8a..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAffinityGroup.py
+++ /dev/null
@@ -1,41 +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.
-
-
-"""Deletes affinity group"""
-from baseCmd import *
-from baseResponse import *
-class deleteAffinityGroupCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the account of the affinity group. Must be specified with domain ID"""
-        self.account = None
-        """the domain ID of account owning the affinity group"""
-        self.domainid = None
-        """The ID of the affinity group. Mutually exclusive with name parameter"""
-        self.id = None
-        """The name of the affinity group. Mutually exclusive with id parameter"""
-        self.name = None
-        self.required = []
-
-class deleteAffinityGroupResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAlerts.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAlerts.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAlerts.py
deleted file mode 100644
index 7bebd41..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAlerts.py
+++ /dev/null
@@ -1,41 +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.
-
-
-"""Delete one or more alerts."""
-from baseCmd import *
-from baseResponse import *
-class deleteAlertsCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "false"
-        """end date range to delete alerts (including) this date (use format "yyyy-MM-dd" or the new format "yyyy-MM-ddThh:mm:ss")"""
-        self.enddate = None
-        """the IDs of the alerts"""
-        self.ids = []
-        """start date range to delete alerts (including) this date (use format "yyyy-MM-dd" or the new format "yyyy-MM-ddThh:mm:ss")"""
-        self.startdate = None
-        """delete by alert type"""
-        self.type = None
-        self.required = []
-
-class deleteAlertsResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAutoScalePolicy.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAutoScalePolicy.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAutoScalePolicy.py
deleted file mode 100644
index 5ce5b2a..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAutoScalePolicy.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes a autoscale policy."""
-from baseCmd import *
-from baseResponse import *
-class deleteAutoScalePolicyCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the autoscale policy"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteAutoScalePolicyResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAutoScaleVmGroup.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAutoScaleVmGroup.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAutoScaleVmGroup.py
deleted file mode 100644
index 060d5f0..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAutoScaleVmGroup.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes a autoscale vm group."""
-from baseCmd import *
-from baseResponse import *
-class deleteAutoScaleVmGroupCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the autoscale group"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteAutoScaleVmGroupResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAutoScaleVmProfile.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAutoScaleVmProfile.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAutoScaleVmProfile.py
deleted file mode 100644
index 9279a56..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteAutoScaleVmProfile.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes a autoscale vm profile."""
-from baseCmd import *
-from baseResponse import *
-class deleteAutoScaleVmProfileCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the autoscale profile"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteAutoScaleVmProfileResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteBigSwitchVnsDevice.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteBigSwitchVnsDevice.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteBigSwitchVnsDevice.py
deleted file mode 100644
index c3c4150..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteBigSwitchVnsDevice.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""delete a bigswitch vns device"""
-from baseCmd import *
-from baseResponse import *
-class deleteBigSwitchVnsDeviceCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """BigSwitch device ID"""
-        """Required"""
-        self.vnsdeviceid = None
-        self.required = ["vnsdeviceid",]
-
-class deleteBigSwitchVnsDeviceResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteCluster.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteCluster.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteCluster.py
deleted file mode 100644
index 7ad27c2..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteCluster.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes a cluster."""
-from baseCmd import *
-from baseResponse import *
-class deleteClusterCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "false"
-        """the cluster ID"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteClusterResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteCondition.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteCondition.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteCondition.py
deleted file mode 100644
index e87ec95..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteCondition.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Removes a condition"""
-from baseCmd import *
-from baseResponse import *
-class deleteConditionCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the condition."""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteConditionResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteCounter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteCounter.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteCounter.py
deleted file mode 100644
index 78c2b71..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteCounter.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes a counter"""
-from baseCmd import *
-from baseResponse import *
-class deleteCounterCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the counter"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteCounterResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteDiskOffering.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteDiskOffering.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteDiskOffering.py
deleted file mode 100644
index 535d992..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteDiskOffering.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Updates a disk offering."""
-from baseCmd import *
-from baseResponse import *
-class deleteDiskOfferingCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "false"
-        """ID of the disk offering"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteDiskOfferingResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteDomain.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteDomain.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteDomain.py
deleted file mode 100644
index 7289850..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteDomain.py
+++ /dev/null
@@ -1,38 +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.
-
-
-"""Deletes a specified domain"""
-from baseCmd import *
-from baseResponse import *
-class deleteDomainCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """ID of domain to delete"""
-        """Required"""
-        self.id = None
-        """true if all domain resources (child domains, accounts) have to be cleaned up, false otherwise"""
-        self.cleanup = None
-        self.required = ["id",]
-
-class deleteDomainResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteEgressFirewallRule.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteEgressFirewallRule.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteEgressFirewallRule.py
deleted file mode 100644
index 3baecad..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteEgressFirewallRule.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes an ggress firewall rule"""
-from baseCmd import *
-from baseResponse import *
-class deleteEgressFirewallRuleCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the firewall rule"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteEgressFirewallRuleResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteEvents.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteEvents.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteEvents.py
deleted file mode 100644
index 3b4cbdf..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteEvents.py
+++ /dev/null
@@ -1,41 +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.
-
-
-"""Delete one or more events."""
-from baseCmd import *
-from baseResponse import *
-class deleteEventsCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "false"
-        """end date range to delete events (including) this date (use format "yyyy-MM-dd" or the new format "yyyy-MM-ddThh:mm:ss")"""
-        self.enddate = None
-        """the IDs of the events"""
-        self.ids = []
-        """start date range to delete events (including) this date (use format "yyyy-MM-dd" or the new format "yyyy-MM-ddThh:mm:ss")"""
-        self.startdate = None
-        """delete by event type"""
-        self.type = None
-        self.required = []
-
-class deleteEventsResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteFirewallRule.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteFirewallRule.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteFirewallRule.py
deleted file mode 100644
index de9344a..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteFirewallRule.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes a firewall rule"""
-from baseCmd import *
-from baseResponse import *
-class deleteFirewallRuleCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the firewall rule"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteFirewallRuleResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteGlobalLoadBalancerRule.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteGlobalLoadBalancerRule.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteGlobalLoadBalancerRule.py
deleted file mode 100644
index 26ef6fe..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteGlobalLoadBalancerRule.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes a global load balancer rule."""
-from baseCmd import *
-from baseResponse import *
-class deleteGlobalLoadBalancerRuleCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the global load balancer rule"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteGlobalLoadBalancerRuleResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteHost.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteHost.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteHost.py
deleted file mode 100644
index 1ffd8de..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteHost.py
+++ /dev/null
@@ -1,40 +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.
-
-
-"""Deletes a host."""
-from baseCmd import *
-from baseResponse import *
-class deleteHostCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "false"
-        """the host ID"""
-        """Required"""
-        self.id = None
-        """Force delete the host. All HA enabled vms running on the host will be put to HA; HA disabled ones will be stopped"""
-        self.forced = None
-        """Force destroy local storage on this host. All VMs created on this local storage will be destroyed"""
-        self.forcedestroylocalstorage = None
-        self.required = ["id",]
-
-class deleteHostResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteImageStore.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteImageStore.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteImageStore.py
deleted file mode 100644
index 447eab3..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteImageStore.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes an image store ."""
-from baseCmd import *
-from baseResponse import *
-class deleteImageStoreCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "false"
-        """the image store ID"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteImageStoreResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteInstanceGroup.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteInstanceGroup.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteInstanceGroup.py
deleted file mode 100644
index ccfef7f..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteInstanceGroup.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes a vm group"""
-from baseCmd import *
-from baseResponse import *
-class deleteInstanceGroupCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "false"
-        """the ID of the instance group"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteInstanceGroupResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteIpForwardingRule.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteIpForwardingRule.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteIpForwardingRule.py
deleted file mode 100644
index 3cf496f..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteIpForwardingRule.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes an ip forwarding rule"""
-from baseCmd import *
-from baseResponse import *
-class deleteIpForwardingRuleCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the id of the forwarding rule"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteIpForwardingRuleResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteIso.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteIso.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteIso.py
deleted file mode 100644
index 748b6be..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteIso.py
+++ /dev/null
@@ -1,38 +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.
-
-
-"""Deletes an ISO file."""
-from baseCmd import *
-from baseResponse import *
-class deleteIsoCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the ISO file"""
-        """Required"""
-        self.id = None
-        """the ID of the zone of the ISO file. If not specified, the ISO will be deleted from all the zones"""
-        self.zoneid = None
-        self.required = ["id",]
-
-class deleteIsoResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteLBHealthCheckPolicy.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteLBHealthCheckPolicy.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteLBHealthCheckPolicy.py
deleted file mode 100644
index 5008616..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteLBHealthCheckPolicy.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes a load balancer HealthCheck policy."""
-from baseCmd import *
-from baseResponse import *
-class deleteLBHealthCheckPolicyCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the load balancer HealthCheck policy"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteLBHealthCheckPolicyResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteLBStickinessPolicy.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteLBStickinessPolicy.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteLBStickinessPolicy.py
deleted file mode 100644
index d90b4d8..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteLBStickinessPolicy.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes a LB stickiness policy."""
-from baseCmd import *
-from baseResponse import *
-class deleteLBStickinessPolicyCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the LB stickiness policy"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteLBStickinessPolicyResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteLdapConfiguration.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteLdapConfiguration.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteLdapConfiguration.py
deleted file mode 100644
index 3ac530d..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteLdapConfiguration.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Remove an Ldap Configuration"""
-from baseCmd import *
-from baseResponse import *
-class deleteLdapConfigurationCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "false"
-        """Hostname"""
-        """Required"""
-        self.hostname = None
-        self.required = ["hostname",]
-
-class deleteLdapConfigurationResponse (baseResponse):
-    def __init__(self):
-        """hostname"""
-        self.hostname = None
-        """port"""
-        self.port = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteLoadBalancer.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteLoadBalancer.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteLoadBalancer.py
deleted file mode 100644
index 753c370..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteLoadBalancer.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes a load balancer"""
-from baseCmd import *
-from baseResponse import *
-class deleteLoadBalancerCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the Load Balancer"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteLoadBalancerResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteLoadBalancerRule.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteLoadBalancerRule.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteLoadBalancerRule.py
deleted file mode 100644
index 6608250..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteLoadBalancerRule.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes a load balancer rule."""
-from baseCmd import *
-from baseResponse import *
-class deleteLoadBalancerRuleCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the load balancer rule"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteLoadBalancerRuleResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetwork.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetwork.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetwork.py
deleted file mode 100644
index adbb792..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetwork.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes a network"""
-from baseCmd import *
-from baseResponse import *
-class deleteNetworkCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the network"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteNetworkResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetworkACL.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetworkACL.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetworkACL.py
deleted file mode 100644
index cf2288d..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetworkACL.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes a Network ACL"""
-from baseCmd import *
-from baseResponse import *
-class deleteNetworkACLCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the network ACL"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteNetworkACLResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetworkACLList.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetworkACLList.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetworkACLList.py
deleted file mode 100644
index e9b854b..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetworkACLList.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes a Network ACL"""
-from baseCmd import *
-from baseResponse import *
-class deleteNetworkACLListCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the network ACL"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteNetworkACLListResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetworkDevice.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetworkDevice.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetworkDevice.py
deleted file mode 100644
index 11014f4..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetworkDevice.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes network device."""
-from baseCmd import *
-from baseResponse import *
-class deleteNetworkDeviceCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "false"
-        """Id of network device to delete"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteNetworkDeviceResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetworkOffering.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetworkOffering.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetworkOffering.py
deleted file mode 100644
index 7674721..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetworkOffering.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes a network offering."""
-from baseCmd import *
-from baseResponse import *
-class deleteNetworkOfferingCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "false"
-        """the ID of the network offering"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteNetworkOfferingResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetworkServiceProvider.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetworkServiceProvider.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetworkServiceProvider.py
deleted file mode 100644
index 0bdc3e4..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNetworkServiceProvider.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes a Network Service Provider."""
-from baseCmd import *
-from baseResponse import *
-class deleteNetworkServiceProviderCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the network service provider"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deleteNetworkServiceProviderResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNiciraNvpDevice.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNiciraNvpDevice.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNiciraNvpDevice.py
deleted file mode 100644
index 067ea8b..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deleteNiciraNvpDevice.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""delete a nicira nvp device"""
-from baseCmd import *
-from baseResponse import *
-class deleteNiciraNvpDeviceCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """Nicira device ID"""
-        """Required"""
-        self.nvpdeviceid = None
-        self.required = ["nvpdeviceid",]
-
-class deleteNiciraNvpDeviceResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deletePhysicalNetwork.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deletePhysicalNetwork.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deletePhysicalNetwork.py
deleted file mode 100644
index 3638130..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deletePhysicalNetwork.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes a Physical Network."""
-from baseCmd import *
-from baseResponse import *
-class deletePhysicalNetworkCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the Physical network"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deletePhysicalNetworkResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deletePod.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deletePod.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deletePod.py
deleted file mode 100644
index 73e636e..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deletePod.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes a Pod."""
-from baseCmd import *
-from baseResponse import *
-class deletePodCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "false"
-        """the ID of the Pod"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deletePodResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deletePortForwardingRule.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deletePortForwardingRule.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deletePortForwardingRule.py
deleted file mode 100644
index 4669d0e..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deletePortForwardingRule.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""Deletes a port forwarding rule"""
-from baseCmd import *
-from baseResponse import *
-class deletePortForwardingRuleCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """the ID of the port forwarding rule"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deletePortForwardingRuleResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65b12f45/tools/marvin/build/lib/marvin/cloudstackAPI/deletePortableIpRange.py
----------------------------------------------------------------------
diff --git a/tools/marvin/build/lib/marvin/cloudstackAPI/deletePortableIpRange.py b/tools/marvin/build/lib/marvin/cloudstackAPI/deletePortableIpRange.py
deleted file mode 100644
index 9fe2346..0000000
--- a/tools/marvin/build/lib/marvin/cloudstackAPI/deletePortableIpRange.py
+++ /dev/null
@@ -1,36 +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.
-
-
-"""deletes a range of portable public IP's associated with a region"""
-from baseCmd import *
-from baseResponse import *
-class deletePortableIpRangeCmd (baseCmd):
-    def __init__(self):
-        self.isAsync = "true"
-        """Id of the portable ip range"""
-        """Required"""
-        self.id = None
-        self.required = ["id",]
-
-class deletePortableIpRangeResponse (baseResponse):
-    def __init__(self):
-        """any text associated with the success or failure"""
-        self.displaytext = None
-        """true if operation is executed successfully"""
-        self.success = None
-