Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "JCLOUDS-375: Fix VirtualGuestToNodeMetadata when server returns SoftLayer_Exception_Order_Item_Duplicate" to correct JIRA issue number 

This reverts commit 43f2f0ba3b.
This commit is contained in:
Andrew Phillips 2013-11-13 14:19:56 +01:00
parent 43f2f0ba3b
commit 2abc98ab6b
3 changed files with 1 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java
View File

@ -22,9 +22,7 @@ import static com.google.common.collect.FluentIterable.from;
import java.util.Map;
import java.util.Set;
import javax.annotation.Resource;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import org.jclouds.collect.Memoized;
@ -34,15 +32,12 @@ import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.domain.NodeMetadata.Status;
import org.jclouds.compute.domain.NodeMetadataBuilder;
import org.jclouds.compute.functions.GroupNamingConvention;
import org.jclouds.compute.reference.ComputeServiceConstants;
import org.jclouds.domain.Location;
import org.jclouds.location.predicates.LocationPredicates;
import org.jclouds.logging.Logger;
import org.jclouds.softlayer.SoftLayerApi;
import org.jclouds.softlayer.domain.ProductItem;
import org.jclouds.softlayer.domain.ProductOrder;
import org.jclouds.softlayer.domain.VirtualGuest;
import org.jclouds.softlayer.exceptions.SoftLayerOrderItemDuplicateException;
import org.jclouds.softlayer.predicates.ProductItemPredicates;
import com.google.common.base.Function;
@ -136,10 +131,6 @@ public class VirtualGuestToNodeMetadata implements Function<VirtualGuest, NodeMe
@Singleton
public static class GetImageForVirtualGuest {
@Resource
@Named(ComputeServiceConstants.COMPUTE_LOGGER)
protected Logger logger = Logger.NULL;
private SoftLayerApi api;
@Inject
@ -148,16 +139,10 @@ public class VirtualGuestToNodeMetadata implements Function<VirtualGuest, NodeMe
}
public Image getImage(VirtualGuest guest) {
ProductOrder order = null;
// 'bad' orders have no start cpu's and cause the order lookup to fail.
if (guest.getStartCpus() < 1)
return null;
try {
order = api.getVirtualGuestApi().getOrderTemplate(guest.getId());
} catch (SoftLayerOrderItemDuplicateException e) {
// this is a workaround because SoftLayer throws sometimes 500 internal server errors for the above method call
logger.warn(e, "Cannot get order template for virtualGuestId(%s)", guest.getId());
}
ProductOrder order = api.getVirtualGuestApi().getOrderTemplate(guest.getId());
if (order == null)
return null;
Iterable<ProductItem> items = Iterables.transform(order.getPrices(), ProductItems.item());

25
providers/softlayer/src/main/java/org/jclouds/softlayer/exceptions/SoftLayerOrderItemDuplicateException.java
View File

@ -1,25 +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.
*/
package org.jclouds.softlayer.exceptions;
public class SoftLayerOrderItemDuplicateException extends RuntimeException {
public SoftLayerOrderItemDuplicateException(String message, Exception exception) {
super(message, exception);
}
}

3
providers/softlayer/src/main/java/org/jclouds/softlayer/handlers/SoftLayerErrorHandler.java
View File

@ -26,7 +26,6 @@ import org.jclouds.http.HttpResponse;
import org.jclouds.http.HttpResponseException;
import org.jclouds.rest.AuthorizationException;
import org.jclouds.rest.ResourceNotFoundException;
import org.jclouds.softlayer.exceptions.SoftLayerOrderItemDuplicateException;
import org.jclouds.util.Strings2;
import com.google.common.base.Throwables;
@ -65,8 +64,6 @@ public class SoftLayerErrorHandler implements HttpErrorHandler {
exception = new ResourceNotFoundException(message, exception);
} else if (message.indexOf("currently an active transaction") != -1) {
exception = new IllegalStateException(message, exception);
} else if (message.indexOf("SoftLayer_Exception_Order_Item_Duplicate") != -1) {
exception = new SoftLayerOrderItemDuplicateException(message, exception);
}
}
}