etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

marvin_refactor: not all factories are required. 

Factories are reqd. for entities that come into existense through the
process of a CLoudStack API create command. Some entities are added from
external sources for which factories are not reqd.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Prasanna Santhanam 2013-04-12 17:25:01 +05:30
parent aa4651bcc3
commit d2b3c7f100
78 changed files with 45 additions and 63508 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/marvin/marvin/integration/lib/base/IpAddress.py
View File

@ -17,6 +17,7 @@
from marvin.integration.lib.base import CloudStackEntity
from marvin.cloudstackAPI import disassociateIpAddress
from marvin.cloudstackAPI import associateIpAddress
from marvin.cloudstackAPI import listPublicIpAddresses
class IpAddress(CloudStackEntity.CloudStackEntity):
@ -40,3 +41,11 @@ class IpAddress(CloudStackEntity.CloudStackEntity):
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
ipaddress = apiclient.associateIpAddress(cmd)
return ipaddress
@classmethod
def list(self, apiclient, **kwargs):
cmd = listPublicIpAddresses.listPublicIpAddressesCmd()
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
publicipaddresses = apiclient.listPublicIpAddresses(cmd)
return map(lambda e: IpAddress(e.__dict__), publicipaddresses)

3
tools/marvin/marvin/integration/lib/base/LBHealthCheckPolicy.py
View File

@ -35,10 +35,9 @@ class LBHealthCheckPolicy(CloudStackEntity.CloudStackEntity):
return LBHealthCheckPolicy(lbhealthcheckpolicy.__dict__)
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteLBHealthCheckPolicy.deleteLBHealthCheckPolicyCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
lbhealthcheckpolicy = apiclient.deleteLBHealthCheckPolicy(cmd)
return lbhealthcheckpolicy

3
tools/marvin/marvin/integration/lib/base/ProjectInvitation.py
View File

@ -43,10 +43,9 @@ class ProjectInvitation(CloudStackEntity.CloudStackEntity):
return projectinvitation
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteProjectInvitation.deleteProjectInvitationCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
projectinvitation = apiclient.deleteProjectInvitation(cmd)
return projectinvitation

32
tools/marvin/marvin/integration/lib/base/PublicIpAddresses.py
View File

@ -1,32 +0,0 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
from marvin.integration.lib.base import CloudStackEntity
from marvin.cloudstackAPI import listPublicIpAddresses
class PublicIpAddresses(CloudStackEntity.CloudStackEntity):
def __init__(self, items):
self.__dict__.update(items)
@classmethod
def list(self, apiclient, **kwargs):
cmd = listPublicIpAddresses.listPublicIpAddressesCmd()
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
publicipaddresses = apiclient.listPublicIpAddresses(cmd)
return map(lambda e: PublicIpAddresses(e.__dict__), publicipaddresses)

3
tools/marvin/marvin/integration/lib/base/TrafficMonitor.py
View File

@ -45,10 +45,9 @@ class TrafficMonitor(CloudStackEntity.CloudStackEntity):
return map(lambda e: TrafficMonitor(e.__dict__), trafficmonitor)
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteTrafficMonitor.deleteTrafficMonitorCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
trafficmonitor = apiclient.deleteTrafficMonitor(cmd)
return trafficmonitor

6
tools/marvin/marvin/integration/lib/base/TrafficType.py
View File

@ -46,19 +46,17 @@ class TrafficType(CloudStackEntity.CloudStackEntity):
return map(lambda e: TrafficType(e.__dict__), traffictype)
def update(self, apiclient, id, **kwargs):
def update(self, apiclient, **kwargs):
cmd = updateTrafficType.updateTrafficTypeCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
traffictype = apiclient.updateTrafficType(cmd)
return traffictype
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteTrafficType.deleteTrafficTypeCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
traffictype = apiclient.deleteTrafficType(cmd)
return traffictype

15
tools/marvin/marvin/integration/lib/base/User.py
View File

