You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/03/01 11:06:29 UTC
[42/42] git commit: refs/heads/marvin-refactor - Merge branch
'marvin-refactor-phase1' into marvin-refactor
Updated Branches:
refs/heads/marvin-refactor [created] 41f2ac041
Merge branch 'marvin-refactor-phase1' into marvin-refactor
bring in the old abandoned branch for marvin-refactor atop latest HEAD
to prevent merge email flood.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/41f2ac04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/41f2ac04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/41f2ac04
Branch: refs/heads/marvin-refactor
Commit: 41f2ac0415fb76fd7859afa17f1f85436340436e
Parents: 0b07bc9 e459f12
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Fri Mar 1 15:34:28 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Fri Mar 1 15:35:36 2013 +0530
----------------------------------------------------------------------
tools/apidoc/gen_toc.py | 1 +
tools/marvin/marvin/integration/lib/base.py | 2424 ---------------
.../marvin/marvin/integration/lib/base/Account.py | 83 +
.../integration/lib/base/AccountFromProject.py | 33 +
.../integration/lib/base/AccountToProject.py | 32 +
tools/marvin/marvin/integration/lib/base/Alerts.py | 33 +
.../marvin/marvin/integration/lib/base/ApiLimit.py | 38 +
tools/marvin/marvin/integration/lib/base/Apis.py | 33 +
.../marvin/integration/lib/base/AsyncJobResult.py | 32 +
.../marvin/integration/lib/base/AsyncJobs.py | 33 +
.../integration/lib/base/AutoScalePolicies.py | 33 +
.../marvin/integration/lib/base/AutoScalePolicy.py | 50 +
.../integration/lib/base/AutoScaleVmGroup.py | 75 +
.../integration/lib/base/AutoScaleVmProfile.py | 59 +
.../marvin/integration/lib/base/Capabilities.py | 33 +
.../marvin/marvin/integration/lib/base/Capacity.py | 33 +
.../marvin/integration/lib/base/CloudIdentifier.py | 32 +
.../integration/lib/base/CloudStackEntity.py | 25 +
.../marvin/marvin/integration/lib/base/Cluster.py | 61 +
.../marvin/integration/lib/base/Condition.py | 51 +
tools/marvin/marvin/integration/lib/base/Config.py | 34 +
.../marvin/integration/lib/base/Configuration.py | 41 +
.../marvin/marvin/integration/lib/base/Counter.py | 51 +
.../integration/lib/base/CustomCertificate.py | 33 +
.../integration/lib/base/DefaultZoneForAccount.py | 34 +
.../marvin/integration/lib/base/DiskOffering.py | 59 +
tools/marvin/marvin/integration/lib/base/Domain.py | 59 +
.../marvin/integration/lib/base/DomainChildren.py | 33 +
.../marvin/integration/lib/base/EventTypes.py | 33 +
tools/marvin/marvin/integration/lib/base/Events.py | 33 +
.../marvin/integration/lib/base/FirewallRule.py | 51 +
.../integration/lib/base/FromLoadBalancerRule.py | 33 +
tools/marvin/marvin/integration/lib/base/Host.py | 70 +
.../integration/lib/base/HostForMaintenance.py | 32 +
.../marvin/integration/lib/base/HostMaintenance.py | 32 +
.../marvin/integration/lib/base/HostPassword.py | 33 +
.../integration/lib/base/HypervisorCapabilities.py | 40 +
.../marvin/integration/lib/base/Hypervisors.py | 33 +
.../marvin/integration/lib/base/InstanceGroup.py | 59 +
.../marvin/integration/lib/base/IpAddress.py | 39 +
.../integration/lib/base/IpForwardingRule.py | 51 +
tools/marvin/marvin/integration/lib/base/Iso.py | 96 +
.../marvin/integration/lib/base/IsoPermissions.py | 42 +
.../integration/lib/base/LBStickinessPolicies.py | 34 +
.../integration/lib/base/LBStickinessPolicy.py | 42 +
.../integration/lib/base/LoadBalancerRule.py | 59 +
.../lib/base/LoadBalancerRuleInstances.py | 34 +
.../marvin/marvin/integration/lib/base/Network.py | 67 +
.../marvin/integration/lib/base/NetworkACL.py | 51 +
.../marvin/integration/lib/base/NetworkDevice.py | 48 +
.../marvin/integration/lib/base/NetworkOffering.py | 58 +
.../integration/lib/base/NetworkServiceProvider.py | 58 +
.../marvin/integration/lib/base/NiciraNvpDevice.py | 53 +
.../lib/base/NiciraNvpDeviceNetworks.py | 34 +
.../marvin/integration/lib/base/OsCategories.py | 33 +
.../marvin/marvin/integration/lib/base/OsTypes.py | 33 +
.../lib/base/PasswordForVirtualMachine.py | 32 +
.../marvin/integration/lib/base/PhysicalNetwork.py | 59 +
tools/marvin/marvin/integration/lib/base/Pod.py | 59 +
.../integration/lib/base/PortForwardingRule.py | 62 +
.../marvin/integration/lib/base/PrivateGateway.py | 51 +
.../marvin/marvin/integration/lib/base/Project.py | 75 +
.../marvin/integration/lib/base/ProjectAccounts.py | 34 +
.../integration/lib/base/ProjectInvitation.py | 49 +
.../integration/lib/base/PublicIpAddresses.py | 33 +
.../marvin/integration/lib/base/RemoteAccessVpn.py | 52 +
tools/marvin/marvin/integration/lib/base/Remove.py | 31 +
.../marvin/integration/lib/base/ResourceCount.py | 32 +
.../marvin/integration/lib/base/ResourceLimit.py | 41 +
tools/marvin/marvin/integration/lib/base/Router.py | 65 +
tools/marvin/marvin/integration/lib/base/S3.py | 43 +
.../marvin/integration/lib/base/SSHKeyPair.py | 60 +
.../integration/lib/base/SecondaryStorage.py | 32 +
.../marvin/integration/lib/base/SecurityGroup.py | 50 +
.../integration/lib/base/SecurityGroupEgress.py | 39 +
.../integration/lib/base/SecurityGroupIngress.py | 39 +
.../integration/lib/base/ServiceForRouter.py | 33 +
.../integration/lib/base/ServiceForSystemVm.py | 33 +
.../lib/base/ServiceForVirtualMachine.py | 33 +
.../marvin/integration/lib/base/ServiceOffering.py | 59 +
.../marvin/marvin/integration/lib/base/Snapshot.py | 51 +
.../integration/lib/base/SnapshotPolicies.py | 41 +
.../marvin/integration/lib/base/SnapshotPolicy.py | 34 +
.../marvin/integration/lib/base/StaticNat.py | 41 +
.../marvin/integration/lib/base/StaticRoute.py | 51 +
.../integration/lib/base/StorageMaintenance.py | 40 +
.../integration/lib/base/StorageNetworkIpRange.py | 59 +
.../marvin/integration/lib/base/StoragePool.py | 59 +
.../lib/base/SupportedNetworkServices.py | 33 +
tools/marvin/marvin/integration/lib/base/Swift.py | 41 +
.../marvin/marvin/integration/lib/base/SystemVm.py | 74 +
tools/marvin/marvin/integration/lib/base/Tags.py | 52 +
.../marvin/marvin/integration/lib/base/Template.py | 102 +
.../integration/lib/base/TemplatePermissions.py | 42 +
.../integration/lib/base/ToLoadBalancerRule.py | 33 +
.../marvin/integration/lib/base/TrafficMonitor.py | 51 +
.../marvin/integration/lib/base/TrafficType.py | 59 +
.../lib/base/TrafficTypeImplementors.py | 33 +
.../marvin/integration/lib/base/UsageRecords.py | 44 +
.../marvin/integration/lib/base/UsageTypes.py | 33 +
tools/marvin/marvin/integration/lib/base/User.py | 91 +
.../marvin/marvin/integration/lib/base/UserKeys.py | 32 +
.../marvin/integration/lib/base/VMPassword.py | 32 +
tools/marvin/marvin/integration/lib/base/VPC.py | 65 +
.../marvin/integration/lib/base/VPCOffering.py | 58 +
.../marvin/integration/lib/base/VirtualMachine.py | 109 +
.../integration/lib/base/VirtualRouterElement.py | 52 +
.../marvin/integration/lib/base/VlanIpRange.py | 51 +
tools/marvin/marvin/integration/lib/base/Volume.py | 97 +
.../marvin/integration/lib/base/VpnConnection.py | 59 +
.../integration/lib/base/VpnCustomerGateway.py | 64 +
.../marvin/integration/lib/base/VpnGateway.py | 51 +
.../marvin/marvin/integration/lib/base/VpnUser.py | 50 +
tools/marvin/marvin/integration/lib/base/Zone.py | 59 +
.../marvin/marvin/integration/lib/base/__init__.py | 16 +
.../integration/lib/factory/AccountFactory.py | 48 +
.../lib/factory/AutoScalePolicyFactory.py | 25 +
.../lib/factory/AutoScaleVmGroupFactory.py | 28 +
.../lib/factory/AutoScaleVmProfileFactory.py | 25 +
.../integration/lib/factory/ConditionFactory.py | 25 +
.../integration/lib/factory/CounterFactory.py | 25 +
.../integration/lib/factory/DiskOfferingFactory.py | 24 +
.../integration/lib/factory/DomainFactory.py | 23 +
.../integration/lib/factory/FirewallRuleFactory.py | 24 +
.../lib/factory/InstanceGroupFactory.py | 23 +
.../integration/lib/factory/IpAddressFactory.py | 22 +
.../lib/factory/IpForwardingRuleFactory.py | 25 +
.../marvin/integration/lib/factory/IsoFactory.py | 26 +
.../lib/factory/LBStickinessPolicyFactory.py | 25 +
.../lib/factory/LoadBalancerRuleFactory.py | 26 +
.../integration/lib/factory/NetworkACLFactory.py | 24 +
.../integration/lib/factory/NetworkFactory.py | 26 +
.../lib/factory/NetworkOfferingFactory.py | 27 +
.../lib/factory/PhysicalNetworkFactory.py | 24 +
.../marvin/integration/lib/factory/PodFactory.py | 27 +
.../lib/factory/PortForwardingRuleFactory.py | 27 +
.../lib/factory/PrivateGatewayFactory.py | 27 +
.../integration/lib/factory/ProjectFactory.py | 24 +
.../lib/factory/RemoteAccessVpnFactory.py | 23 +
.../integration/lib/factory/SSHKeyPairFactory.py | 23 +
.../lib/factory/SecurityGroupFactory.py | 23 +
.../lib/factory/ServiceOfferingFactory.py | 27 +
.../integration/lib/factory/SnapshotFactory.py | 23 +
.../lib/factory/SnapshotPolicyFactory.py | 27 +
.../integration/lib/factory/StaticRouteFactory.py | 24 +
.../lib/factory/StorageNetworkIpRangeFactory.py | 26 +
.../integration/lib/factory/StoragePoolFactory.py | 27 +
.../marvin/integration/lib/factory/TagsFactory.py | 25 +
.../integration/lib/factory/TemplateFactory.py | 25 +
.../marvin/integration/lib/factory/UserFactory.py | 28 +
.../integration/lib/factory/UserKeysFactory.py | 23 +
.../marvin/integration/lib/factory/VPCFactory.py | 27 +
.../integration/lib/factory/VPCOfferingFactory.py | 25 +
.../lib/factory/VirtualMachineFactory.py | 25 +
.../lib/factory/VirtualRouterElementFactory.py | 23 +
.../integration/lib/factory/VlanIpRangeFactory.py | 23 +
.../integration/lib/factory/VolumeFactory.py | 23 +
.../lib/factory/VpnConnectionFactory.py | 24 +
.../lib/factory/VpnCustomerGatewayFactory.py | 27 +
.../integration/lib/factory/VpnGatewayFactory.py | 23 +
.../marvin/integration/lib/factory/ZoneFactory.py | 26 +
.../marvin/integration/lib/factory/__init__.py | 16 +
.../marvin/marvin/integration/lib/generateBase.py | 197 ++
tools/marvin/marvin/integration/lib/oldbase.py | 2424 +++++++++++++++
164 files changed, 9157 insertions(+), 2424 deletions(-)
----------------------------------------------------------------------