[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a
Garrett Holmstrom
gholms at fedoraproject.org
Sun Jun 16 02:31:18 UTC 2013
The following commit has been merged in the master branch:
commit d64b23545caa55ae34b32efdfca2b6f1f401dc86
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date: Tue May 7 16:05:47 2013 -0700
Port to requestbuilder alpha 10
diff --git a/euca2ools/commands/autoscaling/describeadjustmenttypes.py b/euca2ools/commands/autoscaling/describeadjustmenttypes.py
index 0f9d209..5ff4dc3 100644
--- a/euca2ools/commands/autoscaling/describeadjustmenttypes.py
+++ b/euca2ools/commands/autoscaling/describeadjustmenttypes.py
@@ -29,10 +29,10 @@
# POSSIBILITY OF SUCH DAMAGE.
from euca2ools.commands.autoscaling import AutoScalingRequest
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
-class DescribeAdjustmentTypes(AutoScalingRequest, TabifyingCommand):
+class DescribeAdjustmentTypes(AutoScalingRequest, TabifyingMixin):
DESCRIPTION = ('Describe policy adjustment types usable with scaling '
'policies')
LIST_TAGS = ['AdjustmentTypes']
diff --git a/euca2ools/commands/autoscaling/describeautoscalinggroups.py b/euca2ools/commands/autoscaling/describeautoscalinggroups.py
index ee77fc6..967ece8 100644
--- a/euca2ools/commands/autoscaling/describeautoscalinggroups.py
+++ b/euca2ools/commands/autoscaling/describeautoscalinggroups.py
@@ -30,11 +30,11 @@
from euca2ools.commands.autoscaling import AutoScalingRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
from requestbuilder.response import PaginatedResponse
-class DescribeAutoScalingGroups(AutoScalingRequest, TabifyingCommand):
+class DescribeAutoScalingGroups(AutoScalingRequest, TabifyingMixin):
DESCRIPTION = 'Describe auto-scaling groups'
ARGS = [Arg('AutoScalingGroupNames.member', metavar='ASGROUP',
nargs='*',
diff --git a/euca2ools/commands/autoscaling/describeautoscalinginstances.py b/euca2ools/commands/autoscaling/describeautoscalinginstances.py
index 2cfff45..806bd91 100644
--- a/euca2ools/commands/autoscaling/describeautoscalinginstances.py
+++ b/euca2ools/commands/autoscaling/describeautoscalinginstances.py
@@ -31,11 +31,11 @@
import argparse
from euca2ools.commands.autoscaling import AutoScalingRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
from requestbuilder.response import PaginatedResponse
-class DescribeAutoScalingInstances(AutoScalingRequest, TabifyingCommand):
+class DescribeAutoScalingInstances(AutoScalingRequest, TabifyingMixin):
DESCRIPTION = 'Describe instances in auto-scaling groups'
ARGS = [Arg('InstanceIds.member', metavar='INSTANCE', nargs='*',
help='limit results to specific instances'),
diff --git a/euca2ools/commands/autoscaling/describeautoscalingnotificationtypes.py b/euca2ools/commands/autoscaling/describeautoscalingnotificationtypes.py
index 4f87e64..fceeb58 100644
--- a/euca2ools/commands/autoscaling/describeautoscalingnotificationtypes.py
+++ b/euca2ools/commands/autoscaling/describeautoscalingnotificationtypes.py
@@ -29,11 +29,11 @@
# POSSIBILITY OF SUCH DAMAGE.
from euca2ools.commands.autoscaling import AutoScalingRequest
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
class DescribeAutoScalingNotificationTypes(AutoScalingRequest,
- TabifyingCommand):
+ TabifyingMixin):
DESCRIPTION = 'List all notification types supported by the service'
LIST_TAGS = ['AutoScalingNotificationTypes']
diff --git a/euca2ools/commands/autoscaling/describelaunchconfigurations.py b/euca2ools/commands/autoscaling/describelaunchconfigurations.py
index f5366f2..e50ecf4 100644
--- a/euca2ools/commands/autoscaling/describelaunchconfigurations.py
+++ b/euca2ools/commands/autoscaling/describelaunchconfigurations.py
@@ -30,11 +30,11 @@
from euca2ools.commands.autoscaling import AutoScalingRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
from requestbuilder.response import PaginatedResponse
-class DescribeLaunchConfigurations(AutoScalingRequest, TabifyingCommand):
+class DescribeLaunchConfigurations(AutoScalingRequest, TabifyingMixin):
DESCRIPTION = 'Describe auto-scaling instance launch configurations'
ARGS = [Arg('LaunchConfigurationNames.member', metavar='LAUNCHCONFIG',
nargs='*',
diff --git a/euca2ools/commands/autoscaling/describemetriccollectiontypes.py b/euca2ools/commands/autoscaling/describemetriccollectiontypes.py
index 8b1883d..f947cdb 100644
--- a/euca2ools/commands/autoscaling/describemetriccollectiontypes.py
+++ b/euca2ools/commands/autoscaling/describemetriccollectiontypes.py
@@ -29,10 +29,10 @@
# POSSIBILITY OF SUCH DAMAGE.
from euca2ools.commands.autoscaling import AutoScalingRequest
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
-class DescribeMetricCollectionTypes(AutoScalingRequest, TabifyingCommand):
+class DescribeMetricCollectionTypes(AutoScalingRequest, TabifyingMixin):
DESCRIPTION = 'Describe auto-scaling metrics and granularities'
LIST_TAGS = ['Metrics', 'Granularities']
diff --git a/euca2ools/commands/autoscaling/describenotificationconfigurations.py b/euca2ools/commands/autoscaling/describenotificationconfigurations.py
index fe79f24..939e932 100644
--- a/euca2ools/commands/autoscaling/describenotificationconfigurations.py
+++ b/euca2ools/commands/autoscaling/describenotificationconfigurations.py
@@ -30,11 +30,11 @@
from euca2ools.commands.autoscaling import AutoScalingRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
from requestbuilder.response import PaginatedResponse
-class DescribeNotificationConfigurations(AutoScalingRequest, TabifyingCommand):
+class DescribeNotificationConfigurations(AutoScalingRequest, TabifyingMixin):
DESCRIPTION = ('Describe notification actions associated with '
'auto-scaling groups')
ARGS = [Arg('AutoScalingGroupNames.member', metavar='ASGROUP',
diff --git a/euca2ools/commands/autoscaling/describepolicies.py b/euca2ools/commands/autoscaling/describepolicies.py
index 9cff37c..89fa88a 100644
--- a/euca2ools/commands/autoscaling/describepolicies.py
+++ b/euca2ools/commands/autoscaling/describepolicies.py
@@ -30,11 +30,11 @@
from euca2ools.commands.autoscaling import AutoScalingRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
from requestbuilder.response import PaginatedResponse
-class DescribePolicies(AutoScalingRequest, TabifyingCommand):
+class DescribePolicies(AutoScalingRequest, TabifyingMixin):
DESCRIPTION = 'Describe auto-scaling policies'
ARGS = [Arg('PolicyNames.member', metavar='POLICY', nargs='*',
help='limit results to specific auto-scaling policies'),
diff --git a/euca2ools/commands/autoscaling/describescalingactivities.py b/euca2ools/commands/autoscaling/describescalingactivities.py
index 94571c1..c23122d 100644
--- a/euca2ools/commands/autoscaling/describescalingactivities.py
+++ b/euca2ools/commands/autoscaling/describescalingactivities.py
@@ -30,11 +30,11 @@
from euca2ools.commands.autoscaling import AutoScalingRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
from requestbuilder.response import PaginatedResponse
-class DescribeScalingActivities(AutoScalingRequest, TabifyingCommand):
+class DescribeScalingActivities(AutoScalingRequest, TabifyingMixin):
DESCRIPTION = 'Describe past and current auto-scaling activities'
ARGS = [Arg('ActivityIds.member', metavar='ACTIVITY', nargs='*',
help='limit results to specific auto-scaling activities'),
diff --git a/euca2ools/commands/autoscaling/describescalingprocesstypes.py b/euca2ools/commands/autoscaling/describescalingprocesstypes.py
index 1fd50de..8b203f0 100644
--- a/euca2ools/commands/autoscaling/describescalingprocesstypes.py
+++ b/euca2ools/commands/autoscaling/describescalingprocesstypes.py
@@ -29,10 +29,10 @@
# POSSIBILITY OF SUCH DAMAGE.
from euca2ools.commands.autoscaling import AutoScalingRequest
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
-class DescribeScalingProcessTypes(AutoScalingRequest, TabifyingCommand):
+class DescribeScalingProcessTypes(AutoScalingRequest, TabifyingMixin):
DESCRIPTION = 'List all types of scaling processes'
LIST_TAGS = ['Processes']
diff --git a/euca2ools/commands/autoscaling/describescheduledactions.py b/euca2ools/commands/autoscaling/describescheduledactions.py
index 4ad22d6..9aab22a 100644
--- a/euca2ools/commands/autoscaling/describescheduledactions.py
+++ b/euca2ools/commands/autoscaling/describescheduledactions.py
@@ -30,11 +30,11 @@
from euca2ools.commands.autoscaling import AutoScalingRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
from requestbuilder.response import PaginatedResponse
-class DescribeScheduledActions(AutoScalingRequest, TabifyingCommand):
+class DescribeScheduledActions(AutoScalingRequest, TabifyingMixin):
DESCRIPTION = 'Describe scheduled auto-scaling group actions'
ARGS = [Arg('ScheduledActionNames.member', metavar='ACTION', nargs='*',
help='limit results to specific actions'),
diff --git a/euca2ools/commands/autoscaling/describeterminationpolicytypes.py b/euca2ools/commands/autoscaling/describeterminationpolicytypes.py
index d0b02ab..b65df30 100644
--- a/euca2ools/commands/autoscaling/describeterminationpolicytypes.py
+++ b/euca2ools/commands/autoscaling/describeterminationpolicytypes.py
@@ -29,10 +29,10 @@
# POSSIBILITY OF SUCH DAMAGE.
from euca2ools.commands.autoscaling import AutoScalingRequest
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
-class DescribeTerminationPolicyTypes(AutoScalingRequest, TabifyingCommand):
+class DescribeTerminationPolicyTypes(AutoScalingRequest, TabifyingMixin):
DESCRIPTION = 'List all termination policies supported by the service'
LIST_TAGS = ['TerminationPolicyTypes']
diff --git a/euca2ools/commands/autoscaling/terminateinstanceinautoscalinggroup.py b/euca2ools/commands/autoscaling/terminateinstanceinautoscalinggroup.py
index 037f0c2..6c71692 100644
--- a/euca2ools/commands/autoscaling/terminateinstanceinautoscalinggroup.py
+++ b/euca2ools/commands/autoscaling/terminateinstanceinautoscalinggroup.py
@@ -31,11 +31,11 @@
import argparse
from euca2ools.commands.autoscaling import AutoScalingRequest
from requestbuilder import Arg, MutuallyExclusiveArgList
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
class TerminateInstanceInAutoScalingGroup(AutoScalingRequest,
- TabifyingCommand):
+ TabifyingMixin):
DESCRIPTION = "Manually terminate an auto-scaling instance"
ARGS = [Arg('InstanceId', metavar='INSTANCE',
help='ID of the instance to terminate (required)'),
diff --git a/euca2ools/commands/elasticloadbalancing/applysecuritygroupstoloadbalancer.py b/euca2ools/commands/elasticloadbalancing/applysecuritygroupstoloadbalancer.py
index 2860746..8ffbf32 100644
--- a/euca2ools/commands/elasticloadbalancing/applysecuritygroupstoloadbalancer.py
+++ b/euca2ools/commands/elasticloadbalancing/applysecuritygroupstoloadbalancer.py
@@ -31,10 +31,10 @@
from euca2ools.commands.argtypes import delimited_list
from euca2ools.commands.elasticloadbalancing import ELBRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
-class ApplySecurityGroupsToLoadBalancer(ELBRequest, TabifyingCommand):
+class ApplySecurityGroupsToLoadBalancer(ELBRequest, TabifyingMixin):
DESCRIPTION = ('[VPC only] Associate one or more security groups with a '
'load balancer. All previous associations with security '
'groups will be replaced.')
diff --git a/euca2ools/commands/elasticloadbalancing/attachloadbalancertosubnets.py b/euca2ools/commands/elasticloadbalancing/attachloadbalancertosubnets.py
index b3b2bcf..3a5fce1 100644
--- a/euca2ools/commands/elasticloadbalancing/attachloadbalancertosubnets.py
+++ b/euca2ools/commands/elasticloadbalancing/attachloadbalancertosubnets.py
@@ -31,10 +31,10 @@
from euca2ools.commands.argtypes import delimited_list
from euca2ools.commands.elasticloadbalancing import ELBRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
-class AttachLoadBalancerToSubnets(ELBRequest, TabifyingCommand):
+class AttachLoadBalancerToSubnets(ELBRequest, TabifyingMixin):
DESCRIPTION = '[VPC only] Add a load balancer to one or more subnets'
ARGS = [Arg('LoadBalancerName', metavar='ELB',
help='name of the load balancer to modify (required)'),
diff --git a/euca2ools/commands/elasticloadbalancing/configurehealthcheck.py b/euca2ools/commands/elasticloadbalancing/configurehealthcheck.py
index 253338d..f00060b 100644
--- a/euca2ools/commands/elasticloadbalancing/configurehealthcheck.py
+++ b/euca2ools/commands/elasticloadbalancing/configurehealthcheck.py
@@ -31,10 +31,10 @@
from euca2ools.commands.elasticloadbalancing import ELBRequest
from requestbuilder import Arg
from requestbuilder.exceptions import ArgumentError
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
-class ConfigureHealthCheck(ELBRequest, TabifyingCommand):
+class ConfigureHealthCheck(ELBRequest, TabifyingMixin):
DESCRIPTION = ('Configure health checking for instance registerd with a '
'load balancer')
ARGS = [Arg('LoadBalancerName', metavar='ELB',
diff --git a/euca2ools/commands/elasticloadbalancing/createloadbalancer.py b/euca2ools/commands/elasticloadbalancing/createloadbalancer.py
index f537adb..f3aa617 100644
--- a/euca2ools/commands/elasticloadbalancing/createloadbalancer.py
+++ b/euca2ools/commands/elasticloadbalancing/createloadbalancer.py
@@ -32,10 +32,10 @@ from euca2ools.commands.argtypes import delimited_list
from euca2ools.commands.elasticloadbalancing import ELBRequest
from euca2ools.commands.elasticloadbalancing.argtypes import listener
from requestbuilder import Arg, MutuallyExclusiveArgList
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
-class CreateLoadBalancer(ELBRequest, TabifyingCommand):
+class CreateLoadBalancer(ELBRequest, TabifyingMixin):
DESCRIPTION = ('Create a load balancer\n\nAfter the load balancer is '
'created, instances must be registered with it separately.')
ARGS = [Arg('LoadBalancerName', metavar='ELB',
diff --git a/euca2ools/commands/elasticloadbalancing/deregisterinstancesfromloadbalancer.py b/euca2ools/commands/elasticloadbalancing/deregisterinstancesfromloadbalancer.py
index cdab494..a6bff98 100644
--- a/euca2ools/commands/elasticloadbalancing/deregisterinstancesfromloadbalancer.py
+++ b/euca2ools/commands/elasticloadbalancing/deregisterinstancesfromloadbalancer.py
@@ -31,14 +31,14 @@
from euca2ools.commands.argtypes import delimited_list
from euca2ools.commands.elasticloadbalancing import ELBRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
def instance(inst_as_str):
return {'InstanceId': inst_as_str}
-class DeregisterInstancesFromLoadBalancer(ELBRequest, TabifyingCommand):
+class DeregisterInstancesFromLoadBalancer(ELBRequest, TabifyingMixin):
DESCRIPTION = 'Remove one or more instances from a load balancer'
ARGS = [Arg('LoadBalancerName', metavar='ELB',
help='name of the load balancer to modify (required)'),
diff --git a/euca2ools/commands/elasticloadbalancing/describeinstancehealth.py b/euca2ools/commands/elasticloadbalancing/describeinstancehealth.py
index 053f2e4..9861a4e 100644
--- a/euca2ools/commands/elasticloadbalancing/describeinstancehealth.py
+++ b/euca2ools/commands/elasticloadbalancing/describeinstancehealth.py
@@ -31,14 +31,14 @@
from euca2ools.commands.argtypes import delimited_list
from euca2ools.commands.elasticloadbalancing import ELBRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
def instance(inst_as_str):
return {'InstanceId': inst_as_str}
-class DescribeInstanceHealth(ELBRequest, TabifyingCommand):
+class DescribeInstanceHealth(ELBRequest, TabifyingMixin):
DESCRIPTION = 'Show the state of instances registered with a load balancer'
ARGS = [Arg('LoadBalancerName', metavar='ELB', help='''name of the load
balancer to describe instances for (required)'''),
diff --git a/euca2ools/commands/elasticloadbalancing/describeloadbalancerpolicies.py b/euca2ools/commands/elasticloadbalancing/describeloadbalancerpolicies.py
index f010c96..2637555 100644
--- a/euca2ools/commands/elasticloadbalancing/describeloadbalancerpolicies.py
+++ b/euca2ools/commands/elasticloadbalancing/describeloadbalancerpolicies.py
@@ -31,10 +31,10 @@
from euca2ools.commands.argtypes import delimited_list
from euca2ools.commands.elasticloadbalancing import ELBRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
-class DescribeLoadBalancerPolicies(ELBRequest, TabifyingCommand):
+class DescribeLoadBalancerPolicies(ELBRequest, TabifyingMixin):
DESCRIPTION = 'Show information about load balancer policies'
ARGS = [Arg('LoadBalancerName', metavar='ELB', nargs='?', help='''show
policies associated with a specific load balancer (default:
diff --git a/euca2ools/commands/elasticloadbalancing/describeloadbalancerpolicytypes.py b/euca2ools/commands/elasticloadbalancing/describeloadbalancerpolicytypes.py
index 2b84710..aad8798 100644
--- a/euca2ools/commands/elasticloadbalancing/describeloadbalancerpolicytypes.py
+++ b/euca2ools/commands/elasticloadbalancing/describeloadbalancerpolicytypes.py
@@ -30,10 +30,10 @@
from euca2ools.commands.elasticloadbalancing import ELBRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
-class DescribeLoadBalancerPolicyTypes(ELBRequest, TabifyingCommand):
+class DescribeLoadBalancerPolicyTypes(ELBRequest, TabifyingMixin):
DESCRIPTION = 'Show information about load balancer policy types'
ARGS = [Arg('PolicyTypeNames.member', metavar='POLTYPE', nargs='*',
help='limit results to specific policy types'),
diff --git a/euca2ools/commands/elasticloadbalancing/describeloadbalancers.py b/euca2ools/commands/elasticloadbalancing/describeloadbalancers.py
index e8abf8a..793a4a4 100644
--- a/euca2ools/commands/elasticloadbalancing/describeloadbalancers.py
+++ b/euca2ools/commands/elasticloadbalancing/describeloadbalancers.py
@@ -30,10 +30,10 @@
from euca2ools.commands.elasticloadbalancing import ELBRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
-class DescribeLoadBalancers(ELBRequest, TabifyingCommand):
+class DescribeLoadBalancers(ELBRequest, TabifyingMixin):
DESCRIPTION = 'Show information about load balancers'
ARGS = [Arg('LoadBalancerNames.member', metavar='ELB', nargs='*',
help='limit results to specific load balancers'),
diff --git a/euca2ools/commands/elasticloadbalancing/detachloadbalancerfromsubnets.py b/euca2ools/commands/elasticloadbalancing/detachloadbalancerfromsubnets.py
index bfaf1b4..937b7ef 100644
--- a/euca2ools/commands/elasticloadbalancing/detachloadbalancerfromsubnets.py
+++ b/euca2ools/commands/elasticloadbalancing/detachloadbalancerfromsubnets.py
@@ -31,10 +31,10 @@
from euca2ools.commands.argtypes import delimited_list
from euca2ools.commands.elasticloadbalancing import ELBRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
-class DetachLoadBalancerFromSubnets(ELBRequest, TabifyingCommand):
+class DetachLoadBalancerFromSubnets(ELBRequest, TabifyingMixin):
DESCRIPTION = '[VPC only] Remove a load balancer from one or more subnets'
ARGS = [Arg('LoadBalancerName', metavar='ELB',
help='name of the load balancer to modify (required)'),
diff --git a/euca2ools/commands/elasticloadbalancing/disableavailabilityzonesforloadbalancer.py b/euca2ools/commands/elasticloadbalancing/disableavailabilityzonesforloadbalancer.py
index 6e19e82..49cd471 100644
--- a/euca2ools/commands/elasticloadbalancing/disableavailabilityzonesforloadbalancer.py
+++ b/euca2ools/commands/elasticloadbalancing/disableavailabilityzonesforloadbalancer.py
@@ -31,10 +31,10 @@
from euca2ools.commands.argtypes import delimited_list
from euca2ools.commands.elasticloadbalancing import ELBRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
-class DisableAvailabilityZonesForLoadBalancer(ELBRequest, TabifyingCommand):
+class DisableAvailabilityZonesForLoadBalancer(ELBRequest, TabifyingMixin):
DESCRIPTION = 'Remove a load balancer from one or more availability zones'
ARGS = [Arg('LoadBalancerName', metavar='ELB',
help='name of the load balancer to modify (required)'),
diff --git a/euca2ools/commands/elasticloadbalancing/enableavailabilityzonesforloadbalancer.py b/euca2ools/commands/elasticloadbalancing/enableavailabilityzonesforloadbalancer.py
index e7a7a49..e198d42 100644
--- a/euca2ools/commands/elasticloadbalancing/enableavailabilityzonesforloadbalancer.py
+++ b/euca2ools/commands/elasticloadbalancing/enableavailabilityzonesforloadbalancer.py
@@ -31,10 +31,10 @@
from euca2ools.commands.argtypes import delimited_list
from euca2ools.commands.elasticloadbalancing import ELBRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
-class EnableAvailabilityZonesForLoadBalancer(ELBRequest, TabifyingCommand):
+class EnableAvailabilityZonesForLoadBalancer(ELBRequest, TabifyingMixin):
DESCRIPTION = 'Add a load balancer to one or more availability zones'
ARGS = [Arg('LoadBalancerName', metavar='ELB',
help='name of the load balancer to modify (required)'),
diff --git a/euca2ools/commands/elasticloadbalancing/registerinstanceswithloadbalancer.py b/euca2ools/commands/elasticloadbalancing/registerinstanceswithloadbalancer.py
index 039a846..f61f27b 100644
--- a/euca2ools/commands/elasticloadbalancing/registerinstanceswithloadbalancer.py
+++ b/euca2ools/commands/elasticloadbalancing/registerinstanceswithloadbalancer.py
@@ -31,14 +31,14 @@
from euca2ools.commands.argtypes import delimited_list
from euca2ools.commands.elasticloadbalancing import ELBRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
def instance(inst_as_str):
return {'InstanceId': inst_as_str}
-class RegisterInstancesWithLoadBalancer(ELBRequest, TabifyingCommand):
+class RegisterInstancesWithLoadBalancer(ELBRequest, TabifyingMixin):
DESCRIPTION = 'Add one or more instances to a load balancer'
ARGS = [Arg('LoadBalancerName', metavar='ELB',
help='name of the load balancer to modify (required)'),
diff --git a/euca2ools/commands/euare/createaccount.py b/euca2ools/commands/euare/createaccount.py
index 955d0e7..32da182 100644
--- a/euca2ools/commands/euare/createaccount.py
+++ b/euca2ools/commands/euare/createaccount.py
@@ -30,10 +30,10 @@
from euca2ools.commands.euare import EuareRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
-class CreateAccount(EuareRequest, TabifyingCommand):
+class CreateAccount(EuareRequest, TabifyingMixin):
DESCRIPTION = ('[Eucalyptus only] Create a new account. This command is '
'only usable by cloud administrators.')
ARGS = [Arg('-a', '--account-name', dest='AccountName', metavar='ACCOUNT',
diff --git a/euca2ools/commands/euare/getldapsyncstatus.py b/euca2ools/commands/euare/getldapsyncstatus.py
index 66366a5..1455a9f 100644
--- a/euca2ools/commands/euare/getldapsyncstatus.py
+++ b/euca2ools/commands/euare/getldapsyncstatus.py
@@ -29,10 +29,10 @@
# POSSIBILITY OF SUCH DAMAGE.
from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
-class GetLdapSyncStatus(EuareRequest, TabifyingCommand):
+class GetLdapSyncStatus(EuareRequest, TabifyingMixin):
DESCRIPTION = ("[Eucalyptus only] Describe the server's current LDAP "
"synchronization status. This command is only usable by "
"cloud administrators.")
diff --git a/euca2ools/commands/euare/getuserinfo.py b/euca2ools/commands/euare/getuserinfo.py
index 9e3e752..f9229d1 100644
--- a/euca2ools/commands/euare/getuserinfo.py
+++ b/euca2ools/commands/euare/getuserinfo.py
@@ -30,10 +30,10 @@
from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
-class GetUserInfo(EuareRequest, TabifyingCommand):
+class GetUserInfo(EuareRequest, TabifyingMixin):
DESCRIPTION = '[Eucalyptus only] Display information about a user'
ARGS = [Arg('-u', '--user-name', dest='UserName', metavar='USER',
help='''name of the user to display info for (default: current
diff --git a/euca2ools/commands/euare/listaccounts.py b/euca2ools/commands/euare/listaccounts.py
index 3bf468d..33317ef 100644
--- a/euca2ools/commands/euare/listaccounts.py
+++ b/euca2ools/commands/euare/listaccounts.py
@@ -30,10 +30,10 @@
from euca2ools.commands.euare import EuareRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
-class ListAccounts(EuareRequest, TabifyingCommand):
+class ListAccounts(EuareRequest, TabifyingMixin):
DESCRIPTION = ("[Eucalyptus only] List all of the cloud's accounts. This "
"command is only usable by cloud administrators.")
LIST_TAGS = ['Accounts']
diff --git a/euca2ools/commands/euca/__init__.py b/euca2ools/commands/euca/__init__.py
index 9dadd83..d4a85e2 100644
--- a/euca2ools/commands/euca/__init__.py
+++ b/euca2ools/commands/euca/__init__.py
@@ -36,10 +36,10 @@ import os.path
from requestbuilder import Arg, MutuallyExclusiveArgList, AUTH, SERVICE
from requestbuilder.auth import QuerySigV2Auth
from requestbuilder.exceptions import AuthError
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
+from requestbuilder.request import AWSQueryRequest
+from requestbuilder.service import BaseService
from requestbuilder.util import set_userregion
-import requestbuilder.request
-import requestbuilder.service
import requests
import shlex
from string import Template
@@ -133,7 +133,7 @@ class EC2CompatibleQuerySigV2Auth(QuerySigV2Auth):
raise AuthError('missing secret key; please supply one with -S')
-class Eucalyptus(requestbuilder.service.BaseService):
+class Eucalyptus(BaseService):
NAME = 'ec2'
DESCRIPTION = 'Eucalyptus compute cloud service'
API_VERSION = '2013-02-01'
@@ -200,18 +200,16 @@ class Eucalyptus(requestbuilder.service.BaseService):
raise AWSError(response)
-class EucalyptusRequest(requestbuilder.request.AWSQueryRequest,
- TabifyingCommand):
+class EucalyptusRequest(AWSQueryRequest, TabifyingMixin):
SUITE = Euca2ools
SERVICE_CLASS = Eucalyptus
METHOD = 'POST'
def __init__(self, **kwargs):
- requestbuilder.request.AWSQueryRequest.__init__(self, **kwargs)
+ AWSQueryRequest.__init__(self, **kwargs)
def parse_http_response(self, response_body):
- response = requestbuilder.request.AWSQueryRequest.parse_http_response(
- self, response_body)
+ response = AWSQueryRequest.parse_http_response(self, response_body)
# Compute cloud controller responses enclose their useful data inside
# FooResponse elements. If that's all we have after stripping out
# RequestId then just return its contents.
diff --git a/euca2ools/commands/euca/describevmtypes.py b/euca2ools/commands/euca/describevmtypes.py
index 486ddc2..f344de3 100644
--- a/euca2ools/commands/euca/describevmtypes.py
+++ b/euca2ools/commands/euca/describevmtypes.py
@@ -30,10 +30,10 @@
from euca2ools.commands.euca import EucalyptusRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
-class DescribeVmTypes(EucalyptusRequest, TabifyingCommand):
+class DescribeVmTypes(EucalyptusRequest, TabifyingMixin):
DESCRIPTION = '[Eucalyptus only] Show information about instance types'
ARGS = [Arg('VmTypes', metavar='INSTANCETYPE', nargs='*',
help='limit results to specific instance types'),
diff --git a/euca2ools/commands/eustore/describeimages.py b/euca2ools/commands/eustore/describeimages.py
index a6753d3..e97f163 100644
--- a/euca2ools/commands/eustore/describeimages.py
+++ b/euca2ools/commands/eustore/describeimages.py
@@ -30,10 +30,10 @@
from euca2ools.commands.eustore import EuStoreRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
-class DescribeImages(EuStoreRequest, TabifyingCommand):
+class DescribeImages(EuStoreRequest, TabifyingMixin):
DESCRIPTION = 'List images available for installation from EuStore'
ARGS = [Arg('-v', '--verbose', action='store_true',
help='display more information about images than the default')]
diff --git a/euca2ools/commands/monitoring/describealarmhistory.py b/euca2ools/commands/monitoring/describealarmhistory.py
index e5de82b..5e86d1d 100644
--- a/euca2ools/commands/monitoring/describealarmhistory.py
+++ b/euca2ools/commands/monitoring/describealarmhistory.py
@@ -30,11 +30,11 @@
from euca2ools.commands.monitoring import CloudWatchRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
from requestbuilder.response import PaginatedResponse
-class DescribeAlarmHistory(CloudWatchRequest, TabifyingCommand):
+class DescribeAlarmHistory(CloudWatchRequest, TabifyingMixin):
DESCRIPTION = 'Retrieve history for one alarm or all alarms'
ARGS = [Arg('AlarmName', metavar='ALARM', nargs='?',
help='limit results to a specific alarm'),
diff --git a/euca2ools/commands/monitoring/describealarms.py b/euca2ools/commands/monitoring/describealarms.py
index d28aaba..00f9340 100644
--- a/euca2ools/commands/monitoring/describealarms.py
+++ b/euca2ools/commands/monitoring/describealarms.py
@@ -31,11 +31,11 @@
import argparse
from euca2ools.commands.monitoring import CloudWatchRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
from requestbuilder.response import PaginatedResponse
-class DescribeAlarms(CloudWatchRequest, TabifyingCommand):
+class DescribeAlarms(CloudWatchRequest, TabifyingMixin):
DESCRIPTION = 'Describe alarms'
ARGS = [Arg('AlarmNames.member', metavar='ALARM', nargs='*',
help='limit results to specific alarms'),
diff --git a/euca2ools/commands/monitoring/describealarmsformetric.py b/euca2ools/commands/monitoring/describealarmsformetric.py
index 952399b..369cb30 100644
--- a/euca2ools/commands/monitoring/describealarmsformetric.py
+++ b/euca2ools/commands/monitoring/describealarmsformetric.py
@@ -33,11 +33,11 @@ from euca2ools.commands.argtypes import delimited_list
from euca2ools.commands.monitoring import CloudWatchRequest
from euca2ools.commands.monitoring.argtypes import cloudwatch_dimension
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
from requestbuilder.response import PaginatedResponse
-class DescribeAlarmsForMetric(CloudWatchRequest, TabifyingCommand):
+class DescribeAlarmsForMetric(CloudWatchRequest, TabifyingMixin):
DESCRIPTION = ('Describe alarms for a single metric.\n\nNote that all '
"of an alarm's metrics must match exactly to obtain any "
'results.')
diff --git a/euca2ools/commands/monitoring/getmetricstatistics.py b/euca2ools/commands/monitoring/getmetricstatistics.py
index 459ac35..c8bf343 100644
--- a/euca2ools/commands/monitoring/getmetricstatistics.py
+++ b/euca2ools/commands/monitoring/getmetricstatistics.py
@@ -34,11 +34,11 @@ from euca2ools.commands.monitoring import CloudWatchRequest
from euca2ools.commands.monitoring.argtypes import cloudwatch_dimension
from requestbuilder import Arg
from requestbuilder.exceptions import ArgumentError
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
from requestbuilder.response import PaginatedResponse
-class GetMetricStatistics(CloudWatchRequest, TabifyingCommand):
+class GetMetricStatistics(CloudWatchRequest, TabifyingMixin):
DESCRIPTION = "Show a metric's statistics"
ARGS = [Arg('MetricName', metavar='METRIC',
help='name of the metric to get statistics for (required)'),
diff --git a/euca2ools/commands/monitoring/listmetrics.py b/euca2ools/commands/monitoring/listmetrics.py
index fb26ede..db416c3 100644
--- a/euca2ools/commands/monitoring/listmetrics.py
+++ b/euca2ools/commands/monitoring/listmetrics.py
@@ -32,11 +32,11 @@ from euca2ools.commands.argtypes import delimited_list
from euca2ools.commands.monitoring import CloudWatchRequest
from euca2ools.commands.monitoring.argtypes import cloudwatch_dimension
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
from requestbuilder.response import PaginatedResponse
-class ListMetrics(CloudWatchRequest, TabifyingCommand):
+class ListMetrics(CloudWatchRequest, TabifyingMixin):
DESCRIPTION = 'Show a list of monitoring metrics'
ARGS = [Arg('-d', '--dimensions', dest='Dimensions.member',
metavar='KEY1=VALUE1,KEY2=VALUE2,...',
diff --git a/euca2ools/commands/walrus/listallmybuckets.py b/euca2ools/commands/walrus/listallmybuckets.py
index 289abb3..678b389 100644
--- a/euca2ools/commands/walrus/listallmybuckets.py
+++ b/euca2ools/commands/walrus/listallmybuckets.py
@@ -30,11 +30,11 @@
from euca2ools.commands.walrus import WalrusRequest
from requestbuilder import Arg
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
from requestbuilder.xmlparse import parse_listdelimited_aws_xml
-class ListAllMyBuckets(WalrusRequest, TabifyingCommand):
+class ListAllMyBuckets(WalrusRequest, TabifyingMixin):
DESCRIPTION = 'List all buckets owned by your account'
ARGS = [Arg('-l', dest='long_output', action='store_true', route_to=None,
help='''list in long format, with creation dates and owner
diff --git a/euca2ools/commands/walrus/listbucket.py b/euca2ools/commands/walrus/listbucket.py
index a8082f5..ff3921e 100644
--- a/euca2ools/commands/walrus/listbucket.py
+++ b/euca2ools/commands/walrus/listbucket.py
@@ -33,12 +33,12 @@ from euca2ools.commands.walrus import (WalrusRequest,
validate_generic_bucket_name)
from requestbuilder import Arg
from requestbuilder.exceptions import ArgumentError
-from requestbuilder.mixins import TabifyingCommand
+from requestbuilder.mixins import TabifyingMixin
from requestbuilder.response import PaginatedResponse
from requestbuilder.xmlparse import parse_aws_xml
-class ListBucket(WalrusRequest, TabifyingCommand):
+class ListBucket(WalrusRequest, TabifyingMixin):
DESCRIPTION = 'List keys in one or more buckets'
ARGS = [Arg('paths', metavar='BUCKET[/KEY]', nargs='+', route_to=None),
Arg('--max-keys-per-request', dest='max-keys', type=int,
--
managing cloud instances for Eucalyptus
More information about the pkg-eucalyptus-commits
mailing list