@ -32,10 +32,9 @@ class User(CloudStackEntity.CloudStackEntity):
self.__dict__.update(items)
def enable(self, apiclient, id, **kwargs):
def enable(self, apiclient, **kwargs):
cmd = enableUser.enableUserCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
user = apiclient.enableUser(cmd)
return user
@ -50,10 +49,9 @@ class User(CloudStackEntity.CloudStackEntity):
return user
def lock(self, apiclient, id, **kwargs):
def lock(self, apiclient, **kwargs):
cmd = lockUser.lockUserCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
user = apiclient.lockUser(cmd)
return user
@ -76,28 +74,25 @@ class User(CloudStackEntity.CloudStackEntity):
return map(lambda e: User(e.__dict__), user)
def update(self, apiclient, id, **kwargs):
def update(self, apiclient, **kwargs):
cmd = updateUser.updateUserCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
user = apiclient.updateUser(cmd)
return user
def disable(self, apiclient, id, **kwargs):
def disable(self, apiclient, **kwargs):
cmd = disableUser.disableUserCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
user = apiclient.disableUser(cmd)
return user
def delete(self, apiclient, id, **kwargs):
def delete(self, apiclient, **kwargs):
cmd = deleteUser.deleteUserCmd()
cmd.id = self.id
cmd.id = id
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
user = apiclient.deleteUser(cmd)
return user

3
tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py
View File

@ -43,10 +43,9 @@ class VirtualRouterElement(CloudStackEntity.CloudStackEntity):
return map(lambda e: VirtualRouterElement(e.__dict__), virtualrouterelement)
def configure(self, apiclient, enabled, id, **kwargs):
def configure(self, apiclient, enabled, **kwargs):
cmd = configureVirtualRouterElement.configureVirtualRouterElementCmd()
cmd.id = self.id
cmd.id = id
cmd.enabled = enabled
[setattr(cmd, key, value) for key,value in kwargs.iteritems()]
virtualrouterelement = apiclient.configureVirtualRouterElement(cmd)

8
tools/marvin/marvin/integration/lib/factory/AccountFromProjectFactory.py
View File

@ -1,8 +0,0 @@
import factory
from marvin.integration.lib.newbase import AccountFromProject
class AccountFromProjectFactory(factory.Factory):
FACTORY_FOR = AccountFromProject
account = None
projectid = None

7
tools/marvin/marvin/integration/lib/factory/AccountToProjectFactory.py
View File

@ -1,7 +0,0 @@
import factory
from marvin.integration.lib.newbase import AccountToProject
class AccountToProjectFactory(factory.Factory):
FACTORY_FOR = AccountToProject
projectid = None

5
tools/marvin/marvin/integration/lib/factory/AlertsFactory.py
View File

@ -1,5 +0,0 @@
import factory
from marvin.integration.lib.newbase import Alerts
class AlertsFactory(factory.Factory):
FACTORY_FOR = Alerts

5
tools/marvin/marvin/integration/lib/factory/ApisFactory.py
View File

@ -1,5 +0,0 @@
import factory
from marvin.integration.lib.newbase import Apis
class ApisFactory(factory.Factory):
FACTORY_FOR = Apis

7
tools/marvin/marvin/integration/lib/factory/AsyncJobResultFactory.py
View File

@ -1,7 +0,0 @@
import factory
from marvin.integration.lib.newbase import AsyncJobResult
class AsyncJobResultFactory(factory.Factory):
FACTORY_FOR = AsyncJobResult
jobid = None

5
tools/marvin/marvin/integration/lib/factory/AsyncJobsFactory.py
View File

@ -1,5 +0,0 @@
import factory
from marvin.integration.lib.newbase import AsyncJobs
class AsyncJobsFactory(factory.Factory):
FACTORY_FOR = AsyncJobs

5
tools/marvin/marvin/integration/lib/factory/AutoScalePoliciesFactory.py
View File

@ -1,5 +0,0 @@
import factory
from marvin.integration.lib.newbase import AutoScalePolicies
class AutoScalePoliciesFactory(factory.Factory):
FACTORY_FOR = AutoScalePolicies

5
tools/marvin/marvin/integration/lib/factory/CapabilitiesFactory.py
View File

@ -1,5 +0,0 @@
import factory
from marvin.integration.lib.newbase import Capabilities
class CapabilitiesFactory(factory.Factory):
FACTORY_FOR = Capabilities

5
tools/marvin/marvin/integration/lib/factory/CapacityFactory.py
View File

@ -1,5 +0,0 @@
import factory
from marvin.integration.lib.newbase import Capacity
class CapacityFactory(factory.Factory):
FACTORY_FOR = Capacity

7
tools/marvin/marvin/integration/lib/factory/CloudIdentifierFactory.py
View File

@ -1,7 +0,0 @@
import factory
from marvin.integration.lib.newbase import CloudIdentifier
class CloudIdentifierFactory(factory.Factory):
FACTORY_FOR = CloudIdentifier
userid = None

