You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/04/09 15:21:08 UTC
[31/50] [abbrv] git commit: updated refs/heads/marvin_refactor to
2a99064
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 <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7e80721e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7e80721e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7e80721e
Branch: refs/heads/marvin_refactor
Commit: 7e80721e42a406c29f328b1f0c0b76a9fdca94af
Parents: 9e38c5d
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Wed Jan 23 19:34:25 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Sun Mar 31 22:19:14 2013 +0530
----------------------------------------------------------------------
.../lib/factory/AccountFromProjectFactory.py | 8 ++++
.../lib/factory/AccountToProjectFactory.py | 7 +++
.../integration/lib/factory/AlertsFactory.py | 5 ++
.../marvin/integration/lib/factory/ApisFactory.py | 5 ++
.../lib/factory/AsyncJobResultFactory.py | 7 +++
.../integration/lib/factory/AsyncJobsFactory.py | 5 ++
.../lib/factory/AutoScalePoliciesFactory.py | 5 ++
.../integration/lib/factory/CapabilitiesFactory.py | 5 ++
.../integration/lib/factory/CapacityFactory.py | 5 ++
.../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 | 5 ++
.../integration/lib/factory/EventTypesFactory.py | 5 ++
.../integration/lib/factory/EventsFactory.py | 5 ++
.../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 | 9 ++++
.../integration/lib/factory/HypervisorsFactory.py | 5 ++
.../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 | 5 ++
.../integration/lib/factory/OsTypesFactory.py | 5 ++
.../factory/PasswordForVirtualMachineFactory.py | 7 +++
.../lib/factory/ProjectAccountsFactory.py | 7 +++
.../lib/factory/ProjectInvitationFactory.py | 16 +++++++
.../lib/factory/PublicIpAddressesFactory.py | 5 ++
.../integration/lib/factory/RemoveFactory.py | 5 ++
.../lib/factory/ResourceCountFactory.py | 7 +++
.../lib/factory/ResourceLimitFactory.py | 11 +++++
.../integration/lib/factory/RouterFactory.py | 26 ++++++++++++
.../marvin/integration/lib/factory/S3Factory.py | 12 +++++
.../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 | 10 +++++
.../integration/lib/factory/StaticNatFactory.py | 13 ++++++
.../lib/factory/StorageMaintenanceFactory.py | 12 +++++
.../lib/factory/SupportedNetworkServicesFactory.py | 5 ++
.../marvin/integration/lib/factory/SwiftFactory.py | 10 +++++
.../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 | 5 ++
.../integration/lib/factory/UsageRecordsFactory.py | 14 ++++++
.../integration/lib/factory/UsageTypesFactory.py | 5 ++
.../integration/lib/factory/VMPasswordFactory.py | 7 +++
.../integration/lib/factory/VpnUserFactory.py | 17 ++++++++
64 files changed, 651 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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..18ee4e0
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/AlertsFactory.py
@@ -0,0 +1,5 @@
+import factory
+from marvin.integration.lib.newbase import Alerts
+class AlertsFactory(factory.Factory):
+
+ FACTORY_FOR = Alerts
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e80721e/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..78b5986
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/ApisFactory.py
@@ -0,0 +1,5 @@
+import factory
+from marvin.integration.lib.newbase import Apis
+class ApisFactory(factory.Factory):
+
+ FACTORY_FOR = Apis
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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..c85b281
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/AsyncJobsFactory.py
@@ -0,0 +1,5 @@
+import factory
+from marvin.integration.lib.newbase import AsyncJobs
+class AsyncJobsFactory(factory.Factory):
+
+ FACTORY_FOR = AsyncJobs
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e80721e/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..2cf6902
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/AutoScalePoliciesFactory.py
@@ -0,0 +1,5 @@
+import factory
+from marvin.integration.lib.newbase import AutoScalePolicies
+class AutoScalePoliciesFactory(factory.Factory):
+
+ FACTORY_FOR = AutoScalePolicies
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e80721e/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..bb40fd4
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/CapabilitiesFactory.py
@@ -0,0 +1,5 @@
+import factory
+from marvin.integration.lib.newbase import Capabilities
+class CapabilitiesFactory(factory.Factory):
+
+ FACTORY_FOR = Capabilities
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e80721e/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..5f4c406
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/CapacityFactory.py
@@ -0,0 +1,5 @@
+import factory
+from marvin.integration.lib.newbase import Capacity
+class CapacityFactory(factory.Factory):
+
+ FACTORY_FOR = Capacity
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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..44d350a
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/DomainChildrenFactory.py
@@ -0,0 +1,5 @@
+import factory
+from marvin.integration.lib.newbase import DomainChildren
+class DomainChildrenFactory(factory.Factory):
+
+ FACTORY_FOR = DomainChildren
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e80721e/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..5e7d718
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/EventTypesFactory.py
@@ -0,0 +1,5 @@
+import factory
+from marvin.integration.lib.newbase import EventTypes
+class EventTypesFactory(factory.Factory):
+
+ FACTORY_FOR = EventTypes
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e80721e/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..700f5ae
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/EventsFactory.py
@@ -0,0 +1,5 @@
+import factory
+from marvin.integration.lib.newbase import Events
+class EventsFactory(factory.Factory):
+
+ FACTORY_FOR = Events
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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..4819a53
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/HypervisorCapabilitiesFactory.py
@@ -0,0 +1,9 @@
+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/cloudstack/blob/7e80721e/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..7b69ccb
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/HypervisorsFactory.py
@@ -0,0 +1,5 @@
+import factory
+from marvin.integration.lib.newbase import Hypervisors
+class HypervisorsFactory(factory.Factory):
+
+ FACTORY_FOR = Hypervisors
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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..0d60359
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/OsCategoriesFactory.py
@@ -0,0 +1,5 @@
+import factory
+from marvin.integration.lib.newbase import OsCategories
+class OsCategoriesFactory(factory.Factory):
+
+ FACTORY_FOR = OsCategories
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e80721e/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..fe105b3
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/OsTypesFactory.py
@@ -0,0 +1,5 @@
+import factory
+from marvin.integration.lib.newbase import OsTypes
+class OsTypesFactory(factory.Factory):
+
+ FACTORY_FOR = OsTypes
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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..32e899e
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/PublicIpAddressesFactory.py
@@ -0,0 +1,5 @@
+import factory
+from marvin.integration.lib.newbase import PublicIpAddresses
+class PublicIpAddressesFactory(factory.Factory):
+
+ FACTORY_FOR = PublicIpAddresses
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e80721e/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..4cdb94f
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/RemoveFactory.py
@@ -0,0 +1,5 @@
+import factory
+from marvin.integration.lib.newbase import Remove
+class RemoveFactory(factory.Factory):
+
+ FACTORY_FOR = Remove
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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..a4942c9
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/S3Factory.py
@@ -0,0 +1,12 @@
+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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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..bf4cd16
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/SnapshotPoliciesFactory.py
@@ -0,0 +1,10 @@
+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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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..d82ab68
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/SupportedNetworkServicesFactory.py
@@ -0,0 +1,5 @@
+import factory
+from marvin.integration.lib.newbase import SupportedNetworkServices
+class SupportedNetworkServicesFactory(factory.Factory):
+
+ FACTORY_FOR = SupportedNetworkServices
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e80721e/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..a52da8e
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/SwiftFactory.py
@@ -0,0 +1,10 @@
+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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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..3879caf
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/TrafficTypeImplementorsFactory.py
@@ -0,0 +1,5 @@
+import factory
+from marvin.integration.lib.newbase import TrafficTypeImplementors
+class TrafficTypeImplementorsFactory(factory.Factory):
+
+ FACTORY_FOR = TrafficTypeImplementors
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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..6778df4
--- /dev/null
+++ b/tools/marvin/marvin/integration/lib/factory/UsageTypesFactory.py
@@ -0,0 +1,5 @@
+import factory
+from marvin.integration.lib.newbase import UsageTypes
+class UsageTypesFactory(factory.Factory):
+
+ FACTORY_FOR = UsageTypes
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e80721e/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/cloudstack/blob/7e80721e/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