incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject git commit: marvin factories: factory info required only for create-able entities
Date Wed, 23 Jan 2013 14:23:10 GMT
Updated Branches:
  refs/heads/marvin-refactor-phase1 1abf48d6d -> f435ffb2e


marvin factories: factory info required only for create-able entities

entities come in to life on 'create', 'deploy', 'associate', 'register'

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f435ffb2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f435ffb2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f435ffb2

Branch: refs/heads/marvin-refactor-phase1
Commit: f435ffb2e68eb3e8e7449dee03967ac99d9be0de
Parents: 1abf48d
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Wed Jan 23 19:38:42 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Wed Jan 23 19:51:09 2013 +0530

----------------------------------------------------------------------
 .../lib/factory/AccountFromProjectFactory.py       |    8 ---
 .../lib/factory/AccountToProjectFactory.py         |    7 --
 .../integration/lib/factory/AlertsFactory.py       |    6 --
 .../marvin/integration/lib/factory/ApisFactory.py  |    6 --
 .../lib/factory/AsyncJobResultFactory.py           |    7 --
 .../integration/lib/factory/AsyncJobsFactory.py    |    6 --
 .../lib/factory/AutoScalePoliciesFactory.py        |    6 --
 .../integration/lib/factory/CapabilitiesFactory.py |    6 --
 .../integration/lib/factory/CapacityFactory.py     |    6 --
 .../lib/factory/CloudIdentifierFactory.py          |    7 --
 .../integration/lib/factory/ClusterFactory.py      |   25 --------
 .../integration/lib/factory/ConfigFactory.py       |    9 ---
 .../lib/factory/ConfigurationFactory.py            |   11 ----
 .../lib/factory/CustomCertificateFactory.py        |    8 ---
 .../lib/factory/DefaultZoneForAccountFactory.py    |    9 ---
 .../lib/factory/DomainChildrenFactory.py           |    6 --
 .../integration/lib/factory/EventTypesFactory.py   |    6 --
 .../integration/lib/factory/EventsFactory.py       |    6 --
 .../lib/factory/FromLoadBalancerRuleFactory.py     |    8 ---
 .../marvin/integration/lib/factory/HostFactory.py  |   31 ----------
 .../lib/factory/HostForMaintenanceFactory.py       |    7 --
 .../lib/factory/HostMaintenanceFactory.py          |    7 --
 .../integration/lib/factory/HostPasswordFactory.py |    8 ---
 .../lib/factory/HypervisorCapabilitiesFactory.py   |   10 ---
 .../integration/lib/factory/HypervisorsFactory.py  |    6 --
 .../integration/lib/factory/IpAddressFactory.py    |    5 --
 .../marvin/integration/lib/factory/IsoFactory.py   |   40 -------------
 .../lib/factory/IsoPermissionsFactory.py           |   12 ----
 .../lib/factory/LBStickinessPoliciesFactory.py     |    7 --
 .../factory/LoadBalancerRuleInstancesFactory.py    |    7 --
 .../lib/factory/NetworkDeviceFactory.py            |   15 -----
 .../lib/factory/NetworkServiceProviderFactory.py   |   22 -------
 .../lib/factory/NiciraNvpDeviceFactory.py          |   20 ------
 .../lib/factory/NiciraNvpDeviceNetworksFactory.py  |    7 --
 .../integration/lib/factory/OsCategoriesFactory.py |    6 --
 .../integration/lib/factory/OsTypesFactory.py      |    6 --
 .../factory/PasswordForVirtualMachineFactory.py    |    7 --
 .../lib/factory/ProjectAccountsFactory.py          |    7 --
 .../lib/factory/ProjectInvitationFactory.py        |   16 -----
 .../lib/factory/PublicIpAddressesFactory.py        |    6 --
 .../integration/lib/factory/RemoveFactory.py       |    6 --
 .../lib/factory/ResourceCountFactory.py            |    7 --
 .../lib/factory/ResourceLimitFactory.py            |   11 ----
 .../integration/lib/factory/RouterFactory.py       |   26 --------
 .../marvin/integration/lib/factory/S3Factory.py    |   13 ----
 .../lib/factory/SecondaryStorageFactory.py         |    7 --
 .../lib/factory/SecurityGroupEgressFactory.py      |   11 ----
 .../lib/factory/SecurityGroupIngressFactory.py     |   11 ----
 .../lib/factory/ServiceForRouterFactory.py         |    8 ---
 .../lib/factory/ServiceForSystemVmFactory.py       |    8 ---
 .../lib/factory/ServiceForVirtualMachineFactory.py |    8 ---
 .../lib/factory/SnapshotPoliciesFactory.py         |   11 ----
 .../integration/lib/factory/StaticNatFactory.py    |   13 ----
 .../lib/factory/StorageMaintenanceFactory.py       |   12 ----
 .../lib/factory/SupportedNetworkServicesFactory.py |    6 --
 .../marvin/integration/lib/factory/SwiftFactory.py |   11 ----
 .../integration/lib/factory/SystemVmFactory.py     |   32 ----------
 .../lib/factory/TemplatePermissionsFactory.py      |   12 ----
 .../lib/factory/ToLoadBalancerRuleFactory.py       |    8 ---
 .../lib/factory/TrafficMonitorFactory.py           |   18 ------
 .../integration/lib/factory/TrafficTypeFactory.py  |   23 -------
 .../lib/factory/TrafficTypeImplementorsFactory.py  |    6 --
 .../integration/lib/factory/UsageRecordsFactory.py |   14 -----
 .../integration/lib/factory/UsageTypesFactory.py   |    6 --
 .../integration/lib/factory/VMPasswordFactory.py   |    7 --
 .../lib/factory/VirtualMachineFactory.py           |   46 ---------------
 .../integration/lib/factory/VpnUserFactory.py      |   17 -----
 .../marvin/integration/lib/factory/__init__.py     |    2 +-
 .../marvin/marvin/integration/lib/generateBase.py  |   13 ++++-
 69 files changed, 12 insertions(+), 766 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/AccountFromProjectFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/AccountFromProjectFactory.py b/tools/marvin/marvin/integration/lib/factory/AccountFromProjectFactory.py