2
tools/marvin/marvin/integration/lib/factory/ClusterFactory.py
View File

@ -1,5 +1,5 @@
import factory
from marvin.integration.lib.newbase import Cluster
from marvin.integration.lib.base import Cluster
class ClusterFactory(factory.Factory):
FACTORY_FOR = Cluster

9
tools/marvin/marvin/integration/lib/factory/ConfigFactory.py
View File

@ -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

11
tools/marvin/marvin/integration/lib/factory/ConfigurationFactory.py
View File

@ -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

8
tools/marvin/marvin/integration/lib/factory/CustomCertificateFactory.py
View File

@ -1,8 +0,0 @@
import factory
from marvin.integration.lib.newbase import CustomCertificate
class CustomCertificateFactory(factory.Factory):
FACTORY_FOR = CustomCertificate
certificate = None
domainsuffix = None

9
tools/marvin/marvin/integration/lib/factory/DefaultZoneForAccountFactory.py
View File

@ -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

5
tools/marvin/marvin/integration/lib/factory/DomainChildrenFactory.py
View File

@ -1,5 +0,0 @@
import factory
from marvin.integration.lib.newbase import DomainChildren
class DomainChildrenFactory(factory.Factory):
FACTORY_FOR = DomainChildren

5
tools/marvin/marvin/integration/lib/factory/EventTypesFactory.py
View File

@ -1,5 +0,0 @@
import factory
from marvin.integration.lib.newbase import EventTypes
class EventTypesFactory(factory.Factory):
FACTORY_FOR = EventTypes

5
tools/marvin/marvin/integration/lib/factory/EventsFactory.py
View File

@ -1,5 +0,0 @@
import factory
from marvin.integration.lib.newbase import Events
class EventsFactory(factory.Factory):
FACTORY_FOR = Events

8
tools/marvin/marvin/integration/lib/factory/FromLoadBalancerRuleFactory.py
View File

@ -1,8 +0,0 @@
import factory
from marvin.integration.lib.newbase import FromLoadBalancerRule
class FromLoadBalancerRuleFactory(factory.Factory):
FACTORY_FOR = FromLoadBalancerRule
id = None
virtualmachineids = None

20
tools/marvin/marvin/integration/lib/factory/HostFactory.py
View File

@ -1,5 +1,5 @@
import factory
from marvin.integration.lib.newbase import Host
from marvin.integration.lib.base import Host
class HostFactory(factory.Factory):
FACTORY_FOR = Host
@ -11,21 +11,3 @@ class HostFactory(factory.Factory):
username = None
zoneid = None
FACTORY_FOR = Host
FACTORY_FOR = Host
id = None
FACTORY_FOR = Host
id = None
FACTORY_FOR = Host
id = None

7
tools/marvin/marvin/integration/lib/factory/HostForMaintenanceFactory.py
View File

@ -1,7 +0,0 @@
import factory
from marvin.integration.lib.newbase import HostForMaintenance
class HostForMaintenanceFactory(factory.Factory):
FACTORY_FOR = HostForMaintenance
id = None

7
tools/marvin/marvin/integration/lib/factory/HostMaintenanceFactory.py
View File

@ -1,7 +0,0 @@
import factory
from marvin.integration.lib.newbase import HostMaintenance
class HostMaintenanceFactory(factory.Factory):
FACTORY_FOR = HostMaintenance
id = None

8
tools/marvin/marvin/integration/lib/factory/HostPasswordFactory.py
View File

@ -1,8 +0,0 @@
import factory
from marvin.integration.lib.newbase import HostPassword
class HostPasswordFactory(factory.Factory):
FACTORY_FOR = HostPassword
password = None
username = None

9
tools/marvin/marvin/integration/lib/factory/HypervisorCapabilitiesFactory.py
View File

@ -1,9 +0,0 @@
import factory
from marvin.integration.lib.newbase import HypervisorCapabilities
class HypervisorCapabilitiesFactory(factory.Factory):
FACTORY_FOR = HypervisorCapabilities
FACTORY_FOR = HypervisorCapabilities

5
tools/marvin/marvin/integration/lib/factory/HypervisorsFactory.py
View File

@ -1,5 +0,0 @@
import factory
from marvin.integration.lib.newbase import Hypervisors
class HypervisorsFactory(factory.Factory):
FACTORY_FOR = Hypervisors

2
tools/marvin/marvin/integration/lib/factory/InstanceGroupFactory.py
View File

