EucalyptusActivityTasks.java (eucalyptus-4.4.1) | : | EucalyptusActivityTasks.java (eucalyptus-4.4.2) | ||
---|---|---|---|---|
skipping to change at line 2213 | skipping to change at line 2213 | |||
DeleteAutoScalingGroupType getRequest(){ | DeleteAutoScalingGroupType getRequest(){ | |||
final DeleteAutoScalingGroupType req = new DeleteAutoScal ingGroupType(); | final DeleteAutoScalingGroupType req = new DeleteAutoScal ingGroupType(); | |||
req.setAutoScalingGroupName(this.groupName); | req.setAutoScalingGroupName(this.groupName); | |||
req.setForceDelete(this.terminateInstances); | req.setForceDelete(this.terminateInstances); | |||
return req; | return req; | |||
} | } | |||
@Override | @Override | |||
boolean dispatchFailure(ActivityContext<AutoScalingMessage, AutoS caling> context, Throwable throwable) { | boolean dispatchFailure(ActivityContext<AutoScalingMessage, AutoS caling> context, Throwable throwable) { | |||
if ( !AsyncExceptions.isWebServiceErrorCode( throwable, " | if ( !AsyncExceptions.isWebServiceErrorCode( throwable, " | |||
ScalingActivityInProgress" ) ) { | ScalingActivityInProgress" ) && | |||
!AsyncExceptions.isWebServiceErrorCode( t | ||||
hrowable, "ResourceInUse" ) ) { | ||||
return super.dispatchFailure( context, throwable ); | return super.dispatchFailure( context, throwable ); | |||
} | } | |||
return false; | return false; | |||
} | } | |||
} | } | |||
private class AutoScalingDeleteLaunchConfigTask extends EucalyptusActivit yTask<AutoScalingMessage, AutoScaling>{ | private class AutoScalingDeleteLaunchConfigTask extends EucalyptusActivit yTask<AutoScalingMessage, AutoScaling>{ | |||
private String launchConfigName = null; | private String launchConfigName = null; | |||
private AutoScalingDeleteLaunchConfigTask(final String launchConf igName){ | private AutoScalingDeleteLaunchConfigTask(final String launchConf igName){ | |||
this.launchConfigName = launchConfigName; | this.launchConfigName = launchConfigName; | |||
skipping to change at line 2572 | skipping to change at line 2573 | |||
private class EucalyptusDeleteGroupTask extends EucalyptusActivityTask<Co mputeMessage, Compute>{ | private class EucalyptusDeleteGroupTask extends EucalyptusActivityTask<Co mputeMessage, Compute>{ | |||
private String groupName = null; | private String groupName = null; | |||
EucalyptusDeleteGroupTask(String groupName){ | EucalyptusDeleteGroupTask(String groupName){ | |||
this.groupName = groupName; | this.groupName = groupName; | |||
} | } | |||
DeleteSecurityGroupType getRequest(){ | DeleteSecurityGroupType getRequest(){ | |||
final DeleteSecurityGroupType req = new DeleteSecurityGro upType(); | final DeleteSecurityGroupType req = new DeleteSecurityGro upType(); | |||
req.setGroupName(this.groupName); | req.setGroupName(this.groupName); | |||
return req; | return req; | |||
} | } | |||
@Override | ||||
boolean dispatchFailure( final ActivityContext<ComputeMessage, Co | ||||
mpute> context, final Throwable throwable ) { | ||||
if ( AsyncExceptions.isWebServiceErrorCode( throwable, "I | ||||
nvalidGroup.InUse" ) ) { | ||||
LOG.warn( "Could not delete in-use security group | ||||
" + groupName ); | ||||
return false; | ||||
} else { | ||||
return super.dispatchFailure( context, throwable | ||||
); | ||||
} | ||||
} | ||||
} | } | |||
private class EucalyptusDescribeSecurityGroupTask extends EucalyptusActiv ityTaskWithResult<ComputeMessage, Compute, List<SecurityGroupItemType>>{ | private class EucalyptusDescribeSecurityGroupTask extends EucalyptusActiv ityTaskWithResult<ComputeMessage, Compute, List<SecurityGroupItemType>>{ | |||
@Nullable private List<String> groupIds = null; | @Nullable private List<String> groupIds = null; | |||
@Nullable private List<String> groupNames = null; | @Nullable private List<String> groupNames = null; | |||
@Nullable private String vpcId = null; | @Nullable private String vpcId = null; | |||
EucalyptusDescribeSecurityGroupTask( | EucalyptusDescribeSecurityGroupTask( | |||
@Nullable final List<String> groupIds, | @Nullable final List<String> groupIds, | |||
@Nullable final List<String> groupNames, | @Nullable final List<String> groupNames, | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 18 lines changed or added |