deleted file mode 100644
index ef67a93..0000000
--- a/tools/marvin/marvin/integration/lib/factory/AccountFromProjectFactory.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import AccountFromProject
-class AccountFromProjectFactory(factory.Factory):
-
-    FACTORY_FOR = AccountFromProject
-
-    account = None
-    projectid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/AccountToProjectFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/AccountToProjectFactory.py b/tools/marvin/marvin/integration/lib/factory/AccountToProjectFactory.py
deleted file mode 100644
index df54c18..0000000
--- a/tools/marvin/marvin/integration/lib/factory/AccountToProjectFactory.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import AccountToProject
-class AccountToProjectFactory(factory.Factory):
-
-    FACTORY_FOR = AccountToProject
-
-    projectid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/AlertsFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/AlertsFactory.py b/tools/marvin/marvin/integration/lib/factory/AlertsFactory.py
deleted file mode 100644
index 2f21883..0000000
--- a/tools/marvin/marvin/integration/lib/factory/AlertsFactory.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import Alerts
-class AlertsFactory(factory.Factory):
-
-    FACTORY_FOR = Alerts
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/ApisFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/ApisFactory.py b/tools/marvin/marvin/integration/lib/factory/ApisFactory.py
deleted file mode 100644
index b0bdc38..0000000
--- a/tools/marvin/marvin/integration/lib/factory/ApisFactory.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import Apis
-class ApisFactory(factory.Factory):
-
-    FACTORY_FOR = Apis
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/AsyncJobResultFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/AsyncJobResultFactory.py b/tools/marvin/marvin/integration/lib/factory/AsyncJobResultFactory.py
deleted file mode 100644
index d36fad8..0000000
--- a/tools/marvin/marvin/integration/lib/factory/AsyncJobResultFactory.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import AsyncJobResult
-class AsyncJobResultFactory(factory.Factory):
-
-    FACTORY_FOR = AsyncJobResult
-
-    jobid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/AsyncJobsFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/AsyncJobsFactory.py b/tools/marvin/marvin/integration/lib/factory/AsyncJobsFactory.py
deleted file mode 100644
index c2a2b3c..0000000
--- a/tools/marvin/marvin/integration/lib/factory/AsyncJobsFactory.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import AsyncJobs
-class AsyncJobsFactory(factory.Factory):
-
-    FACTORY_FOR = AsyncJobs
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/AutoScalePoliciesFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/AutoScalePoliciesFactory.py b/tools/marvin/marvin/integration/lib/factory/AutoScalePoliciesFactory.py
deleted file mode 100644
index b3500c5..0000000
--- a/tools/marvin/marvin/integration/lib/factory/AutoScalePoliciesFactory.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import AutoScalePolicies
-class AutoScalePoliciesFactory(factory.Factory):
-
-    FACTORY_FOR = AutoScalePolicies
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/CapabilitiesFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/CapabilitiesFactory.py b/tools/marvin/marvin/integration/lib/factory/CapabilitiesFactory.py
deleted file mode 100644
index 2ee11d4..0000000
--- a/tools/marvin/marvin/integration/lib/factory/CapabilitiesFactory.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import Capabilities
-class CapabilitiesFactory(factory.Factory):
-
-    FACTORY_FOR = Capabilities
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/CapacityFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/CapacityFactory.py b/tools/marvin/marvin/integration/lib/factory/CapacityFactory.py
deleted file mode 100644
index b2aa717..0000000
--- a/tools/marvin/marvin/integration/lib/factory/CapacityFactory.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import Capacity
-class CapacityFactory(factory.Factory):
-
-    FACTORY_FOR = Capacity
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/CloudIdentifierFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/CloudIdentifierFactory.py b/tools/marvin/marvin/integration/lib/factory/CloudIdentifierFactory.py
deleted file mode 100644
index 22c27d7..0000000
--- a/tools/marvin/marvin/integration/lib/factory/CloudIdentifierFactory.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import CloudIdentifier
-class CloudIdentifierFactory(factory.Factory):
-
-    FACTORY_FOR = CloudIdentifier
-
-    userid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/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 2697f6a..0000000
--- a/tools/marvin/marvin/integration/lib/factory/ClusterFactory.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import Cluster
-class ClusterFactory(factory.Factory):
-
-    FACTORY_FOR = Cluster
-
-    clustername = None
-    clustertype = None
-    hypervisor = None
-    podid = None
-    zoneid = None
-
-
-    FACTORY_FOR = Cluster
-
-
-
-    FACTORY_FOR = Cluster
-
-    id = None
-
-
-    FACTORY_FOR = Cluster
-
-    id = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/ConfigFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/ConfigFactory.py b/tools/marvin/marvin/integration/lib/factory/ConfigFactory.py
deleted file mode 100644
index f62c583..0000000
--- a/tools/marvin/marvin/integration/lib/factory/ConfigFactory.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import Config
-class ConfigFactory(factory.Factory):
-
-    FACTORY_FOR = Config
-
-    hostname = None
-    queryfilter = None
-    searchbase = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/ConfigurationFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/ConfigurationFactory.py b/tools/marvin/marvin/integration/lib/factory/ConfigurationFactory.py
deleted file mode 100644
index 88c6556..0000000
--- a/tools/marvin/marvin/integration/lib/factory/ConfigurationFactory.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import Configuration
-class ConfigurationFactory(factory.Factory):
-
-    FACTORY_FOR = Configuration
-
-
-
-    FACTORY_FOR = Configuration
-
-    name = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/CustomCertificateFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/CustomCertificateFactory.py b/tools/marvin/marvin/integration/lib/factory/CustomCertificateFactory.py
deleted file mode 100644
index c3f8c62..0000000
--- a/tools/marvin/marvin/integration/lib/factory/CustomCertificateFactory.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import CustomCertificate
-class CustomCertificateFactory(factory.Factory):
-
-    FACTORY_FOR = CustomCertificate
-
-    certificate = None
-    domainsuffix = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/DefaultZoneForAccountFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/DefaultZoneForAccountFactory.py b/tools/marvin/marvin/integration/lib/factory/DefaultZoneForAccountFactory.py
deleted file mode 100644
index 15da73a..0000000
--- a/tools/marvin/marvin/integration/lib/factory/DefaultZoneForAccountFactory.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import DefaultZoneForAccount
-class DefaultZoneForAccountFactory(factory.Factory):
-
-    FACTORY_FOR = DefaultZoneForAccount
-
-    account = None
-    domainid = None
-    zoneid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/DomainChildrenFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/DomainChildrenFactory.py b/tools/marvin/marvin/integration/lib/factory/DomainChildrenFactory.py
deleted file mode 100644
index 792a523..0000000
--- a/tools/marvin/marvin/integration/lib/factory/DomainChildrenFactory.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import DomainChildren
-class DomainChildrenFactory(factory.Factory):
-
-    FACTORY_FOR = DomainChildren
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/EventTypesFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/EventTypesFactory.py b/tools/marvin/marvin/integration/lib/factory/EventTypesFactory.py
deleted file mode 100644
index 07bf395..0000000
--- a/tools/marvin/marvin/integration/lib/factory/EventTypesFactory.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import EventTypes
-class EventTypesFactory(factory.Factory):
-
-    FACTORY_FOR = EventTypes
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/EventsFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/EventsFactory.py b/tools/marvin/marvin/integration/lib/factory/EventsFactory.py
deleted file mode 100644
index 640e2e4..0000000
--- a/tools/marvin/marvin/integration/lib/factory/EventsFactory.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import Events
-class EventsFactory(factory.Factory):
-
-    FACTORY_FOR = Events
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/FromLoadBalancerRuleFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/FromLoadBalancerRuleFactory.py b/tools/marvin/marvin/integration/lib/factory/FromLoadBalancerRuleFactory.py
deleted file mode 100644
index 82e46cb..0000000
--- a/tools/marvin/marvin/integration/lib/factory/FromLoadBalancerRuleFactory.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import FromLoadBalancerRule
-class FromLoadBalancerRuleFactory(factory.Factory):
-
-    FACTORY_FOR = FromLoadBalancerRule
-
-    id = None
-    virtualmachineids = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/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 fcdf074..0000000
--- a/tools/marvin/marvin/integration/lib/factory/HostFactory.py
+++ /dev/null
@@ -1,31 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import Host
-class HostFactory(factory.Factory):
-
-    FACTORY_FOR = Host
-
-    hypervisor = None
-    password = None
-    podid = None
-    url = None
-    username = None
-    zoneid = None
-
-
-    FACTORY_FOR = Host
-
-
-
-    FACTORY_FOR = Host
-
-    id = None
-
-
-    FACTORY_FOR = Host
-
-    id = None
-
-
-    FACTORY_FOR = Host
-
-    id = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/HostForMaintenanceFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/HostForMaintenanceFactory.py b/tools/marvin/marvin/integration/lib/factory/HostForMaintenanceFactory.py
deleted file mode 100644
index 653e37a..0000000
--- a/tools/marvin/marvin/integration/lib/factory/HostForMaintenanceFactory.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import HostForMaintenance
-class HostForMaintenanceFactory(factory.Factory):
-
-    FACTORY_FOR = HostForMaintenance
-
-    id = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/HostMaintenanceFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/HostMaintenanceFactory.py b/tools/marvin/marvin/integration/lib/factory/HostMaintenanceFactory.py
deleted file mode 100644
index d491e00..0000000
--- a/tools/marvin/marvin/integration/lib/factory/HostMaintenanceFactory.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import HostMaintenance
-class HostMaintenanceFactory(factory.Factory):
-
-    FACTORY_FOR = HostMaintenance
-
-    id = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/HostPasswordFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/HostPasswordFactory.py b/tools/marvin/marvin/integration/lib/factory/HostPasswordFactory.py
deleted file mode 100644
index 316af2b..0000000
--- a/tools/marvin/marvin/integration/lib/factory/HostPasswordFactory.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import HostPassword
-class HostPasswordFactory(factory.Factory):
-
-    FACTORY_FOR = HostPassword
-
-    password = None
-    username = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/HypervisorCapabilitiesFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/HypervisorCapabilitiesFactory.py b/tools/marvin/marvin/integration/lib/factory/HypervisorCapabilitiesFactory.py
deleted file mode 100644
index a259b06..0000000
--- a/tools/marvin/marvin/integration/lib/factory/HypervisorCapabilitiesFactory.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import HypervisorCapabilities
-class HypervisorCapabilitiesFactory(factory.Factory):
-
-    FACTORY_FOR = HypervisorCapabilities
-
-
-
-    FACTORY_FOR = HypervisorCapabilities
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/HypervisorsFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/HypervisorsFactory.py b/tools/marvin/marvin/integration/lib/factory/HypervisorsFactory.py
deleted file mode 100644
index 0dd58c3..0000000
--- a/tools/marvin/marvin/integration/lib/factory/HypervisorsFactory.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import Hypervisors
-class HypervisorsFactory(factory.Factory):
-
-    FACTORY_FOR = Hypervisors
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/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
index a214e78..28b82ac 100644
--- a/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py
@@ -4,8 +4,3 @@ class IpAddressFactory(factory.Factory):
 
     FACTORY_FOR = IpAddress
 