@ -18,6 +18,6 @@ import factory
from marvin.integration.lib.base import InstanceGroup
class InstanceGroupFactory(factory.Factory):
FACTORY_FOR = InstanceGroup
FACTORY_FOR = InstanceGroup.InstanceGroup
name = None

2
tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py
View File

@ -18,5 +18,5 @@ import factory
from marvin.integration.lib.base import IpAddress
class IpAddressFactory(factory.Factory):
FACTORY_FOR = IpAddress
FACTORY_FOR = IpAddress.IpAddress

2
tools/marvin/marvin/integration/lib/factory/IsoFactory.py
View File

@ -18,7 +18,7 @@ import factory
from marvin.integration.lib.base import Iso
class IsoFactory(factory.Factory):
FACTORY_FOR = Iso
FACTORY_FOR = Iso.Iso
displaytext = None
name = None

12
tools/marvin/marvin/integration/lib/factory/IsoPermissionsFactory.py
View File

@ -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

11
tools/marvin/marvin/integration/lib/factory/UserKeysFactory.py → tools/marvin/marvin/integration/lib/factory/LBHealthCheckPolicyFactory.py
View File

@ -15,9 +15,12 @@
# specific language governing permissions and limitations
# under the License.
import factory
from marvin.integration.lib.base import UserKeys
class UserKeysFactory(factory.Factory):
from marvin.integration.lib.base import LBHealthCheckPolicy
FACTORY_FOR = UserKeys
class LBHealthCheckPolicyFactory(factory.Factory):
id = None
FACTORY_FOR = LBHealthCheckPolicy.LBHealthCheckPolicy
lbruleid = None
methodname = None
name = None

7
tools/marvin/marvin/integration/lib/factory/LBStickinessPoliciesFactory.py
View File

@ -1,7 +0,0 @@
import factory
from marvin.integration.lib.newbase import LBStickinessPolicies
class LBStickinessPoliciesFactory(factory.Factory):
FACTORY_FOR = LBStickinessPolicies
lbruleid = None

7
tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleInstancesFactory.py
View File

@ -1,7 +0,0 @@
import factory
from marvin.integration.lib.newbase import LoadBalancerRuleInstances
class LoadBalancerRuleInstancesFactory(factory.Factory):
FACTORY_FOR = LoadBalancerRuleInstances
id = None

15
tools/marvin/marvin/integration/lib/factory/NetworkDeviceFactory.py
View File

@ -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

16
tools/marvin/marvin/integration/lib/factory/NetworkServiceProviderFactory.py
View File

@ -1,22 +1,8 @@
import factory
from marvin.integration.lib.newbase import NetworkServiceProvider
from marvin.integration.lib.base 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

11
tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceFactory.py
View File

@ -1,5 +1,5 @@
import factory
from marvin.integration.lib.newbase import NiciraNvpDevice
from marvin.integration.lib.base import NiciraNvpDevice
class NiciraNvpDeviceFactory(factory.Factory):
FACTORY_FOR = NiciraNvpDevice
@ -9,12 +9,3 @@ class NiciraNvpDeviceFactory(factory.Factory):
physicalnetworkid = None
transportzoneuuid = None
username = None
FACTORY_FOR = NiciraNvpDevice
FACTORY_FOR = NiciraNvpDevice
nvpdeviceid = None

7
tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceNetworksFactory.py
View File

@ -1,7 +0,0 @@
import factory
from marvin.integration.lib.newbase import NiciraNvpDeviceNetworks
class NiciraNvpDeviceNetworksFactory(factory.Factory):
FACTORY_FOR = NiciraNvpDeviceNetworks
nvpdeviceid = None

2
tools/marvin/marvin/integration/lib/factory/OsCategoriesFactory.py
View File

@ -1,5 +1,5 @@
import factory
from marvin.integration.lib.newbase import OsCategories
from marvin.integration.lib.base import OsCategories
class OsCategoriesFactory(factory.Factory):
FACTORY_FOR = OsCategories

2
tools/marvin/marvin/integration/lib/factory/OsTypesFactory.py
View File

@ -1,5 +1,5 @@
import factory
from marvin.integration.lib.newbase import OsTypes
from marvin.integration.lib.base import OsTypes
class OsTypesFactory(factory.Factory):
FACTORY_FOR = OsTypes

7
tools/marvin/marvin/integration/lib/factory/PasswordForVirtualMachineFactory.py
View File

