Permalink
Browse files

Merge from team/clc-dev/services

  • Loading branch information...
2 parents 1b317b8 + 64418f6 commit 728e54949f3dca404b647d1365641fe4c2233a71 @sjones4 sjones4 committed Feb 22, 2013
Showing with 13,124 additions and 844 deletions.
  1. +4 −0 clc/.classpath
  2. +53 −24 ...les/autoscaling-common/src/main/java/com/eucalyptus/autoscaling/common/AutoScalingMessages.groovy
  3. +6 −0 ...dules/autoscaling-common/src/main/java/com/eucalyptus/autoscaling/common/AutoScalingMetadata.java
  4. +2 −18 clc/modules/autoscaling-common/src/main/resources/autoscaling-binding.xml
  5. +435 −42 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/AutoScalingService.java
  6. +35 −0 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/ResourceInUseException.java
  7. +35 −0 ...ules/autoscaling/src/main/java/com/eucalyptus/autoscaling/ScalingActivityInProgressException.java
  8. +1,371 −0 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/activities/ActivityManager.java
  9. +54 −0 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/activities/ActivityStatusCode.java
  10. +247 −0 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/activities/BackoffRunner.java
  11. +116 −0 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/activities/DispatchingClient.java
  12. +33 −0 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/activities/ElbClient.java
  13. +33 −0 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/activities/EucalyptusClient.java
  14. +99 −0 ...autoscaling/src/main/java/com/eucalyptus/autoscaling/activities/PersistenceScalingActivities.java
  15. +76 −0 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/activities/ScalingActivities.java
  16. +215 −0 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/activities/ScalingActivity.java
  17. +15 −10 ...ules/autoscaling/src/main/java/com/eucalyptus/autoscaling/configurations/LaunchConfiguration.java
  18. +38 −0 ...les/autoscaling/src/main/java/com/eucalyptus/autoscaling/configurations/LaunchConfigurations.java
  19. +2 −2 ...ling/src/main/java/com/eucalyptus/autoscaling/configurations/PersistenceLaunchConfigurations.java
  20. +114 −25 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/groups/AutoScalingGroup.java
  21. +23 −0 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/groups/AutoScalingGroups.java
  22. +81 −2 ...les/autoscaling/src/main/java/com/eucalyptus/autoscaling/groups/PersistenceAutoScalingGroups.java
  23. +139 −1 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/groups/TerminationPolicyType.java
  24. +198 −0 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/instances/AutoScalingInstance.java
  25. +136 −0 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/instances/AutoScalingInstances.java
  26. +28 −0 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/instances/HealthStatus.java
  27. +29 −0 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/instances/LifecycleState.java
  28. +172 −0 ...toscaling/src/main/java/com/eucalyptus/autoscaling/instances/PersistenceAutoScalingInstances.java
  29. +6 −1 ...odules/autoscaling/src/main/java/com/eucalyptus/autoscaling/metadata/AbstractOwnedPersistent.java
  30. +80 −91 ...dules/autoscaling/src/main/java/com/eucalyptus/autoscaling/metadata/AbstractOwnedPersistents.java
  31. +114 −0 ...ain/java/com/eucalyptus/autoscaling/metadata/AbstractOwnedPersistentsWithResourceNameSupport.java
  32. +2 −2 ...les/autoscaling/src/main/java/com/eucalyptus/autoscaling/policies/PersistenceScalingPolicies.java
  33. +142 −0 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/tags/AutoScalingGroupTag.java
  34. +139 −0 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/tags/Tag.java
  35. +213 −0 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/tags/TagSupport.java
  36. +51 −0 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/tags/TagSupportDiscovery.java
  37. +232 −0 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/tags/Tags.java
  38. +1 −1 clc/modules/autoscaling/src/main/java/com/eucalyptus/autoscaling/ws/AutoScalingQueryBinding.java
  39. +172 −31 clc/modules/autoscaling/src/test/java/com/eucalyptus/autoscaling/AutoScalingBindingTest.groovy
  40. +323 −63 clc/modules/autoscaling/src/test/java/com/eucalyptus/autoscaling/AutoScalingServiceTest.groovy
  41. +783 −0 ...odules/autoscaling/src/test/java/com/eucalyptus/autoscaling/activities/ActivityManagerTest.groovy
  42. +191 −0 clc/modules/autoscaling/src/test/java/com/eucalyptus/autoscaling/activities/BackoffRunnerTest.groovy
  43. +57 −0 clc/modules/autoscaling/src/test/java/com/eucalyptus/autoscaling/activities/TestClients.java
  44. +160 −0 ...ules/autoscaling/src/test/java/com/eucalyptus/autoscaling/groups/TerminationPolicyTypeTest.groovy
  45. +55 −18 clc/modules/cloudwatch-common/src/main/java/com/eucalyptus/cloudwatch/CloudWatchMessages.groovy
  46. +31 −16 clc/modules/cloudwatch-common/src/main/resources/cloudwatch-binding.xml
  47. +172 −6 clc/modules/cloudwatch/src/main/java/com/eucalyptus/cloudwatch/CloudWatchService.java
  48. +319 −0 ...ch/src/main/java/com/eucalyptus/cloudwatch/domain/dimension/AbstractPersistentWithDimensions.java
  49. +6 −6 ...alyptus/cloudwatch/domain/{listmetrics/ListMetricDimension.java → dimension/DimensionEntity.java}
  50. +2 −306 clc/modules/cloudwatch/src/main/java/com/eucalyptus/cloudwatch/domain/listmetrics/ListMetric.java
  51. +7 −4 ...ules/cloudwatch/src/main/java/com/eucalyptus/cloudwatch/domain/listmetrics/ListMetricManager.java
  52. +16 −15 ...odules/cloudwatch/src/main/java/com/eucalyptus/cloudwatch/domain/listmetrics/ListMetricsTest.java
  53. +96 −0 .../src/main/java/com/eucalyptus/cloudwatch/domain/metricdata/GetMetricStatisticsAggregationKey.java
  54. +158 −0 ...modules/cloudwatch/src/main/java/com/eucalyptus/cloudwatch/domain/metricdata/MetricDataQueue.java
  55. +190 −0 clc/modules/cloudwatch/src/main/java/com/eucalyptus/cloudwatch/domain/metricdata/MetricEntity.java
  56. +691 −0 ...les/cloudwatch/src/main/java/com/eucalyptus/cloudwatch/domain/metricdata/MetricEntityFactory.java
  57. +291 −0 clc/modules/cloudwatch/src/main/java/com/eucalyptus/cloudwatch/domain/metricdata/MetricManager.java
  58. +146 −0 ...modules/cloudwatch/src/main/java/com/eucalyptus/cloudwatch/domain/metricdata/MetricQueueItem.java
  59. +160 −0 ...odules/cloudwatch/src/main/java/com/eucalyptus/cloudwatch/domain/metricdata/MetricStatistics.java
  60. +57 −0 clc/modules/cloudwatch/src/main/java/com/eucalyptus/cloudwatch/domain/metricdata/MetricTest.java
  61. +99 −0 ...dwatch/src/main/java/com/eucalyptus/cloudwatch/domain/metricdata/PutMetricDataAggregationKey.java
  62. +255 −0 clc/modules/cloudwatch/src/test/java/com/eucalyptus/cloudwatch/CloudWatchBindingTest.groovy
  63. +615 −0 clc/modules/cloudwatch/src/test/java/com/eucalyptus/cloudwatch/TestAggregationQueue.java
  64. +17 −2 clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/Allocations.java
  65. +3 −0 ...modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/DescribeSensorCallback.java
  66. +2 −0 clc/modules/cluster-manager/src/main/java/com/eucalyptus/images/ImageManager.java
  67. +23 −0 clc/modules/cluster-manager/src/main/java/com/eucalyptus/tags/Filter.java
  68. +117 −9 clc/modules/cluster-manager/src/main/java/com/eucalyptus/tags/FilterSupport.java
  69. +94 −7 clc/modules/cluster-manager/src/main/java/com/eucalyptus/tags/Filters.java
  70. +15 −2 clc/modules/cluster-manager/src/main/java/com/eucalyptus/tags/TagManager.java
  71. +15 −3 clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmBootRecord.java
  72. +123 −7 clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmControl.java
  73. +59 −5 clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmInstance.java
  74. +21 −0 clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmInstances.java
  75. +40 −5 ...ules/loadbalancing-common/src/main/java/com/eucalyptus/loadbalancing/LoadBalancingMessages.groovy
  76. +22 −13 clc/modules/loadbalancing-common/src/main/resources/loadbalancing-binding.xml
  77. +19 −0 clc/modules/loadbalancing/src/main/java/com/eucalyptus/loadbalancing/LoadBalancer.java
  78. +12 −0 ...modules/loadbalancing/src/main/java/com/eucalyptus/loadbalancing/LoadBalancerBackendInstance.java
  79. +12 −3 clc/modules/loadbalancing/src/main/java/com/eucalyptus/loadbalancing/LoadBalancerListener.java
  80. +27 −1 clc/modules/loadbalancing/src/main/java/com/eucalyptus/loadbalancing/LoadBalancerZone.java
  81. +109 −1 clc/modules/loadbalancing/src/main/java/com/eucalyptus/loadbalancing/LoadBalancingService.java
  82. +148 −0 clc/modules/loadbalancing/src/main/java/com/eucalyptus/loadbalancing/activities/ActivityManager.java
  83. +184 −0 .../loadbalancing/src/main/java/com/eucalyptus/loadbalancing/activities/EucalyptusActivityTasks.java
  84. +28 −0 clc/modules/loadbalancing/src/main/java/com/eucalyptus/loadbalancing/activities/EventHandler.java
  85. +55 −0 ...odules/loadbalancing/src/main/java/com/eucalyptus/loadbalancing/activities/EventHandlerChain.java
  86. +157 −0 ...dules/loadbalancing/src/main/java/com/eucalyptus/loadbalancing/activities/EventHandlerChains.java
  87. +172 −0 ...oadbalancing/src/main/java/com/eucalyptus/loadbalancing/activities/LoadBalancerServoInstance.java
  88. +83 −0 ...balancing/src/main/java/com/eucalyptus/loadbalancing/activities/LoadbalancerInstanceLauncher.java
  89. +53 −0 ...es/loadbalancing/src/main/java/com/eucalyptus/loadbalancing/activities/LoadbalancingEvents.groovy
  90. +0 −1 ...odules/loadbalancing/src/main/java/com/eucalyptus/loadbalancing/ws/LoadBalancingQueryBinding.java
  91. +2 −2 ...odules/loadbalancing/src/main/java/com/eucalyptus/loadbalancing/ws/LoadBalancingSoapPipeline.java
  92. +106 −0 clc/modules/loadbalancing/src/test/java/com/eucalyptus/loadbalancing/LoadBalancingBindingTest.groovy
  93. +3 −1 clc/modules/module-inc.order
  94. +33 −2 clc/modules/msgs/src/main/java/com/eucalyptus/auth/policy/PolicySpec.java
  95. +1 −1 clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Eucalyptus.java
  96. +16 −0 clc/modules/msgs/src/main/java/com/eucalyptus/context/ServiceContext.java
  97. +86 −2 clc/modules/msgs/src/main/java/com/eucalyptus/util/CollectionUtils.java
  98. +36 −0 clc/modules/msgs/src/main/java/com/eucalyptus/util/Strings.java
  99. +38 −1 clc/modules/msgs/src/main/java/com/eucalyptus/util/async/Futures.java
  100. +5 −1 clc/modules/msgs/src/main/java/com/eucalyptus/ws/Handlers.java
  101. +66 −0 clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/InternalImpersonationHandler.java
  102. +104 −71 clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/BaseQueryBinding.java
  103. +71 −1 clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/VmControl.groovy
  104. +1 −1 clc/modules/msgs/src/main/resources/2011-11-01-binding.xml
  105. +1 −1 clc/modules/msgs/src/main/resources/2011-12-01-binding.xml
  106. +1 −1 clc/modules/msgs/src/main/resources/2011-12-15-binding.xml
  107. +1 −1 clc/modules/msgs/src/main/resources/2012-03-01-binding.xml
  108. +1 −1 clc/modules/msgs/src/main/resources/2012-04-01-binding.xml
  109. +1 −1 clc/modules/msgs/src/main/resources/2012-05-01-binding.xml
  110. +1 −1 clc/modules/msgs/src/main/resources/2012-06-01-binding.xml
  111. +1 −1 clc/modules/msgs/src/main/resources/2012-06-15-binding.xml
  112. +1 −1 clc/modules/msgs/src/main/resources/2012-07-20-binding.xml
  113. +1 −1 clc/modules/msgs/src/main/resources/2012-08-15-binding.xml
  114. +1 −1 clc/modules/msgs/src/main/resources/2012-10-01-binding.xml
  115. +46 −0 clc/modules/msgs/src/main/resources/2012-12-01-binding.xml
  116. +472 −0 clc/modules/msgs/src/main/resources/aws-instances-11-11-01.xml
  117. +101 −0 clc/modules/msgs/src/test/java/com/eucalyptus/util/async/FuturesTest.groovy
  118. +223 −0 clc/modules/msgs/src/test/java/com/eucalyptus/ws/protocol/BaseQueryBindingTest.groovy
  119. +213 −0 clc/modules/msgs/src/test/java/com/eucalyptus/ws/protocol/QueryBindingTestSupport.groovy
  120. +52 −0 clc/modules/msgs/src/test/java/com/eucalyptus/ws/protocol/TestQueryBinding.java
  121. +2 −8 clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/pipeline/InternalClientPipeline.java
  122. +6 −0 clc/modules/www/src/main/java/com/eucalyptus/www/X509Download.java