-    id = None
-
-
-    FACTORY_FOR = IpAddress
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/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
index 4daae41..ac4cd2e 100644
--- a/tools/marvin/marvin/integration/lib/factory/IsoFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/IsoFactory.py
@@ -4,47 +4,7 @@ class IsoFactory(factory.Factory):
 
     FACTORY_FOR = Iso
 
-    id = None
-    destzoneid = None
-    destzoneid = None
-    sourcezoneid = None
-    sourcezoneid = None
-
-
-    FACTORY_FOR = Iso
-
     displaytext = None
     name = None
     url = None
     zoneid = None
-
-
-    FACTORY_FOR = Iso
-
-
-
-    FACTORY_FOR = Iso
-
-    id = None
-
-
-    FACTORY_FOR = Iso
-
-    id = None
-    virtualmachineid = None
-
-
-    FACTORY_FOR = Iso
-
-    virtualmachineid = None
-
-
-    FACTORY_FOR = Iso
-
-    id = None
-    mode = None
-
-
-    FACTORY_FOR = Iso
-
-    id = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/IsoPermissionsFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/IsoPermissionsFactory.py b/tools/marvin/marvin/integration/lib/factory/IsoPermissionsFactory.py
deleted file mode 100644
index 9116ff9..0000000
--- a/tools/marvin/marvin/integration/lib/factory/IsoPermissionsFactory.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import IsoPermissions
-class IsoPermissionsFactory(factory.Factory):
-
-    FACTORY_FOR = IsoPermissions
-
-    id = None
-
-
-    FACTORY_FOR = IsoPermissions
-
-    id = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/LBStickinessPoliciesFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/LBStickinessPoliciesFactory.py b/tools/marvin/marvin/integration/lib/factory/LBStickinessPoliciesFactory.py
deleted file mode 100644
index 1ed738b..0000000
--- a/tools/marvin/marvin/integration/lib/factory/LBStickinessPoliciesFactory.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import LBStickinessPolicies
-class LBStickinessPoliciesFactory(factory.Factory):
-
-    FACTORY_FOR = LBStickinessPolicies
-
-    lbruleid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleInstancesFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleInstancesFactory.py b/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleInstancesFactory.py
deleted file mode 100644
index f5abf63..0000000
--- a/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleInstancesFactory.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import LoadBalancerRuleInstances
-class LoadBalancerRuleInstancesFactory(factory.Factory):
-
-    FACTORY_FOR = LoadBalancerRuleInstances
-
-    id = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/NetworkDeviceFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/NetworkDeviceFactory.py b/tools/marvin/marvin/integration/lib/factory/NetworkDeviceFactory.py
deleted file mode 100644
index 1437e25..0000000
--- a/tools/marvin/marvin/integration/lib/factory/NetworkDeviceFactory.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import NetworkDevice
-class NetworkDeviceFactory(factory.Factory):
-
-    FACTORY_FOR = NetworkDevice
-
-
-
-    FACTORY_FOR = NetworkDevice
-
-
-
-    FACTORY_FOR = NetworkDevice
-
-    id = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/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 108af5d..0000000
--- a/tools/marvin/marvin/integration/lib/factory/NetworkServiceProviderFactory.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import NetworkServiceProvider
-class NetworkServiceProviderFactory(factory.Factory):
-
-    FACTORY_FOR = NetworkServiceProvider
-
-    name = None
-    physicalnetworkid = None
-
-
-    FACTORY_FOR = NetworkServiceProvider
-
-
-
-    FACTORY_FOR = NetworkServiceProvider
-
-    id = None
-
-
-    FACTORY_FOR = NetworkServiceProvider
-
-    id = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/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 8448c42..0000000
--- a/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceFactory.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import NiciraNvpDevice
-class NiciraNvpDeviceFactory(factory.Factory):
-
-    FACTORY_FOR = NiciraNvpDevice
-
-    hostname = None
-    password = None
-    physicalnetworkid = None
-    transportzoneuuid = None
-    username = None
-
-
-    FACTORY_FOR = NiciraNvpDevice
-
-
-
-    FACTORY_FOR = NiciraNvpDevice
-
-    nvpdeviceid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceNetworksFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceNetworksFactory.py b/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceNetworksFactory.py
deleted file mode 100644
index fe7dc70..0000000
--- a/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceNetworksFactory.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import NiciraNvpDeviceNetworks
-class NiciraNvpDeviceNetworksFactory(factory.Factory):
-
-    FACTORY_FOR = NiciraNvpDeviceNetworks
-
-    nvpdeviceid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/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 dac6d47..0000000
--- a/tools/marvin/marvin/integration/lib/factory/OsCategoriesFactory.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import OsCategories
-class OsCategoriesFactory(factory.Factory):
-
-    FACTORY_FOR = OsCategories
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/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 01b0c5e..0000000
--- a/tools/marvin/marvin/integration/lib/factory/OsTypesFactory.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import OsTypes
-class OsTypesFactory(factory.Factory):
-
-    FACTORY_FOR = OsTypes
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/PasswordForVirtualMachineFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/PasswordForVirtualMachineFactory.py b/tools/marvin/marvin/integration/lib/factory/PasswordForVirtualMachineFactory.py
deleted file mode 100644
index b959226..0000000
--- a/tools/marvin/marvin/integration/lib/factory/PasswordForVirtualMachineFactory.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import PasswordForVirtualMachine
-class PasswordForVirtualMachineFactory(factory.Factory):
-
-    FACTORY_FOR = PasswordForVirtualMachine
-
-    id = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/ProjectAccountsFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/ProjectAccountsFactory.py b/tools/marvin/marvin/integration/lib/factory/ProjectAccountsFactory.py
deleted file mode 100644
index e242004..0000000
--- a/tools/marvin/marvin/integration/lib/factory/ProjectAccountsFactory.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import ProjectAccounts
-class ProjectAccountsFactory(factory.Factory):
-
-    FACTORY_FOR = ProjectAccounts
-
-    projectid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/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 762a9d4..0000000
--- a/tools/marvin/marvin/integration/lib/factory/ProjectInvitationFactory.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import ProjectInvitation
-class ProjectInvitationFactory(factory.Factory):
-
-    FACTORY_FOR = ProjectInvitation
-
-
-
-    FACTORY_FOR = ProjectInvitation
-
-    projectid = None
-
-
-    FACTORY_FOR = ProjectInvitation
-
-    id = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/PublicIpAddressesFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/PublicIpAddressesFactory.py b/tools/marvin/marvin/integration/lib/factory/PublicIpAddressesFactory.py
deleted file mode 100644
index b60e145..0000000
--- a/tools/marvin/marvin/integration/lib/factory/PublicIpAddressesFactory.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import PublicIpAddresses
-class PublicIpAddressesFactory(factory.Factory):
-
-    FACTORY_FOR = PublicIpAddresses
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/RemoveFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/RemoveFactory.py b/tools/marvin/marvin/integration/lib/factory/RemoveFactory.py
deleted file mode 100644
index 89b90bc..0000000
--- a/tools/marvin/marvin/integration/lib/factory/RemoveFactory.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import Remove
-class RemoveFactory(factory.Factory):
-
-    FACTORY_FOR = Remove
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/ResourceCountFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/ResourceCountFactory.py b/tools/marvin/marvin/integration/lib/factory/ResourceCountFactory.py
deleted file mode 100644
index 7e41d96..0000000
--- a/tools/marvin/marvin/integration/lib/factory/ResourceCountFactory.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import ResourceCount
-class ResourceCountFactory(factory.Factory):
-
-    FACTORY_FOR = ResourceCount
-
-    domainid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/ResourceLimitFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/ResourceLimitFactory.py b/tools/marvin/marvin/integration/lib/factory/ResourceLimitFactory.py
deleted file mode 100644
index 9e9f0a0..0000000
--- a/tools/marvin/marvin/integration/lib/factory/ResourceLimitFactory.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import ResourceLimit
-class ResourceLimitFactory(factory.Factory):
-
-    FACTORY_FOR = ResourceLimit
-
-
-
-    FACTORY_FOR = ResourceLimit
-
-    resourcetype = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/RouterFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/RouterFactory.py b/tools/marvin/marvin/integration/lib/factory/RouterFactory.py
deleted file mode 100644
index e5d8a6e..0000000
--- a/tools/marvin/marvin/integration/lib/factory/RouterFactory.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import Router
-class RouterFactory(factory.Factory):
-
-    FACTORY_FOR = Router
-
-    id = None
-
-
-    FACTORY_FOR = Router
-
-
-
-    FACTORY_FOR = Router
-
-    id = None
-
-
-    FACTORY_FOR = Router
-
-    id = None
-
-
-    FACTORY_FOR = Router
-
-    id = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/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 5255851..0000000
--- a/tools/marvin/marvin/integration/lib/factory/S3Factory.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import S3
-class S3Factory(factory.Factory):
-
-    FACTORY_FOR = S3
-
-    accesskey = None
-    bucket = None
-    secretkey = None
-
-
-    FACTORY_FOR = S3
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/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 b44f1ed..0000000
--- a/tools/marvin/marvin/integration/lib/factory/SecondaryStorageFactory.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import SecondaryStorage
-class SecondaryStorageFactory(factory.Factory):
-
-    FACTORY_FOR = SecondaryStorage
-
-    url = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/SecurityGroupEgressFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/SecurityGroupEgressFactory.py b/tools/marvin/marvin/integration/lib/factory/SecurityGroupEgressFactory.py
deleted file mode 100644
index 19e715d..0000000
--- a/tools/marvin/marvin/integration/lib/factory/SecurityGroupEgressFactory.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import SecurityGroupEgress
-class SecurityGroupEgressFactory(factory.Factory):
-
-    FACTORY_FOR = SecurityGroupEgress
-
-
-
-    FACTORY_FOR = SecurityGroupEgress
-
-    id = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/SecurityGroupIngressFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/SecurityGroupIngressFactory.py b/tools/marvin/marvin/integration/lib/factory/SecurityGroupIngressFactory.py
deleted file mode 100644
index d0f4447..0000000
--- a/tools/marvin/marvin/integration/lib/factory/SecurityGroupIngressFactory.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import SecurityGroupIngress
-class SecurityGroupIngressFactory(factory.Factory):
-
-    FACTORY_FOR = SecurityGroupIngress
-
-
-
-    FACTORY_FOR = SecurityGroupIngress
-
-    id = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/ServiceForRouterFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/ServiceForRouterFactory.py b/tools/marvin/marvin/integration/lib/factory/ServiceForRouterFactory.py
deleted file mode 100644
index faa7d7d..0000000
--- a/tools/marvin/marvin/integration/lib/factory/ServiceForRouterFactory.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import ServiceForRouter
-class ServiceForRouterFactory(factory.Factory):
-
-    FACTORY_FOR = ServiceForRouter
-
-    id = None
-    serviceofferingid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/ServiceForSystemVmFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/ServiceForSystemVmFactory.py b/tools/marvin/marvin/integration/lib/factory/ServiceForSystemVmFactory.py
deleted file mode 100644
index 42ee081..0000000
--- a/tools/marvin/marvin/integration/lib/factory/ServiceForSystemVmFactory.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import ServiceForSystemVm
-class ServiceForSystemVmFactory(factory.Factory):
-
-    FACTORY_FOR = ServiceForSystemVm
-
-    id = None
-    serviceofferingid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/ServiceForVirtualMachineFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/ServiceForVirtualMachineFactory.py b/tools/marvin/marvin/integration/lib/factory/ServiceForVirtualMachineFactory.py
deleted file mode 100644
index 2884594..0000000
--- a/tools/marvin/marvin/integration/lib/factory/ServiceForVirtualMachineFactory.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import ServiceForVirtualMachine
-class ServiceForVirtualMachineFactory(factory.Factory):
-
-    FACTORY_FOR = ServiceForVirtualMachine
-
-    id = None
-    serviceofferingid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/SnapshotPoliciesFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/SnapshotPoliciesFactory.py b/tools/marvin/marvin/integration/lib/factory/SnapshotPoliciesFactory.py
deleted file mode 100644
index b79787e..0000000
--- a/tools/marvin/marvin/integration/lib/factory/SnapshotPoliciesFactory.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import SnapshotPolicies
-class SnapshotPoliciesFactory(factory.Factory):
-
-    FACTORY_FOR = SnapshotPolicies
-
-    volumeid = None
-
-
-    FACTORY_FOR = SnapshotPolicies
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/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 817fb27..0000000
--- a/tools/marvin/marvin/integration/lib/factory/StaticNatFactory.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import StaticNat
-class StaticNatFactory(factory.Factory):
-
-    FACTORY_FOR = StaticNat
-
-    ipaddressid = None
-    virtualmachineid = None
-
-
-    FACTORY_FOR = StaticNat
-
-    ipaddressid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/StorageMaintenanceFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/StorageMaintenanceFactory.py b/tools/marvin/marvin/integration/lib/factory/StorageMaintenanceFactory.py
deleted file mode 100644
index 90335c0..0000000
--- a/tools/marvin/marvin/integration/lib/factory/StorageMaintenanceFactory.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import StorageMaintenance
-class StorageMaintenanceFactory(factory.Factory):
-
-    FACTORY_FOR = StorageMaintenance
-
-    id = None
-
-
-    FACTORY_FOR = StorageMaintenance
-
-    id = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/SupportedNetworkServicesFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/SupportedNetworkServicesFactory.py b/tools/marvin/marvin/integration/lib/factory/SupportedNetworkServicesFactory.py
deleted file mode 100644
index 881689d..0000000
--- a/tools/marvin/marvin/integration/lib/factory/SupportedNetworkServicesFactory.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import SupportedNetworkServices
-class SupportedNetworkServicesFactory(factory.Factory):
-
-    FACTORY_FOR = SupportedNetworkServices
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/SwiftFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/SwiftFactory.py b/tools/marvin/marvin/integration/lib/factory/SwiftFactory.py
deleted file mode 100644
index dca2f72..0000000
--- a/tools/marvin/marvin/integration/lib/factory/SwiftFactory.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import Swift
-class SwiftFactory(factory.Factory):
-
-    FACTORY_FOR = Swift
-
-    url = None
-
-
-    FACTORY_FOR = Swift
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/SystemVmFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/SystemVmFactory.py b/tools/marvin/marvin/integration/lib/factory/SystemVmFactory.py
deleted file mode 100644
index 65c4311..0000000
--- a/tools/marvin/marvin/integration/lib/factory/SystemVmFactory.py
+++ /dev/null
@@ -1,32 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import SystemVm
-class SystemVmFactory(factory.Factory):
-
-    FACTORY_FOR = SystemVm
-
-    hostid = None
-    virtualmachineid = None
-
-
-    FACTORY_FOR = SystemVm
-
-    id = None
-
-
-    FACTORY_FOR = SystemVm
-
-
-
-    FACTORY_FOR = SystemVm
-
-    id = None
-
-
-    FACTORY_FOR = SystemVm
-
-    id = None
-
-
-    FACTORY_FOR = SystemVm
-
-    id = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/TemplatePermissionsFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/TemplatePermissionsFactory.py b/tools/marvin/marvin/integration/lib/factory/TemplatePermissionsFactory.py
deleted file mode 100644
index 88f2493..0000000
--- a/tools/marvin/marvin/integration/lib/factory/TemplatePermissionsFactory.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import TemplatePermissions
-class TemplatePermissionsFactory(factory.Factory):
-
-    FACTORY_FOR = TemplatePermissions
-
-    id = None
-
-
-    FACTORY_FOR = TemplatePermissions
-
-    id = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/ToLoadBalancerRuleFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/ToLoadBalancerRuleFactory.py b/tools/marvin/marvin/integration/lib/factory/ToLoadBalancerRuleFactory.py
deleted file mode 100644
index 57ad32a..0000000
--- a/tools/marvin/marvin/integration/lib/factory/ToLoadBalancerRuleFactory.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import ToLoadBalancerRule
-class ToLoadBalancerRuleFactory(factory.Factory):
-
-    FACTORY_FOR = ToLoadBalancerRule
-
-    id = None
-    virtualmachineids = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/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 cc6db01..0000000
--- a/tools/marvin/marvin/integration/lib/factory/TrafficMonitorFactory.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import TrafficMonitor
-class TrafficMonitorFactory(factory.Factory):
-
-    FACTORY_FOR = TrafficMonitor
-
-    url = None
-    zoneid = None
-
-
-    FACTORY_FOR = TrafficMonitor
-
-    zoneid = None
-
-
-    FACTORY_FOR = TrafficMonitor
-
-    id = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/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 78f61a7..0000000
--- a/tools/marvin/marvin/integration/lib/factory/TrafficTypeFactory.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import TrafficType
-class TrafficTypeFactory(factory.Factory):
-
-    FACTORY_FOR = TrafficType
-
-    physicalnetworkid = None
-    traffictype = None
-
-
-    FACTORY_FOR = TrafficType
-
-    physicalnetworkid = None
-
-
-    FACTORY_FOR = TrafficType
-
-    id = None
-
-
-    FACTORY_FOR = TrafficType
-
-    id = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/TrafficTypeImplementorsFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/TrafficTypeImplementorsFactory.py b/tools/marvin/marvin/integration/lib/factory/TrafficTypeImplementorsFactory.py
deleted file mode 100644
index 175af80..0000000
--- a/tools/marvin/marvin/integration/lib/factory/TrafficTypeImplementorsFactory.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import TrafficTypeImplementors
-class TrafficTypeImplementorsFactory(factory.Factory):
-
-    FACTORY_FOR = TrafficTypeImplementors
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/UsageRecordsFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/UsageRecordsFactory.py b/tools/marvin/marvin/integration/lib/factory/UsageRecordsFactory.py
deleted file mode 100644
index 045bdd0..0000000
--- a/tools/marvin/marvin/integration/lib/factory/UsageRecordsFactory.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import UsageRecords
-class UsageRecordsFactory(factory.Factory):
-
-    FACTORY_FOR = UsageRecords
-
-    enddate = None
-    startdate = None
-
-
-    FACTORY_FOR = UsageRecords
-
-    enddate = None
-    startdate = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/UsageTypesFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/UsageTypesFactory.py b/tools/marvin/marvin/integration/lib/factory/UsageTypesFactory.py
deleted file mode 100644
index 78295d0..0000000
--- a/tools/marvin/marvin/integration/lib/factory/UsageTypesFactory.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import UsageTypes
-class UsageTypesFactory(factory.Factory):
-
-    FACTORY_FOR = UsageTypes
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/VMPasswordFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/VMPasswordFactory.py b/tools/marvin/marvin/integration/lib/factory/VMPasswordFactory.py
deleted file mode 100644
index b1cd5bf..0000000
--- a/tools/marvin/marvin/integration/lib/factory/VMPasswordFactory.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import VMPassword
-class VMPasswordFactory(factory.Factory):
-
-    FACTORY_FOR = VMPassword
-
-    id = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/VirtualMachineFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/VirtualMachineFactory.py b/tools/marvin/marvin/integration/lib/factory/VirtualMachineFactory.py
index e1fbbfc..96b1eac 100644
--- a/tools/marvin/marvin/integration/lib/factory/VirtualMachineFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/VirtualMachineFactory.py
@@ -4,52 +4,6 @@ class VirtualMachineFactory(factory.Factory):
 
     FACTORY_FOR = VirtualMachine
 
