cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [10/17] make the module structure more relevant and simple
Date Sun, 21 Apr 2013 12:23:23 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/SystemVm.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/SystemVm.py b/tools/marvin/marvin/integration/lib/base/SystemVm.py
deleted file mode 100644
index f6e6af5..0000000
--- a/tools/marvin/marvin/integration/lib/base/SystemVm.py
+++ /dev/null
@@ -1,80 +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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import migrateSystemVm
-from marvin.cloudstackAPI import stopSystemVm
-from marvin.cloudstackAPI import listSystemVms
-from marvin.cloudstackAPI import rebootSystemVm
-from marvin.cloudstackAPI import startSystemVm
-from marvin.cloudstackAPI import destroySystemVm
-
-class SystemVm(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    def migrate(self, apiclient, hostid, virtualmachineid, **kwargs):
-        cmd = migrateSystemVm.migrateSystemVmCmd()
-        cmd.id = self.id
-        cmd.hostid = hostid
-        cmd.virtualmachineid = virtualmachineid
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        systemvm = apiclient.migrateSystemVm(cmd)
-        return systemvm
-
-
-    def stop(self, apiclient, **kwargs):
-        cmd = stopSystemVm.stopSystemVmCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        systemvm = apiclient.stopSystemVm(cmd)
-        return systemvm
-
-
-    @classmethod
-    def list(self, apiclient, **kwargs):
-        cmd = listSystemVms.listSystemVmsCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        systemvm = apiclient.listSystemVms(cmd)
-        return map(lambda e: SystemVm(e.__dict__), systemvm)
-
-
-    def reboot(self, apiclient, **kwargs):
-        cmd = rebootSystemVm.rebootSystemVmCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        systemvm = apiclient.rebootSystemVm(cmd)
-        return systemvm
-
-
-    def start(self, apiclient, **kwargs):
-        cmd = startSystemVm.startSystemVmCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        systemvm = apiclient.startSystemVm(cmd)
-        return systemvm
-
-
-    def destroy(self, apiclient, **kwargs):
-        cmd = destroySystemVm.destroySystemVmCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        systemvm = apiclient.destroySystemVm(cmd)
-        return systemvm
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/Tags.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Tags.py b/tools/marvin/marvin/integration/lib/base/Tags.py
deleted file mode 100644
index c68a664..0000000
--- a/tools/marvin/marvin/integration/lib/base/Tags.py
+++ /dev/null
@@ -1,54 +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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import createTags
-from marvin.cloudstackAPI import listTags
-from marvin.cloudstackAPI import deleteTags
-
-class Tags(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    @classmethod
-    def create(cls, apiclient, factory, **kwargs):
-        cmd = createTags.createTagsCmd()
-        [setattr(cmd, factoryKey, factoryValue) for factoryKey, factoryValue in factory.__dict__.iteritems()]
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        tags = apiclient.createTags(cmd)
-        return Tags(tags.__dict__)
-
-
-    @classmethod
-    def list(self, apiclient, **kwargs):
-        cmd = listTags.listTagsCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        tags = apiclient.listTags(cmd)
-        return map(lambda e: Tags(e.__dict__), tags)
-
-
-    def delete(self, apiclient, resourcetype, resourceids, **kwargs):
-        cmd = deleteTags.deleteTagsCmd()
-        cmd.id = self.id
-        cmd.resourceids = resourceids
-        cmd.resourcetype = resourcetype
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        tags = apiclient.deleteTags(cmd)
-        return tags
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/Template.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Template.py b/tools/marvin/marvin/integration/lib/base/Template.py
deleted file mode 100644
index 0e7d794..0000000
--- a/tools/marvin/marvin/integration/lib/base/Template.py
+++ /dev/null
@@ -1,106 +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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import prepareTemplate
-from marvin.cloudstackAPI import createTemplate
-from marvin.cloudstackAPI import registerTemplate
-from marvin.cloudstackAPI import listTemplates
-from marvin.cloudstackAPI import updateTemplate
-from marvin.cloudstackAPI import copyTemplate
-from marvin.cloudstackAPI import extractTemplate
-from marvin.cloudstackAPI import deleteTemplate
-
-class Template(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    def prepare(self, apiclient, zoneid, templateid, **kwargs):
-        cmd = prepareTemplate.prepareTemplateCmd()
-        cmd.id = self.id
-        cmd.templateid = templateid
-        cmd.zoneid = zoneid
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        template = apiclient.prepareTemplate(cmd)
-        return template
-
-
-    def template_of_vm(self, apiclient, name, displaytext, ostypeid, **kwargs):
-        cmd = createTemplate.createTemplateCmd()
-        cmd.id = self.id
-        cmd.name = name
-        cmd.displaytext = displaytext
-        cmd.ostypeid = ostypeid
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        template = apiclient.createTemplate(cmd)
-        return Template(template.__dict__)
-
-
-    @classmethod
-    def create(self, apiclient, factory, **kwargs):
-        cmd = registerTemplate.registerTemplateCmd()
-        [setattr(cmd, factoryKey, factoryValue) for factoryKey, factoryValue in factory.__dict__.iteritems()]
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        template = apiclient.registerTemplate(cmd)
-        return template
-
-
-    @classmethod
-    def list(self, apiclient, templatefilter, **kwargs):
-        cmd = listTemplates.listTemplatesCmd()
-        cmd.templatefilter = templatefilter
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        template = apiclient.listTemplates(cmd)
-        return map(lambda e: Template(e.__dict__), template)
-
-
-    def update(self, apiclient, **kwargs):
-        cmd = updateTemplate.updateTemplateCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        template = apiclient.updateTemplate(cmd)
-        return template
-
-
-    def copy(self, apiclient, sourcezoneid, destzoneid, **kwargs):
-        cmd = copyTemplate.copyTemplateCmd()
-        cmd.id = self.id
-        cmd.destzoneid = destzoneid
-        cmd.sourcezoneid = sourcezoneid
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        template = apiclient.copyTemplate(cmd)
-        return template
-
-
-    def extract(self, apiclient, mode, **kwargs):
-        cmd = extractTemplate.extractTemplateCmd()
-        cmd.id = self.id
-        cmd.mode = mode
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        template = apiclient.extractTemplate(cmd)
-        return template
-
-
-    def delete(self, apiclient, **kwargs):
-        cmd = deleteTemplate.deleteTemplateCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        template = apiclient.deleteTemplate(cmd)
-        return template
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/TemplatePermissions.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/TemplatePermissions.py b/tools/marvin/marvin/integration/lib/base/TemplatePermissions.py
deleted file mode 100644
index 85333f4..0000000
--- a/tools/marvin/marvin/integration/lib/base/TemplatePermissions.py
+++ /dev/null
@@ -1,42 +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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import listTemplatePermissions
-from marvin.cloudstackAPI import updateTemplatePermissions
-
-class TemplatePermissions(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    @classmethod
-    def list(self, apiclient, **kwargs):
-        cmd = listTemplatePermissions.listTemplatePermissionsCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        templatepermissions = apiclient.listTemplatePermissions(cmd)
-        return map(lambda e: TemplatePermissions(e.__dict__), templatepermissions)
-
-
-    def update(self, apiclient, **kwargs):
-        cmd = updateTemplatePermissions.updateTemplatePermissionsCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        templatepermissions = apiclient.updateTemplatePermissions(cmd)
-        return templatepermissions
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/TrafficMonitor.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/TrafficMonitor.py b/tools/marvin/marvin/integration/lib/base/TrafficMonitor.py
deleted file mode 100644
index f08dd55..0000000
--- a/tools/marvin/marvin/integration/lib/base/TrafficMonitor.py
+++ /dev/null
@@ -1,54 +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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import addTrafficMonitor
-from marvin.cloudstackAPI import listTrafficMonitors
-from marvin.cloudstackAPI import deleteTrafficMonitor
-
-class TrafficMonitor(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    def add(self, apiclient, url, zoneid, **kwargs):
-        cmd = addTrafficMonitor.addTrafficMonitorCmd()
-        cmd.id = self.id
-        cmd.url = url
-        cmd.zoneid = zoneid
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        trafficmonitor = apiclient.addTrafficMonitor(cmd)
-        return trafficmonitor
-
-
-    @classmethod
-    def list(self, apiclient, zoneid, **kwargs):
-        cmd = listTrafficMonitors.listTrafficMonitorsCmd()
-        cmd.zoneid = zoneid
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        trafficmonitor = apiclient.listTrafficMonitors(cmd)
-        return map(lambda e: TrafficMonitor(e.__dict__), trafficmonitor)
-
-
-    def delete(self, apiclient, **kwargs):
-        cmd = deleteTrafficMonitor.deleteTrafficMonitorCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        trafficmonitor = apiclient.deleteTrafficMonitor(cmd)
-        return trafficmonitor
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/TrafficType.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/TrafficType.py b/tools/marvin/marvin/integration/lib/base/TrafficType.py
deleted file mode 100644
index cad2cb8..0000000
--- a/tools/marvin/marvin/integration/lib/base/TrafficType.py
+++ /dev/null
@@ -1,63 +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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import addTrafficType
-from marvin.cloudstackAPI import listTrafficTypes
-from marvin.cloudstackAPI import updateTrafficType
-from marvin.cloudstackAPI import deleteTrafficType
-
-class TrafficType(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    def add(self, apiclient, traffictype, physicalnetworkid, **kwargs):
-        cmd = addTrafficType.addTrafficTypeCmd()
-        cmd.id = self.id
-        cmd.physicalnetworkid = physicalnetworkid
-        cmd.traffictype = traffictype
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        traffictype = apiclient.addTrafficType(cmd)
-        return traffictype
-
-
-    @classmethod
-    def list(self, apiclient, physicalnetworkid, **kwargs):
-        cmd = listTrafficTypes.listTrafficTypesCmd()
-        cmd.physicalnetworkid = physicalnetworkid
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        traffictype = apiclient.listTrafficTypes(cmd)
-        return map(lambda e: TrafficType(e.__dict__), traffictype)
-
-
-    def update(self, apiclient, **kwargs):
-        cmd = updateTrafficType.updateTrafficTypeCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        traffictype = apiclient.updateTrafficType(cmd)
-        return traffictype
-
-
-    def delete(self, apiclient, **kwargs):
-        cmd = deleteTrafficType.deleteTrafficTypeCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        traffictype = apiclient.deleteTrafficType(cmd)
-        return traffictype
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/TrafficTypeImplementors.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/TrafficTypeImplementors.py b/tools/marvin/marvin/integration/lib/base/TrafficTypeImplementors.py
deleted file mode 100644
index 50277f3..0000000
--- a/tools/marvin/marvin/integration/lib/base/TrafficTypeImplementors.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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import listTrafficTypeImplementors
-
-class TrafficTypeImplementors(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    @classmethod
-    def list(self, apiclient, **kwargs):
-        cmd = listTrafficTypeImplementors.listTrafficTypeImplementorsCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        traffictypeimplementors = apiclient.listTrafficTypeImplementors(cmd)
-        return map(lambda e: TrafficTypeImplementors(e.__dict__), traffictypeimplementors)
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/UsageRecords.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/UsageRecords.py b/tools/marvin/marvin/integration/lib/base/UsageRecords.py
deleted file mode 100644
index 6c0776c..0000000
--- a/tools/marvin/marvin/integration/lib/base/UsageRecords.py
+++ /dev/null
@@ -1,46 +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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import listUsageRecords
-from marvin.cloudstackAPI import generateUsageRecords
-
-class UsageRecords(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    @classmethod
-    def list(self, apiclient, startdate, enddate, **kwargs):
-        cmd = listUsageRecords.listUsageRecordsCmd()
-        cmd.enddate = enddate
-        cmd.startdate = startdate
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        usagerecords = apiclient.listUsageRecords(cmd)
-        return map(lambda e: UsageRecords(e.__dict__), usagerecords)
-
-
-    def generate(self, apiclient, startdate, enddate, **kwargs):
-        cmd = generateUsageRecords.generateUsageRecordsCmd()
-        cmd.id = self.id
-        cmd.enddate = enddate
-        cmd.startdate = startdate
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        usagerecords = apiclient.generateUsageRecords(cmd)
-        return usagerecords
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/UsageTypes.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/UsageTypes.py b/tools/marvin/marvin/integration/lib/base/UsageTypes.py
deleted file mode 100644
index a490643..0000000
--- a/tools/marvin/marvin/integration/lib/base/UsageTypes.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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import listUsageTypes
-
-class UsageTypes(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    @classmethod
-    def list(self, apiclient, **kwargs):
-        cmd = listUsageTypes.listUsageTypesCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        usagetypes = apiclient.listUsageTypes(cmd)
-        return map(lambda e: UsageTypes(e.__dict__), usagetypes)
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/User.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/User.py b/tools/marvin/marvin/integration/lib/base/User.py
deleted file mode 100644
index e10d4f3..0000000
--- a/tools/marvin/marvin/integration/lib/base/User.py
+++ /dev/null
@@ -1,107 +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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import enableUser
-from marvin.cloudstackAPI import getUser
-from marvin.cloudstackAPI import lockUser
-from marvin.cloudstackAPI import createUser
-from marvin.cloudstackAPI import listUsers
-from marvin.cloudstackAPI import updateUser
-from marvin.cloudstackAPI import disableUser
-from marvin.cloudstackAPI import deleteUser
-from marvin.cloudstackAPI import registerUserKeys
-
-class User(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    def enable(self, apiclient, **kwargs):
-        cmd = enableUser.enableUserCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        user = apiclient.enableUser(cmd)
-        return user
-
-
-    def get(self, apiclient, userapikey, **kwargs):
-        cmd = getUser.getUserCmd()
-        cmd.id = self.id
-        cmd.userapikey = userapikey
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        user = apiclient.getUser(cmd)
-        return user
-
-
-    def lock(self, apiclient, **kwargs):
-        cmd = lockUser.lockUserCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        user = apiclient.lockUser(cmd)
-        return user
-
-
-    @classmethod
-    def create(cls, apiclient, factory, **kwargs):
-        cmd = createUser.createUserCmd()
-        [setattr(cmd, factoryKey, factoryValue) for factoryKey, factoryValue in factory.__dict__.iteritems()]
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        user = apiclient.createUser(cmd)
-        return User(user.__dict__)
-
-
-    @classmethod
-    def list(self, apiclient, **kwargs):
-        cmd = listUsers.listUsersCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        user = apiclient.listUsers(cmd)
-        return map(lambda e: User(e.__dict__), user)
-
-
-    def update(self, apiclient, **kwargs):
-        cmd = updateUser.updateUserCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        user = apiclient.updateUser(cmd)
-        return user
-
-
-    def disable(self, apiclient, **kwargs):
-        cmd = disableUser.disableUserCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        user = apiclient.disableUser(cmd)
-        return user
-
-
-    def delete(self, apiclient, **kwargs):
-        cmd = deleteUser.deleteUserCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        user = apiclient.deleteUser(cmd)
-        return user
-
-
-    def register_userkeys(self, apiclient, **kwargs):
-        cmd = registerUserKeys.registerUserKeysCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        userkeys = apiclient.registerUserKeys(cmd)
-        return userkeys
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/VMPassword.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/VMPassword.py b/tools/marvin/marvin/integration/lib/base/VMPassword.py
deleted file mode 100644
index 8940b3b..0000000
--- a/tools/marvin/marvin/integration/lib/base/VMPassword.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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import getVMPassword
-
-class VMPassword(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    def get(self, apiclient, **kwargs):
-        cmd = getVMPassword.getVMPasswordCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vmpassword = apiclient.getVMPassword(cmd)
-        return vmpassword
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/VMSnapshot.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/VMSnapshot.py b/tools/marvin/marvin/integration/lib/base/VMSnapshot.py
deleted file mode 100644
index 570365a..0000000
--- a/tools/marvin/marvin/integration/lib/base/VMSnapshot.py
+++ /dev/null
@@ -1,53 +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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import createVMSnapshot
-from marvin.cloudstackAPI import listVMSnapshot
-from marvin.cloudstackAPI import deleteVMSnapshot
-
-class VMSnapshot(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    @classmethod
-    def create(cls, apiclient, factory, **kwargs):
-        cmd = createVMSnapshot.createVMSnapshotCmd()
-        [setattr(cmd, factoryKey, factoryValue) for factoryKey, factoryValue in factory.__dict__.iteritems()]
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vmsnapshot = apiclient.createVMSnapshot(cmd)
-        return VMSnapshot(vmsnapshot.__dict__)
-
-
-    @classmethod
-    def list(self, apiclient, **kwargs):
-        cmd = listVMSnapshot.listVMSnapshotCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vmsnapshot = apiclient.listVMSnapshot(cmd)
-        return map(lambda e: VMSnapshot(e.__dict__), vmsnapshot)
-
-
-    def delete(self, apiclient, vmsnapshotid, **kwargs):
-        cmd = deleteVMSnapshot.deleteVMSnapshotCmd()
-        cmd.id = self.id
-        cmd.vmsnapshotid = vmsnapshotid
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vmsnapshot = apiclient.deleteVMSnapshot(cmd)
-        return vmsnapshot
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/VPC.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/VPC.py b/tools/marvin/marvin/integration/lib/base/VPC.py
deleted file mode 100644
index b3ae25d..0000000
--- a/tools/marvin/marvin/integration/lib/base/VPC.py
+++ /dev/null
@@ -1,70 +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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import createVPC
-from marvin.cloudstackAPI import listVPCs
-from marvin.cloudstackAPI import updateVPC
-from marvin.cloudstackAPI import restartVPC
-from marvin.cloudstackAPI import deleteVPC
-
-class VPC(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    @classmethod
-    def create(cls, apiclient, factory, **kwargs):
-        cmd = createVPC.createVPCCmd()
-        [setattr(cmd, factoryKey, factoryValue) for factoryKey, factoryValue in factory.__dict__.iteritems()]
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpc = apiclient.createVPC(cmd)
-        return VPC(vpc.__dict__)
-
-
-    @classmethod
-    def list(self, apiclient, **kwargs):
-        cmd = listVPCs.listVPCsCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpc = apiclient.listVPCs(cmd)
-        return map(lambda e: VPC(e.__dict__), vpc)
-
-
-    def update(self, apiclient, **kwargs):
-        cmd = updateVPC.updateVPCCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpc = apiclient.updateVPC(cmd)
-        return vpc
-
-
-    def restart(self, apiclient, **kwargs):
-        cmd = restartVPC.restartVPCCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpc = apiclient.restartVPC(cmd)
-        return vpc
-
-
-    def delete(self, apiclient, **kwargs):
-        cmd = deleteVPC.deleteVPCCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpc = apiclient.deleteVPC(cmd)
-        return vpc
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/VPCOffering.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/VPCOffering.py b/tools/marvin/marvin/integration/lib/base/VPCOffering.py
deleted file mode 100644
index 842afec..0000000
--- a/tools/marvin/marvin/integration/lib/base/VPCOffering.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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import createVPCOffering
-from marvin.cloudstackAPI import listVPCOfferings
-from marvin.cloudstackAPI import updateVPCOffering
-from marvin.cloudstackAPI import deleteVPCOffering
-
-class VPCOffering(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    @classmethod
-    def create(cls, apiclient, factory, **kwargs):
-        cmd = createVPCOffering.createVPCOfferingCmd()
-        [setattr(cmd, factoryKey, factoryValue) for factoryKey, factoryValue in factory.__dict__.iteritems()]
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpcoffering = apiclient.createVPCOffering(cmd)
-        return VPCOffering(vpcoffering.__dict__)
-
-
-    @classmethod
-    def list(self, apiclient, **kwargs):
-        cmd = listVPCOfferings.listVPCOfferingsCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpcoffering = apiclient.listVPCOfferings(cmd)
-        return map(lambda e: VPCOffering(e.__dict__), vpcoffering)
-
-
-    def update(self, apiclient, **kwargs):
-        cmd = updateVPCOffering.updateVPCOfferingCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpcoffering = apiclient.updateVPCOffering(cmd)
-        return vpcoffering
-
-
-    def delete(self, apiclient, **kwargs):
-        cmd = deleteVPCOffering.deleteVPCOfferingCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpcoffering = apiclient.deleteVPCOffering(cmd)
-        return vpcoffering
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/VirtualMachine.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/VirtualMachine.py b/tools/marvin/marvin/integration/lib/base/VirtualMachine.py
deleted file mode 100644
index a0193cb..0000000
--- a/tools/marvin/marvin/integration/lib/base/VirtualMachine.py
+++ /dev/null
@@ -1,178 +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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import restoreVirtualMachine
-from marvin.cloudstackAPI import scaleVirtualMachine
-from marvin.cloudstackAPI import deployVirtualMachine
-from marvin.cloudstackAPI import migrateVirtualMachine
-from marvin.cloudstackAPI import listVirtualMachines
-from marvin.cloudstackAPI import stopVirtualMachine
-from marvin.cloudstackAPI import rebootVirtualMachine
-from marvin.cloudstackAPI import updateVirtualMachine
-from marvin.cloudstackAPI import startVirtualMachine
-from marvin.cloudstackAPI import destroyVirtualMachine
-from marvin.cloudstackAPI import assignVirtualMachine
-from marvin.cloudstackAPI import addNicToVirtualMachine
-from marvin.cloudstackAPI import removeNicFromVirtualMachine
-from marvin.cloudstackAPI import resetPasswordForVirtualMachine
-from marvin.cloudstackAPI import resetSSHKeyForVirtualMachine
-from marvin.cloudstackAPI import updateDefaultNicForVirtualMachine
-
-class VirtualMachine(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    def restore(self, apiclient, virtualmachineid, **kwargs):
-        cmd = restoreVirtualMachine.restoreVirtualMachineCmd()
-        cmd.id = self.id
-        cmd.virtualmachineid = virtualmachineid
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        virtualmachine = apiclient.restoreVirtualMachine(cmd)
-        return virtualmachine
-
-
-    def scale(self, apiclient, serviceofferingid, **kwargs):
-        cmd = scaleVirtualMachine.scaleVirtualMachineCmd()
-        cmd.id = self.id
-        cmd.serviceofferingid = serviceofferingid
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        virtualmachine = apiclient.scaleVirtualMachine(cmd)
-        return virtualmachine
-
-
-    @classmethod
-    def deploy(cls, apiclient, factory, **kwargs):
-        cmd = deployVirtualMachine.deployVirtualMachineCmd()
-        [setattr(cmd, factoryKey, factoryValue) for factoryKey, factoryValue in factory.__dict__.iteritems()]
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        virtualmachine = apiclient.deployVirtualMachine(cmd)
-        return VirtualMachine(virtualmachine.__dict__)
-
-
-    def migrate(self, apiclient, virtualmachineid, **kwargs):
-        cmd = migrateVirtualMachine.migrateVirtualMachineCmd()
-        cmd.id = self.id
-        cmd.virtualmachineid = virtualmachineid
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        virtualmachine = apiclient.migrateVirtualMachine(cmd)
-        return virtualmachine
-
-
-    @classmethod
-    def list(self, apiclient, **kwargs):
-        cmd = listVirtualMachines.listVirtualMachinesCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        virtualmachine = apiclient.listVirtualMachines(cmd)
-        return map(lambda e: VirtualMachine(e.__dict__), virtualmachine)
-
-
-    def stop(self, apiclient, **kwargs):
-        cmd = stopVirtualMachine.stopVirtualMachineCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        virtualmachine = apiclient.stopVirtualMachine(cmd)
-        return virtualmachine
-
-
-    def reboot(self, apiclient, **kwargs):
-        cmd = rebootVirtualMachine.rebootVirtualMachineCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        virtualmachine = apiclient.rebootVirtualMachine(cmd)
-        return virtualmachine
-
-
-    def update(self, apiclient, **kwargs):
-        cmd = updateVirtualMachine.updateVirtualMachineCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        virtualmachine = apiclient.updateVirtualMachine(cmd)
-        return virtualmachine
-
-
-    def start(self, apiclient, **kwargs):
-        cmd = startVirtualMachine.startVirtualMachineCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        virtualmachine = apiclient.startVirtualMachine(cmd)
-        return virtualmachine
-
-
-    def destroy(self, apiclient, **kwargs):
-        cmd = destroyVirtualMachine.destroyVirtualMachineCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        virtualmachine = apiclient.destroyVirtualMachine(cmd)
-        return virtualmachine
-
-
-    def assign(self, apiclient, account, domainid, virtualmachineid, **kwargs):
-        cmd = assignVirtualMachine.assignVirtualMachineCmd()
-        cmd.id = self.id
-        cmd.account = account
-        cmd.domainid = domainid
-        cmd.virtualmachineid = virtualmachineid
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        virtualmachine = apiclient.assignVirtualMachine(cmd)
-        return virtualmachine
-
-    def remove_nic(self, apiclient, nicid, **kwargs):
-        cmd = removeNicFromVirtualMachine.removeNicFromVirtualMachineCmd()
-        cmd.virtualmachineid = self.id
-        cmd.nicid = nicid
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        nicfromvirtualmachine = apiclient.removeNicFromVirtualMachine(cmd)
-        return nicfromvirtualmachine
-
-
-    def add_nic(self, apiclient, networkid, **kwargs):
-        cmd = addNicToVirtualMachine.addNicToVirtualMachineCmd()
-        cmd.virtualmachineid = self.id
-        cmd.networkid = networkid
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        nictovirtualmachine = apiclient.addNicToVirtualMachine(cmd)
-        return nictovirtualmachine
-
-
-    def update_default_nic(self, apiclient, nicid, **kwargs):
-        cmd = updateDefaultNicForVirtualMachine.updateDefaultNicForVirtualMachineCmd()
-        cmd.virtualmachineid = self.id
-        cmd.nicid = nicid
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        defaultnicforvirtualmachine = apiclient.updateDefaultNicForVirtualMachine(cmd)
-        return defaultnicforvirtualmachine
-
-
-    def reset_password(self, apiclient, **kwargs):
-        cmd = resetPasswordForVirtualMachine.resetPasswordForVirtualMachineCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        passwordforvirtualmachine = apiclient.resetPasswordForVirtualMachine(cmd)
-        return passwordforvirtualmachine
-
-
-    def reset_sshkey(self, apiclient, keypair, **kwargs):
-        cmd = resetSSHKeyForVirtualMachine.resetSSHKeyForVirtualMachineCmd()
-        cmd.id = self.id
-        cmd.keypair = keypair
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        sshkeyforvirtualmachine = apiclient.resetSSHKeyForVirtualMachine(cmd)
-        return sshkeyforvirtualmachine
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py b/tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py
deleted file mode 100644
index 669298e..0000000
--- a/tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py
+++ /dev/null
@@ -1,53 +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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import createVirtualRouterElement
-from marvin.cloudstackAPI import listVirtualRouterElements
-from marvin.cloudstackAPI import configureVirtualRouterElement
-
-class VirtualRouterElement(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    @classmethod
-    def create(cls, apiclient, factory, **kwargs):
-        cmd = createVirtualRouterElement.createVirtualRouterElementCmd()
-        [setattr(cmd, factoryKey, factoryValue) for factoryKey, factoryValue in factory.__dict__.iteritems()]
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        virtualrouterelement = apiclient.createVirtualRouterElement(cmd)
-        return VirtualRouterElement(virtualrouterelement.__dict__)
-
-
-    @classmethod
-    def list(self, apiclient, **kwargs):
-        cmd = listVirtualRouterElements.listVirtualRouterElementsCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        virtualrouterelement = apiclient.listVirtualRouterElements(cmd)
-        return map(lambda e: VirtualRouterElement(e.__dict__), virtualrouterelement)
-
-
-    def configure(self, apiclient, enabled, **kwargs):
-        cmd = configureVirtualRouterElement.configureVirtualRouterElementCmd()
-        cmd.id = self.id
-        cmd.enabled = enabled
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        virtualrouterelement = apiclient.configureVirtualRouterElement(cmd)
-        return virtualrouterelement
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/VlanIpRange.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/VlanIpRange.py b/tools/marvin/marvin/integration/lib/base/VlanIpRange.py
deleted file mode 100644
index 2bc11d5..0000000
--- a/tools/marvin/marvin/integration/lib/base/VlanIpRange.py
+++ /dev/null
@@ -1,52 +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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import createVlanIpRange
-from marvin.cloudstackAPI import listVlanIpRanges
-from marvin.cloudstackAPI import deleteVlanIpRange
-
-class VlanIpRange(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    @classmethod
-    def create(cls, apiclient, factory, **kwargs):
-        cmd = createVlanIpRange.createVlanIpRangeCmd()
-        [setattr(cmd, factoryKey, factoryValue) for factoryKey, factoryValue in factory.__dict__.iteritems()]
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vlaniprange = apiclient.createVlanIpRange(cmd)
-        return VlanIpRange(vlaniprange.__dict__)
-
-
-    @classmethod
-    def list(self, apiclient, **kwargs):
-        cmd = listVlanIpRanges.listVlanIpRangesCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vlaniprange = apiclient.listVlanIpRanges(cmd)
-        return map(lambda e: VlanIpRange(e.__dict__), vlaniprange)
-
-
-    def delete(self, apiclient, **kwargs):
-        cmd = deleteVlanIpRange.deleteVlanIpRangeCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vlaniprange = apiclient.deleteVlanIpRange(cmd)
-        return vlaniprange
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/Volume.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Volume.py b/tools/marvin/marvin/integration/lib/base/Volume.py
deleted file mode 100644
index 2f4831f..0000000
--- a/tools/marvin/marvin/integration/lib/base/Volume.py
+++ /dev/null
@@ -1,106 +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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import migrateVolume
-from marvin.cloudstackAPI import createVolume
-from marvin.cloudstackAPI import listVolumes
-from marvin.cloudstackAPI import uploadVolume
-from marvin.cloudstackAPI import attachVolume
-from marvin.cloudstackAPI import detachVolume
-from marvin.cloudstackAPI import extractVolume
-from marvin.cloudstackAPI import deleteVolume
-
-class Volume(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    def migrate(self, apiclient, storageid, volumeid, **kwargs):
-        cmd = migrateVolume.migrateVolumeCmd()
-        cmd.id = self.id
-        cmd.storageid = storageid
-        cmd.volumeid = volumeid
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        volume = apiclient.migrateVolume(cmd)
-        return volume
-
-
-    @classmethod
-    def create(cls, apiclient, factory, **kwargs):
-        cmd = createVolume.createVolumeCmd()
-        [setattr(cmd, factoryKey, factoryValue) for factoryKey, factoryValue in factory.__dict__.iteritems()]
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        volume = apiclient.createVolume(cmd)
-        return Volume(volume.__dict__)
-
-
-    @classmethod
-    def list(self, apiclient, **kwargs):
-        cmd = listVolumes.listVolumesCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        volume = apiclient.listVolumes(cmd)
-        return map(lambda e: Volume(e.__dict__), volume)
-
-
-    def upload(self, apiclient, url, zoneid, name, format, **kwargs):
-        cmd = uploadVolume.uploadVolumeCmd()
-        cmd.id = self.id
-        cmd.format = format
-        cmd.name = name
-        cmd.url = url
-        cmd.zoneid = zoneid
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        volume = apiclient.uploadVolume(cmd)
-        return volume
-
-
-    def attach(self, apiclient, virtualmachineid, **kwargs):
-        cmd = attachVolume.attachVolumeCmd()
-        cmd.id = self.id
-        cmd.virtualmachineid = virtualmachineid
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        volume = apiclient.attachVolume(cmd)
-        return volume
-
-
-    def detach(self, apiclient, **kwargs):
-        cmd = detachVolume.detachVolumeCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        volume = apiclient.detachVolume(cmd)
-        return volume
-
-
-    def extract(self, apiclient, zoneid, mode, **kwargs):
-        cmd = extractVolume.extractVolumeCmd()
-        cmd.id = self.id
-        cmd.mode = mode
-        cmd.zoneid = zoneid
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        volume = apiclient.extractVolume(cmd)
-        return volume
-
-
-    def delete(self, apiclient, **kwargs):
-        cmd = deleteVolume.deleteVolumeCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        volume = apiclient.deleteVolume(cmd)
-        return volume
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/VpnConnection.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/VpnConnection.py b/tools/marvin/marvin/integration/lib/base/VpnConnection.py
deleted file mode 100644
index 1fb889e..0000000
--- a/tools/marvin/marvin/integration/lib/base/VpnConnection.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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import resetVpnConnection
-from marvin.cloudstackAPI import createVpnConnection
-from marvin.cloudstackAPI import listVpnConnections
-from marvin.cloudstackAPI import deleteVpnConnection
-
-class VpnConnection(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    def reset(self, apiclient, **kwargs):
-        cmd = resetVpnConnection.resetVpnConnectionCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpnconnection = apiclient.resetVpnConnection(cmd)
-        return vpnconnection
-
-
-    @classmethod
-    def create(cls, apiclient, factory, **kwargs):
-        cmd = createVpnConnection.createVpnConnectionCmd()
-        [setattr(cmd, factoryKey, factoryValue) for factoryKey, factoryValue in factory.__dict__.iteritems()]
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpnconnection = apiclient.createVpnConnection(cmd)
-        return VpnConnection(vpnconnection.__dict__)
-
-
-    @classmethod
-    def list(self, apiclient, **kwargs):
-        cmd = listVpnConnections.listVpnConnectionsCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpnconnection = apiclient.listVpnConnections(cmd)
-        return map(lambda e: VpnConnection(e.__dict__), vpnconnection)
-
-
-    def delete(self, apiclient, **kwargs):
-        cmd = deleteVpnConnection.deleteVpnConnectionCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpnconnection = apiclient.deleteVpnConnection(cmd)
-        return vpnconnection
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/VpnCustomerGateway.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/VpnCustomerGateway.py b/tools/marvin/marvin/integration/lib/base/VpnCustomerGateway.py
deleted file mode 100644
index f80b18c..0000000
--- a/tools/marvin/marvin/integration/lib/base/VpnCustomerGateway.py
+++ /dev/null
@@ -1,66 +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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import createVpnCustomerGateway
-from marvin.cloudstackAPI import listVpnCustomerGateways
-from marvin.cloudstackAPI import updateVpnCustomerGateway
-from marvin.cloudstackAPI import deleteVpnCustomerGateway
-
-class VpnCustomerGateway(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    @classmethod
-    def create(cls, apiclient, factory, **kwargs):
-        cmd = createVpnCustomerGateway.createVpnCustomerGatewayCmd()
-        [setattr(cmd, factoryKey, factoryValue) for factoryKey, factoryValue in factory.__dict__.iteritems()]
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpncustomergateway = apiclient.createVpnCustomerGateway(cmd)
-        return VpnCustomerGateway(vpncustomergateway.__dict__)
-
-
-    @classmethod
-    def list(self, apiclient, **kwargs):
-        cmd = listVpnCustomerGateways.listVpnCustomerGatewaysCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpncustomergateway = apiclient.listVpnCustomerGateways(cmd)
-        return map(lambda e: VpnCustomerGateway(e.__dict__), vpncustomergateway)
-
-
-    def update(self, apiclient, ikepolicy, cidrlist, gateway, ipsecpsk, esppolicy, **kwargs):
-        cmd = updateVpnCustomerGateway.updateVpnCustomerGatewayCmd()
-        cmd.id = self.id
-        cmd.cidrlist = cidrlist
-        cmd.esppolicy = esppolicy
-        cmd.gateway = gateway
-        cmd.ikepolicy = ikepolicy
-        cmd.ipsecpsk = ipsecpsk
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpncustomergateway = apiclient.updateVpnCustomerGateway(cmd)
-        return vpncustomergateway
-
-
-    def delete(self, apiclient, **kwargs):
-        cmd = deleteVpnCustomerGateway.deleteVpnCustomerGatewayCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpncustomergateway = apiclient.deleteVpnCustomerGateway(cmd)
-        return vpncustomergateway
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/VpnGateway.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/VpnGateway.py b/tools/marvin/marvin/integration/lib/base/VpnGateway.py
deleted file mode 100644
index 6ae6c14..0000000
--- a/tools/marvin/marvin/integration/lib/base/VpnGateway.py
+++ /dev/null
@@ -1,52 +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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import createVpnGateway
-from marvin.cloudstackAPI import listVpnGateways
-from marvin.cloudstackAPI import deleteVpnGateway
-
-class VpnGateway(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    @classmethod
-    def create(cls, apiclient, factory, **kwargs):
-        cmd = createVpnGateway.createVpnGatewayCmd()
-        [setattr(cmd, factoryKey, factoryValue) for factoryKey, factoryValue in factory.__dict__.iteritems()]
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpngateway = apiclient.createVpnGateway(cmd)
-        return VpnGateway(vpngateway.__dict__)
-
-
-    @classmethod
-    def list(self, apiclient, **kwargs):
-        cmd = listVpnGateways.listVpnGatewaysCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpngateway = apiclient.listVpnGateways(cmd)
-        return map(lambda e: VpnGateway(e.__dict__), vpngateway)
-
-
-    def delete(self, apiclient, **kwargs):
-        cmd = deleteVpnGateway.deleteVpnGatewayCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpngateway = apiclient.deleteVpnGateway(cmd)
-        return vpngateway
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/VpnUser.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/VpnUser.py b/tools/marvin/marvin/integration/lib/base/VpnUser.py
deleted file mode 100644
index b6b62b2..0000000
--- a/tools/marvin/marvin/integration/lib/base/VpnUser.py
+++ /dev/null
@@ -1,54 +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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import addVpnUser
-from marvin.cloudstackAPI import listVpnUsers
-from marvin.cloudstackAPI import removeVpnUser
-
-class VpnUser(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    def add(self, apiclient, username, password, **kwargs):
-        cmd = addVpnUser.addVpnUserCmd()
-        cmd.id = self.id
-        cmd.password = password
-        cmd.username = username
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpnuser = apiclient.addVpnUser(cmd)
-        return vpnuser
-
-
-    @classmethod
-    def list(self, apiclient, **kwargs):
-        cmd = listVpnUsers.listVpnUsersCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpnuser = apiclient.listVpnUsers(cmd)
-        return map(lambda e: VpnUser(e.__dict__), vpnuser)
-
-
-    def remove(self, apiclient, username, **kwargs):
-        cmd = removeVpnUser.removeVpnUserCmd()
-        cmd.id = self.id
-        cmd.username = username
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        vpnuser = apiclient.removeVpnUser(cmd)
-        return vpnuser
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/Zone.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Zone.py b/tools/marvin/marvin/integration/lib/base/Zone.py
deleted file mode 100644
index 918b031..0000000
--- a/tools/marvin/marvin/integration/lib/base/Zone.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.
-from marvin.integration.lib.base import CloudStackEntity
-from marvin.cloudstackAPI import createZone
-from marvin.cloudstackAPI import listZones
-from marvin.cloudstackAPI import updateZone
-from marvin.cloudstackAPI import deleteZone
-
-class Zone(CloudStackEntity.CloudStackEntity):
-
-
-    def __init__(self, items):
-        self.__dict__.update(items)
-
-
-    @classmethod
-    def create(cls, apiclient, factory, **kwargs):
-        cmd = createZone.createZoneCmd()
-        [setattr(cmd, factoryKey, factoryValue) for factoryKey, factoryValue in factory.__dict__.iteritems()]
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        zone = apiclient.createZone(cmd)
-        return Zone(zone.__dict__)
-
-
-    @classmethod
-    def list(self, apiclient, **kwargs):
-        cmd = listZones.listZonesCmd()
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        zone = apiclient.listZones(cmd)
-        return map(lambda e: Zone(e.__dict__), zone)
-
-
-    def update(self, apiclient, **kwargs):
-        cmd = updateZone.updateZoneCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        zone = apiclient.updateZone(cmd)
-        return zone
-
-
-    def delete(self, apiclient, **kwargs):
-        cmd = deleteZone.deleteZoneCmd()
-        cmd.id = self.id
-        [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
-        zone = apiclient.deleteZone(cmd)
-        return zone
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/base/__init__.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/__init__.py b/tools/marvin/marvin/integration/lib/base/__init__.py
deleted file mode 100644
index 13a8339..0000000
--- a/tools/marvin/marvin/integration/lib/base/__init__.py
+++ /dev/null
@@ -1,16 +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.


Mime
View raw message