Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AB181104C1 for ; Fri, 12 Apr 2013 11:58:49 +0000 (UTC) Received: (qmail 3187 invoked by uid 500); 12 Apr 2013 11:58:40 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 3074 invoked by uid 500); 12 Apr 2013 11:58:40 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 1667 invoked by uid 99); 12 Apr 2013 11:58:38 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Apr 2013 11:58:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 431588195E9; Fri, 12 Apr 2013 11:58:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: commits@cloudstack.apache.org Date: Fri, 12 Apr 2013 11:59:20 -0000 Message-Id: In-Reply-To: <01bb2ac671e64923b32e7c204ceb4b7b@git.apache.org> References: <01bb2ac671e64923b32e7c204ceb4b7b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [47/50] [abbrv] git commit: updated refs/heads/marvin_refactor to 30e2971 factories+marvin: 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 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6070672b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6070672b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6070672b Branch: refs/heads/marvin_refactor Commit: 6070672b2ffce1006613883df35f17275f124896 Parents: 2a99064 Author: Prasanna Santhanam Authored: Fri Apr 12 17:25:01 2013 +0530 Committer: Prasanna Santhanam Committed: Fri Apr 12 17:25:01 2013 +0530 ---------------------------------------------------------------------- .../marvin/integration/lib/base/IpAddress.py | 8 + .../integration/lib/base/LBHealthCheckPolicy.py | 3 +- .../integration/lib/base/ProjectInvitation.py | 3 +- .../integration/lib/base/PublicIpAddresses.py | 33 - .../marvin/integration/lib/base/TrafficMonitor.py | 3 +- .../marvin/integration/lib/base/TrafficType.py | 6 +- tools/marvin/marvin/integration/lib/base/User.py | 15 +- .../integration/lib/base/VirtualRouterElement.py | 3 +- .../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 | 2 +- .../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 | 20 +- .../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/InstanceGroupFactory.py | 2 +- .../integration/lib/factory/IpAddressFactory.py | 2 +- .../marvin/integration/lib/factory/IsoFactory.py | 2 +- .../lib/factory/IsoPermissionsFactory.py | 12 - .../lib/factory/LBHealthCheckPolicyFactory.py | 26 + .../lib/factory/LBStickinessPoliciesFactory.py | 7 - .../factory/LoadBalancerRuleInstancesFactory.py | 7 - .../lib/factory/NetworkDeviceFactory.py | 15 - .../lib/factory/NetworkServiceProviderFactory.py | 16 +- .../lib/factory/NiciraNvpDeviceFactory.py | 11 +- .../lib/factory/NiciraNvpDeviceNetworksFactory.py | 7 - .../integration/lib/factory/OsCategoriesFactory.py | 2 +- .../integration/lib/factory/OsTypesFactory.py | 2 +- .../factory/PasswordForVirtualMachineFactory.py | 7 - .../lib/factory/ProjectAccountsFactory.py | 7 - .../lib/factory/ProjectInvitationFactory.py | 11 +- .../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 | 8 +- .../lib/factory/SecondaryStorageFactory.py | 2 +- .../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 | 7 +- .../lib/factory/StorageMaintenanceFactory.py | 12 - .../integration/lib/factory/StoragePoolFactory.py | 4 - .../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 | 12 +- .../integration/lib/factory/TrafficTypeFactory.py | 16 +- .../lib/factory/TrafficTypeImplementorsFactory.py | 5 - .../integration/lib/factory/UsageRecordsFactory.py | 8 +- .../integration/lib/factory/UsageTypesFactory.py | 5 - .../integration/lib/factory/UserKeysFactory.py | 23 - .../integration/lib/factory/VMPasswordFactory.py | 7 - .../integration/lib/factory/VpnUserFactory.py | 11 +- tools/marvin/marvin/integration/lib/newbase.py |62907 --------------- 79 files changed, 63 insertions(+), 63528 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/base/IpAddress.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/base/IpAddress.py b/tools/marvin/marvin/integration/lib/base/IpAddress.py index 8d34597..0f81e32 100644 --- a/tools/marvin/marvin/integration/lib/base/IpAddress.py +++ b/tools/marvin/marvin/integration/lib/base/IpAddress.py @@ -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): @@ -41,3 +42,10 @@ class IpAddress(CloudStackEntity.CloudStackEntity): 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) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/base/LBHealthCheckPolicy.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/base/LBHealthCheckPolicy.py b/tools/marvin/marvin/integration/lib/base/LBHealthCheckPolicy.py index 1ecc03d..5527a1c 100644 --- a/tools/marvin/marvin/integration/lib/base/LBHealthCheckPolicy.py +++ b/tools/marvin/marvin/integration/lib/base/LBHealthCheckPolicy.py @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/base/ProjectInvitation.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/base/ProjectInvitation.py b/tools/marvin/marvin/integration/lib/base/ProjectInvitation.py index 698dc53..196eec6 100644 --- a/tools/marvin/marvin/integration/lib/base/ProjectInvitation.py +++ b/tools/marvin/marvin/integration/lib/base/ProjectInvitation.py @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/base/PublicIpAddresses.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/base/PublicIpAddresses.py b/tools/marvin/marvin/integration/lib/base/PublicIpAddresses.py deleted file mode 100644 index b6601af..0000000 --- a/tools/marvin/marvin/integration/lib/base/PublicIpAddresses.py +++ /dev/null @@ -1,33 +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) - http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/base/TrafficMonitor.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/base/TrafficMonitor.py b/tools/marvin/marvin/integration/lib/base/TrafficMonitor.py index 3fadecd..f08dd55 100644 --- a/tools/marvin/marvin/integration/lib/base/TrafficMonitor.py +++ b/tools/marvin/marvin/integration/lib/base/TrafficMonitor.py @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/base/TrafficType.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/base/TrafficType.py b/tools/marvin/marvin/integration/lib/base/TrafficType.py index 7ef028c..cad2cb8 100644 --- a/tools/marvin/marvin/integration/lib/base/TrafficType.py +++ b/tools/marvin/marvin/integration/lib/base/TrafficType.py @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/base/User.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/base/User.py b/tools/marvin/marvin/integration/lib/base/User.py index a7c2262..0cf3978 100644 --- a/tools/marvin/marvin/integration/lib/base/User.py +++ b/tools/marvin/marvin/integration/lib/base/User.py @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py b/tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py index 9faf355..f22e7ee 100644 --- a/tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py +++ b/tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py @@ -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) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/AccountFromProjectFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/AccountFromProjectFactory.py b/tools/marvin/marvin/integration/lib/factory/AccountFromProjectFactory.py deleted file mode 100644 index ef67a93..0000000 --- a/tools/marvin/marvin/integration/lib/factory/AccountFromProjectFactory.py +++ /dev/null @@ -1,8 +0,0 @@ -import factory -from marvin.integration.lib.newbase import AccountFromProject -class AccountFromProjectFactory(factory.Factory): - - FACTORY_FOR = AccountFromProject - - account = None - projectid = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/AccountToProjectFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/AccountToProjectFactory.py b/tools/marvin/marvin/integration/lib/factory/AccountToProjectFactory.py deleted file mode 100644 index df54c18..0000000 --- a/tools/marvin/marvin/integration/lib/factory/AccountToProjectFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import AccountToProject -class AccountToProjectFactory(factory.Factory): - - FACTORY_FOR = AccountToProject - - projectid = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/AlertsFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/AlertsFactory.py b/tools/marvin/marvin/integration/lib/factory/AlertsFactory.py deleted file mode 100644 index 18ee4e0..0000000 --- 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/ApisFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/ApisFactory.py b/tools/marvin/marvin/integration/lib/factory/ApisFactory.py deleted file mode 100644 index 78b5986..0000000 --- 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/AsyncJobResultFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/AsyncJobResultFactory.py b/tools/marvin/marvin/integration/lib/factory/AsyncJobResultFactory.py deleted file mode 100644 index d36fad8..0000000 --- a/tools/marvin/marvin/integration/lib/factory/AsyncJobResultFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import AsyncJobResult -class AsyncJobResultFactory(factory.Factory): - - FACTORY_FOR = AsyncJobResult - - jobid = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/AsyncJobsFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/AsyncJobsFactory.py b/tools/marvin/marvin/integration/lib/factory/AsyncJobsFactory.py deleted file mode 100644 index c85b281..0000000 --- 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/AutoScalePoliciesFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/AutoScalePoliciesFactory.py b/tools/marvin/marvin/integration/lib/factory/AutoScalePoliciesFactory.py deleted file mode 100644 index 2cf6902..0000000 --- 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/CapabilitiesFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/CapabilitiesFactory.py b/tools/marvin/marvin/integration/lib/factory/CapabilitiesFactory.py deleted file mode 100644 index bb40fd4..0000000 --- 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/CapacityFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/CapacityFactory.py b/tools/marvin/marvin/integration/lib/factory/CapacityFactory.py deleted file mode 100644 index 5f4c406..0000000 --- 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/CloudIdentifierFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/CloudIdentifierFactory.py b/tools/marvin/marvin/integration/lib/factory/CloudIdentifierFactory.py deleted file mode 100644 index 22c27d7..0000000 --- a/tools/marvin/marvin/integration/lib/factory/CloudIdentifierFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import CloudIdentifier -class CloudIdentifierFactory(factory.Factory): - - FACTORY_FOR = CloudIdentifier - - userid = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/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 index 2697f6a..eaf7daa 100644 --- a/tools/marvin/marvin/integration/lib/factory/ClusterFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/ClusterFactory.py @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/ConfigFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/ConfigFactory.py b/tools/marvin/marvin/integration/lib/factory/ConfigFactory.py deleted file mode 100644 index f62c583..0000000 --- a/tools/marvin/marvin/integration/lib/factory/ConfigFactory.py +++ /dev/null @@ -1,9 +0,0 @@ -import factory -from marvin.integration.lib.newbase import Config -class ConfigFactory(factory.Factory): - - FACTORY_FOR = Config - - hostname = None - queryfilter = None - searchbase = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/ConfigurationFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/ConfigurationFactory.py b/tools/marvin/marvin/integration/lib/factory/ConfigurationFactory.py deleted file mode 100644 index 88c6556..0000000 --- a/tools/marvin/marvin/integration/lib/factory/ConfigurationFactory.py +++ /dev/null @@ -1,11 +0,0 @@ -import factory -from marvin.integration.lib.newbase import Configuration -class ConfigurationFactory(factory.Factory): - - FACTORY_FOR = Configuration - - - - FACTORY_FOR = Configuration - - name = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/CustomCertificateFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/CustomCertificateFactory.py b/tools/marvin/marvin/integration/lib/factory/CustomCertificateFactory.py deleted file mode 100644 index c3f8c62..0000000 --- a/tools/marvin/marvin/integration/lib/factory/CustomCertificateFactory.py +++ /dev/null @@ -1,8 +0,0 @@ -import factory -from marvin.integration.lib.newbase import CustomCertificate -class CustomCertificateFactory(factory.Factory): - - FACTORY_FOR = CustomCertificate - - certificate = None - domainsuffix = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/DefaultZoneForAccountFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/DefaultZoneForAccountFactory.py b/tools/marvin/marvin/integration/lib/factory/DefaultZoneForAccountFactory.py deleted file mode 100644 index 15da73a..0000000 --- a/tools/marvin/marvin/integration/lib/factory/DefaultZoneForAccountFactory.py +++ /dev/null @@ -1,9 +0,0 @@ -import factory -from marvin.integration.lib.newbase import DefaultZoneForAccount -class DefaultZoneForAccountFactory(factory.Factory): - - FACTORY_FOR = DefaultZoneForAccount - - account = None - domainid = None - zoneid = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/DomainChildrenFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/DomainChildrenFactory.py b/tools/marvin/marvin/integration/lib/factory/DomainChildrenFactory.py deleted file mode 100644 index 44d350a..0000000 --- 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/EventTypesFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/EventTypesFactory.py b/tools/marvin/marvin/integration/lib/factory/EventTypesFactory.py deleted file mode 100644 index 5e7d718..0000000 --- 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/EventsFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/EventsFactory.py b/tools/marvin/marvin/integration/lib/factory/EventsFactory.py deleted file mode 100644 index 700f5ae..0000000 --- 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/FromLoadBalancerRuleFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/FromLoadBalancerRuleFactory.py b/tools/marvin/marvin/integration/lib/factory/FromLoadBalancerRuleFactory.py deleted file mode 100644 index 82e46cb..0000000 --- a/tools/marvin/marvin/integration/lib/factory/FromLoadBalancerRuleFactory.py +++ /dev/null @@ -1,8 +0,0 @@ -import factory -from marvin.integration.lib.newbase import FromLoadBalancerRule -class FromLoadBalancerRuleFactory(factory.Factory): - - FACTORY_FOR = FromLoadBalancerRule - - id = None - virtualmachineids = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/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 index fcdf074..3bbbaf6 100644 --- a/tools/marvin/marvin/integration/lib/factory/HostFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/HostFactory.py @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/HostForMaintenanceFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/HostForMaintenanceFactory.py b/tools/marvin/marvin/integration/lib/factory/HostForMaintenanceFactory.py deleted file mode 100644 index 653e37a..0000000 --- a/tools/marvin/marvin/integration/lib/factory/HostForMaintenanceFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import HostForMaintenance -class HostForMaintenanceFactory(factory.Factory): - - FACTORY_FOR = HostForMaintenance - - id = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/HostMaintenanceFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/HostMaintenanceFactory.py b/tools/marvin/marvin/integration/lib/factory/HostMaintenanceFactory.py deleted file mode 100644 index d491e00..0000000 --- a/tools/marvin/marvin/integration/lib/factory/HostMaintenanceFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import HostMaintenance -class HostMaintenanceFactory(factory.Factory): - - FACTORY_FOR = HostMaintenance - - id = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/HostPasswordFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/HostPasswordFactory.py b/tools/marvin/marvin/integration/lib/factory/HostPasswordFactory.py deleted file mode 100644 index 316af2b..0000000 --- a/tools/marvin/marvin/integration/lib/factory/HostPasswordFactory.py +++ /dev/null @@ -1,8 +0,0 @@ -import factory -from marvin.integration.lib.newbase import HostPassword -class HostPasswordFactory(factory.Factory): - - FACTORY_FOR = HostPassword - - password = None - username = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/HypervisorCapabilitiesFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/HypervisorCapabilitiesFactory.py b/tools/marvin/marvin/integration/lib/factory/HypervisorCapabilitiesFactory.py deleted file mode 100644 index 4819a53..0000000 --- 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/HypervisorsFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/HypervisorsFactory.py b/tools/marvin/marvin/integration/lib/factory/HypervisorsFactory.py deleted file mode 100644 index 7b69ccb..0000000 --- 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/InstanceGroupFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/InstanceGroupFactory.py b/tools/marvin/marvin/integration/lib/factory/InstanceGroupFactory.py index 022a79a..426c00c 100644 --- a/tools/marvin/marvin/integration/lib/factory/InstanceGroupFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/InstanceGroupFactory.py @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py b/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py index f8c6894..46b931a 100644 --- a/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py @@ -18,5 +18,5 @@ import factory from marvin.integration.lib.base import IpAddress class IpAddressFactory(factory.Factory): - FACTORY_FOR = IpAddress + FACTORY_FOR = IpAddress.IpAddress http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/IsoFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/IsoFactory.py b/tools/marvin/marvin/integration/lib/factory/IsoFactory.py index 086c7e5..65655aa 100644 --- a/tools/marvin/marvin/integration/lib/factory/IsoFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/IsoFactory.py @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/IsoPermissionsFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/IsoPermissionsFactory.py b/tools/marvin/marvin/integration/lib/factory/IsoPermissionsFactory.py deleted file mode 100644 index 9116ff9..0000000 --- a/tools/marvin/marvin/integration/lib/factory/IsoPermissionsFactory.py +++ /dev/null @@ -1,12 +0,0 @@ -import factory -from marvin.integration.lib.newbase import IsoPermissions -class IsoPermissionsFactory(factory.Factory): - - FACTORY_FOR = IsoPermissions - - id = None - - - FACTORY_FOR = IsoPermissions - - id = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/LBHealthCheckPolicyFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/LBHealthCheckPolicyFactory.py b/tools/marvin/marvin/integration/lib/factory/LBHealthCheckPolicyFactory.py new file mode 100644 index 0000000..714e214 --- /dev/null +++ b/tools/marvin/marvin/integration/lib/factory/LBHealthCheckPolicyFactory.py @@ -0,0 +1,26 @@ +# 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. +import factory +from marvin.integration.lib.base import LBHealthCheckPolicy + +class LBHealthCheckPolicyFactory(factory.Factory): + + FACTORY_FOR = LBHealthCheckPolicy.LBHealthCheckPolicy + + lbruleid = None + methodname = None + name = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/LBStickinessPoliciesFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/LBStickinessPoliciesFactory.py b/tools/marvin/marvin/integration/lib/factory/LBStickinessPoliciesFactory.py deleted file mode 100644 index 1ed738b..0000000 --- a/tools/marvin/marvin/integration/lib/factory/LBStickinessPoliciesFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import LBStickinessPolicies -class LBStickinessPoliciesFactory(factory.Factory): - - FACTORY_FOR = LBStickinessPolicies - - lbruleid = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleInstancesFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleInstancesFactory.py b/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleInstancesFactory.py deleted file mode 100644 index f5abf63..0000000 --- a/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleInstancesFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import LoadBalancerRuleInstances -class LoadBalancerRuleInstancesFactory(factory.Factory): - - FACTORY_FOR = LoadBalancerRuleInstances - - id = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/NetworkDeviceFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/NetworkDeviceFactory.py b/tools/marvin/marvin/integration/lib/factory/NetworkDeviceFactory.py deleted file mode 100644 index 1437e25..0000000 --- a/tools/marvin/marvin/integration/lib/factory/NetworkDeviceFactory.py +++ /dev/null @@ -1,15 +0,0 @@ -import factory -from marvin.integration.lib.newbase import NetworkDevice -class NetworkDeviceFactory(factory.Factory): - - FACTORY_FOR = NetworkDevice - - - - FACTORY_FOR = NetworkDevice - - - - FACTORY_FOR = NetworkDevice - - id = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/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 index 108af5d..649ea16 100644 --- a/tools/marvin/marvin/integration/lib/factory/NetworkServiceProviderFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/NetworkServiceProviderFactory.py @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/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 index 8448c42..1e71beb 100644 --- a/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceFactory.py @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceNetworksFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceNetworksFactory.py b/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceNetworksFactory.py deleted file mode 100644 index fe7dc70..0000000 --- a/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceNetworksFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import NiciraNvpDeviceNetworks -class NiciraNvpDeviceNetworksFactory(factory.Factory): - - FACTORY_FOR = NiciraNvpDeviceNetworks - - nvpdeviceid = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/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 index 0d60359..0e0e79a 100644 --- a/tools/marvin/marvin/integration/lib/factory/OsCategoriesFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/OsCategoriesFactory.py @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/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 index fe105b3..dacdfd3 100644 --- a/tools/marvin/marvin/integration/lib/factory/OsTypesFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/OsTypesFactory.py @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/PasswordForVirtualMachineFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/PasswordForVirtualMachineFactory.py b/tools/marvin/marvin/integration/lib/factory/PasswordForVirtualMachineFactory.py deleted file mode 100644 index b959226..0000000 --- a/tools/marvin/marvin/integration/lib/factory/PasswordForVirtualMachineFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import PasswordForVirtualMachine -class PasswordForVirtualMachineFactory(factory.Factory): - - FACTORY_FOR = PasswordForVirtualMachine - - id = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/ProjectAccountsFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/ProjectAccountsFactory.py b/tools/marvin/marvin/integration/lib/factory/ProjectAccountsFactory.py deleted file mode 100644 index e242004..0000000 --- a/tools/marvin/marvin/integration/lib/factory/ProjectAccountsFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import ProjectAccounts -class ProjectAccountsFactory(factory.Factory): - - FACTORY_FOR = ProjectAccounts - - projectid = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/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 index 762a9d4..70034a3 100644 --- a/tools/marvin/marvin/integration/lib/factory/ProjectInvitationFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/ProjectInvitationFactory.py @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/PublicIpAddressesFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/PublicIpAddressesFactory.py b/tools/marvin/marvin/integration/lib/factory/PublicIpAddressesFactory.py deleted file mode 100644 index 32e899e..0000000 --- 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/RemoveFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/RemoveFactory.py b/tools/marvin/marvin/integration/lib/factory/RemoveFactory.py deleted file mode 100644 index 4cdb94f..0000000 --- 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/ResourceCountFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/ResourceCountFactory.py b/tools/marvin/marvin/integration/lib/factory/ResourceCountFactory.py deleted file mode 100644 index 7e41d96..0000000 --- a/tools/marvin/marvin/integration/lib/factory/ResourceCountFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import ResourceCount -class ResourceCountFactory(factory.Factory): - - FACTORY_FOR = ResourceCount - - domainid = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/ResourceLimitFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/ResourceLimitFactory.py b/tools/marvin/marvin/integration/lib/factory/ResourceLimitFactory.py deleted file mode 100644 index 9e9f0a0..0000000 --- a/tools/marvin/marvin/integration/lib/factory/ResourceLimitFactory.py +++ /dev/null @@ -1,11 +0,0 @@ -import factory -from marvin.integration.lib.newbase import ResourceLimit -class ResourceLimitFactory(factory.Factory): - - FACTORY_FOR = ResourceLimit - - - - FACTORY_FOR = ResourceLimit - - resourcetype = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/RouterFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/RouterFactory.py b/tools/marvin/marvin/integration/lib/factory/RouterFactory.py deleted file mode 100644 index e5d8a6e..0000000 --- a/tools/marvin/marvin/integration/lib/factory/RouterFactory.py +++ /dev/null @@ -1,26 +0,0 @@ -import factory -from marvin.integration.lib.newbase import Router -class RouterFactory(factory.Factory): - - FACTORY_FOR = Router - - id = None - - - FACTORY_FOR = Router - - - - FACTORY_FOR = Router - - id = None - - - FACTORY_FOR = Router - - id = None - - - FACTORY_FOR = Router - - id = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/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 index a4942c9..56765ce 100644 --- a/tools/marvin/marvin/integration/lib/factory/S3Factory.py +++ b/tools/marvin/marvin/integration/lib/factory/S3Factory.py @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/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 index b44f1ed..6af655c 100644 --- a/tools/marvin/marvin/integration/lib/factory/SecondaryStorageFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/SecondaryStorageFactory.py @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/SecurityGroupEgressFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/SecurityGroupEgressFactory.py b/tools/marvin/marvin/integration/lib/factory/SecurityGroupEgressFactory.py deleted file mode 100644 index 19e715d..0000000 --- a/tools/marvin/marvin/integration/lib/factory/SecurityGroupEgressFactory.py +++ /dev/null @@ -1,11 +0,0 @@ -import factory -from marvin.integration.lib.newbase import SecurityGroupEgress -class SecurityGroupEgressFactory(factory.Factory): - - FACTORY_FOR = SecurityGroupEgress - - - - FACTORY_FOR = SecurityGroupEgress - - id = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/SecurityGroupIngressFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/SecurityGroupIngressFactory.py b/tools/marvin/marvin/integration/lib/factory/SecurityGroupIngressFactory.py deleted file mode 100644 index d0f4447..0000000 --- a/tools/marvin/marvin/integration/lib/factory/SecurityGroupIngressFactory.py +++ /dev/null @@ -1,11 +0,0 @@ -import factory -from marvin.integration.lib.newbase import SecurityGroupIngress -class SecurityGroupIngressFactory(factory.Factory): - - FACTORY_FOR = SecurityGroupIngress - - - - FACTORY_FOR = SecurityGroupIngress - - id = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/ServiceForRouterFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/ServiceForRouterFactory.py b/tools/marvin/marvin/integration/lib/factory/ServiceForRouterFactory.py deleted file mode 100644 index faa7d7d..0000000 --- a/tools/marvin/marvin/integration/lib/factory/ServiceForRouterFactory.py +++ /dev/null @@ -1,8 +0,0 @@ -import factory -from marvin.integration.lib.newbase import ServiceForRouter -class ServiceForRouterFactory(factory.Factory): - - FACTORY_FOR = ServiceForRouter - - id = None - serviceofferingid = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/ServiceForSystemVmFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/ServiceForSystemVmFactory.py b/tools/marvin/marvin/integration/lib/factory/ServiceForSystemVmFactory.py deleted file mode 100644 index 42ee081..0000000 --- a/tools/marvin/marvin/integration/lib/factory/ServiceForSystemVmFactory.py +++ /dev/null @@ -1,8 +0,0 @@ -import factory -from marvin.integration.lib.newbase import ServiceForSystemVm -class ServiceForSystemVmFactory(factory.Factory): - - FACTORY_FOR = ServiceForSystemVm - - id = None - serviceofferingid = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/ServiceForVirtualMachineFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/ServiceForVirtualMachineFactory.py b/tools/marvin/marvin/integration/lib/factory/ServiceForVirtualMachineFactory.py deleted file mode 100644 index 2884594..0000000 --- a/tools/marvin/marvin/integration/lib/factory/ServiceForVirtualMachineFactory.py +++ /dev/null @@ -1,8 +0,0 @@ -import factory -from marvin.integration.lib.newbase import ServiceForVirtualMachine -class ServiceForVirtualMachineFactory(factory.Factory): - - FACTORY_FOR = ServiceForVirtualMachine - - id = None - serviceofferingid = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/SnapshotPoliciesFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/SnapshotPoliciesFactory.py b/tools/marvin/marvin/integration/lib/factory/SnapshotPoliciesFactory.py deleted file mode 100644 index bf4cd16..0000000 --- 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/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 index 817fb27..72c5437 100644 --- a/tools/marvin/marvin/integration/lib/factory/StaticNatFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/StaticNatFactory.py @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/StorageMaintenanceFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/StorageMaintenanceFactory.py b/tools/marvin/marvin/integration/lib/factory/StorageMaintenanceFactory.py deleted file mode 100644 index 90335c0..0000000 --- a/tools/marvin/marvin/integration/lib/factory/StorageMaintenanceFactory.py +++ /dev/null @@ -1,12 +0,0 @@ -import factory -from marvin.integration.lib.newbase import StorageMaintenance -class StorageMaintenanceFactory(factory.Factory): - - FACTORY_FOR = StorageMaintenance - - id = None - - - FACTORY_FOR = StorageMaintenance - - id = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/StoragePoolFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/StoragePoolFactory.py b/tools/marvin/marvin/integration/lib/factory/StoragePoolFactory.py index 775375d..da45385 100644 --- a/tools/marvin/marvin/integration/lib/factory/StoragePoolFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/StoragePoolFactory.py @@ -24,7 +24,3 @@ class StoragePoolFactory(factory.Factory): name = None podid = None url = None - zoneid = None - name = None - url = None - zoneid = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/SupportedNetworkServicesFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/SupportedNetworkServicesFactory.py b/tools/marvin/marvin/integration/lib/factory/SupportedNetworkServicesFactory.py deleted file mode 100644 index d82ab68..0000000 --- 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/SwiftFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/SwiftFactory.py b/tools/marvin/marvin/integration/lib/factory/SwiftFactory.py deleted file mode 100644 index a52da8e..0000000 --- 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/SystemVmFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/SystemVmFactory.py b/tools/marvin/marvin/integration/lib/factory/SystemVmFactory.py deleted file mode 100644 index 65c4311..0000000 --- a/tools/marvin/marvin/integration/lib/factory/SystemVmFactory.py +++ /dev/null @@ -1,32 +0,0 @@ -import factory -from marvin.integration.lib.newbase import SystemVm -class SystemVmFactory(factory.Factory): - - FACTORY_FOR = SystemVm - - hostid = None - virtualmachineid = None - - - FACTORY_FOR = SystemVm - - id = None - - - FACTORY_FOR = SystemVm - - - - FACTORY_FOR = SystemVm - - id = None - - - FACTORY_FOR = SystemVm - - id = None - - - FACTORY_FOR = SystemVm - - id = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/TemplatePermissionsFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/TemplatePermissionsFactory.py b/tools/marvin/marvin/integration/lib/factory/TemplatePermissionsFactory.py deleted file mode 100644 index 88f2493..0000000 --- a/tools/marvin/marvin/integration/lib/factory/TemplatePermissionsFactory.py +++ /dev/null @@ -1,12 +0,0 @@ -import factory -from marvin.integration.lib.newbase import TemplatePermissions -class TemplatePermissionsFactory(factory.Factory): - - FACTORY_FOR = TemplatePermissions - - id = None - - - FACTORY_FOR = TemplatePermissions - - id = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/ToLoadBalancerRuleFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/ToLoadBalancerRuleFactory.py b/tools/marvin/marvin/integration/lib/factory/ToLoadBalancerRuleFactory.py deleted file mode 100644 index 57ad32a..0000000 --- a/tools/marvin/marvin/integration/lib/factory/ToLoadBalancerRuleFactory.py +++ /dev/null @@ -1,8 +0,0 @@ -import factory -from marvin.integration.lib.newbase import ToLoadBalancerRule -class ToLoadBalancerRuleFactory(factory.Factory): - - FACTORY_FOR = ToLoadBalancerRule - - id = None - virtualmachineids = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/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 index cc6db01..63841cb 100644 --- a/tools/marvin/marvin/integration/lib/factory/TrafficMonitorFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/TrafficMonitorFactory.py @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/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 index 78f61a7..c336810 100644 --- a/tools/marvin/marvin/integration/lib/factory/TrafficTypeFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/TrafficTypeFactory.py @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/TrafficTypeImplementorsFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/TrafficTypeImplementorsFactory.py b/tools/marvin/marvin/integration/lib/factory/TrafficTypeImplementorsFactory.py deleted file mode 100644 index 3879caf..0000000 --- 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/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 index 045bdd0..e0c73c8 100644 --- a/tools/marvin/marvin/integration/lib/factory/UsageRecordsFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/UsageRecordsFactory.py @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/UsageTypesFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/UsageTypesFactory.py b/tools/marvin/marvin/integration/lib/factory/UsageTypesFactory.py deleted file mode 100644 index 6778df4..0000000 --- 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/UserKeysFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/UserKeysFactory.py b/tools/marvin/marvin/integration/lib/factory/UserKeysFactory.py deleted file mode 100644 index c905c1c..0000000 --- a/tools/marvin/marvin/integration/lib/factory/UserKeysFactory.py +++ /dev/null @@ -1,23 +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. -import factory -from marvin.integration.lib.base import UserKeys -class UserKeysFactory(factory.Factory): - - FACTORY_FOR = UserKeys - - id = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/tools/marvin/marvin/integration/lib/factory/VMPasswordFactory.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/factory/VMPasswordFactory.py b/tools/marvin/marvin/integration/lib/factory/VMPasswordFactory.py deleted file mode 100644 index b1cd5bf..0000000 --- a/tools/marvin/marvin/integration/lib/factory/VMPasswordFactory.py +++ /dev/null @@ -1,7 +0,0 @@ -import factory -from marvin.integration.lib.newbase import VMPassword -class VMPasswordFactory(factory.Factory): - - FACTORY_FOR = VMPassword - - id = None http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6070672b/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 index 1dce088..8a7121e 100644 --- a/tools/marvin/marvin/integration/lib/factory/VpnUserFactory.py +++ b/tools/marvin/marvin/integration/lib/factory/VpnUserFactory.py @@ -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