diff --git a/tools/marvin/marvin/integration/lib/factory/AccountFromProjectFactory.py b/tools/marvin/marvin/integration/lib/factory/AccountFromProjectFactory.py deleted file mode 100644 index ef67a93fe09..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/AccountFromProjectFactory.py +++ /dev/null @@ -1,8 +0,0 @@ -import factory -from marvin.integration.lib.newbase import AccountFromProject -class AccountFromProjectFactory(factory.Factory): - - FACTORY_FOR = AccountFromProject - - account = None - projectid = None diff --git a/tools/marvin/marvin/integration/lib/factory/AccountToProjectFactory.py b/tools/marvin/marvin/integration/lib/factory/AccountToProjectFactory.py deleted file mode 100644 index df54c18aaa8..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/AccountToProjectFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import AccountToProject -class AccountToProjectFactory(factory.Factory): - - FACTORY_FOR = AccountToProject - - projectid = None diff --git a/tools/marvin/marvin/integration/lib/factory/AlertsFactory.py b/tools/marvin/marvin/integration/lib/factory/AlertsFactory.py deleted file mode 100644 index 18ee4e0446b..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/AlertsFactory.py +++ /dev/null @@ -1,5 +0,0 @@ -import factory -from marvin.integration.lib.newbase import Alerts -class AlertsFactory(factory.Factory): - - FACTORY_FOR = Alerts diff --git a/tools/marvin/marvin/integration/lib/factory/ApisFactory.py b/tools/marvin/marvin/integration/lib/factory/ApisFactory.py deleted file mode 100644 index 78b5986f498..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/ApisFactory.py +++ /dev/null @@ -1,5 +0,0 @@ -import factory -from marvin.integration.lib.newbase import Apis -class ApisFactory(factory.Factory): - - FACTORY_FOR = Apis diff --git a/tools/marvin/marvin/integration/lib/factory/AsyncJobResultFactory.py b/tools/marvin/marvin/integration/lib/factory/AsyncJobResultFactory.py deleted file mode 100644 index d36fad83d1d..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/AsyncJobResultFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import AsyncJobResult -class AsyncJobResultFactory(factory.Factory): - - FACTORY_FOR = AsyncJobResult - - jobid = None diff --git a/tools/marvin/marvin/integration/lib/factory/AsyncJobsFactory.py b/tools/marvin/marvin/integration/lib/factory/AsyncJobsFactory.py deleted file mode 100644 index c85b28185cb..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/AsyncJobsFactory.py +++ /dev/null @@ -1,5 +0,0 @@ -import factory -from marvin.integration.lib.newbase import AsyncJobs -class AsyncJobsFactory(factory.Factory): - - FACTORY_FOR = AsyncJobs diff --git a/tools/marvin/marvin/integration/lib/factory/AutoScalePoliciesFactory.py b/tools/marvin/marvin/integration/lib/factory/AutoScalePoliciesFactory.py deleted file mode 100644 index 2cf690226e1..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/AutoScalePoliciesFactory.py +++ /dev/null @@ -1,5 +0,0 @@ -import factory -from marvin.integration.lib.newbase import AutoScalePolicies -class AutoScalePoliciesFactory(factory.Factory): - - FACTORY_FOR = AutoScalePolicies diff --git a/tools/marvin/marvin/integration/lib/factory/CapabilitiesFactory.py b/tools/marvin/marvin/integration/lib/factory/CapabilitiesFactory.py deleted file mode 100644 index bb40fd493cc..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/CapabilitiesFactory.py +++ /dev/null @@ -1,5 +0,0 @@ -import factory -from marvin.integration.lib.newbase import Capabilities -class CapabilitiesFactory(factory.Factory): - - FACTORY_FOR = Capabilities diff --git a/tools/marvin/marvin/integration/lib/factory/CapacityFactory.py b/tools/marvin/marvin/integration/lib/factory/CapacityFactory.py deleted file mode 100644 index 5f4c40658f0..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/CapacityFactory.py +++ /dev/null @@ -1,5 +0,0 @@ -import factory -from marvin.integration.lib.newbase import Capacity -class CapacityFactory(factory.Factory): - - FACTORY_FOR = Capacity diff --git a/tools/marvin/marvin/integration/lib/factory/CloudIdentifierFactory.py b/tools/marvin/marvin/integration/lib/factory/CloudIdentifierFactory.py deleted file mode 100644 index 22c27d714ea..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/CloudIdentifierFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import CloudIdentifier -class CloudIdentifierFactory(factory.Factory): - - FACTORY_FOR = CloudIdentifier - - userid = None diff --git a/tools/marvin/marvin/integration/lib/factory/ClusterFactory.py b/tools/marvin/marvin/integration/lib/factory/ClusterFactory.py deleted file mode 100644 index 2697f6aa3f4..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/ClusterFactory.py +++ /dev/null @@ -1,25 +0,0 @@ -import factory -from marvin.integration.lib.newbase import Cluster -class ClusterFactory(factory.Factory): - - FACTORY_FOR = Cluster - - clustername = None - clustertype = None - hypervisor = None - podid = None - zoneid = None - - - FACTORY_FOR = Cluster - - - - FACTORY_FOR = Cluster - - id = None - - - FACTORY_FOR = Cluster - - id = None diff --git a/tools/marvin/marvin/integration/lib/factory/ConfigFactory.py b/tools/marvin/marvin/integration/lib/factory/ConfigFactory.py deleted file mode 100644 index f62c5836dd5..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/ConfigFactory.py +++ /dev/null @@ -1,9 +0,0 @@ -import factory -from marvin.integration.lib.newbase import Config -class ConfigFactory(factory.Factory): - - FACTORY_FOR = Config - - hostname = None - queryfilter = None - searchbase = None diff --git a/tools/marvin/marvin/integration/lib/factory/ConfigurationFactory.py b/tools/marvin/marvin/integration/lib/factory/ConfigurationFactory.py deleted file mode 100644 index 88c65568e87..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/ConfigurationFactory.py +++ /dev/null @@ -1,11 +0,0 @@ -import factory -from marvin.integration.lib.newbase import Configuration -class ConfigurationFactory(factory.Factory): - - FACTORY_FOR = Configuration - - - - FACTORY_FOR = Configuration - - name = None diff --git a/tools/marvin/marvin/integration/lib/factory/CustomCertificateFactory.py b/tools/marvin/marvin/integration/lib/factory/CustomCertificateFactory.py deleted file mode 100644 index c3f8c62b993..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/CustomCertificateFactory.py +++ /dev/null @@ -1,8 +0,0 @@ -import factory -from marvin.integration.lib.newbase import CustomCertificate -class CustomCertificateFactory(factory.Factory): - - FACTORY_FOR = CustomCertificate - - certificate = None - domainsuffix = None diff --git a/tools/marvin/marvin/integration/lib/factory/DefaultZoneForAccountFactory.py b/tools/marvin/marvin/integration/lib/factory/DefaultZoneForAccountFactory.py deleted file mode 100644 index 15da73a6d42..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/DefaultZoneForAccountFactory.py +++ /dev/null @@ -1,9 +0,0 @@ -import factory -from marvin.integration.lib.newbase import DefaultZoneForAccount -class DefaultZoneForAccountFactory(factory.Factory): - - FACTORY_FOR = DefaultZoneForAccount - - account = None - domainid = None - zoneid = None diff --git a/tools/marvin/marvin/integration/lib/factory/DomainChildrenFactory.py b/tools/marvin/marvin/integration/lib/factory/DomainChildrenFactory.py deleted file mode 100644 index 44d350ab8bb..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/DomainChildrenFactory.py +++ /dev/null @@ -1,5 +0,0 @@ -import factory -from marvin.integration.lib.newbase import DomainChildren -class DomainChildrenFactory(factory.Factory): - - FACTORY_FOR = DomainChildren diff --git a/tools/marvin/marvin/integration/lib/factory/EventTypesFactory.py b/tools/marvin/marvin/integration/lib/factory/EventTypesFactory.py deleted file mode 100644 index 5e7d7185b75..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/EventTypesFactory.py +++ /dev/null @@ -1,5 +0,0 @@ -import factory -from marvin.integration.lib.newbase import EventTypes -class EventTypesFactory(factory.Factory): - - FACTORY_FOR = EventTypes diff --git a/tools/marvin/marvin/integration/lib/factory/EventsFactory.py b/tools/marvin/marvin/integration/lib/factory/EventsFactory.py deleted file mode 100644 index 700f5ae31a8..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/EventsFactory.py +++ /dev/null @@ -1,5 +0,0 @@ -import factory -from marvin.integration.lib.newbase import Events -class EventsFactory(factory.Factory): - - FACTORY_FOR = Events diff --git a/tools/marvin/marvin/integration/lib/factory/FromLoadBalancerRuleFactory.py b/tools/marvin/marvin/integration/lib/factory/FromLoadBalancerRuleFactory.py deleted file mode 100644 index 82e46cbfe09..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/FromLoadBalancerRuleFactory.py +++ /dev/null @@ -1,8 +0,0 @@ -import factory -from marvin.integration.lib.newbase import FromLoadBalancerRule -class FromLoadBalancerRuleFactory(factory.Factory): - - FACTORY_FOR = FromLoadBalancerRule - - id = None - virtualmachineids = None diff --git a/tools/marvin/marvin/integration/lib/factory/HostFactory.py b/tools/marvin/marvin/integration/lib/factory/HostFactory.py deleted file mode 100644 index fcdf07423f2..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/HostFactory.py +++ /dev/null @@ -1,31 +0,0 @@ -import factory -from marvin.integration.lib.newbase import Host -class HostFactory(factory.Factory): - - FACTORY_FOR = Host - - hypervisor = None - password = None - podid = None - url = None - username = None - zoneid = None - - - FACTORY_FOR = Host - - - - FACTORY_FOR = Host - - id = None - - - FACTORY_FOR = Host - - id = None - - - FACTORY_FOR = Host - - id = None diff --git a/tools/marvin/marvin/integration/lib/factory/HostForMaintenanceFactory.py b/tools/marvin/marvin/integration/lib/factory/HostForMaintenanceFactory.py deleted file mode 100644 index 653e37a7157..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/HostForMaintenanceFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import HostForMaintenance -class HostForMaintenanceFactory(factory.Factory): - - FACTORY_FOR = HostForMaintenance - - id = None diff --git a/tools/marvin/marvin/integration/lib/factory/HostMaintenanceFactory.py b/tools/marvin/marvin/integration/lib/factory/HostMaintenanceFactory.py deleted file mode 100644 index d491e00f5c4..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/HostMaintenanceFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import HostMaintenance -class HostMaintenanceFactory(factory.Factory): - - FACTORY_FOR = HostMaintenance - - id = None diff --git a/tools/marvin/marvin/integration/lib/factory/HostPasswordFactory.py b/tools/marvin/marvin/integration/lib/factory/HostPasswordFactory.py deleted file mode 100644 index 316af2b359d..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/HostPasswordFactory.py +++ /dev/null @@ -1,8 +0,0 @@ -import factory -from marvin.integration.lib.newbase import HostPassword -class HostPasswordFactory(factory.Factory): - - FACTORY_FOR = HostPassword - - password = None - username = None diff --git a/tools/marvin/marvin/integration/lib/factory/HypervisorCapabilitiesFactory.py b/tools/marvin/marvin/integration/lib/factory/HypervisorCapabilitiesFactory.py deleted file mode 100644 index 4819a531faa..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/HypervisorCapabilitiesFactory.py +++ /dev/null @@ -1,9 +0,0 @@ -import factory -from marvin.integration.lib.newbase import HypervisorCapabilities -class HypervisorCapabilitiesFactory(factory.Factory): - - FACTORY_FOR = HypervisorCapabilities - - - - FACTORY_FOR = HypervisorCapabilities diff --git a/tools/marvin/marvin/integration/lib/factory/HypervisorsFactory.py b/tools/marvin/marvin/integration/lib/factory/HypervisorsFactory.py deleted file mode 100644 index 7b69ccbdb8d..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/HypervisorsFactory.py +++ /dev/null @@ -1,5 +0,0 @@ -import factory -from marvin.integration.lib.newbase import Hypervisors -class HypervisorsFactory(factory.Factory): - - FACTORY_FOR = Hypervisors diff --git a/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py b/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py index 751c858063e..28b82ac34b4 100644 --- a/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py @@ -4,7 +4,3 @@ class IpAddressFactory(factory.Factory): FACTORY_FOR = IpAddress - id = None - - - FACTORY_FOR = IpAddress diff --git a/tools/marvin/marvin/integration/lib/factory/IsoFactory.py b/tools/marvin/marvin/integration/lib/factory/IsoFactory.py index 4daae418135..ac4cd2ed59c 100644 --- a/tools/marvin/marvin/integration/lib/factory/IsoFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/IsoFactory.py @@ -2,49 +2,9 @@ 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 diff --git a/tools/marvin/marvin/integration/lib/factory/IsoPermissionsFactory.py b/tools/marvin/marvin/integration/lib/factory/IsoPermissionsFactory.py deleted file mode 100644 index 9116ff95acb..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/IsoPermissionsFactory.py +++ /dev/null @@ -1,12 +0,0 @@ -import factory -from marvin.integration.lib.newbase import IsoPermissions -class IsoPermissionsFactory(factory.Factory): - - FACTORY_FOR = IsoPermissions - - id = None - - - FACTORY_FOR = IsoPermissions - - id = None diff --git a/tools/marvin/marvin/integration/lib/factory/LBStickinessPoliciesFactory.py b/tools/marvin/marvin/integration/lib/factory/LBStickinessPoliciesFactory.py deleted file mode 100644 index 1ed738bcb1f..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/LBStickinessPoliciesFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import LBStickinessPolicies -class LBStickinessPoliciesFactory(factory.Factory): - - FACTORY_FOR = LBStickinessPolicies - - lbruleid = None diff --git a/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleInstancesFactory.py b/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleInstancesFactory.py deleted file mode 100644 index f5abf63df00..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleInstancesFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import LoadBalancerRuleInstances -class LoadBalancerRuleInstancesFactory(factory.Factory): - - FACTORY_FOR = LoadBalancerRuleInstances - - id = None diff --git a/tools/marvin/marvin/integration/lib/factory/NetworkDeviceFactory.py b/tools/marvin/marvin/integration/lib/factory/NetworkDeviceFactory.py deleted file mode 100644 index 1437e256c65..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/NetworkDeviceFactory.py +++ /dev/null @@ -1,15 +0,0 @@ -import factory -from marvin.integration.lib.newbase import NetworkDevice -class NetworkDeviceFactory(factory.Factory): - - FACTORY_FOR = NetworkDevice - - - - FACTORY_FOR = NetworkDevice - - - - FACTORY_FOR = NetworkDevice - - id = None diff --git a/tools/marvin/marvin/integration/lib/factory/NetworkServiceProviderFactory.py b/tools/marvin/marvin/integration/lib/factory/NetworkServiceProviderFactory.py deleted file mode 100644 index 108af5d6e0d..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/NetworkServiceProviderFactory.py +++ /dev/null @@ -1,22 +0,0 @@ -import factory -from marvin.integration.lib.newbase import NetworkServiceProvider -class NetworkServiceProviderFactory(factory.Factory): - - FACTORY_FOR = NetworkServiceProvider - - name = None - physicalnetworkid = None - - - FACTORY_FOR = NetworkServiceProvider - - - - FACTORY_FOR = NetworkServiceProvider - - id = None - - - FACTORY_FOR = NetworkServiceProvider - - id = None diff --git a/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceFactory.py b/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceFactory.py deleted file mode 100644 index 8448c420626..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceFactory.py +++ /dev/null @@ -1,20 +0,0 @@ -import factory -from marvin.integration.lib.newbase import NiciraNvpDevice -class NiciraNvpDeviceFactory(factory.Factory): - - FACTORY_FOR = NiciraNvpDevice - - hostname = None - password = None - physicalnetworkid = None - transportzoneuuid = None - username = None - - - FACTORY_FOR = NiciraNvpDevice - - - - FACTORY_FOR = NiciraNvpDevice - - nvpdeviceid = None diff --git a/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceNetworksFactory.py b/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceNetworksFactory.py deleted file mode 100644 index fe7dc707198..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceNetworksFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import NiciraNvpDeviceNetworks -class NiciraNvpDeviceNetworksFactory(factory.Factory): - - FACTORY_FOR = NiciraNvpDeviceNetworks - - nvpdeviceid = None diff --git a/tools/marvin/marvin/integration/lib/factory/OsCategoriesFactory.py b/tools/marvin/marvin/integration/lib/factory/OsCategoriesFactory.py deleted file mode 100644 index 0d60359b570..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/OsCategoriesFactory.py +++ /dev/null @@ -1,5 +0,0 @@ -import factory -from marvin.integration.lib.newbase import OsCategories -class OsCategoriesFactory(factory.Factory): - - FACTORY_FOR = OsCategories diff --git a/tools/marvin/marvin/integration/lib/factory/OsTypesFactory.py b/tools/marvin/marvin/integration/lib/factory/OsTypesFactory.py deleted file mode 100644 index fe105b3a567..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/OsTypesFactory.py +++ /dev/null @@ -1,5 +0,0 @@ -import factory -from marvin.integration.lib.newbase import OsTypes -class OsTypesFactory(factory.Factory): - - FACTORY_FOR = OsTypes diff --git a/tools/marvin/marvin/integration/lib/factory/PasswordForVirtualMachineFactory.py b/tools/marvin/marvin/integration/lib/factory/PasswordForVirtualMachineFactory.py deleted file mode 100644 index b9592260c2b..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/PasswordForVirtualMachineFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import PasswordForVirtualMachine -class PasswordForVirtualMachineFactory(factory.Factory): - - FACTORY_FOR = PasswordForVirtualMachine - - id = None diff --git a/tools/marvin/marvin/integration/lib/factory/ProjectAccountsFactory.py b/tools/marvin/marvin/integration/lib/factory/ProjectAccountsFactory.py deleted file mode 100644 index e242004b860..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/ProjectAccountsFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import ProjectAccounts -class ProjectAccountsFactory(factory.Factory): - - FACTORY_FOR = ProjectAccounts - - projectid = None diff --git a/tools/marvin/marvin/integration/lib/factory/ProjectInvitationFactory.py b/tools/marvin/marvin/integration/lib/factory/ProjectInvitationFactory.py deleted file mode 100644 index 762a9d440c4..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/ProjectInvitationFactory.py +++ /dev/null @@ -1,16 +0,0 @@ -import factory -from marvin.integration.lib.newbase import ProjectInvitation -class ProjectInvitationFactory(factory.Factory): - - FACTORY_FOR = ProjectInvitation - - - - FACTORY_FOR = ProjectInvitation - - projectid = None - - - FACTORY_FOR = ProjectInvitation - - id = None diff --git a/tools/marvin/marvin/integration/lib/factory/PublicIpAddressesFactory.py b/tools/marvin/marvin/integration/lib/factory/PublicIpAddressesFactory.py deleted file mode 100644 index 32e899e64b9..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/PublicIpAddressesFactory.py +++ /dev/null @@ -1,5 +0,0 @@ -import factory -from marvin.integration.lib.newbase import PublicIpAddresses -class PublicIpAddressesFactory(factory.Factory): - - FACTORY_FOR = PublicIpAddresses diff --git a/tools/marvin/marvin/integration/lib/factory/RemoveFactory.py b/tools/marvin/marvin/integration/lib/factory/RemoveFactory.py deleted file mode 100644 index 4cdb94f9c1f..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/RemoveFactory.py +++ /dev/null @@ -1,5 +0,0 @@ -import factory -from marvin.integration.lib.newbase import Remove -class RemoveFactory(factory.Factory): - - FACTORY_FOR = Remove diff --git a/tools/marvin/marvin/integration/lib/factory/ResourceCountFactory.py b/tools/marvin/marvin/integration/lib/factory/ResourceCountFactory.py deleted file mode 100644 index 7e41d964eae..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/ResourceCountFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import ResourceCount -class ResourceCountFactory(factory.Factory): - - FACTORY_FOR = ResourceCount - - domainid = None diff --git a/tools/marvin/marvin/integration/lib/factory/ResourceLimitFactory.py b/tools/marvin/marvin/integration/lib/factory/ResourceLimitFactory.py deleted file mode 100644 index 9e9f0a062bd..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/ResourceLimitFactory.py +++ /dev/null @@ -1,11 +0,0 @@ -import factory -from marvin.integration.lib.newbase import ResourceLimit -class ResourceLimitFactory(factory.Factory): - - FACTORY_FOR = ResourceLimit - - - - FACTORY_FOR = ResourceLimit - - resourcetype = None diff --git a/tools/marvin/marvin/integration/lib/factory/RouterFactory.py b/tools/marvin/marvin/integration/lib/factory/RouterFactory.py deleted file mode 100644 index e5d8a6e80b5..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/RouterFactory.py +++ /dev/null @@ -1,26 +0,0 @@ -import factory -from marvin.integration.lib.newbase import Router -class RouterFactory(factory.Factory): - - FACTORY_FOR = Router - - id = None - - - FACTORY_FOR = Router - - - - FACTORY_FOR = Router - - id = None - - - FACTORY_FOR = Router - - id = None - - - FACTORY_FOR = Router - - id = None diff --git a/tools/marvin/marvin/integration/lib/factory/S3Factory.py b/tools/marvin/marvin/integration/lib/factory/S3Factory.py deleted file mode 100644 index a4942c972d4..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/S3Factory.py +++ /dev/null @@ -1,12 +0,0 @@ -import factory -from marvin.integration.lib.newbase import S3 -class S3Factory(factory.Factory): - - FACTORY_FOR = S3 - - accesskey = None - bucket = None - secretkey = None - - - FACTORY_FOR = S3 diff --git a/tools/marvin/marvin/integration/lib/factory/SecondaryStorageFactory.py b/tools/marvin/marvin/integration/lib/factory/SecondaryStorageFactory.py deleted file mode 100644 index b44f1ede12e..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/SecondaryStorageFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import SecondaryStorage -class SecondaryStorageFactory(factory.Factory): - - FACTORY_FOR = SecondaryStorage - - url = None diff --git a/tools/marvin/marvin/integration/lib/factory/SecurityGroupEgressFactory.py b/tools/marvin/marvin/integration/lib/factory/SecurityGroupEgressFactory.py deleted file mode 100644 index 19e715db9d4..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/SecurityGroupEgressFactory.py +++ /dev/null @@ -1,11 +0,0 @@ -import factory -from marvin.integration.lib.newbase import SecurityGroupEgress -class SecurityGroupEgressFactory(factory.Factory): - - FACTORY_FOR = SecurityGroupEgress - - - - FACTORY_FOR = SecurityGroupEgress - - id = None diff --git a/tools/marvin/marvin/integration/lib/factory/SecurityGroupIngressFactory.py b/tools/marvin/marvin/integration/lib/factory/SecurityGroupIngressFactory.py deleted file mode 100644 index d0f44476915..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/SecurityGroupIngressFactory.py +++ /dev/null @@ -1,11 +0,0 @@ -import factory -from marvin.integration.lib.newbase import SecurityGroupIngress -class SecurityGroupIngressFactory(factory.Factory): - - FACTORY_FOR = SecurityGroupIngress - - - - FACTORY_FOR = SecurityGroupIngress - - id = None diff --git a/tools/marvin/marvin/integration/lib/factory/ServiceForRouterFactory.py b/tools/marvin/marvin/integration/lib/factory/ServiceForRouterFactory.py deleted file mode 100644 index faa7d7dc2fb..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/ServiceForRouterFactory.py +++ /dev/null @@ -1,8 +0,0 @@ -import factory -from marvin.integration.lib.newbase import ServiceForRouter -class ServiceForRouterFactory(factory.Factory): - - FACTORY_FOR = ServiceForRouter - - id = None - serviceofferingid = None diff --git a/tools/marvin/marvin/integration/lib/factory/ServiceForSystemVmFactory.py b/tools/marvin/marvin/integration/lib/factory/ServiceForSystemVmFactory.py deleted file mode 100644 index 42ee08183cb..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/ServiceForSystemVmFactory.py +++ /dev/null @@ -1,8 +0,0 @@ -import factory -from marvin.integration.lib.newbase import ServiceForSystemVm -class ServiceForSystemVmFactory(factory.Factory): - - FACTORY_FOR = ServiceForSystemVm - - id = None - serviceofferingid = None diff --git a/tools/marvin/marvin/integration/lib/factory/ServiceForVirtualMachineFactory.py b/tools/marvin/marvin/integration/lib/factory/ServiceForVirtualMachineFactory.py deleted file mode 100644 index 28845946756..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/ServiceForVirtualMachineFactory.py +++ /dev/null @@ -1,8 +0,0 @@ -import factory -from marvin.integration.lib.newbase import ServiceForVirtualMachine -class ServiceForVirtualMachineFactory(factory.Factory): - - FACTORY_FOR = ServiceForVirtualMachine - - id = None - serviceofferingid = None diff --git a/tools/marvin/marvin/integration/lib/factory/SnapshotPoliciesFactory.py b/tools/marvin/marvin/integration/lib/factory/SnapshotPoliciesFactory.py deleted file mode 100644 index bf4cd1679a5..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/SnapshotPoliciesFactory.py +++ /dev/null @@ -1,10 +0,0 @@ -import factory -from marvin.integration.lib.newbase import SnapshotPolicies -class SnapshotPoliciesFactory(factory.Factory): - - FACTORY_FOR = SnapshotPolicies - - volumeid = None - - - FACTORY_FOR = SnapshotPolicies diff --git a/tools/marvin/marvin/integration/lib/factory/StaticNatFactory.py b/tools/marvin/marvin/integration/lib/factory/StaticNatFactory.py deleted file mode 100644 index 817fb27a2a0..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/StaticNatFactory.py +++ /dev/null @@ -1,13 +0,0 @@ -import factory -from marvin.integration.lib.newbase import StaticNat -class StaticNatFactory(factory.Factory): - - FACTORY_FOR = StaticNat - - ipaddressid = None - virtualmachineid = None - - - FACTORY_FOR = StaticNat - - ipaddressid = None diff --git a/tools/marvin/marvin/integration/lib/factory/StorageMaintenanceFactory.py b/tools/marvin/marvin/integration/lib/factory/StorageMaintenanceFactory.py deleted file mode 100644 index 90335c08221..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/StorageMaintenanceFactory.py +++ /dev/null @@ -1,12 +0,0 @@ -import factory -from marvin.integration.lib.newbase import StorageMaintenance -class StorageMaintenanceFactory(factory.Factory): - - FACTORY_FOR = StorageMaintenance - - id = None - - - FACTORY_FOR = StorageMaintenance - - id = None diff --git a/tools/marvin/marvin/integration/lib/factory/SupportedNetworkServicesFactory.py b/tools/marvin/marvin/integration/lib/factory/SupportedNetworkServicesFactory.py deleted file mode 100644 index d82ab68c949..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/SupportedNetworkServicesFactory.py +++ /dev/null @@ -1,5 +0,0 @@ -import factory -from marvin.integration.lib.newbase import SupportedNetworkServices -class SupportedNetworkServicesFactory(factory.Factory): - - FACTORY_FOR = SupportedNetworkServices diff --git a/tools/marvin/marvin/integration/lib/factory/SwiftFactory.py b/tools/marvin/marvin/integration/lib/factory/SwiftFactory.py deleted file mode 100644 index a52da8ea82f..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/SwiftFactory.py +++ /dev/null @@ -1,10 +0,0 @@ -import factory -from marvin.integration.lib.newbase import Swift -class SwiftFactory(factory.Factory): - - FACTORY_FOR = Swift - - url = None - - - FACTORY_FOR = Swift diff --git a/tools/marvin/marvin/integration/lib/factory/SystemVmFactory.py b/tools/marvin/marvin/integration/lib/factory/SystemVmFactory.py deleted file mode 100644 index 65c4311f755..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/SystemVmFactory.py +++ /dev/null @@ -1,32 +0,0 @@ -import factory -from marvin.integration.lib.newbase import SystemVm -class SystemVmFactory(factory.Factory): - - FACTORY_FOR = SystemVm - - hostid = None - virtualmachineid = None - - - FACTORY_FOR = SystemVm - - id = None - - - FACTORY_FOR = SystemVm - - - - FACTORY_FOR = SystemVm - - id = None - - - FACTORY_FOR = SystemVm - - id = None - - - FACTORY_FOR = SystemVm - - id = None diff --git a/tools/marvin/marvin/integration/lib/factory/TemplatePermissionsFactory.py b/tools/marvin/marvin/integration/lib/factory/TemplatePermissionsFactory.py deleted file mode 100644 index 88f2493137e..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/TemplatePermissionsFactory.py +++ /dev/null @@ -1,12 +0,0 @@ -import factory -from marvin.integration.lib.newbase import TemplatePermissions -class TemplatePermissionsFactory(factory.Factory): - - FACTORY_FOR = TemplatePermissions - - id = None - - - FACTORY_FOR = TemplatePermissions - - id = None diff --git a/tools/marvin/marvin/integration/lib/factory/ToLoadBalancerRuleFactory.py b/tools/marvin/marvin/integration/lib/factory/ToLoadBalancerRuleFactory.py deleted file mode 100644 index 57ad32a3313..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/ToLoadBalancerRuleFactory.py +++ /dev/null @@ -1,8 +0,0 @@ -import factory -from marvin.integration.lib.newbase import ToLoadBalancerRule -class ToLoadBalancerRuleFactory(factory.Factory): - - FACTORY_FOR = ToLoadBalancerRule - - id = None - virtualmachineids = None diff --git a/tools/marvin/marvin/integration/lib/factory/TrafficMonitorFactory.py b/tools/marvin/marvin/integration/lib/factory/TrafficMonitorFactory.py deleted file mode 100644 index cc6db015d66..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/TrafficMonitorFactory.py +++ /dev/null @@ -1,18 +0,0 @@ -import factory -from marvin.integration.lib.newbase import TrafficMonitor -class TrafficMonitorFactory(factory.Factory): - - FACTORY_FOR = TrafficMonitor - - url = None - zoneid = None - - - FACTORY_FOR = TrafficMonitor - - zoneid = None - - - FACTORY_FOR = TrafficMonitor - - id = None diff --git a/tools/marvin/marvin/integration/lib/factory/TrafficTypeFactory.py b/tools/marvin/marvin/integration/lib/factory/TrafficTypeFactory.py deleted file mode 100644 index 78f61a71812..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/TrafficTypeFactory.py +++ /dev/null @@ -1,23 +0,0 @@ -import factory -from marvin.integration.lib.newbase import TrafficType -class TrafficTypeFactory(factory.Factory): - - FACTORY_FOR = TrafficType - - physicalnetworkid = None - traffictype = None - - - FACTORY_FOR = TrafficType - - physicalnetworkid = None - - - FACTORY_FOR = TrafficType - - id = None - - - FACTORY_FOR = TrafficType - - id = None diff --git a/tools/marvin/marvin/integration/lib/factory/TrafficTypeImplementorsFactory.py b/tools/marvin/marvin/integration/lib/factory/TrafficTypeImplementorsFactory.py deleted file mode 100644 index 3879caf071b..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/TrafficTypeImplementorsFactory.py +++ /dev/null @@ -1,5 +0,0 @@ -import factory -from marvin.integration.lib.newbase import TrafficTypeImplementors -class TrafficTypeImplementorsFactory(factory.Factory): - - FACTORY_FOR = TrafficTypeImplementors diff --git a/tools/marvin/marvin/integration/lib/factory/UsageRecordsFactory.py b/tools/marvin/marvin/integration/lib/factory/UsageRecordsFactory.py deleted file mode 100644 index 045bdd07d88..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/UsageRecordsFactory.py +++ /dev/null @@ -1,14 +0,0 @@ -import factory -from marvin.integration.lib.newbase import UsageRecords -class UsageRecordsFactory(factory.Factory): - - FACTORY_FOR = UsageRecords - - enddate = None - startdate = None - - - FACTORY_FOR = UsageRecords - - enddate = None - startdate = None diff --git a/tools/marvin/marvin/integration/lib/factory/UsageTypesFactory.py b/tools/marvin/marvin/integration/lib/factory/UsageTypesFactory.py deleted file mode 100644 index 6778df45e28..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/UsageTypesFactory.py +++ /dev/null @@ -1,5 +0,0 @@ -import factory -from marvin.integration.lib.newbase import UsageTypes -class UsageTypesFactory(factory.Factory): - - FACTORY_FOR = UsageTypes diff --git a/tools/marvin/marvin/integration/lib/factory/VMPasswordFactory.py b/tools/marvin/marvin/integration/lib/factory/VMPasswordFactory.py deleted file mode 100644 index b1cd5bf1774..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/VMPasswordFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import VMPassword -class VMPasswordFactory(factory.Factory): - - FACTORY_FOR = VMPassword - - id = None diff --git a/tools/marvin/marvin/integration/lib/factory/VirtualMachineFactory.py b/tools/marvin/marvin/integration/lib/factory/VirtualMachineFactory.py index e1fbbfcea7e..96b1eac7de1 100644 --- a/tools/marvin/marvin/integration/lib/factory/VirtualMachineFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/VirtualMachineFactory.py @@ -2,54 +2,8 @@ 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 diff --git a/tools/marvin/marvin/integration/lib/factory/VpnUserFactory.py b/tools/marvin/marvin/integration/lib/factory/VpnUserFactory.py deleted file mode 100644 index 1dce088e9b4..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/VpnUserFactory.py +++ /dev/null @@ -1,17 +0,0 @@ -import factory -from marvin.integration.lib.newbase import VpnUser -class VpnUserFactory(factory.Factory): - - FACTORY_FOR = VpnUser - - password = None - username = None - - - FACTORY_FOR = VpnUser - - - - FACTORY_FOR = VpnUser - - username = None diff --git a/tools/marvin/marvin/integration/lib/factory/__init__.py b/tools/marvin/marvin/integration/lib/factory/__init__.py index d216be4ddc9..13a83393a91 100644 --- a/tools/marvin/marvin/integration/lib/factory/__init__.py +++ b/tools/marvin/marvin/integration/lib/factory/__init__.py @@ -13,4 +13,4 @@ # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations -# under the License. \ No newline at end of file +# under the License. diff --git a/tools/marvin/marvin/integration/lib/generateBase.py b/tools/marvin/marvin/integration/lib/generateBase.py index c5214c950a3..9fe0338b079 100644 --- a/tools/marvin/marvin/integration/lib/generateBase.py +++ b/tools/marvin/marvin/integration/lib/generateBase.py @@ -118,9 +118,18 @@ def write_entity_factory(entity, actions): tabspace = ' ' #TODO: Add license header for ASLv2 code = '' - if 'create' not in actions: + factory_defaults = [] + if 'create' in actions: + factory_defaults.extend(actions['create']) + elif 'deploy' in actions: + factory_defaults.extend(actions['deploy']) + elif 'associate' in actions: + factory_defaults.extend(actions['associate']) + elif 'register' in actions: + factory_defaults.extend(actions['register']) + else: return - factory_defaults = actions['create'] + if os.path.exists("./factory/%sFactory.py"%entity): for arg in factory_defaults[0]: code += tabspace + '%s = None\n'%arg