incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [4/42] git commit: refs/heads/marvin-refactor - marvin: factories for each api entity
Date Fri, 01 Mar 2013 10:06:31 GMT
marvin: factories for each api entity

factories will help define default test data for each entity. So a

Account.create(apiclient) returns a default account
VirtualMachine.deploy(apiclient) returns a virtualmachine etc

WIP: only skeletons, no flesh

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/1abf48d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1abf48d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1abf48d6

Branch: refs/heads/marvin-refactor
Commit: 1abf48d6d30db3c16b8cb81b3cbcd4e89b27257f
Parents: ddd7660
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Wed Jan 23 19:34:25 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Wed Jan 23 19:34:25 2013 +0530

----------------------------------------------------------------------
 .../integration/lib/factory/AccountFactory.py      |   12 +
 .../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 +
 .../lib/factory/AutoScalePolicyFactory.py          |    9 +
 .../lib/factory/AutoScaleVmGroupFactory.py         |   12 +
 .../lib/factory/AutoScaleVmProfileFactory.py       |    9 +
 .../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/ConditionFactory.py    |    9 +
 .../integration/lib/factory/ConfigFactory.py       |    9 +
 .../lib/factory/ConfigurationFactory.py            |   11 +
 .../integration/lib/factory/CounterFactory.py      |    9 +
 .../lib/factory/CustomCertificateFactory.py        |    8 +
 .../lib/factory/DefaultZoneForAccountFactory.py    |    9 +
 .../integration/lib/factory/DiskOfferingFactory.py |    8 +
 .../lib/factory/DomainChildrenFactory.py           |    6 +
 .../integration/lib/factory/DomainFactory.py       |    7 +
 .../integration/lib/factory/EventTypesFactory.py   |    6 +
 .../integration/lib/factory/EventsFactory.py       |    6 +
 .../integration/lib/factory/FirewallRuleFactory.py |    8 +
 .../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 +
 .../lib/factory/InstanceGroupFactory.py            |    7 +
 .../integration/lib/factory/IpAddressFactory.py    |   11 +
 .../lib/factory/IpForwardingRuleFactory.py         |    9 +
 .../marvin/integration/lib/factory/IsoFactory.py   |   50 +
 .../lib/factory/IsoPermissionsFactory.py           |   12 +
 .../lib/factory/LBStickinessPoliciesFactory.py     |    7 +
 .../lib/factory/LBStickinessPolicyFactory.py       |    9 +
 .../lib/factory/LoadBalancerRuleFactory.py         |   10 +
 .../factory/LoadBalancerRuleInstancesFactory.py    |    7 +
 .../integration/lib/factory/NetworkACLFactory.py   |    8 +
 .../lib/factory/NetworkDeviceFactory.py            |   15 +
 .../integration/lib/factory/NetworkFactory.py      |   10 +
 .../lib/factory/NetworkOfferingFactory.py          |   11 +
 .../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/PhysicalNetworkFactory.py          |    8 +
 .../marvin/integration/lib/factory/PodFactory.py   |   11 +
 .../lib/factory/PortForwardingRuleFactory.py       |   11 +
 .../lib/factory/PrivateGatewayFactory.py           |   11 +
 .../lib/factory/ProjectAccountsFactory.py          |    7 +
 .../integration/lib/factory/ProjectFactory.py      |    8 +
 .../lib/factory/ProjectInvitationFactory.py        |   16 +
 .../lib/factory/PublicIpAddressesFactory.py        |    6 +
 .../lib/factory/RemoteAccessVpnFactory.py          |    7 +
 .../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 +
 .../integration/lib/factory/SSHKeyPairFactory.py   |    7 +
 .../lib/factory/SecondaryStorageFactory.py         |    7 +
 .../lib/factory/SecurityGroupEgressFactory.py      |   11 +
 .../lib/factory/SecurityGroupFactory.py            |    7 +
 .../lib/factory/SecurityGroupIngressFactory.py     |   11 +
 .../lib/factory/ServiceForRouterFactory.py         |    8 +
 .../lib/factory/ServiceForSystemVmFactory.py       |    8 +
 .../lib/factory/ServiceForVirtualMachineFactory.py |    8 +
 .../lib/factory/ServiceOfferingFactory.py          |   11 +
 .../integration/lib/factory/SnapshotFactory.py     |    7 +
 .../lib/factory/SnapshotPoliciesFactory.py         |   11 +
 .../lib/factory/SnapshotPolicyFactory.py           |   11 +
 .../integration/lib/factory/StaticNatFactory.py    |   13 +
 .../integration/lib/factory/StaticRouteFactory.py  |    8 +
 .../lib/factory/StorageMaintenanceFactory.py       |   12 +
 .../lib/factory/StorageNetworkIpRangeFactory.py    |   10 +
 .../integration/lib/factory/StoragePoolFactory.py  |   11 +
 .../lib/factory/SupportedNetworkServicesFactory.py |    6 +
 .../marvin/integration/lib/factory/SwiftFactory.py |   11 +
 .../integration/lib/factory/SystemVmFactory.py     |   32 +
 .../marvin/integration/lib/factory/TagsFactory.py  |    9 +
 .../integration/lib/factory/TemplateFactory.py     |    9 +
 .../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 +
 .../marvin/integration/lib/factory/UserFactory.py  |   12 +
 .../integration/lib/factory/UserKeysFactory.py     |    7 +
 .../integration/lib/factory/VMPasswordFactory.py   |    7 +
 .../marvin/integration/lib/factory/VPCFactory.py   |   11 +
 .../integration/lib/factory/VPCOfferingFactory.py  |    9 +
 .../lib/factory/VirtualMachineFactory.py           |   55 +
 .../lib/factory/VirtualRouterElementFactory.py     |    7 +
 .../integration/lib/factory/VlanIpRangeFactory.py  |    7 +
 .../integration/lib/factory/VolumeFactory.py       |    7 +
 .../lib/factory/VpnConnectionFactory.py            |    8 +
 .../lib/factory/VpnCustomerGatewayFactory.py       |   11 +
 .../integration/lib/factory/VpnGatewayFactory.py   |    7 +
 .../integration/lib/factory/VpnUserFactory.py      |   17 +
 .../marvin/integration/lib/factory/ZoneFactory.py  |   10 +
 .../marvin/integration/lib/factory/__init__.py     |   16 +
 .../marvin/marvin/integration/lib/generateBase.py  |   36 +-
 tools/marvin/marvin/integration/lib/newbase.py     |62909 +++++++++++++++
 113 files changed, 64136 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..aeed02a
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/AccountFactory.py
@@ -0,0 +1,12 @@
+import factory
+from marvin.integration.lib.newbase import Account
+class AccountFactory(factory.Factory):
+
+    FACTORY_FOR = Account
+
+    accounttype = None
+    email = None
+    firstname = None
+    lastname = None
+    password = None
+    username = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..ef67a93
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/AccountFromProjectFactory.py
@@ -0,0 +1,8 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..df54c18
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/AccountToProjectFactory.py
@@ -0,0 +1,7 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..2f21883
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/AlertsFactory.py
@@ -0,0 +1,6 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..b0bdc38
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/ApisFactory.py
@@ -0,0 +1,6 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..d36fad8
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/AsyncJobResultFactory.py
@@ -0,0 +1,7 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..c2a2b3c
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/AsyncJobsFactory.py
@@ -0,0 +1,6 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..b3500c5
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/AutoScalePoliciesFactory.py
@@ -0,0 +1,6 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..22f7eb1
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/AutoScalePolicyFactory.py
@@ -0,0 +1,9 @@
+import factory
+from marvin.integration.lib.newbase import AutoScalePolicy
+class AutoScalePolicyFactory(factory.Factory):
+
+    FACTORY_FOR = AutoScalePolicy
+
+    action = None
+    conditionids = None
+    duration = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..ac156e4
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/AutoScaleVmGroupFactory.py
@@ -0,0 +1,12 @@
+import factory
+from marvin.integration.lib.newbase 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/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..56a5b78
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/AutoScaleVmProfileFactory.py
@@ -0,0 +1,9 @@
+import factory
+from marvin.integration.lib.newbase import AutoScaleVmProfile
+class AutoScaleVmProfileFactory(factory.Factory):
+
+    FACTORY_FOR = AutoScaleVmProfile
+
+    serviceofferingid = None
+    templateid = None
+    zoneid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..2ee11d4
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/CapabilitiesFactory.py
@@ -0,0 +1,6 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..b2aa717
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/CapacityFactory.py
@@ -0,0 +1,6 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..22c27d7
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/CloudIdentifierFactory.py
@@ -0,0 +1,7 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..2697f6a
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/ClusterFactory.py
@@ -0,0 +1,25 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..621dc53
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/ConditionFactory.py
@@ -0,0 +1,9 @@
+import factory
+from marvin.integration.lib.newbase import Condition
+class ConditionFactory(factory.Factory):
+
+    FACTORY_FOR = Condition
+
+    counterid = None
+    relationaloperator = None
+    threshold = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..f62c583
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/ConfigFactory.py
@@ -0,0 +1,9 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..88c6556
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/ConfigurationFactory.py
@@ -0,0 +1,11 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..e195227
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/CounterFactory.py
@@ -0,0 +1,9 @@
+import factory
+from marvin.integration.lib.newbase import Counter
+class CounterFactory(factory.Factory):
+
+    FACTORY_FOR = Counter
+
+    name = None
+    source = None
+    value = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..c3f8c62
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/CustomCertificateFactory.py
@@ -0,0 +1,8 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..15da73a
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/DefaultZoneForAccountFactory.py
@@ -0,0 +1,9 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..11fb5c2
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/DiskOfferingFactory.py
@@ -0,0 +1,8 @@
+import factory
+from marvin.integration.lib.newbase import DiskOffering
+class DiskOfferingFactory(factory.Factory):
+
+    FACTORY_FOR = DiskOffering
+
+    displaytext = None
+    name = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..792a523
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/DomainChildrenFactory.py
@@ -0,0 +1,6 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..0c51f02
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/DomainFactory.py
@@ -0,0 +1,7 @@
+import factory
+from marvin.integration.lib.newbase import Domain
+class DomainFactory(factory.Factory):
+
+    FACTORY_FOR = Domain
+
+    name = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..07bf395
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/EventTypesFactory.py
@@ -0,0 +1,6 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..640e2e4
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/EventsFactory.py
@@ -0,0 +1,6 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..bdc6a48
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/FirewallRuleFactory.py
@@ -0,0 +1,8 @@
+import factory
+from marvin.integration.lib.newbase import FirewallRule
+class FirewallRuleFactory(factory.Factory):
+
+    FACTORY_FOR = FirewallRule
+
+    ipaddressid = None
+    protocol = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..82e46cb
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/FromLoadBalancerRuleFactory.py
@@ -0,0 +1,8 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..fcdf074
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/HostFactory.py
@@ -0,0 +1,31 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..653e37a
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/HostForMaintenanceFactory.py
@@ -0,0 +1,7 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..d491e00
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/HostMaintenanceFactory.py
@@ -0,0 +1,7 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..316af2b
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/HostPasswordFactory.py
@@ -0,0 +1,8 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..a259b06
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/HypervisorCapabilitiesFactory.py
@@ -0,0 +1,10 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..0dd58c3
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/HypervisorsFactory.py
@@ -0,0 +1,6 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..b4cca67
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/InstanceGroupFactory.py
@@ -0,0 +1,7 @@
+import factory
+from marvin.integration.lib.newbase import InstanceGroup
+class InstanceGroupFactory(factory.Factory):
+
+    FACTORY_FOR = InstanceGroup
+
+    name = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..a214e78
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py
@@ -0,0 +1,11 @@
+import factory
+from marvin.integration.lib.newbase import IpAddress
+class IpAddressFactory(factory.Factory):
+
+    FACTORY_FOR = IpAddress
+
+    id = None
+
+
+    FACTORY_FOR = IpAddress
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..2e297c0
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/IpForwardingRuleFactory.py
@@ -0,0 +1,9 @@
+import factory
+from marvin.integration.lib.newbase import IpForwardingRule
+class IpForwardingRuleFactory(factory.Factory):
+
+    FACTORY_FOR = IpForwardingRule
+
+    ipaddressid = None
+    protocol = None
+    startport = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..4daae41
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/IsoFactory.py
@@ -0,0 +1,50 @@
+import factory
+from marvin.integration.lib.newbase import Iso
+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/1abf48d6/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
new file mode 100644
index 0000000..9116ff9
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/IsoPermissionsFactory.py
@@ -0,0 +1,12 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..1ed738b
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/LBStickinessPoliciesFactory.py
@@ -0,0 +1,7 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..d05b375
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/LBStickinessPolicyFactory.py
@@ -0,0 +1,9 @@
+import factory
+from marvin.integration.lib.newbase import LBStickinessPolicy
+class LBStickinessPolicyFactory(factory.Factory):
+
+    FACTORY_FOR = LBStickinessPolicy
+
+    lbruleid = None
+    methodname = None
+    name = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..469f425
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleFactory.py
@@ -0,0 +1,10 @@
+import factory
+from marvin.integration.lib.newbase 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/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..f5abf63
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleInstancesFactory.py
@@ -0,0 +1,7 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..aab418c
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/NetworkACLFactory.py
@@ -0,0 +1,8 @@
+import factory
+from marvin.integration.lib.newbase import NetworkACL
+class NetworkACLFactory(factory.Factory):
+
+    FACTORY_FOR = NetworkACL
+
+    networkid = None
+    protocol = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..1437e25
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/NetworkDeviceFactory.py
@@ -0,0 +1,15 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..17368f9
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/NetworkFactory.py
@@ -0,0 +1,10 @@
+import factory
+from marvin.integration.lib.newbase 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/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..18629db
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/NetworkOfferingFactory.py
@@ -0,0 +1,11 @@
+import factory
+from marvin.integration.lib.newbase import NetworkOffering
+class NetworkOfferingFactory(factory.Factory):
+
+    FACTORY_FOR = NetworkOffering
+
+    displaytext = None
+    guestiptype = None
+    name = None
+    supportedservices = None
+    traffictype = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..108af5d
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/NetworkServiceProviderFactory.py
@@ -0,0 +1,22 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..8448c42
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceFactory.py
@@ -0,0 +1,20 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..fe7dc70
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceNetworksFactory.py
@@ -0,0 +1,7 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..dac6d47
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/OsCategoriesFactory.py
@@ -0,0 +1,6 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..01b0c5e
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/OsTypesFactory.py
@@ -0,0 +1,6 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..b959226
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/PasswordForVirtualMachineFactory.py
@@ -0,0 +1,7 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..61ae19d
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/PhysicalNetworkFactory.py
@@ -0,0 +1,8 @@
+import factory
+from marvin.integration.lib.newbase import PhysicalNetwork
+class PhysicalNetworkFactory(factory.Factory):
+
+    FACTORY_FOR = PhysicalNetwork
+
+    name = None
+    zoneid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..117cf26
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/PodFactory.py
@@ -0,0 +1,11 @@
+import factory
+from marvin.integration.lib.newbase 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/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..dfb4635
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/PortForwardingRuleFactory.py
@@ -0,0 +1,11 @@
+import factory
+from marvin.integration.lib.newbase 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/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..0573757
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/PrivateGatewayFactory.py
@@ -0,0 +1,11 @@
+import factory
+from marvin.integration.lib.newbase 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/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..e242004
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/ProjectAccountsFactory.py
@@ -0,0 +1,7 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..0b91585
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/ProjectFactory.py
@@ -0,0 +1,8 @@
+import factory
+from marvin.integration.lib.newbase import Project
+class ProjectFactory(factory.Factory):
+
+    FACTORY_FOR = Project
+
+    displaytext = None
+    name = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..762a9d4
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/ProjectInvitationFactory.py
@@ -0,0 +1,16 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..b60e145
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/PublicIpAddressesFactory.py
@@ -0,0 +1,6 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..445a8d3
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/RemoteAccessVpnFactory.py
@@ -0,0 +1,7 @@
+import factory
+from marvin.integration.lib.newbase import RemoteAccessVpn
+class RemoteAccessVpnFactory(factory.Factory):
+
+    FACTORY_FOR = RemoteAccessVpn
+
+    publicipid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..89b90bc
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/RemoveFactory.py
@@ -0,0 +1,6 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..7e41d96
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/ResourceCountFactory.py
@@ -0,0 +1,7 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..9e9f0a0
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/ResourceLimitFactory.py
@@ -0,0 +1,11 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..e5d8a6e
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/RouterFactory.py
@@ -0,0 +1,26 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..5255851
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/S3Factory.py
@@ -0,0 +1,13 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..7181c8b
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/SSHKeyPairFactory.py
@@ -0,0 +1,7 @@
+import factory
+from marvin.integration.lib.newbase import SSHKeyPair
+class SSHKeyPairFactory(factory.Factory):
+
+    FACTORY_FOR = SSHKeyPair
+
+    name = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..b44f1ed
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/SecondaryStorageFactory.py
@@ -0,0 +1,7 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..19e715d
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/SecurityGroupEgressFactory.py
@@ -0,0 +1,11 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..6b7cc8a
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/SecurityGroupFactory.py
@@ -0,0 +1,7 @@
+import factory
+from marvin.integration.lib.newbase import SecurityGroup
+class SecurityGroupFactory(factory.Factory):
+
+    FACTORY_FOR = SecurityGroup
+
+    name = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..d0f4447
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/SecurityGroupIngressFactory.py
@@ -0,0 +1,11 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..faa7d7d
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/ServiceForRouterFactory.py
@@ -0,0 +1,8 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..42ee081
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/ServiceForSystemVmFactory.py
@@ -0,0 +1,8 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..2884594
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/ServiceForVirtualMachineFactory.py
@@ -0,0 +1,8 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..0a654cd
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/ServiceOfferingFactory.py
@@ -0,0 +1,11 @@
+import factory
+from marvin.integration.lib.newbase import ServiceOffering
+class ServiceOfferingFactory(factory.Factory):
+
+    FACTORY_FOR = ServiceOffering
+
+    cpunumber = None
+    cpuspeed = None
+    displaytext = None
+    memory = None
+    name = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..0bf7188
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/SnapshotFactory.py
@@ -0,0 +1,7 @@
+import factory
+from marvin.integration.lib.newbase import Snapshot
+class SnapshotFactory(factory.Factory):
+
+    FACTORY_FOR = Snapshot
+
+    volumeid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..b79787e
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/SnapshotPoliciesFactory.py
@@ -0,0 +1,11 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..6749f89
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/SnapshotPolicyFactory.py
@@ -0,0 +1,11 @@
+import factory
+from marvin.integration.lib.newbase 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/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..817fb27
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/StaticNatFactory.py
@@ -0,0 +1,13 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..765a25a
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/StaticRouteFactory.py
@@ -0,0 +1,8 @@
+import factory
+from marvin.integration.lib.newbase import StaticRoute
+class StaticRouteFactory(factory.Factory):
+
+    FACTORY_FOR = StaticRoute
+
+    cidr = None
+    gatewayid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..90335c0
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/StorageMaintenanceFactory.py
@@ -0,0 +1,12 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..2233c64
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/StorageNetworkIpRangeFactory.py
@@ -0,0 +1,10 @@
+import factory
+from marvin.integration.lib.newbase 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/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..62baff9
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/StoragePoolFactory.py
@@ -0,0 +1,11 @@
+import factory
+from marvin.integration.lib.newbase import StoragePool
+class StoragePoolFactory(factory.Factory):
+
+    FACTORY_FOR = StoragePool
+
+    clusterid = None
+    name = None
+    podid = None
+    url = None
+    zoneid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..881689d
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/SupportedNetworkServicesFactory.py
@@ -0,0 +1,6 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..dca2f72
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/SwiftFactory.py
@@ -0,0 +1,11 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..65c4311
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/SystemVmFactory.py
@@ -0,0 +1,32 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..eedf1fd
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/TagsFactory.py
@@ -0,0 +1,9 @@
+import factory
+from marvin.integration.lib.newbase import Tags
+class TagsFactory(factory.Factory):
+
+    FACTORY_FOR = Tags
+
+    resourceids = None
+    resourcetype = None
+    tags = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..93a1526
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/TemplateFactory.py
@@ -0,0 +1,9 @@
+import factory
+from marvin.integration.lib.newbase import Template
+class TemplateFactory(factory.Factory):
+
+    FACTORY_FOR = Template
+
+    displaytext = None
+    name = None
+    ostypeid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..88f2493
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/TemplatePermissionsFactory.py
@@ -0,0 +1,12 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..57ad32a
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/ToLoadBalancerRuleFactory.py
@@ -0,0 +1,8 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..cc6db01
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/TrafficMonitorFactory.py
@@ -0,0 +1,18 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..78f61a7
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/TrafficTypeFactory.py
@@ -0,0 +1,23 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..175af80
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/TrafficTypeImplementorsFactory.py
@@ -0,0 +1,6 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..045bdd0
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/UsageRecordsFactory.py
@@ -0,0 +1,14 @@
+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/1abf48d6/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
new file mode 100644
index 0000000..78295d0
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/UsageTypesFactory.py
@@ -0,0 +1,6 @@
+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/1abf48d6/tools/marvin/marvin/integration/lib/factory/UserFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/UserFactory.py b/tools/marvin/marvin/integration/lib/factory/UserFactory.py
new file mode 100644
index 0000000..ed857f9
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/UserFactory.py
@@ -0,0 +1,12 @@
+import factory
+from marvin.integration.lib.newbase import User
+class UserFactory(factory.Factory):
+
+    FACTORY_FOR = User
+
+    account = None
+    email = None
+    firstname = None
+    lastname = None
+    password = None
+    username = None

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

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..b1cd5bf
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/VMPasswordFactory.py
@@ -0,0 +1,7 @@
+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/1abf48d6/tools/marvin/marvin/integration/lib/factory/VPCFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/VPCFactory.py b/tools/marvin/marvin/integration/lib/factory/VPCFactory.py
new file mode 100644
index 0000000..47f0ffc
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/VPCFactory.py
@@ -0,0 +1,11 @@
+import factory
+from marvin.integration.lib.newbase import VPC
+class VPCFactory(factory.Factory):
+
+    FACTORY_FOR = VPC
+
+    cidr = None
+    displaytext = None
+    name = None
+    vpcofferingid = None
+    zoneid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/tools/marvin/marvin/integration/lib/factory/VPCOfferingFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/VPCOfferingFactory.py b/tools/marvin/marvin/integration/lib/factory/VPCOfferingFactory.py
new file mode 100644
index 0000000..92be188
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/VPCOfferingFactory.py
@@ -0,0 +1,9 @@
+import factory
+from marvin.integration.lib.newbase import VPCOffering
+class VPCOfferingFactory(factory.Factory):
+
+    FACTORY_FOR = VPCOffering
+
+    displaytext = None
+    name = None
+    supportedservices = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..e1fbbfc
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/VirtualMachineFactory.py
@@ -0,0 +1,55 @@
+import factory
+from marvin.integration.lib.newbase import VirtualMachine
+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/1abf48d6/tools/marvin/marvin/integration/lib/factory/VirtualRouterElementFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/VirtualRouterElementFactory.py b/tools/marvin/marvin/integration/lib/factory/VirtualRouterElementFactory.py
new file mode 100644
index 0000000..f8dd5f2
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/VirtualRouterElementFactory.py
@@ -0,0 +1,7 @@
+import factory
+from marvin.integration.lib.newbase import VirtualRouterElement
+class VirtualRouterElementFactory(factory.Factory):
+
+    FACTORY_FOR = VirtualRouterElement
+
+    nspid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/tools/marvin/marvin/integration/lib/factory/VlanIpRangeFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/VlanIpRangeFactory.py b/tools/marvin/marvin/integration/lib/factory/VlanIpRangeFactory.py
new file mode 100644
index 0000000..ff64183
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/VlanIpRangeFactory.py
@@ -0,0 +1,7 @@
+import factory
+from marvin.integration.lib.newbase import VlanIpRange
+class VlanIpRangeFactory(factory.Factory):
+
+    FACTORY_FOR = VlanIpRange
+
+    startip = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/tools/marvin/marvin/integration/lib/factory/VolumeFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/VolumeFactory.py b/tools/marvin/marvin/integration/lib/factory/VolumeFactory.py
new file mode 100644
index 0000000..483cf82
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/VolumeFactory.py
@@ -0,0 +1,7 @@
+import factory
+from marvin.integration.lib.newbase import Volume
+class VolumeFactory(factory.Factory):
+
+    FACTORY_FOR = Volume
+
+    name = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/tools/marvin/marvin/integration/lib/factory/VpnConnectionFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/VpnConnectionFactory.py b/tools/marvin/marvin/integration/lib/factory/VpnConnectionFactory.py
new file mode 100644
index 0000000..eb104c2
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/VpnConnectionFactory.py
@@ -0,0 +1,8 @@
+import factory
+from marvin.integration.lib.newbase import VpnConnection
+class VpnConnectionFactory(factory.Factory):
+
+    FACTORY_FOR = VpnConnection
+
+    s2scustomergatewayid = None
+    s2svpngatewayid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/tools/marvin/marvin/integration/lib/factory/VpnCustomerGatewayFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/VpnCustomerGatewayFactory.py b/tools/marvin/marvin/integration/lib/factory/VpnCustomerGatewayFactory.py
new file mode 100644
index 0000000..77c3b80
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/VpnCustomerGatewayFactory.py
@@ -0,0 +1,11 @@
+import factory
+from marvin.integration.lib.newbase import VpnCustomerGateway
+class VpnCustomerGatewayFactory(factory.Factory):
+
+    FACTORY_FOR = VpnCustomerGateway
+
+    cidrlist = None
+    esppolicy = None
+    gateway = None
+    ikepolicy = None
+    ipsecpsk = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/tools/marvin/marvin/integration/lib/factory/VpnGatewayFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/VpnGatewayFactory.py b/tools/marvin/marvin/integration/lib/factory/VpnGatewayFactory.py
new file mode 100644
index 0000000..5cce2c4
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/VpnGatewayFactory.py
@@ -0,0 +1,7 @@
+import factory
+from marvin.integration.lib.newbase import VpnGateway
+class VpnGatewayFactory(factory.Factory):
+
+    FACTORY_FOR = VpnGateway
+
+    vpcid = None

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1abf48d6/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
new file mode 100644
index 0000000..1dce088
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/VpnUserFactory.py
@@ -0,0 +1,17 @@
+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/1abf48d6/tools/marvin/marvin/integration/lib/factory/ZoneFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/ZoneFactory.py b/tools/marvin/marvin/integration/lib/factory/ZoneFactory.py
new file mode 100644
index 0000000..9b9e415
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/ZoneFactory.py
@@ -0,0 +1,10 @@
+import factory
+from marvin.integration.lib.newbase import Zone
+class ZoneFactory(factory.Factory):
+
+    FACTORY_FOR = Zone
+
+    dns1 = None
+    internaldns1 = None
+    name = None
+    networktype = None


Mime
View raw message