-    virtualmachineid = None
-
-
-    FACTORY_FOR = VirtualMachine
-
     serviceofferingid = None
     templateid = None
     zoneid = None
-
-
-    FACTORY_FOR = VirtualMachine
-
-    virtualmachineid = None
-
-
-    FACTORY_FOR = VirtualMachine
-
-
-
-    FACTORY_FOR = VirtualMachine
-
-    id = None
-
-
-    FACTORY_FOR = VirtualMachine
-
-    id = None
-
-
-    FACTORY_FOR = VirtualMachine
-
-    id = None
-
-
-    FACTORY_FOR = VirtualMachine
-
-    id = None
-
-
-    FACTORY_FOR = VirtualMachine
-
-    id = None
-
-
-    FACTORY_FOR = VirtualMachine
-
-    account = None
-    domainid = None
-    virtualmachineid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/VpnUserFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/VpnUserFactory.py b/tools/marvin/marvin/integration/lib/factory/VpnUserFactory.py
deleted file mode 100644
index 1dce088..0000000
--- a/tools/marvin/marvin/integration/lib/factory/VpnUserFactory.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import factory
-from marvin.integration.lib.newbase import VpnUser
-class VpnUserFactory(factory.Factory):
-
-    FACTORY_FOR = VpnUser
-
-    password = None
-    username = None
-
-
-    FACTORY_FOR = VpnUser
-
-
-
-    FACTORY_FOR = VpnUser
-
-    username = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/factory/__init__.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/__init__.py b/tools/marvin/marvin/integration/lib/factory/__init__.py
index 287f9b1..978b68a 100644
--- a/tools/marvin/marvin/integration/lib/factory/__init__.py
+++ b/tools/marvin/marvin/integration/lib/factory/__init__.py
@@ -13,4 +13,4 @@
 # "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.
\ No newline at end of file
+# under the License.

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f435ffb2/tools/marvin/marvin/integration/lib/generateBase.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/generateBase.py b/tools/marvin/marvin/integration/lib/generateBase.py
index 8b4bfd8..75aa1bf 100644
--- a/tools/marvin/marvin/integration/lib/generateBase.py
+++ b/tools/marvin/marvin/integration/lib/generateBase.py
@@ -118,9 +118,18 @@ def write_entity_factory(entity, actions):
     tabspace = '    '
     #TODO: Add license header for ASLv2
     code = ''
-    if 'create' not in actions:
+    factory_defaults = []
+    if 'create' in actions:
+        factory_defaults.extend(actions['create'])
+    elif 'deploy' in actions:
+        factory_defaults.extend(actions['deploy'])
+    elif 'associate' in actions:
+        factory_defaults.extend(actions['associate'])
+    elif 'register' in actions:
+        factory_defaults.extend(actions['register'])
+    else:
         return
-    factory_defaults = actions['create']
+
     if os.path.exists("./factory/%sFactory.py"%entity):
         for arg in factory_defaults[0]:
             code += tabspace + '%s = None\n'%arg


Mime
View raw message