@ -1,7 +0,0 @@
import factory
from marvin.integration.lib.newbase import PasswordForVirtualMachine
class PasswordForVirtualMachineFactory(factory.Factory):
FACTORY_FOR = PasswordForVirtualMachine
id = None

7
tools/marvin/marvin/integration/lib/factory/ProjectAccountsFactory.py
View File

@ -1,7 +0,0 @@
import factory
from marvin.integration.lib.newbase import ProjectAccounts
class ProjectAccountsFactory(factory.Factory):
FACTORY_FOR = ProjectAccounts
projectid = None

11
tools/marvin/marvin/integration/lib/factory/ProjectInvitationFactory.py
View File

@ -1,16 +1,7 @@
import factory
from marvin.integration.lib.newbase import ProjectInvitation
from marvin.integration.lib.base import ProjectInvitation
class ProjectInvitationFactory(factory.Factory):
FACTORY_FOR = ProjectInvitation
FACTORY_FOR = ProjectInvitation
projectid = None
FACTORY_FOR = ProjectInvitation
id = None

5
tools/marvin/marvin/integration/lib/factory/PublicIpAddressesFactory.py
View File

@ -1,5 +0,0 @@
import factory
from marvin.integration.lib.newbase import PublicIpAddresses
class PublicIpAddressesFactory(factory.Factory):
FACTORY_FOR = PublicIpAddresses

5
tools/marvin/marvin/integration/lib/factory/RemoveFactory.py
View File

@ -1,5 +0,0 @@
import factory
from marvin.integration.lib.newbase import Remove
class RemoveFactory(factory.Factory):
FACTORY_FOR = Remove

7
tools/marvin/marvin/integration/lib/factory/ResourceCountFactory.py
View File

@ -1,7 +0,0 @@
import factory
from marvin.integration.lib.newbase import ResourceCount
class ResourceCountFactory(factory.Factory):
FACTORY_FOR = ResourceCount
domainid = None

11
tools/marvin/marvin/integration/lib/factory/ResourceLimitFactory.py
View File

@ -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

26
tools/marvin/marvin/integration/lib/factory/RouterFactory.py
View File

@ -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

8
tools/marvin/marvin/integration/lib/factory/S3Factory.py
View File

@ -1,12 +1,8 @@
import factory
from marvin.integration.lib.newbase import S3
from marvin.integration.lib.base import S3
class S3Factory(factory.Factory):
FACTORY_FOR = S3
FACTORY_FOR = S3.S3
accesskey = None
bucket = None
secretkey = None
FACTORY_FOR = S3

2
tools/marvin/marvin/integration/lib/factory/SecondaryStorageFactory.py
View File

@ -1,5 +1,5 @@
import factory
from marvin.integration.lib.newbase import SecondaryStorage
from marvin.integration.lib.base import SecondaryStorage
class SecondaryStorageFactory(factory.Factory):
FACTORY_FOR = SecondaryStorage

11
tools/marvin/marvin/integration/lib/factory/SecurityGroupEgressFactory.py
View File

@ -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

11
tools/marvin/marvin/integration/lib/factory/SecurityGroupIngressFactory.py
View File

@ -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

8
tools/marvin/marvin/integration/lib/factory/ServiceForRouterFactory.py
View File

@ -1,8 +0,0 @@
import factory
from marvin.integration.lib.newbase import ServiceForRouter
class ServiceForRouterFactory(factory.Factory):
FACTORY_FOR = ServiceForRouter
id = None
serviceofferingid = None

8
tools/marvin/marvin/integration/lib/factory/ServiceForSystemVmFactory.py
View File

@ -1,8 +0,0 @@
import factory
from marvin.integration.lib.newbase import ServiceForSystemVm
class ServiceForSystemVmFactory(factory.Factory):
FACTORY_FOR = ServiceForSystemVm
id = None
serviceofferingid = None

8
tools/marvin/marvin/integration/lib/factory/ServiceForVirtualMachineFactory.py
View File

@ -1,8 +0,0 @@
import factory
from marvin.integration.lib.newbase import ServiceForVirtualMachine
class ServiceForVirtualMachineFactory(factory.Factory):
FACTORY_FOR = ServiceForVirtualMachine
id = None
serviceofferingid = None

10
tools/marvin/marvin/integration/lib/factory/SnapshotPoliciesFactory.py
View File

@ -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

7
tools/marvin/marvin/integration/lib/factory/StaticNatFactory.py
View File

