cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [09/17] make the module structure more relevant and simple
Date Sun, 21 Apr 2013 12:23:22 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/common.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/common.py b/tools/marvin/marvin/integration/lib/common.py
deleted file mode 100644
index 69aa733..0000000
--- a/tools/marvin/marvin/integration/lib/common.py
+++ /dev/null
@@ -1,569 +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.
-"""Common functions
-"""
-
-#Import Local Modules
-import marvin
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
-from marvin.remoteSSHClient import remoteSSHClient
-from utils import *
-from base import *
-
-#Import System modules
-import time
-
-
-def wait_for_cleanup(apiclient, configs=None):
-    """Sleeps till the cleanup configs passed"""
-
-    # Configs list consists of the list of global configs
-    if not isinstance(configs, list):
-        return
-    for config in configs:
-        cmd = listConfigurations.listConfigurationsCmd()
-        cmd.name = config
-        cmd.listall = True
-        try:
-            config_descs = apiclient.listConfigurations(cmd)
-        except Exception as e:
-            raise Exception("Failed to fetch configurations: %s" % e)
-
-        if not isinstance(config_descs, list):
-            raise Exception("List configs didn't returned a valid data")
-
-        config_desc = config_descs[0]
-        # Sleep for the config_desc.value time
-        time.sleep(int(config_desc.value))
-    return
-
-
-def get_domain(apiclient, services=None):
-    "Returns a default domain"
-
-    cmd = listDomains.listDomainsCmd()
-    if services:
-        if "domainid" in services:
-            cmd.id = services["domainid"]
-
-    domains = apiclient.listDomains(cmd)
-
-    if isinstance(domains, list):
-        assert len(domains) > 0
-        return domains[0]
-    else:
-        raise Exception("Failed to find specified domain.")
-
-
-def get_zone(apiclient, services=None):
-    "Returns a default zone"
-
-    cmd = listZones.listZonesCmd()
-    if services:
-        if "zoneid" in services:
-            cmd.id = services["zoneid"]
-
-    zones = apiclient.listZones(cmd)
-
-    if isinstance(zones, list):
-        assert len(zones) > 0, "There are no available zones in the deployment"
-        return zones[0]
-    else:
-        raise Exception("Failed to find specified zone.")
-
-
-def get_pod(apiclient, zoneid, services=None):
-    "Returns a default pod for specified zone"
-
-    cmd = listPods.listPodsCmd()
-    cmd.zoneid = zoneid
-
-    if services:
-        if "podid" in services:
-            cmd.id = services["podid"]
-
-    pods = apiclient.listPods(cmd)
-
-    if isinstance(pods, list):
-        assert len(pods) > 0, "No pods found for zone %s"%zoneid
-        return pods[0]
-    else:
-        raise Exception("Exception: Failed to find specified pod.")
-
-
-def get_template(apiclient, zoneid, ostype, services=None):
-    "Returns a template"
-
-    cmd = listOsTypes.listOsTypesCmd()
-    cmd.description = ostype
-    ostypes = apiclient.listOsTypes(cmd)
-
-    if isinstance(ostypes, list):
-        ostypeid = ostypes[0].id
-    else:
-        raise Exception(
-            "Failed to find OS type with description: %s" % ostype)
-
-    cmd = listTemplates.listTemplatesCmd()
-    cmd.templatefilter = 'featured'
-    cmd.zoneid = zoneid
-
-    if services:
-        if "template" in services:
-            cmd.id = services["template"]
-
-    list_templates = apiclient.listTemplates(cmd)
-
-    if isinstance(list_templates, list):
-        assert len(list_templates) > 0, "received empty response on template of type %s"%ostype
-        for template in list_templates:
-            if template.ostypeid == ostypeid:
-                return template
-
-    raise Exception("Exception: Failed to find template with OSTypeID: %s" %
-                                                                    ostypeid)
-    return
-
-
-def download_systemplates_sec_storage(server, services):
-    """Download System templates on sec storage"""
-
-    try:
-        # Login to management server
-        ssh = remoteSSHClient(
-                                          server["ipaddress"],
-                                          server["port"],
-                                          server["username"],
-                                          server["password"]
-                             )
-    except Exception:
-        raise Exception("SSH access failted for server with IP address: %s" %
-                                                            server["ipaddess"])
-    # Mount Secondary Storage on Management Server
-    cmds = [
-            "mkdir -p %s" % services["mnt_dir"],
-            "mount -t nfs %s:/%s %s" % (
-                                        services["sec_storage"],
-                                        services["path"],
-                                        services["mnt_dir"]
-                                        ),
-            "%s -m %s -u %s -h %s -F" % (
-                                         services["command"],
-                                         services["mnt_dir"],
-                                         services["download_url"],
-                                         services["hypervisor"]
-                                        )
-            ]
-    for c in cmds:
-        result = ssh.execute(c)
-
-    res = str(result)
-
-    # Unmount the Secondary storage
-    ssh.execute("umount %s" % (services["mnt_dir"]))
-
-    if res.count("Successfully installed system VM template") == 1:
-        return
-    else:
-        raise Exception("Failed to download System Templates on Sec Storage")
-    return
-
-
-def wait_for_ssvms(apiclient, zoneid, podid, interval=60):
-    """After setup wait for SSVMs to come Up"""
-
-    time.sleep(interval)
-    timeout = 40
-    while True:
-            list_ssvm_response = list_ssvms(
-                                        apiclient,
-                                        systemvmtype='secondarystoragevm',
-                                        zoneid=zoneid,
-                                        podid=podid
-                                        )
-            ssvm = list_ssvm_response[0]
-            if ssvm.state != 'Running':
-                # Sleep to ensure SSVMs are Up and Running
-                time.sleep(interval)
-                timeout = timeout - 1
-            elif ssvm.state == 'Running':
-                break
-            elif timeout == 0:
-                raise Exception("SSVM failed to come up")
-                break
-
-    timeout = 40
-    while True:
-            list_ssvm_response = list_ssvms(
-                                        apiclient,
-                                        systemvmtype='consoleproxy',
-                                        zoneid=zoneid,
-                                        podid=podid
-                                        )
-            cpvm = list_ssvm_response[0]
-            if cpvm.state != 'Running':
-                # Sleep to ensure SSVMs are Up and Running
-                time.sleep(interval)
-                timeout = timeout - 1
-            elif cpvm.state == 'Running':
-                break
-            elif timeout == 0:
-                raise Exception("CPVM failed to come up")
-                break
-    return
-
-
-def download_builtin_templates(apiclient, zoneid, hypervisor, host,
-                                                linklocalip, interval=60):
-    """After setup wait till builtin templates are downloaded"""
-
-    # Change IPTABLES Rules
-    get_process_status(
-                        host["ipaddress"],
-                        host["port"],
-                        host["username"],
-                        host["password"],
-                        linklocalip,
-                        "iptables -P INPUT ACCEPT"
-                    )
-    time.sleep(interval)
-    # Find the BUILTIN Templates for given Zone, Hypervisor
-    list_template_response = list_templates(
-                                    apiclient,
-                                    hypervisor=hypervisor,
-                                    zoneid=zoneid,
-                                    templatefilter='self'
-                                    )
-
-    if not isinstance(list_template_response, list):
-        raise Exception("Failed to download BUILTIN templates")
-
-    # Ensure all BUILTIN templates are downloaded
-    templateid = None
-    for template in list_template_response:
-        if template.templatetype == "BUILTIN":
-                templateid = template.id
-
-    # Sleep to ensure that template is in downloading state after adding
-    # Sec storage
-    time.sleep(interval)
-    while True:
-        template_response = list_templates(
-                                    apiclient,
-                                    id=templateid,
-                                    zoneid=zoneid,
-                                    templatefilter='self'
-                                    )
-        template = template_response[0]
-        # If template is ready,
-        # template.status = Download Complete
-        # Downloading - x% Downloaded
-        # Error - Any other string
-        if template.status == 'Download Complete':
-            break
-
-        elif 'Downloaded' in template.status:
-            time.sleep(interval)
-
-        elif 'Installing' not in template.status:
-            raise Exception("ErrorInDownload")
-
-    return
-
-
-def update_resource_limit(apiclient, resourcetype, account=None,
-                                    domainid=None, max=None, projectid=None):
-    """Updates the resource limit to 'max' for given account"""
-
-    cmd = updateResourceLimit.updateResourceLimitCmd()
-    cmd.resourcetype = resourcetype
-    if account:
-        cmd.account = account
-    if domainid:
-        cmd.domainid = domainid
-    if max:
-        cmd.max = max
-    if projectid:
-        cmd.projectid = projectid
-    apiclient.updateResourceLimit(cmd)
-    return
-
-
-def list_os_types(apiclient, **kwargs):
-    """List all os types matching criteria"""
-
-    cmd = listOsTypes.listOsTypesCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listOsTypes(cmd))
-
-
-def list_routers(apiclient, **kwargs):
-    """List all Routers matching criteria"""
-
-    cmd = listRouters.listRoutersCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listRouters(cmd))
-
-
-def list_zones(apiclient, **kwargs):
-    """List all Zones matching criteria"""
-
-    cmd = listZones.listZonesCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listZones(cmd))
-
-
-def list_networks(apiclient, **kwargs):
-    """List all Networks matching criteria"""
-
-    cmd = listNetworks.listNetworksCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listNetworks(cmd))
-
-
-def list_clusters(apiclient, **kwargs):
-    """List all Clusters matching criteria"""
-
-    cmd = listClusters.listClustersCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listClusters(cmd))
-
-
-def list_ssvms(apiclient, **kwargs):
-    """List all SSVMs matching criteria"""
-
-    cmd = listSystemVms.listSystemVmsCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listSystemVms(cmd))
-
-
-def list_storage_pools(apiclient, **kwargs):
-    """List all storage pools matching criteria"""
-
-    cmd = listStoragePools.listStoragePoolsCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listStoragePools(cmd))
-
-
-def list_virtual_machines(apiclient, **kwargs):
-    """List all VMs matching criteria"""
-
-    cmd = listVirtualMachines.listVirtualMachinesCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listVirtualMachines(cmd))
-
-
-def list_hosts(apiclient, **kwargs):
-    """List all Hosts matching criteria"""
-
-    cmd = listHosts.listHostsCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listHosts(cmd))
-
-
-def list_configurations(apiclient, **kwargs):
-    """List configuration with specified name"""
-
-    cmd = listConfigurations.listConfigurationsCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listConfigurations(cmd))
-
-
-def list_publicIP(apiclient, **kwargs):
-    """List all Public IPs matching criteria"""
-
-    cmd = listPublicIpAddresses.listPublicIpAddressesCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listPublicIpAddresses(cmd))
-
-
-def list_nat_rules(apiclient, **kwargs):
-    """List all NAT rules matching criteria"""
-
-    cmd = listPortForwardingRules.listPortForwardingRulesCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listPortForwardingRules(cmd))
-
-
-def list_lb_rules(apiclient, **kwargs):
-    """List all Load balancing rules matching criteria"""
-
-    cmd = listLoadBalancerRules.listLoadBalancerRulesCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listLoadBalancerRules(cmd))
-
-
-def list_lb_instances(apiclient, **kwargs):
-    """List all Load balancing instances matching criteria"""
-
-    cmd = listLoadBalancerRuleInstances.listLoadBalancerRuleInstancesCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listLoadBalancerRuleInstances(cmd))
-
-
-def list_firewall_rules(apiclient, **kwargs):
-    """List all Firewall Rules matching criteria"""
-
-    cmd = listFirewallRules.listFirewallRulesCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listFirewallRules(cmd))
-
-
-def list_volumes(apiclient, **kwargs):
-    """List all volumes matching criteria"""
-
-    cmd = listVolumes.listVolumesCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listVolumes(cmd))
-
-
-def list_isos(apiclient, **kwargs):
-    """Lists all available ISO files."""
-
-    cmd = listIsos.listIsosCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listIsos(cmd))
-
-
-def list_snapshots(apiclient, **kwargs):
-    """List all snapshots matching criteria"""
-
-    cmd = listSnapshots.listSnapshotsCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listSnapshots(cmd))
-
-
-def list_templates(apiclient, **kwargs):
-    """List all templates matching criteria"""
-
-    cmd = listTemplates.listTemplatesCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listTemplates(cmd))
-
-
-def list_domains(apiclient, **kwargs):
-    """Lists domains"""
-
-    cmd = listDomains.listDomainsCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listDomains(cmd))
-
-
-def list_accounts(apiclient, **kwargs):
-    """Lists accounts and provides detailed account information for
-    listed accounts"""
-
-    cmd = listAccounts.listAccountsCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listAccounts(cmd))
-
-
-def list_users(apiclient, **kwargs):
-    """Lists users and provides detailed account information for
-    listed users"""
-
-    cmd = listUsers.listUsersCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listUsers(cmd))
-
-
-def list_snapshot_policy(apiclient, **kwargs):
-    """Lists snapshot policies."""
-
-    cmd = listSnapshotPolicies.listSnapshotPoliciesCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listSnapshotPolicies(cmd))
-
-
-def list_events(apiclient, **kwargs):
-    """Lists events"""
-
-    cmd = listEvents.listEventsCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listEvents(cmd))
-
-
-def list_disk_offering(apiclient, **kwargs):
-    """Lists all available disk offerings."""
-
-    cmd = listDiskOfferings.listDiskOfferingsCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listDiskOfferings(cmd))
-
-
-def list_service_offering(apiclient, **kwargs):
-    """Lists all available service offerings."""
-
-    cmd = listServiceOfferings.listServiceOfferingsCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listServiceOfferings(cmd))
-
-
-def list_vlan_ipranges(apiclient, **kwargs):
-    """Lists all VLAN IP ranges."""
-
-    cmd = listVlanIpRanges.listVlanIpRangesCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listVlanIpRanges(cmd))
-
-
-def list_usage_records(apiclient, **kwargs):
-    """Lists usage records for accounts"""
-
-    cmd = listUsageRecords.listUsageRecordsCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listUsageRecords(cmd))
-
-
-def list_nw_service_prividers(apiclient, **kwargs):
-    """Lists Network service providers"""
-
-    cmd = listNetworkServiceProviders.listNetworkServiceProvidersCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listNetworkServiceProviders(cmd))
-
-
-def list_virtual_router_elements(apiclient, **kwargs):
-    """Lists Virtual Router elements"""
-
-    cmd = listVirtualRouterElements.listVirtualRouterElementsCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listVirtualRouterElements(cmd))
-
-
-def list_network_offerings(apiclient, **kwargs):
-    """Lists network offerings"""
-
-    cmd = listNetworkOfferings.listNetworkOfferingsCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listNetworkOfferings(cmd))
-
-
-def list_resource_limits(apiclient, **kwargs):
-    """Lists resource limits"""
-
-    cmd = listResourceLimits.listResourceLimitsCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listResourceLimits(cmd))
-
-def list_vpc_offerings(apiclient, **kwargs):
-    """ Lists VPC offerings """
-
-    cmd = listVPCOfferings.listVPCOfferingsCmd()
-    [setattr(cmd, k, v) for k, v in kwargs.items()]
-    return(apiclient.listVPCOfferings(cmd))
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/AccountFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/AccountFactory.py b/tools/marvin/marvin/integration/lib/factory/AccountFactory.py
deleted file mode 100644
index 00399e4..0000000
--- a/tools/marvin/marvin/integration/lib/factory/AccountFactory.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.
-
-import hashlib
-from marvin.integration.lib.factory.CloudStackBaseFactory import *
-from marvin.integration.lib.base import Account
-from marvin.integration.lib.utils import random_gen
-
-@factory.use_strategy(new_strategy=factory.BUILD_STRATEGY)
-class AccountFactory(CloudStackBaseFactory):
-
-    FACTORY_FOR = Account.Account
-
-    accounttype = 0
-    firstname = factory.Sequence(lambda n: random_gen())
-    lastname = factory.Sequence(lambda n: random_gen())
-    email = factory.LazyAttribute(lambda e: '{0}.{1}@cloudstack.org'.format(e.firstname, e.lastname).lower())
-    username = factory.Sequence(lambda n: random_gen())
-
-    # Password Encoding
-    mdf = hashlib.md5()
-    mdf.update('password')
-    password = mdf.hexdigest()
-
-
-class AdminAccountFactory(AccountFactory):
-    accounttype = 1
-
-
-class DomainAdminFactory(AccountFactory):
-    accounttype = 2
-    domainid = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/AutoScalePolicyFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/AutoScalePolicyFactory.py b/tools/marvin/marvin/integration/lib/factory/AutoScalePolicyFactory.py
deleted file mode 100644
index 20a73f3..0000000
--- a/tools/marvin/marvin/integration/lib/factory/AutoScalePolicyFactory.py
+++ /dev/null
@@ -1,25 +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.
-import factory
-from marvin.integration.lib.base import AutoScalePolicy
-class AutoScalePolicyFactory(factory.Factory):
-
-    FACTORY_FOR = AutoScalePolicy
-
-    action = None
-    conditionids = None
-    duration = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/AutoScaleVmGroupFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/AutoScaleVmGroupFactory.py b/tools/marvin/marvin/integration/lib/factory/AutoScaleVmGroupFactory.py
deleted file mode 100644
index 4b1f8ae..0000000
--- a/tools/marvin/marvin/integration/lib/factory/AutoScaleVmGroupFactory.py
+++ /dev/null
@@ -1,28 +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.
-import factory
-from marvin.integration.lib.base import AutoScaleVmGroup
-class AutoScaleVmGroupFactory(factory.Factory):
-
-    FACTORY_FOR = AutoScaleVmGroup
-
-    lbruleid = None
-    maxmembers = None
-    minmembers = None
-    scaledownpolicyids = None
-    scaleuppolicyids = None
-    vmprofileid = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/AutoScaleVmProfileFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/AutoScaleVmProfileFactory.py b/tools/marvin/marvin/integration/lib/factory/AutoScaleVmProfileFactory.py
deleted file mode 100644
index a0daf30..0000000
--- a/tools/marvin/marvin/integration/lib/factory/AutoScaleVmProfileFactory.py
+++ /dev/null
@@ -1,25 +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.
-import factory
-from marvin.integration.lib.base import AutoScaleVmProfile
-class AutoScaleVmProfileFactory(factory.Factory):
-
-    FACTORY_FOR = AutoScaleVmProfile
-
-    serviceofferingid = None
-    templateid = None
-    zoneid = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/CloudStackBaseFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/CloudStackBaseFactory.py b/tools/marvin/marvin/integration/lib/factory/CloudStackBaseFactory.py
deleted file mode 100644
index 499dbc2..0000000
--- a/tools/marvin/marvin/integration/lib/factory/CloudStackBaseFactory.py
+++ /dev/null
@@ -1,55 +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.
-
-import factory
-import inspect
-
-CREATORS = ["create", "deploy"]
-
-
-class CloudStackBaseFactory(factory.Factory):
-    ABSTRACT_FACTORY = True
-
-    @classmethod
-    def _build(cls, target_class, *args, **kwargs):
-        if len(args) == 0:
-            return target_class(kwargs)
-        return target_class(*args, **kwargs)
-
-    @classmethod
-    def _create(cls, target_class, *args, **kwargs):
-        if cls.apiclient:
-            members = inspect.getmembers(target_class,
-                predicate=inspect.ismethod)
-            creators = filter(lambda x: x[0] in CREATORS, members)
-            assert creators, "How do I bring this guy into existence?"
-            assert inspect.ismethod(creators[0][1])
-            creator = creators[0][1]
-            return creator(cls.apiclient, factory=cls._build(target_class,
-                *args, **kwargs))
-        else:
-            cls._build(target_class, *args, **kwargs)
-
-    @classmethod
-    def _adjust_kwargs(cls, **kwargs):
-        if "apiclient" in kwargs:
-            cls.apiclient = kwargs["apiclient"]
-            clean_kwargs = dict((k, v) for k, v in kwargs.iteritems()
-                if k != "apiclient")
-            return clean_kwargs
-        else:
-            return kwargs
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/ClusterFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/ClusterFactory.py b/tools/marvin/marvin/integration/lib/factory/ClusterFactory.py
deleted file mode 100644
index e8e2e22..0000000
--- a/tools/marvin/marvin/integration/lib/factory/ClusterFactory.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import factory
-from marvin.integration.lib.base import Cluster
-from marvin.integration.lib.factory.CloudStackBaseFactory import CloudStackBaseFactory
-from marvin.integration.lib.utils import random_gen
-
-class ClusterFactory(CloudStackBaseFactory):
-
-    FACTORY_FOR = Cluster
-
-    clustername = None
-    clustertype = None
-    hypervisor = None
-    podid = None
-    zoneid = None
-
-class XenClusterFactory(ClusterFactory):
-    clustername = factory.Sequence(lambda n: "xencluster" + random_gen())
-    clustertype = "XenServer"
-    hypervisor = "XenServer"
-
-class KvmClusterFactory(ClusterFactory):
-    clustername = factory.Sequence(lambda n: "kvmcluster" + random_gen())
-    clustertype = "KVM"
-    hypervisor = "KVM"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/ConditionFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/ConditionFactory.py b/tools/marvin/marvin/integration/lib/factory/ConditionFactory.py
deleted file mode 100644
index fccfddf..0000000
--- a/tools/marvin/marvin/integration/lib/factory/ConditionFactory.py
+++ /dev/null
@@ -1,25 +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.
-import factory
-from marvin.integration.lib.base import Condition
-class ConditionFactory(factory.Factory):
-
-    FACTORY_FOR = Condition
-
-    counterid = None
-    relationaloperator = None
-    threshold = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/CounterFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/CounterFactory.py b/tools/marvin/marvin/integration/lib/factory/CounterFactory.py
deleted file mode 100644
index 046d43a..0000000
--- a/tools/marvin/marvin/integration/lib/factory/CounterFactory.py
+++ /dev/null
@@ -1,25 +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.
-import factory
-from marvin.integration.lib.base import Counter
-class CounterFactory(factory.Factory):
-
-    FACTORY_FOR = Counter
-
-    name = None
-    source = None
-    value = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/DiskOfferingFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/DiskOfferingFactory.py b/tools/marvin/marvin/integration/lib/factory/DiskOfferingFactory.py
deleted file mode 100644
index 0ca22df..0000000
--- a/tools/marvin/marvin/integration/lib/factory/DiskOfferingFactory.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.
-import factory
-from marvin.integration.lib.factory.CloudStackBaseFactory import *
-from marvin.integration.lib.base import DiskOffering
-from marvin.integration.lib.utils import random_gen
-
-class DiskOfferingFactory(CloudStackBaseFactory):
-
-    FACTORY_FOR = DiskOffering.DiskOffering
-
-    displaytext = factory.Sequence(lambda n : "DiskOffering" + random_gen())
-    name = factory.Sequence(lambda n : "DiskOffering" + random_gen())
-
-
-class SharedDiskOfferingFactory(DiskOfferingFactory):
-
-    displaytext = "SharedDiskOffering"
-    name = factory.Sequence(lambda n : "SharedDiskOffering" + random_gen())
-    storagetype = "shared"
-    disksize = 10 #MB
-
-class LocalDiskOfferingFactory(DiskOfferingFactory):
-
-    displaytext = "LocalDiskOffering"
-    name = factory.Sequence(lambda n : "LocalDiskOffering" + random_gen())
-    storagetype = "local"
-    disksize = 10 #MB

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/DomainFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/DomainFactory.py b/tools/marvin/marvin/integration/lib/factory/DomainFactory.py
deleted file mode 100644
index 337f9f2..0000000
--- a/tools/marvin/marvin/integration/lib/factory/DomainFactory.py
+++ /dev/null
@@ -1,24 +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.
-import factory
-from marvin.integration.lib.base import Domain
-from marvin.integration.lib.utils import random_gen
-class DomainFactory(factory.Factory):
-
-    FACTORY_FOR = Domain
-
-    name = factory.Sequence(lambda n : "Domain" + random_gen())

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/EgressFirewallRuleFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/EgressFirewallRuleFactory.py b/tools/marvin/marvin/integration/lib/factory/EgressFirewallRuleFactory.py
deleted file mode 100644
index 1395429..0000000
--- a/tools/marvin/marvin/integration/lib/factory/EgressFirewallRuleFactory.py
+++ /dev/null
@@ -1,24 +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.
-import factory
-from marvin.integration.lib.base import EgressFirewallRule
-class EgressFirewallRuleFactory(factory.Factory):
-
-    FACTORY_FOR = EgressFirewallRule
-
-    networkid = None
-    protocol = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/FirewallRuleFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/FirewallRuleFactory.py b/tools/marvin/marvin/integration/lib/factory/FirewallRuleFactory.py
deleted file mode 100644
index a0d17ec..0000000
--- a/tools/marvin/marvin/integration/lib/factory/FirewallRuleFactory.py
+++ /dev/null
@@ -1,24 +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.
-import factory
-from marvin.integration.lib.base import FirewallRule
-class FirewallRuleFactory(factory.Factory):
-
-    FACTORY_FOR = FirewallRule
-
-    ipaddressid = None
-    protocol = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/HostFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/HostFactory.py b/tools/marvin/marvin/integration/lib/factory/HostFactory.py
deleted file mode 100644
index 3bbbaf6..0000000
--- a/tools/marvin/marvin/integration/lib/factory/HostFactory.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import factory
-from marvin.integration.lib.base import Host
-class HostFactory(factory.Factory):
-
-    FACTORY_FOR = Host
-
-    hypervisor = None
-    password = None
-    podid = None
-    url = None
-    username = None
-    zoneid = None
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/InstanceGroupFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/InstanceGroupFactory.py b/tools/marvin/marvin/integration/lib/factory/InstanceGroupFactory.py
deleted file mode 100644
index 426c00c..0000000
--- a/tools/marvin/marvin/integration/lib/factory/InstanceGroupFactory.py
+++ /dev/null
@@ -1,23 +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.
-import factory
-from marvin.integration.lib.base import InstanceGroup
-class InstanceGroupFactory(factory.Factory):
-
-    FACTORY_FOR = InstanceGroup.InstanceGroup
-
-    name = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py b/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py
deleted file mode 100644
index 46b931a..0000000
--- a/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py
+++ /dev/null
@@ -1,22 +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.
-import factory
-from marvin.integration.lib.base import IpAddress
-class IpAddressFactory(factory.Factory):
-
-    FACTORY_FOR = IpAddress.IpAddress
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/IpForwardingRuleFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/IpForwardingRuleFactory.py b/tools/marvin/marvin/integration/lib/factory/IpForwardingRuleFactory.py
deleted file mode 100644
index c9bc447..0000000
--- a/tools/marvin/marvin/integration/lib/factory/IpForwardingRuleFactory.py
+++ /dev/null
@@ -1,25 +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.
-import factory
-from marvin.integration.lib.base import IpForwardingRule
-class IpForwardingRuleFactory(factory.Factory):
-
-    FACTORY_FOR = IpForwardingRule
-
-    ipaddressid = None
-    protocol = None
-    startport = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/IsoFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/IsoFactory.py b/tools/marvin/marvin/integration/lib/factory/IsoFactory.py
deleted file mode 100644
index 65655aa..0000000
--- a/tools/marvin/marvin/integration/lib/factory/IsoFactory.py
+++ /dev/null
@@ -1,26 +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.
-import factory
-from marvin.integration.lib.base import Iso
-class IsoFactory(factory.Factory):
-
-    FACTORY_FOR = Iso.Iso
-
-    displaytext = None
-    name = None
-    url = None
-    zoneid = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/LBHealthCheckPolicyFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/LBHealthCheckPolicyFactory.py b/tools/marvin/marvin/integration/lib/factory/LBHealthCheckPolicyFactory.py
deleted file mode 100644
index 714e214..0000000
--- a/tools/marvin/marvin/integration/lib/factory/LBHealthCheckPolicyFactory.py
+++ /dev/null
@@ -1,26 +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.
-import factory
-from marvin.integration.lib.base import LBHealthCheckPolicy
-
-class LBHealthCheckPolicyFactory(factory.Factory):
-
-    FACTORY_FOR = LBHealthCheckPolicy.LBHealthCheckPolicy
-
-    lbruleid = None
-    methodname = None
-    name = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/LBStickinessPolicyFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/LBStickinessPolicyFactory.py b/tools/marvin/marvin/integration/lib/factory/LBStickinessPolicyFactory.py
deleted file mode 100644
index 380ab66..0000000
--- a/tools/marvin/marvin/integration/lib/factory/LBStickinessPolicyFactory.py
+++ /dev/null
@@ -1,25 +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.
-import factory
-from marvin.integration.lib.base import LBStickinessPolicy
-class LBStickinessPolicyFactory(factory.Factory):
-
-    FACTORY_FOR = LBStickinessPolicy
-
-    lbruleid = None
-    methodname = None
-    name = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleFactory.py b/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleFactory.py
deleted file mode 100644
index 82d38a6..0000000
--- a/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleFactory.py
+++ /dev/null
@@ -1,26 +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.
-import factory
-from marvin.integration.lib.base import LoadBalancerRule
-class LoadBalancerRuleFactory(factory.Factory):
-
-    FACTORY_FOR = LoadBalancerRule
-
-    algorithm = None
-    name = None
-    privateport = None
-    publicport = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/NetworkACLFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/NetworkACLFactory.py b/tools/marvin/marvin/integration/lib/factory/NetworkACLFactory.py
deleted file mode 100644
index 1969725..0000000
--- a/tools/marvin/marvin/integration/lib/factory/NetworkACLFactory.py
+++ /dev/null
@@ -1,24 +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.
-import factory
-from marvin.integration.lib.base import NetworkACL
-class NetworkACLFactory(factory.Factory):
-
-    FACTORY_FOR = NetworkACL
-
-    networkid = None
-    protocol = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/NetworkFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/NetworkFactory.py b/tools/marvin/marvin/integration/lib/factory/NetworkFactory.py
deleted file mode 100644
index ed8f1ab..0000000
--- a/tools/marvin/marvin/integration/lib/factory/NetworkFactory.py
+++ /dev/null
@@ -1,26 +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.
-import factory
-from marvin.integration.lib.base import Network
-class NetworkFactory(factory.Factory):
-
-    FACTORY_FOR = Network
-
-    displaytext = None
-    name = None
-    networkofferingid = None
-    zoneid = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/NetworkOfferingFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/NetworkOfferingFactory.py b/tools/marvin/marvin/integration/lib/factory/NetworkOfferingFactory.py
deleted file mode 100644
index 8b00819..0000000
--- a/tools/marvin/marvin/integration/lib/factory/NetworkOfferingFactory.py
+++ /dev/null
@@ -1,85 +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.
-import factory
-from marvin.integration.lib.factory.CloudStackBaseFactory import *
-from marvin.integration.lib.base import NetworkOffering
-from marvin.integration.lib.utils import random_gen
-
-class NetworkOfferingFactory(CloudStackBaseFactory):
-
-    FACTORY_FOR = NetworkOffering.NetworkOffering
-
-    displaytext = "Network Offering"
-    guestiptype = "Isolated"
-    name = "Network Offering"
-    supportedservices = "Dhcp,Dns,SourceNat,PortForwarding"
-    traffictype = "GUEST"
-
-
-class DefaultIsolatedNetworkOfferingWithSourceNatServiceFactory(NetworkOfferingFactory):
-    #FIXME: Service Capability Lists with CapabilityTypes (ElasticIP, RvR etc) needs handling
-
-    displaytext = factory.Sequence(lambda n : "DefaultIsolatedNetworkOfferingWithSourceNatService" + random_gen())
-    name = factory.Sequence(lambda n : "DefaultIsolatedNetworkOfferingWithSourceNatService" + random_gen())
-    supportedservices = "Lb,Dns,PortForwarding,StaticNat,Dhcp,Firewall,Vpn,UserData,SourceNat"
-    traffictype = "GUEST"
-    availability = "Optional"
-    guestiptype = "Isolated"
-
-    specifyVlan = False
-    specifyIpRanges = False
-    isPersistent = False
-    conserveMode = True
-
-    serviceProviderList = []
-    for service in map(lambda l: l.strip(' '), supportedservices.split(',')):
-        serviceProviderList.append(
-            {
-                'service': service,
-                'provider': 'VirtualRouter'
-            }
-        )
-
-
-class DefaultSharedNetworkOfferingWithSGServiceFactory(NetworkOfferingFactory):
-
-    displaytext = factory.Sequence(lambda n : "DefaultSharedNetworkOfferingWithSGService" + random_gen())
-    name = factory.Sequence(lambda n : "DefaultSharedNetworkOfferingWithSGService" + random_gen())
-    availability = "Optional"
-    supportedservices = "SecurityGroup,Dns,Dhcp,UserData"
-    guestiptype = "Shared"
-    traffictype = "GUEST"
-
-    specifyVlan = True
-    specifyIpRanges = True
-    isPersistent = False
-    conserveMode = True
-
-    serviceProviderList = []
-    for service in map(lambda l: l.strip(' '), supportedservices.split(',')):
-        if service == 'SecurityGroup':
-            provider = 'SecurityGroupProvider'
-        else:
-            provider = 'VirtualRouter'
-        serviceProviderList.append(
-            {
-                'service': service,
-                'provider': provider
-            }
-        )
-
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/NetworkServiceProviderFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/NetworkServiceProviderFactory.py b/tools/marvin/marvin/integration/lib/factory/NetworkServiceProviderFactory.py
deleted file mode 100644
index 649ea16..0000000
--- a/tools/marvin/marvin/integration/lib/factory/NetworkServiceProviderFactory.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import factory
-from marvin.integration.lib.base import NetworkServiceProvider
-class NetworkServiceProviderFactory(factory.Factory):
-
-    FACTORY_FOR = NetworkServiceProvider
-
-    name = None
-    physicalnetworkid = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceFactory.py b/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceFactory.py
deleted file mode 100644
index 1e71beb..0000000
--- a/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceFactory.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import factory
-from marvin.integration.lib.base import NiciraNvpDevice
-class NiciraNvpDeviceFactory(factory.Factory):
-
-    FACTORY_FOR = NiciraNvpDevice
-
-    hostname = None
-    password = None
-    physicalnetworkid = None
-    transportzoneuuid = None
-    username = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/OsCategoriesFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/OsCategoriesFactory.py b/tools/marvin/marvin/integration/lib/factory/OsCategoriesFactory.py
deleted file mode 100644
index 0e0e79a..0000000
--- a/tools/marvin/marvin/integration/lib/factory/OsCategoriesFactory.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import factory
-from marvin.integration.lib.base import OsCategories
-class OsCategoriesFactory(factory.Factory):
-
-    FACTORY_FOR = OsCategories

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/OsTypesFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/OsTypesFactory.py b/tools/marvin/marvin/integration/lib/factory/OsTypesFactory.py
deleted file mode 100644
index dacdfd3..0000000
--- a/tools/marvin/marvin/integration/lib/factory/OsTypesFactory.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import factory
-from marvin.integration.lib.base import OsTypes
-class OsTypesFactory(factory.Factory):
-
-    FACTORY_FOR = OsTypes

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/PhysicalNetworkFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/PhysicalNetworkFactory.py b/tools/marvin/marvin/integration/lib/factory/PhysicalNetworkFactory.py
deleted file mode 100644
index 6438846..0000000
--- a/tools/marvin/marvin/integration/lib/factory/PhysicalNetworkFactory.py
+++ /dev/null
@@ -1,24 +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.
-import factory
-from marvin.integration.lib.base import PhysicalNetwork
-class PhysicalNetworkFactory(factory.Factory):
-
-    FACTORY_FOR = PhysicalNetwork
-
-    name = None
-    zoneid = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/PodFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/PodFactory.py b/tools/marvin/marvin/integration/lib/factory/PodFactory.py
deleted file mode 100644
index 0cff95d..0000000
--- a/tools/marvin/marvin/integration/lib/factory/PodFactory.py
+++ /dev/null
@@ -1,27 +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.
-import factory
-from marvin.integration.lib.base import Pod
-class PodFactory(factory.Factory):
-
-    FACTORY_FOR = Pod
-
-    gateway = None
-    name = None
-    netmask = None
-    startip = None
-    zoneid = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/PortForwardingRuleFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/PortForwardingRuleFactory.py b/tools/marvin/marvin/integration/lib/factory/PortForwardingRuleFactory.py
deleted file mode 100644
index 179d1e0..0000000
--- a/tools/marvin/marvin/integration/lib/factory/PortForwardingRuleFactory.py
+++ /dev/null
@@ -1,27 +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.
-import factory
-from marvin.integration.lib.base import PortForwardingRule
-class PortForwardingRuleFactory(factory.Factory):
-
-    FACTORY_FOR = PortForwardingRule
-
-    ipaddressid = None
-    privateport = None
-    protocol = None
-    publicport = None
-    virtualmachineid = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/PrivateGatewayFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/PrivateGatewayFactory.py b/tools/marvin/marvin/integration/lib/factory/PrivateGatewayFactory.py
deleted file mode 100644
index cdc2bb6..0000000
--- a/tools/marvin/marvin/integration/lib/factory/PrivateGatewayFactory.py
+++ /dev/null
@@ -1,27 +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.
-import factory
-from marvin.integration.lib.base import PrivateGateway
-class PrivateGatewayFactory(factory.Factory):
-
-    FACTORY_FOR = PrivateGateway
-
-    gateway = None
-    ipaddress = None
-    netmask = None
-    vlan = None
-    vpcid = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/ProjectFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/ProjectFactory.py b/tools/marvin/marvin/integration/lib/factory/ProjectFactory.py
deleted file mode 100644
index 6edeff2..0000000
--- a/tools/marvin/marvin/integration/lib/factory/ProjectFactory.py
+++ /dev/null
@@ -1,24 +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.
-import factory
-from marvin.integration.lib.base import Project
-class ProjectFactory(factory.Factory):
-
-    FACTORY_FOR = Project
-
-    displaytext = None
-    name = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/ProjectInvitationFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/ProjectInvitationFactory.py b/tools/marvin/marvin/integration/lib/factory/ProjectInvitationFactory.py
deleted file mode 100644
index 70034a3..0000000
--- a/tools/marvin/marvin/integration/lib/factory/ProjectInvitationFactory.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import factory
-from marvin.integration.lib.base import ProjectInvitation
-class ProjectInvitationFactory(factory.Factory):
-
-    FACTORY_FOR = ProjectInvitation
-    projectid = None
-    id = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/RemoteAccessVpnFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/RemoteAccessVpnFactory.py b/tools/marvin/marvin/integration/lib/factory/RemoteAccessVpnFactory.py
deleted file mode 100644
index 6c52d60..0000000
--- a/tools/marvin/marvin/integration/lib/factory/RemoteAccessVpnFactory.py
+++ /dev/null
@@ -1,23 +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.
-import factory
-from marvin.integration.lib.base import RemoteAccessVpn
-class RemoteAccessVpnFactory(factory.Factory):
-
-    FACTORY_FOR = RemoteAccessVpn
-
-    publicipid = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/S3Factory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/S3Factory.py b/tools/marvin/marvin/integration/lib/factory/S3Factory.py
deleted file mode 100644
index 56765ce..0000000
--- a/tools/marvin/marvin/integration/lib/factory/S3Factory.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import factory
-from marvin.integration.lib.base import S3
-class S3Factory(factory.Factory):
-    FACTORY_FOR = S3.S3
-
-    accesskey = None
-    bucket = None
-    secretkey = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/SSHKeyPairFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/SSHKeyPairFactory.py b/tools/marvin/marvin/integration/lib/factory/SSHKeyPairFactory.py
deleted file mode 100644
index 0838f30..0000000
--- a/tools/marvin/marvin/integration/lib/factory/SSHKeyPairFactory.py
+++ /dev/null
@@ -1,23 +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.
-import factory
-from marvin.integration.lib.base import SSHKeyPair
-class SSHKeyPairFactory(factory.Factory):
-
-    FACTORY_FOR = SSHKeyPair
-
-    name = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/SecondaryStorageFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/SecondaryStorageFactory.py b/tools/marvin/marvin/integration/lib/factory/SecondaryStorageFactory.py
deleted file mode 100644
index 6af655c..0000000
--- a/tools/marvin/marvin/integration/lib/factory/SecondaryStorageFactory.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import factory
-from marvin.integration.lib.base import SecondaryStorage
-class SecondaryStorageFactory(factory.Factory):
-
-    FACTORY_FOR = SecondaryStorage
-
-    url = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/SecurityGroupFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/SecurityGroupFactory.py b/tools/marvin/marvin/integration/lib/factory/SecurityGroupFactory.py
deleted file mode 100644
index 8cb85e1..0000000
--- a/tools/marvin/marvin/integration/lib/factory/SecurityGroupFactory.py
+++ /dev/null
@@ -1,23 +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.
-import factory
-from marvin.integration.lib.base import SecurityGroup
-class SecurityGroupFactory(factory.Factory):
-
-    FACTORY_FOR = SecurityGroup
-
-    name = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/ServiceOfferingFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/ServiceOfferingFactory.py b/tools/marvin/marvin/integration/lib/factory/ServiceOfferingFactory.py
deleted file mode 100644
index a0b4295..0000000
--- a/tools/marvin/marvin/integration/lib/factory/ServiceOfferingFactory.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.
-import factory
-from marvin.integration.lib.factory.CloudStackBaseFactory import *
-from marvin.integration.lib.base import ServiceOffering
-from marvin.integration.lib.utils import random_gen
-
-class ServiceOfferingFactory(CloudStackBaseFactory):
-
-    FACTORY_FOR = ServiceOffering.ServiceOffering
-
-    cpunumber = 1
-    cpuspeed = 1000 #Mhz
-    displaytext = "Service Offering"
-    memory = 512 #MB
-    name =  factory.Sequence(lambda n: "ServiceOffering" + random_gen())
-
-
-class SmallServiceOfferingFactory(ServiceOfferingFactory):
-    cpunumber = 1
-    cpuspeed = 100 #Mhz
-    memory = 100 #MB
-    displaytext = "Small Service Offering"
-    name = factory.Sequence(lambda n: "SmallServiceOffering" + random_gen())

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/SnapshotFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/SnapshotFactory.py b/tools/marvin/marvin/integration/lib/factory/SnapshotFactory.py
deleted file mode 100644
index 336fa8a..0000000
--- a/tools/marvin/marvin/integration/lib/factory/SnapshotFactory.py
+++ /dev/null
@@ -1,23 +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.
-import factory
-from marvin.integration.lib.base import Snapshot
-class SnapshotFactory(factory.Factory):
-
-    FACTORY_FOR = Snapshot
-
-    volumeid = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/SnapshotPolicyFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/SnapshotPolicyFactory.py b/tools/marvin/marvin/integration/lib/factory/SnapshotPolicyFactory.py
deleted file mode 100644
index 6851fca..0000000
--- a/tools/marvin/marvin/integration/lib/factory/SnapshotPolicyFactory.py
+++ /dev/null
@@ -1,27 +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.
-import factory
-from marvin.integration.lib.base import SnapshotPolicy
-class SnapshotPolicyFactory(factory.Factory):
-
-    FACTORY_FOR = SnapshotPolicy
-
-    intervaltype = None
-    maxsnaps = None
-    schedule = None
-    timezone = None
-    volumeid = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/StaticNatFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/StaticNatFactory.py b/tools/marvin/marvin/integration/lib/factory/StaticNatFactory.py
deleted file mode 100644
index 72c5437..0000000
--- a/tools/marvin/marvin/integration/lib/factory/StaticNatFactory.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import factory
-from marvin.integration.lib.base import StaticNat
-class StaticNatFactory(factory.Factory):
-
-    FACTORY_FOR = StaticNat
-
-    ipaddressid = None
-    virtualmachineid = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/StaticRouteFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/StaticRouteFactory.py b/tools/marvin/marvin/integration/lib/factory/StaticRouteFactory.py
deleted file mode 100644
index d427547..0000000
--- a/tools/marvin/marvin/integration/lib/factory/StaticRouteFactory.py
+++ /dev/null
@@ -1,24 +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.
-import factory
-from marvin.integration.lib.base import StaticRoute
-class StaticRouteFactory(factory.Factory):
-
-    FACTORY_FOR = StaticRoute
-
-    cidr = None
-    gatewayid = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/StorageNetworkIpRangeFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/StorageNetworkIpRangeFactory.py b/tools/marvin/marvin/integration/lib/factory/StorageNetworkIpRangeFactory.py
deleted file mode 100644
index 8fe6ecf..0000000
--- a/tools/marvin/marvin/integration/lib/factory/StorageNetworkIpRangeFactory.py
+++ /dev/null
@@ -1,26 +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.
-import factory
-from marvin.integration.lib.base import StorageNetworkIpRange
-class StorageNetworkIpRangeFactory(factory.Factory):
-
-    FACTORY_FOR = StorageNetworkIpRange
-
-    gateway = None
-    netmask = None
-    podid = None
-    startip = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/StoragePoolFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/StoragePoolFactory.py b/tools/marvin/marvin/integration/lib/factory/StoragePoolFactory.py
deleted file mode 100644
index da45385..0000000
--- a/tools/marvin/marvin/integration/lib/factory/StoragePoolFactory.py
+++ /dev/null
@@ -1,26 +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.
-import factory
-from marvin.integration.lib.base import StoragePool
-class StoragePoolFactory(factory.Factory):
-
-    FACTORY_FOR = StoragePool
-
-    clusterid = None
-    name = None
-    podid = None
-    url = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/TagsFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/TagsFactory.py b/tools/marvin/marvin/integration/lib/factory/TagsFactory.py
deleted file mode 100644
index 28e859d..0000000
--- a/tools/marvin/marvin/integration/lib/factory/TagsFactory.py
+++ /dev/null
@@ -1,25 +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.
-import factory
-from marvin.integration.lib.base import Tags
-class TagsFactory(factory.Factory):
-
-    FACTORY_FOR = Tags
-
-    resourceids = None
-    resourcetype = None
-    tags = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/TemplateFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/TemplateFactory.py b/tools/marvin/marvin/integration/lib/factory/TemplateFactory.py
deleted file mode 100644
index 47d1035..0000000
--- a/tools/marvin/marvin/integration/lib/factory/TemplateFactory.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.
-import factory
-from marvin.integration.lib.base import Template
-from marvin.integration.lib.factory.CloudStackBaseFactory import CloudStackBaseFactory
-
-class TemplateFactory(CloudStackBaseFactory):
-
-    FACTORY_FOR = Template.Template
-
-    name = None
-    displaytext = None
-    format = None
-    url = None
-    hypervisor = None
-    zoneid = None
-    ostypeid = None
-
-class DefaultBuiltInTemplateFactory(TemplateFactory):
-    ostype = 'CentOS 5.3 (64-bit)'
-    displaytext = 'CentOS 5.3 (64-bit)'
-    name = 'CentOS 5.3 (64-bit)'
-    format = 'VHD'
-    hypervisor = 'XenServer'

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/TrafficMonitorFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/TrafficMonitorFactory.py b/tools/marvin/marvin/integration/lib/factory/TrafficMonitorFactory.py
deleted file mode 100644
index 63841cb..0000000
--- a/tools/marvin/marvin/integration/lib/factory/TrafficMonitorFactory.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import factory
-from marvin.integration.lib.base import TrafficMonitor
-class TrafficMonitorFactory(factory.Factory):
-
-    FACTORY_FOR = TrafficMonitor
-
-    url = None
-    zoneid = None

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd838d72/tools/marvin/marvin/integration/lib/factory/TrafficTypeFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/TrafficTypeFactory.py b/tools/marvin/marvin/integration/lib/factory/TrafficTypeFactory.py
deleted file mode 100644
index c336810..0000000
--- a/tools/marvin/marvin/integration/lib/factory/TrafficTypeFactory.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import factory
-from marvin.integration.lib.base import TrafficType
-class TrafficTypeFactory(factory.Factory):
-
-    FACTORY_FOR = TrafficType
-
-    physicalnetworkid = None
-    traffictype = None
-    id = None


Mime
View raw message