View
@@ -2,6 +2,10 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="modules/authentication/src/main/java"/>
+ <classpathentry kind="src" path="modules/autoscaling-common/src/main/java"/>
+ <classpathentry kind="src" path="modules/cloudwatch-common/src/main/java"/>
+ <classpathentry kind="src" path="modules/autoscaling/src/main/java"/>
+ <classpathentry kind="src" path="modules/cloudwatch/src/main/java"/>
<classpathentry kind="src" path="modules/cloud/src/main/java"/>
<classpathentry kind="src" path="modules/cluster-manager/src/main/java"/>
<classpathentry kind="src" path="modules/cluster-manager/conf/scripts"/>
@@ -67,8 +67,9 @@ public class SuspendProcessesResponseType extends AutoScalingMessage {
public SuspendProcessesResponseType() { }
ResponseMetadata responseMetadata = new ResponseMetadata()
}
-public class AutoScalingNotificationTypes extends AutoScalingMessage {
+public class AutoScalingNotificationTypes extends EucalyptusData {
public AutoScalingNotificationTypes() { }
+ @HttpParameterMapping(parameter="member")
ArrayList<String> member = new ArrayList<String>()
}
public class TerminateInstanceInAutoScalingGroupType extends AutoScalingMessage {
@@ -96,13 +97,11 @@ public class LoadBalancerNames extends EucalyptusData {
if ( names != null ) member.addAll( names )
}
@HttpParameterMapping(parameter="member")
- @HttpEmbedded(multiple=true)
ArrayList<String> member = new ArrayList<String>()
}
public class PolicyNames extends EucalyptusData {
public PolicyNames() { }
@HttpParameterMapping(parameter="member")
- @HttpEmbedded(multiple=true)
ArrayList<String> member = new ArrayList<String>()
}
public class DescribeTerminationPolicyTypesType extends AutoScalingMessage {
@@ -122,12 +121,13 @@ public class DeleteAutoScalingGroupType extends AutoScalingMessage {
public DeleteAutoScalingGroupType() { }
}
public class DescribeNotificationConfigurationsType extends AutoScalingMessage {
+ @HttpEmbedded
AutoScalingGroupNames autoScalingGroupNames
String nextToken
Integer maxRecords
public DescribeNotificationConfigurationsType() { }
}
-public class ScheduledUpdateGroupAction extends AutoScalingMessage {
+public class ScheduledUpdateGroupAction extends EucalyptusData {
String autoScalingGroupName
String scheduledActionName
String scheduledActionARN
@@ -203,10 +203,11 @@ public class DescribeAutoScalingInstancesResponseType extends AutoScalingMessage
public class PutNotificationConfigurationType extends AutoScalingMessage {
String autoScalingGroupName
String topicARN
+ @HttpEmbedded
AutoScalingNotificationTypes notificationTypes
public PutNotificationConfigurationType() { }
}
-public class MetricCollectionTypes extends AutoScalingMessage {
+public class MetricCollectionTypes extends EucalyptusData {
public MetricCollectionTypes() { }
ArrayList<MetricCollectionType> member = new ArrayList<MetricCollectionType>()
}
@@ -261,6 +262,7 @@ public class InstanceMonitoring extends EucalyptusData {
}
public class DescribeScheduledActionsType extends AutoScalingMessage {
String autoScalingGroupName
+ @HttpEmbedded
ScheduledActionNames scheduledActionNames
Date startTime
Date endTime
@@ -270,6 +272,7 @@ public class DescribeScheduledActionsType extends AutoScalingMessage {
}
public class Filter extends EucalyptusData {
String name
+ @HttpEmbedded
Values values
public Filter() { }
}
@@ -281,7 +284,7 @@ public class Alarms extends EucalyptusData {
ArrayList<Alarm> member = new ArrayList<Alarm>()
}
public class DescribeAutoScalingInstancesResult extends EucalyptusData {
- AutoScalingInstances autoScalingInstances
+ AutoScalingInstances autoScalingInstances = new AutoScalingInstances()
String nextToken
public DescribeAutoScalingInstancesResult() { }
}
@@ -304,11 +307,12 @@ public class DescribeMetricCollectionTypesResponseType extends AutoScalingMessag
DescribeMetricCollectionTypesResult describeMetricCollectionTypesResult = new DescribeMetricCollectionTypesResult()
ResponseMetadata responseMetadata = new ResponseMetadata()
}
-public class AutoScalingInstances extends AutoScalingMessage {
+public class AutoScalingInstances extends EucalyptusData {
public AutoScalingInstances() { }
ArrayList<AutoScalingInstanceDetails> member = new ArrayList<AutoScalingInstanceDetails>()
}
public class DescribeTagsType extends AutoScalingMessage {
+ @HttpEmbedded
Filters filters
String nextToken
Integer maxRecords
@@ -345,6 +349,7 @@ public class CreateAutoScalingGroupType extends AutoScalingMessage {
String vpcZoneIdentifier
@HttpEmbedded
TerminationPolicies terminationPolicies
+ @HttpEmbedded
Tags tags
public CreateAutoScalingGroupType() { }
public Collection<String> availabilityZones() {
@@ -359,6 +364,7 @@ public class CreateAutoScalingGroupType extends AutoScalingMessage {
}
public class DisableMetricsCollectionType extends AutoScalingMessage {
String autoScalingGroupName
+ @HttpEmbedded
Metrics metrics
public DisableMetricsCollectionType() { }
}
@@ -371,10 +377,9 @@ public class TerminationPolicies extends EucalyptusData {
if ( terminationPolicies != null ) member.addAll( terminationPolicies )
}
@HttpParameterMapping(parameter="member")
- @HttpEmbedded(multiple=true)
ArrayList<String> member = new ArrayList<String>()
}
-public class NotificationConfiguration extends AutoScalingMessage {
+public class NotificationConfiguration extends EucalyptusData {
String autoScalingGroupName
String topicARN
String notificationType
@@ -392,6 +397,7 @@ public class DescribeNotificationConfigurationsResponseType extends AutoScalingM
}
public class ScheduledActionNames extends EucalyptusData {
public ScheduledActionNames() { }
+ @HttpParameterMapping(parameter="member")
ArrayList<String> member = new ArrayList<String>()
}
public class AvailabilityZones extends EucalyptusData {
@@ -400,7 +406,6 @@ public class AvailabilityZones extends EucalyptusData {
if ( zones != null ) member.addAll( zones )
}
@HttpParameterMapping(parameter="member")
- @HttpEmbedded(multiple=true)
ArrayList<String> member = new ArrayList<String>()
}
public class DescribeScalingActivitiesResult extends EucalyptusData {
@@ -413,6 +418,7 @@ public class DescribeAutoScalingNotificationTypesType extends AutoScalingMessage
}
public class Metrics extends EucalyptusData {
public Metrics() { }
+ @HttpParameterMapping(parameter="member")
ArrayList<String> member = new ArrayList<String>()
}
public class DeleteScheduledActionResponseType extends AutoScalingMessage {
@@ -426,6 +432,7 @@ public class DescribeNotificationConfigurationsResult extends EucalyptusData {
}
public class EnableMetricsCollectionType extends AutoScalingMessage {
String autoScalingGroupName
+ @HttpEmbedded
Metrics metrics
String granularity
public EnableMetricsCollectionType() { }
@@ -459,7 +466,7 @@ public class SecurityGroups extends EucalyptusData {
@HttpParameterMapping(parameter="member")
ArrayList<String> member = new ArrayList<String>()
}
-public class NotificationConfigurations extends AutoScalingMessage {
+public class NotificationConfigurations extends EucalyptusData {
public NotificationConfigurations() { }
ArrayList<NotificationConfiguration> member = new ArrayList<NotificationConfiguration>()
}
@@ -474,10 +481,13 @@ public class DescribeScheduledActionsResponseType extends AutoScalingMessage {
}
public class Filters extends EucalyptusData {
public Filters() { }
+ @HttpEmbedded
+ @HttpParameterMapping(parameter="member")
ArrayList<Filter> member = new ArrayList<Filter>()
}
public class ResumeProcessesType extends AutoScalingMessage {
String autoScalingGroupName
+ @HttpEmbedded
ProcessNames scalingProcesses
public ResumeProcessesType() { }
}
@@ -488,18 +498,20 @@ public class DescribeAdjustmentTypesResponseType extends AutoScalingMessage {
}
public class InstanceIds extends EucalyptusData {
public InstanceIds() { }
+ @HttpParameterMapping(parameter="member")
ArrayList<String> member = new ArrayList<String>()
}
public class SuspendProcessesType extends AutoScalingMessage {
String autoScalingGroupName
+ @HttpEmbedded
ProcessNames scalingProcesses
public SuspendProcessesType() { }
}
-public class LaunchConfigurationsType extends AutoScalingMessage {
+public class LaunchConfigurationsType extends EucalyptusData {
public LaunchConfigurationsType() { }
ArrayList<LaunchConfigurationType> member = new ArrayList<LaunchConfigurationType>()
}
-public class Instances extends AutoScalingMessage {
+public class Instances extends EucalyptusData {
public Instances() { }
ArrayList<Instance> member = new ArrayList<Instance>()
}
@@ -513,12 +525,21 @@ public class DescribeScheduledActionsResult extends EucalyptusData {
public DescribeScheduledActionsResult() { }
}
public class DescribeAutoScalingInstancesType extends AutoScalingMessage {
+ @HttpEmbedded
InstanceIds instanceIds
Integer maxRecords
String nextToken
public DescribeAutoScalingInstancesType() { }
+ public List<String> instanceIds() {
+ List<String> names = Lists.newArrayList()
+ if ( instanceIds != null ) {
+ names = instanceIds.getMember()
+ }
+ return names
+ }
}
public class DeleteTagsType extends AutoScalingMessage {
+ @HttpEmbedded
Tags tags
public DeleteTagsType() { }
}
@@ -536,13 +557,13 @@ public class DescribePoliciesResponseType extends AutoScalingMessage {
DescribePoliciesResult describePoliciesResult = new DescribePoliciesResult()
ResponseMetadata responseMetadata = new ResponseMetadata()
}
-public class Tag extends EucalyptusData {
+public class TagType extends EucalyptusData {
String resourceId
String resourceType
String key
String value
Boolean propagateAtLaunch
- public Tag() { }
+ public TagType() { }
}
public class DescribeTagsResponseType extends AutoScalingMessage {
public DescribeTagsResponseType() { }
@@ -571,13 +592,14 @@ public class ExecutePolicyResponseType extends AutoScalingMessage {
}
public class ActivityIds extends EucalyptusData {
public ActivityIds() { }
+ @HttpParameterMapping(parameter="member")
ArrayList<String> member = new ArrayList<String>()
}
public class MetricGranularityType extends EucalyptusData {
String granularity
public MetricGranularityType() { }
}
-public class AdjustmentTypes extends AutoScalingMessage {
+public class AdjustmentTypes extends EucalyptusData {
public AdjustmentTypes() { }
ArrayList<AdjustmentType> member = new ArrayList<AdjustmentType>()
}
@@ -586,24 +608,25 @@ public class PutScalingPolicyResponseType extends AutoScalingMessage {
PutScalingPolicyResult putScalingPolicyResult = new PutScalingPolicyResult()
ResponseMetadata responseMetadata = new ResponseMetadata()
}
-public class Tags extends AutoScalingMessage {
+public class Tags extends EucalyptusData {
public Tags() { }
@HttpParameterMapping(parameter="member")
@HttpEmbedded(multiple=true)
- ArrayList<Tag> member = new ArrayList<Tag>()
+ ArrayList<TagType> member = new ArrayList<TagType>()
}
public class SetDesiredCapacityResponseType extends AutoScalingMessage {
public SetDesiredCapacityResponseType() { }
ResponseMetadata responseMetadata = new ResponseMetadata()
}
public class DescribeScalingActivitiesType extends AutoScalingMessage {
+ @HttpEmbedded
ActivityIds activityIds
String autoScalingGroupName
Integer maxRecords
String nextToken
public DescribeScalingActivitiesType() { }
}
-public class LaunchConfigurationType extends AutoScalingMessage {
+public class LaunchConfigurationType extends EucalyptusData {
String launchConfigurationName
String launchConfigurationARN
String imageId
@@ -621,7 +644,7 @@ public class LaunchConfigurationType extends AutoScalingMessage {
Boolean ebsOptimized
public LaunchConfigurationType() { }
}
-public class Processes extends AutoScalingMessage {
+public class Processes extends EucalyptusData {
public Processes() { }
ArrayList<ProcessType> member = new ArrayList<ProcessType>()
}
@@ -668,6 +691,7 @@ public class DescribeMetricCollectionTypesResult extends EucalyptusData {
public class BlockDeviceMappingType extends EucalyptusData {
String virtualName
String deviceName
+ @HttpEmbedded
Ebs ebs
public BlockDeviceMappingType() { }
public BlockDeviceMappingType( String deviceName, String virtualName, String snapshotId, Integer volumeSize ) {
@@ -701,7 +725,7 @@ public class DescribePoliciesResult extends EucalyptusData {
String nextToken
public DescribePoliciesResult() { }
}
-public class AutoScalingGroupsType extends AutoScalingMessage {
+public class AutoScalingGroupsType extends EucalyptusData {
public AutoScalingGroupsType() { }
ArrayList<AutoScalingGroupType> member = new ArrayList<AutoScalingGroupType>()
}
@@ -729,7 +753,7 @@ public class DescribeAutoScalingGroupsResponseType extends AutoScalingMessage {
DescribeAutoScalingGroupsResult describeAutoScalingGroupsResult = new DescribeAutoScalingGroupsResult()
ResponseMetadata responseMetadata = new ResponseMetadata()
}
-public class AutoScalingGroupType extends AutoScalingMessage {
+public class AutoScalingGroupType extends EucalyptusData {
String autoScalingGroupName
String autoScalingGroupARN
String launchConfigurationName
@@ -765,7 +789,7 @@ public class DescribeScalingActivitiesResponseType extends AutoScalingMessage {
DescribeScalingActivitiesResult describeScalingActivitiesResult = new DescribeScalingActivitiesResult()
ResponseMetadata responseMetadata = new ResponseMetadata()
}
-public class ScalingPolicyType extends AutoScalingMessage {
+public class ScalingPolicyType extends EucalyptusData {
String autoScalingGroupName
String policyName
Integer scalingAdjustment
@@ -778,10 +802,12 @@ public class ScalingPolicyType extends AutoScalingMessage {
}
public class AutoScalingGroupNames extends EucalyptusData {
public AutoScalingGroupNames() { }
+ @HttpParameterMapping(parameter="member")
ArrayList<String> member = new ArrayList<String>()
}
public class Values extends EucalyptusData {
public Values() { }
+ @HttpParameterMapping(parameter="member")
ArrayList<String> member = new ArrayList<String>()
}
public class Error extends EucalyptusData {
@@ -795,7 +821,7 @@ public class CreateOrUpdateTagsResponseType extends AutoScalingMessage {
public CreateOrUpdateTagsResponseType() { }
ResponseMetadata responseMetadata = new ResponseMetadata()
}
-public class Activities extends AutoScalingMessage {
+public class Activities extends EucalyptusData {
public Activities() { }
ArrayList<Activity> member = new ArrayList<Activity>()
}
@@ -823,6 +849,7 @@ public class ResumeProcessesResponseType extends AutoScalingMessage {
ResponseMetadata responseMetadata = new ResponseMetadata()
}
public class DescribeAutoScalingGroupsType extends AutoScalingMessage {
+ @HttpEmbedded
AutoScalingGroupNames autoScalingGroupNames
String nextToken
Integer maxRecords
@@ -867,11 +894,13 @@ public class DescribeScalingProcessTypesType extends AutoScalingMessage {
public DescribeScalingProcessTypesType() { }
}
public class CreateOrUpdateTagsType extends AutoScalingMessage {
+ @HttpEmbedded
Tags tags
public CreateOrUpdateTagsType() { }
}
public class ProcessNames extends EucalyptusData {
public ProcessNames() { }
+ @HttpParameterMapping(parameter="member")
ArrayList<String> member = new ArrayList<String>()
}
public class DescribeAdjustmentTypesResult extends EucalyptusData {
@@ -48,4 +48,10 @@
@PolicyResourceType( "scalingpolicy" )
public interface ScalingPolicyMetadata extends AutoScalingMetadataWithResourceName {}
+
+ @PolicyResourceType( "instance" )
+ public interface AutoScalingInstanceMetadata extends AutoScalingMetadata {}
+
+ @PolicyResourceType( "tag" )
+ public interface AutoScalingTagMetadata extends AutoScalingMetadata {}
}
Oops, something went wrong.

0 comments on commit 728e549

Please sign in to comment.