@ -1,13 +1,8 @@
import factory
from marvin.integration.lib.newbase import StaticNat
from marvin.integration.lib.base import StaticNat
class StaticNatFactory(factory.Factory):
FACTORY_FOR = StaticNat
ipaddressid = None
virtualmachineid = None
FACTORY_FOR = StaticNat
ipaddressid = None

12
tools/marvin/marvin/integration/lib/factory/StorageMaintenanceFactory.py
View File

@ -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

4
tools/marvin/marvin/integration/lib/factory/StoragePoolFactory.py
View File

@ -24,7 +24,3 @@ class StoragePoolFactory(factory.Factory):
name = None
podid = None
url = None
zoneid = None
name = None
url = None
zoneid = None

5
tools/marvin/marvin/integration/lib/factory/SupportedNetworkServicesFactory.py
View File

@ -1,5 +0,0 @@
import factory
from marvin.integration.lib.newbase import SupportedNetworkServices
class SupportedNetworkServicesFactory(factory.Factory):
FACTORY_FOR = SupportedNetworkServices

10
tools/marvin/marvin/integration/lib/factory/SwiftFactory.py
View File

@ -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

32
tools/marvin/marvin/integration/lib/factory/SystemVmFactory.py
View File

@ -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

12
tools/marvin/marvin/integration/lib/factory/TemplatePermissionsFactory.py
View File

@ -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

8
tools/marvin/marvin/integration/lib/factory/ToLoadBalancerRuleFactory.py
View File

@ -1,8 +0,0 @@
import factory
from marvin.integration.lib.newbase import ToLoadBalancerRule
class ToLoadBalancerRuleFactory(factory.Factory):
FACTORY_FOR = ToLoadBalancerRule
id = None
virtualmachineids = None

12
tools/marvin/marvin/integration/lib/factory/TrafficMonitorFactory.py
View File

@ -1,18 +1,8 @@
import factory
from marvin.integration.lib.newbase import TrafficMonitor
from marvin.integration.lib.base import TrafficMonitor
class TrafficMonitorFactory(factory.Factory):
FACTORY_FOR = TrafficMonitor
url = None
zoneid = None
FACTORY_FOR = TrafficMonitor
zoneid = None
FACTORY_FOR = TrafficMonitor
id = None

16
tools/marvin/marvin/integration/lib/factory/TrafficTypeFactory.py
View File

@ -1,23 +1,9 @@
import factory
from marvin.integration.lib.newbase import TrafficType
from marvin.integration.lib.base 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

5
tools/marvin/marvin/integration/lib/factory/TrafficTypeImplementorsFactory.py
View File

@ -1,5 +0,0 @@
import factory
from marvin.integration.lib.newbase import TrafficTypeImplementors
class TrafficTypeImplementorsFactory(factory.Factory):
FACTORY_FOR = TrafficTypeImplementors

8
tools/marvin/marvin/integration/lib/factory/UsageRecordsFactory.py
View File

@ -1,14 +1,8 @@
import factory
from marvin.integration.lib.newbase import UsageRecords
from marvin.integration.lib.base import UsageRecords
class UsageRecordsFactory(factory.Factory):
FACTORY_FOR = UsageRecords
enddate = None
startdate = None
FACTORY_FOR = UsageRecords
enddate = None
startdate = None

5
tools/marvin/marvin/integration/lib/factory/UsageTypesFactory.py
View File

@ -1,5 +0,0 @@
import factory
from marvin.integration.lib.newbase import UsageTypes
class UsageTypesFactory(factory.Factory):
FACTORY_FOR = UsageTypes

7
tools/marvin/marvin/integration/lib/factory/VMPasswordFactory.py
View File

@ -1,7 +0,0 @@
import factory
from marvin.integration.lib.newbase import VMPassword
class VMPasswordFactory(factory.Factory):
FACTORY_FOR = VMPassword
id = None

11
tools/marvin/marvin/integration/lib/factory/VpnUserFactory.py
View File

@ -1,17 +1,8 @@
import factory
from marvin.integration.lib.newbase import VpnUser
from marvin.integration.lib.base import VpnUser
class VpnUserFactory(factory.Factory):
FACTORY_FOR = VpnUser
password = None
username = None
FACTORY_FOR = VpnUser
FACTORY_FOR = VpnUser
username = None

62907
tools/marvin/marvin/integration/lib/newbase.py
View File

File diff suppressed because it is too large Load Diff