mirror of https://github.com/apache/jclouds.git
commit
ddbb41130d
|
@ -90,7 +90,7 @@ public class CloudStackErrorHandlerTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void test531MakesAuthorizationException() {
|
public void test531MakesAuthorizationException() {
|
||||||
assertCodeMakes("GET", URI.create("https://cloudstack.com/foo"), 531, "", "Unauthoized",
|
assertCodeMakes("GET", URI.create("https://cloudstack.com/foo"), 531, "", "Unauthorized",
|
||||||
AuthorizationException.class);
|
AuthorizationException.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,7 @@ public class UserPredicatesTest {
|
||||||
User.builder().id("random-id").apiKey("random-text").build()
|
User.builder().id("random-id").apiKey("random-text").build()
|
||||||
));
|
));
|
||||||
assertFalse(apiKeyEquals("something-different").apply(
|
assertFalse(apiKeyEquals("something-different").apply(
|
||||||
User.builder().id("randome-id").apiKey("random-text").build()
|
User.builder().id("random-id").apiKey("random-text").build()
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -173,18 +173,18 @@ public class CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions {
|
||||||
|
|
||||||
groups.add(markerGroup);
|
groups.add(markerGroup);
|
||||||
|
|
||||||
RegionNameAndIngressRules regionNameAndIngessRulesForMarkerGroup;
|
RegionNameAndIngressRules regionNameAndIngressRulesForMarkerGroup;
|
||||||
|
|
||||||
if (userSpecifiedTheirOwnGroups(options)) {
|
if (userSpecifiedTheirOwnGroups(options)) {
|
||||||
regionNameAndIngessRulesForMarkerGroup = new RegionNameAndIngressRules(region, markerGroup, new int[] {},
|
regionNameAndIngressRulesForMarkerGroup = new RegionNameAndIngressRules(region, markerGroup, new int[] {},
|
||||||
false);
|
false);
|
||||||
groups.addAll(EC2TemplateOptions.class.cast(options).getGroups());
|
groups.addAll(EC2TemplateOptions.class.cast(options).getGroups());
|
||||||
} else {
|
} else {
|
||||||
regionNameAndIngessRulesForMarkerGroup = new RegionNameAndIngressRules(region, markerGroup, options
|
regionNameAndIngressRulesForMarkerGroup = new RegionNameAndIngressRules(region, markerGroup, options
|
||||||
.getInboundPorts(), true);
|
.getInboundPorts(), true);
|
||||||
}
|
}
|
||||||
// this will create if not yet exists.
|
// this will create if not yet exists.
|
||||||
securityGroupMap.getUnchecked(regionNameAndIngessRulesForMarkerGroup);
|
securityGroupMap.getUnchecked(regionNameAndIngressRulesForMarkerGroup);
|
||||||
}
|
}
|
||||||
return groups.build();
|
return groups.build();
|
||||||
}
|
}
|
||||||
|
|
|
@ -81,7 +81,7 @@ public interface ElasticIPAddressClient {
|
||||||
* @see #describeAddresses
|
* @see #describeAddresses
|
||||||
* @see #releaseAddress
|
* @see #releaseAddress
|
||||||
* @see #associateAddress
|
* @see #associateAddress
|
||||||
* @see <a href="http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DisdisassociateAddress.html"
|
* @see <a href="http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DisassociateAddress.html"
|
||||||
*/
|
*/
|
||||||
void disassociateAddressInRegion(@Nullable String region, String publicIp);
|
void disassociateAddressInRegion(@Nullable String region, String publicIp);
|
||||||
|
|
||||||
|
|
|
@ -58,7 +58,7 @@ public class EC2ComputeServiceContextModuleTest {
|
||||||
for (int i = 0; i < 2; i++) {
|
for (int i = 0; i < 2; i++) {
|
||||||
try {
|
try {
|
||||||
Image image = cacheLoader.load(regionAndName);
|
Image image = cacheLoader.load(regionAndName);
|
||||||
fail("Expected Authrization exception, but got "+image);
|
fail("Expected Authorization exception, but got " + image);
|
||||||
} catch (AuthorizationException e) {
|
} catch (AuthorizationException e) {
|
||||||
// success
|
// success
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,7 @@ import org.jclouds.rest.annotations.Delegate;
|
||||||
import com.google.common.base.Optional;
|
import com.google.common.base.Optional;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides access to Openstack keystone resources via their REST API.
|
* Provides access to OpenStack keystone resources via their REST API.
|
||||||
* <p/>
|
* <p/>
|
||||||
*
|
*
|
||||||
* @author Adam Lowe
|
* @author Adam Lowe
|
||||||
|
|
|
@ -37,7 +37,7 @@ import com.google.common.base.Optional;
|
||||||
import com.google.common.util.concurrent.ListenableFuture;
|
import com.google.common.util.concurrent.ListenableFuture;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides access to Openstack keystone resources via their REST API.
|
* Provides access to OpenStack keystone resources via their REST API.
|
||||||
* <p/>
|
* <p/>
|
||||||
*
|
*
|
||||||
* @author Adam Lowe
|
* @author Adam Lowe
|
||||||
|
|
|
@ -38,7 +38,7 @@ import com.google.common.collect.Multimap;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* We use the annotation {@link org.jclouds.openstack.services.Extension} to
|
* We use the annotation {@link org.jclouds.openstack.services.Extension} to
|
||||||
* bind a class that iimplements an extension API to an {@link Extension}.
|
* bind a class that implements an extension API to an {@link Extension}.
|
||||||
*
|
*
|
||||||
* @author Adrian Cole
|
* @author Adrian Cole
|
||||||
*
|
*
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
<groupId>org.jclouds.api</groupId>
|
<groupId>org.jclouds.api</groupId>
|
||||||
<artifactId>openstack-nova-ec2</artifactId>
|
<artifactId>openstack-nova-ec2</artifactId>
|
||||||
<name>jclouds openstack-nova-ec2 api</name>
|
<name>jclouds openstack-nova-ec2 api</name>
|
||||||
<description>EC2 interface to Openstack Nova</description>
|
<description>EC2 interface to OpenStack Nova</description>
|
||||||
<packaging>bundle</packaging>
|
<packaging>bundle</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
|
|
@ -36,7 +36,7 @@ import com.google.common.collect.ImmutableMap;
|
||||||
import com.google.common.collect.ImmutableSet;
|
import com.google.common.collect.ImmutableSet;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An Openstack Nova Volume
|
* An OpenStack Nova Volume
|
||||||
*/
|
*/
|
||||||
public class Volume {
|
public class Volume {
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ import com.google.common.base.Objects;
|
||||||
import com.google.common.base.Objects.ToStringHelper;
|
import com.google.common.base.Objects.ToStringHelper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An Openstack Nova Volume Attachment (describes how Volumes are attached to Servers)
|
* An OpenStack Nova Volume Attachment (describes how Volumes are attached to Servers)
|
||||||
*/
|
*/
|
||||||
public class VolumeAttachment {
|
public class VolumeAttachment {
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ import com.google.common.base.Objects;
|
||||||
import com.google.common.base.Objects.ToStringHelper;
|
import com.google.common.base.Objects.ToStringHelper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An Openstack Nova Volume Snapshot
|
* An OpenStack Nova Volume Snapshot
|
||||||
*/
|
*/
|
||||||
public class VolumeSnapshot {
|
public class VolumeSnapshot {
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ import com.google.inject.Injector;
|
||||||
* @author David Alves
|
* @author David Alves
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Test(groups = "unit", testName = "GetImageWhenImageInZoneHasActiveStatucPredicateWithResultExpectTest")
|
@Test(groups = "unit", testName = "GetImageWhenImageInZoneHasActiveStatusPredicateWithResultExpectTest")
|
||||||
public class GetImageWhenImageInZoneHasActiveStatusPredicateWithResultExpectTest extends
|
public class GetImageWhenImageInZoneHasActiveStatusPredicateWithResultExpectTest extends
|
||||||
BaseNovaComputeServiceContextExpectTest<Injector> {
|
BaseNovaComputeServiceContextExpectTest<Injector> {
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,7 @@ import org.jclouds.concurrent.Timeout;
|
||||||
public interface ${providerName}Client {
|
public interface ${providerName}Client {
|
||||||
/*
|
/*
|
||||||
* Note all these delegate to methods in ${providerName}AsyncClient with a specified or inherited timeout.
|
* Note all these delegate to methods in ${providerName}AsyncClient with a specified or inherited timeout.
|
||||||
* The singatures should match those of ${providerName}AsyncClient, except the returnvals should not be
|
* The signatures should match those of ${providerName}AsyncClient, except the returnvals should not be
|
||||||
* wrapped in a Future
|
* wrapped in a Future
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
@ -51,15 +51,15 @@ public class VAppTemplatesInOrgs implements Supplier<Set<? extends Image>> {
|
||||||
public Logger logger = Logger.NULL;
|
public Logger logger = Logger.NULL;
|
||||||
|
|
||||||
private final Supplier<Set<? extends Location>> locations;
|
private final Supplier<Set<? extends Location>> locations;
|
||||||
private final Function<Iterable<? extends Location>, Iterable<? extends Org>> organizatonsForLocations;
|
private final Function<Iterable<? extends Location>, Iterable<? extends Org>> organizationsForLocations;
|
||||||
private final ImagesInVCloudExpressOrg imagesInOrg;
|
private final ImagesInVCloudExpressOrg imagesInOrg;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
VAppTemplatesInOrgs(@Memoized Supplier<Set<? extends Location>> locations,
|
VAppTemplatesInOrgs(@Memoized Supplier<Set<? extends Location>> locations,
|
||||||
Function<Iterable<? extends Location>, Iterable<? extends Org>> organizatonsForLocations,
|
Function<Iterable<? extends Location>, Iterable<? extends Org>> organizationsForLocations,
|
||||||
ImagesInVCloudExpressOrg imagesInOrg) {
|
ImagesInVCloudExpressOrg imagesInOrg) {
|
||||||
this.locations = locations;
|
this.locations = locations;
|
||||||
this.organizatonsForLocations = organizatonsForLocations;
|
this.organizationsForLocations = organizationsForLocations;
|
||||||
this.imagesInOrg = imagesInOrg;
|
this.imagesInOrg = imagesInOrg;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -70,6 +70,6 @@ public class VAppTemplatesInOrgs implements Supplier<Set<? extends Image>> {
|
||||||
@Override
|
@Override
|
||||||
public Set<? extends Image> get() {
|
public Set<? extends Image> get() {
|
||||||
logger.debug(">> providing vAppTemplates");
|
logger.debug(">> providing vAppTemplates");
|
||||||
return newLinkedHashSet(concat(transform(organizatonsForLocations.apply(locations.get()), imagesInOrg)));
|
return newLinkedHashSet(concat(transform(organizationsForLocations.apply(locations.get()), imagesInOrg)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -239,7 +239,7 @@ public class VirtualSystemSettingData extends ManagedElement {
|
||||||
/**
|
/**
|
||||||
* Action to take for the virtual system when the software executed by the virtual system fails.
|
* Action to take for the virtual system when the software executed by the virtual system fails.
|
||||||
* Failures in this case means a failure that is detectable by the host platform, such as a
|
* Failures in this case means a failure that is detectable by the host platform, such as a
|
||||||
* non-interuptable wait state condition.
|
* non-interruptible wait state condition.
|
||||||
*/
|
*/
|
||||||
public static enum AutomaticRecoveryAction {
|
public static enum AutomaticRecoveryAction {
|
||||||
|
|
||||||
|
@ -397,7 +397,7 @@ public class VirtualSystemSettingData extends ManagedElement {
|
||||||
/**
|
/**
|
||||||
* Action to take for the virtual system when the software executed by the virtual system fails.
|
* Action to take for the virtual system when the software executed by the virtual system fails.
|
||||||
* Failures in this case means a failure that is detectable by the host platform, such as a
|
* Failures in this case means a failure that is detectable by the host platform, such as a
|
||||||
* non-interuptable wait state condition.
|
* non-interruptible wait state condition.
|
||||||
*/
|
*/
|
||||||
public AutomaticRecoveryAction getAutomaticRecoveryAction() {
|
public AutomaticRecoveryAction getAutomaticRecoveryAction() {
|
||||||
return automaticRecoveryAction;
|
return automaticRecoveryAction;
|
||||||
|
|
|
@ -82,10 +82,7 @@ public interface ComputeServiceAdapter<N, H, I, L> {
|
||||||
return node;
|
return node;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** @return Stringified version of the new node's id. */
|
||||||
*
|
|
||||||
* @return Stringifed version of the new node's id.
|
|
||||||
*/
|
|
||||||
public String getNodeId() {
|
public String getNodeId() {
|
||||||
return nodeId;
|
return nodeId;
|
||||||
}
|
}
|
||||||
|
|
|
@ -231,7 +231,7 @@ public class Base64
|
||||||
* anywhere along their length by specifying
|
* anywhere along their length by specifying
|
||||||
* <var>srcOffset</var> and <var>destOffset</var>.
|
* <var>srcOffset</var> and <var>destOffset</var>.
|
||||||
* This method does not check to make sure your arrays
|
* This method does not check to make sure your arrays
|
||||||
* are large enough to accomodate <var>srcOffset</var> + 3 for
|
* are large enough to accommodate <var>srcOffset</var> + 3 for
|
||||||
* the <var>source</var> array or <var>destOffset</var> + 4 for
|
* the <var>source</var> array or <var>destOffset</var> + 4 for
|
||||||
* the <var>destination</var> array.
|
* the <var>destination</var> array.
|
||||||
* The actual number of significant bytes in your array is
|
* The actual number of significant bytes in your array is
|
||||||
|
@ -579,7 +579,7 @@ public class Base64
|
||||||
* anywhere along their length by specifying
|
* anywhere along their length by specifying
|
||||||
* <var>srcOffset</var> and <var>destOffset</var>.
|
* <var>srcOffset</var> and <var>destOffset</var>.
|
||||||
* This method does not check to make sure your arrays
|
* This method does not check to make sure your arrays
|
||||||
* are large enough to accomodate <var>srcOffset</var> + 4 for
|
* are large enough to accommodate <var>srcOffset</var> + 4 for
|
||||||
* the <var>source</var> array or <var>destOffset</var> + 3 for
|
* the <var>source</var> array or <var>destOffset</var> + 3 for
|
||||||
* the <var>destination</var> array.
|
* the <var>destination</var> array.
|
||||||
* This method returns the actual number of bytes that
|
* This method returns the actual number of bytes that
|
||||||
|
|
|
@ -146,8 +146,7 @@ public class HttpMessage extends PayloadEnclosingImpl {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* Replace header.
|
||||||
* Repla
|
|
||||||
*
|
*
|
||||||
* @see HttpMessage#getHeaders()
|
* @see HttpMessage#getHeaders()
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -80,7 +80,7 @@ public class JAXBParser implements XMLParser {
|
||||||
Unmarshaller unmarshaller = context.createUnmarshaller();
|
Unmarshaller unmarshaller = context.createUnmarshaller();
|
||||||
return (T) unmarshaller.unmarshal(reader);
|
return (T) unmarshaller.unmarshal(reader);
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
throw new IOException("Could not unmarshall document into type: " + type.getSimpleName() + "\n" + xml, ex);
|
throw new IOException("Could not unmarshal document into type: " + type.getSimpleName() + "\n" + xml, ex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -62,7 +62,7 @@ public class BindToXMLPayloadTest {
|
||||||
TestJAXBDomain obj = new TestJAXBDomain();
|
TestJAXBDomain obj = new TestJAXBDomain();
|
||||||
obj.setElem("Hello World");
|
obj.setElem("Hello World");
|
||||||
|
|
||||||
// Add teh unknown content-type header to verify it is changed by the
|
// Add the unknown content-type header to verify it is changed by the
|
||||||
// binder
|
// binder
|
||||||
Multimap<String, String> headers = ImmutableMultimap.<String, String> of("Content-type", "application/unknown");
|
Multimap<String, String> headers = ImmutableMultimap.<String, String> of("Content-type", "application/unknown");
|
||||||
HttpRequest request = HttpRequest.builder().method("GET").endpoint("http://momma").headers(headers)
|
HttpRequest request = HttpRequest.builder().method("GET").endpoint("http://momma").headers(headers)
|
||||||
|
|
|
@ -34,7 +34,7 @@ import org.jclouds.xml.XMLParser;
|
||||||
import com.abiquo.model.transport.SingleResourceTransportDto;
|
import com.abiquo.model.transport.SingleResourceTransportDto;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Binds teh given object to the payload and extracts the path parameters from
|
* Binds the given object to the payload and extracts the path parameters from
|
||||||
* the edit link.
|
* the edit link.
|
||||||
* <p>
|
* <p>
|
||||||
* This method should be used in {@link PUT} methods to automatically extract
|
* This method should be used in {@link PUT} methods to automatically extract
|
||||||
|
|
|
@ -56,9 +56,9 @@ public class VirtualMachineTemplateToImage implements Function<VirtualMachineTem
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
public VirtualMachineTemplateToImage(final Function<Datacenter, Location> datacenterToLocation,
|
public VirtualMachineTemplateToImage(final Function<Datacenter, Location> datacenterToLocation,
|
||||||
@Memoized final Supplier<Map<Integer, Datacenter>> reginoMap) {
|
@Memoized final Supplier<Map<Integer, Datacenter>> regionMap) {
|
||||||
this.datacenterToLocation = checkNotNull(datacenterToLocation, "datacenterToLocation");
|
this.datacenterToLocation = checkNotNull(datacenterToLocation, "datacenterToLocation");
|
||||||
this.regionMap = checkNotNull(reginoMap, "reginoMap");
|
this.regionMap = checkNotNull(regionMap, "regionMap");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -101,7 +101,7 @@ public class VirtualAppliance extends DomainWrapper<VirtualApplianceDto> {
|
||||||
/**
|
/**
|
||||||
* Gets the virtual datacenter where the virtual appliance belongs to.
|
* Gets the virtual datacenter where the virtual appliance belongs to.
|
||||||
*
|
*
|
||||||
* @resturn The virtual datacenter where the virtual appliance belongs to.
|
* @return The virtual datacenter where the virtual appliance belongs to.
|
||||||
* @see API: <a href=
|
* @see API: <a href=
|
||||||
* "http://community.abiquo.com/display/ABI20/Virtual+Datacenter+Resource#VirtualDatacenterResource-RetrieveaVirtualDatacenter"
|
* "http://community.abiquo.com/display/ABI20/Virtual+Datacenter+Resource#VirtualDatacenterResource-RetrieveaVirtualDatacenter"
|
||||||
* > http://community.abiquo.com/display/ABI20/Virtual+Datacenter+
|
* > http://community.abiquo.com/display/ABI20/Virtual+Datacenter+
|
||||||
|
|
|
@ -80,7 +80,7 @@ public class VirtualDatacenter extends DomainWithLimitsWrapper<VirtualDatacenter
|
||||||
/** The enterprise where the rack belongs. */
|
/** The enterprise where the rack belongs. */
|
||||||
private Enterprise enterprise;
|
private Enterprise enterprise;
|
||||||
|
|
||||||
/** The dataceter where the virtual datacenter will be deployed. */
|
/** The datacenter where the virtual datacenter will be deployed. */
|
||||||
private Datacenter datacenter;
|
private Datacenter datacenter;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -282,7 +282,7 @@ public class VirtualDatacenter extends DomainWithLimitsWrapper<VirtualDatacenter
|
||||||
*
|
*
|
||||||
* @param id
|
* @param id
|
||||||
* The id of the storage tier.
|
* The id of the storage tier.
|
||||||
* @return The sotrage tier.
|
* @return The storage tier.
|
||||||
*/
|
*/
|
||||||
public Tier getStorageTier(final Integer id) {
|
public Tier getStorageTier(final Integer id) {
|
||||||
TierDto tier = context.getApi().getCloudApi().getStorageTier(target, id);
|
TierDto tier = context.getApi().getCloudApi().getStorageTier(target, id);
|
||||||
|
@ -499,7 +499,7 @@ public class VirtualDatacenter extends DomainWithLimitsWrapper<VirtualDatacenter
|
||||||
context.getApi().getCloudApi().purchasePublicIp(ip.unwrap());
|
context.getApi().getCloudApi().purchasePublicIp(ip.unwrap());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void releaseePublicIp(final PublicIp ip) {
|
public void releasePublicIp(final PublicIp ip) {
|
||||||
checkNotNull(ip.unwrap().searchLink("release"), ValidationErrors.MISSING_REQUIRED_LINK);
|
checkNotNull(ip.unwrap().searchLink("release"), ValidationErrors.MISSING_REQUIRED_LINK);
|
||||||
context.getApi().getCloudApi().releasePublicIp(ip.unwrap());
|
context.getApi().getCloudApi().releasePublicIp(ip.unwrap());
|
||||||
}
|
}
|
||||||
|
|
|
@ -458,16 +458,16 @@ public class VirtualMachine extends DomainWithTasksWrapper<VirtualMachineWithNod
|
||||||
return setNics(ips != null && !ips.isEmpty() ? ips.get(0).getNetwork() : null, ips, null);
|
return setNics(ips != null && !ips.isEmpty() ? ips.get(0).getNetwork() : null, ips, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public AsyncTask setNics(final List<? extends Ip<?, ?>> ips, final List<UnmanagedNetwork> unmanagetNetworks) {
|
public AsyncTask setNics(final List<? extends Ip<?, ?>> ips, final List<UnmanagedNetwork> unmanagedNetworks) {
|
||||||
// By default the network of the first ip will be used as a gateway
|
// By default the network of the first ip will be used as a gateway
|
||||||
Network<?> gateway = null;
|
Network<?> gateway = null;
|
||||||
if (ips != null && !ips.isEmpty()) {
|
if (ips != null && !ips.isEmpty()) {
|
||||||
gateway = ips.get(0).getNetwork();
|
gateway = ips.get(0).getNetwork();
|
||||||
} else if (unmanagetNetworks != null && !unmanagetNetworks.isEmpty()) {
|
} else if (unmanagedNetworks != null && !unmanagedNetworks.isEmpty()) {
|
||||||
gateway = unmanagetNetworks.get(0);
|
gateway = unmanagedNetworks.get(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
return setNics(gateway, ips, unmanagetNetworks);
|
return setNics(gateway, ips, unmanagedNetworks);
|
||||||
}
|
}
|
||||||
|
|
||||||
public AsyncTask setNics(final Network<?> gatewayNetwork, final List<? extends Ip<?, ?>> ips) {
|
public AsyncTask setNics(final Network<?> gatewayNetwork, final List<? extends Ip<?, ?>> ips) {
|
||||||
|
@ -475,7 +475,7 @@ public class VirtualMachine extends DomainWithTasksWrapper<VirtualMachineWithNod
|
||||||
}
|
}
|
||||||
|
|
||||||
public AsyncTask setNics(final Network<?> gatewayNetwork, final List<? extends Ip<?, ?>> ips,
|
public AsyncTask setNics(final Network<?> gatewayNetwork, final List<? extends Ip<?, ?>> ips,
|
||||||
final List<UnmanagedNetwork> unmanagetNetworks) {
|
final List<UnmanagedNetwork> unmanagedNetworks) {
|
||||||
// Remove the gateway configuration and the current nics
|
// Remove the gateway configuration and the current nics
|
||||||
Iterables.removeIf(target.getLinks(),
|
Iterables.removeIf(target.getLinks(),
|
||||||
Predicates.or(LinkPredicates.isNic(), LinkPredicates.rel(ParentLinkName.NETWORK_GATEWAY)));
|
Predicates.or(LinkPredicates.isNic(), LinkPredicates.rel(ParentLinkName.NETWORK_GATEWAY)));
|
||||||
|
@ -492,8 +492,8 @@ public class VirtualMachine extends DomainWithTasksWrapper<VirtualMachineWithNod
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add unmanaged network references, if given
|
// Add unmanaged network references, if given
|
||||||
if (unmanagetNetworks != null) {
|
if (unmanagedNetworks != null) {
|
||||||
for (UnmanagedNetwork unmanaged : unmanagetNetworks) {
|
for (UnmanagedNetwork unmanaged : unmanagedNetworks) {
|
||||||
RESTLink source = checkNotNull(unmanaged.unwrap().searchLink("ips"), ValidationErrors.MISSING_REQUIRED_LINK
|
RESTLink source = checkNotNull(unmanaged.unwrap().searchLink("ips"), ValidationErrors.MISSING_REQUIRED_LINK
|
||||||
+ "ips");
|
+ "ips");
|
||||||
|
|
||||||
|
|
|
@ -103,7 +103,7 @@ public class VirtualMachineTemplate extends DomainWrapper<VirtualMachineTemplate
|
||||||
public AsyncTask makePersistent(final VirtualDatacenter vdc, final Volume volume, final String persistentTemplateName) {
|
public AsyncTask makePersistent(final VirtualDatacenter vdc, final Volume volume, final String persistentTemplateName) {
|
||||||
RESTLink storageLink = volume.unwrap().getEditLink();
|
RESTLink storageLink = volume.unwrap().getEditLink();
|
||||||
storageLink.setRel("volume");
|
storageLink.setRel("volume");
|
||||||
return makePeristent(vdc, storageLink, persistentTemplateName, null);
|
return makePersistent(vdc, storageLink, persistentTemplateName, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public AsyncTask makePersistent(final VirtualDatacenter vdc, final Tier tier, final String persistentTemplateName,
|
public AsyncTask makePersistent(final VirtualDatacenter vdc, final Tier tier, final String persistentTemplateName,
|
||||||
|
@ -115,10 +115,10 @@ public class VirtualMachineTemplate extends DomainWrapper<VirtualMachineTemplate
|
||||||
storageLink = tier.unwrap().searchLink("self");
|
storageLink = tier.unwrap().searchLink("self");
|
||||||
}
|
}
|
||||||
storageLink.setRel(ParentLinkName.TIER);
|
storageLink.setRel(ParentLinkName.TIER);
|
||||||
return makePeristent(vdc, storageLink, persistentTemplateName, persistentVolumeName);
|
return makePersistent(vdc, storageLink, persistentTemplateName, persistentVolumeName);
|
||||||
}
|
}
|
||||||
|
|
||||||
private AsyncTask makePeristent(final VirtualDatacenter vdc, final RESTLink storageLink,
|
private AsyncTask makePersistent(final VirtualDatacenter vdc, final RESTLink storageLink,
|
||||||
final String persistentTemplateName, final String persistentVolumeName) {
|
final String persistentTemplateName, final String persistentVolumeName) {
|
||||||
VirtualMachineTemplatePersistentDto persistentData = new VirtualMachineTemplatePersistentDto();
|
VirtualMachineTemplatePersistentDto persistentData = new VirtualMachineTemplatePersistentDto();
|
||||||
persistentData.setPersistentTemplateName(persistentTemplateName);
|
persistentData.setPersistentTemplateName(persistentTemplateName);
|
||||||
|
|
|
@ -48,7 +48,7 @@ import com.abiquo.server.core.infrastructure.storage.VolumeManagementDto;
|
||||||
*/
|
*/
|
||||||
@EnterpriseEdition
|
@EnterpriseEdition
|
||||||
public class Volume extends DomainWrapper<VolumeManagementDto> {
|
public class Volume extends DomainWrapper<VolumeManagementDto> {
|
||||||
/** The default state for folumes. */
|
/** The default state for volumes. */
|
||||||
public static final VolumeState DEFAULT_STATE = VolumeState.DETACHED;
|
public static final VolumeState DEFAULT_STATE = VolumeState.DETACHED;
|
||||||
|
|
||||||
/** The virtual datacenter where the volume belongs. */
|
/** The virtual datacenter where the volume belongs. */
|
||||||
|
|
|
@ -73,7 +73,7 @@ public class SystemProperty extends DomainWrapper<SystemPropertyDto> {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "SystemPorperty [getName()=" + getName() + ", getValue()=" + getValue() + "]";
|
return "SystemProperty [getName()=" + getName() + ", getValue()=" + getValue() + "]";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,7 +52,7 @@ public class LicenseOptions extends BaseHttpRequestOptions {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Search inaactive licenses
|
* Search inactive licenses
|
||||||
*/
|
*/
|
||||||
public Builder inactive(final boolean inactive) {
|
public Builder inactive(final boolean inactive) {
|
||||||
this.active = !inactive;
|
this.active = !inactive;
|
||||||
|
|
|
@ -117,7 +117,7 @@ public class Enterprise extends DomainWithLimitsWrapper<EnterpriseDto> {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Update emterprise information in the server with the data from this
|
* Update enterprise information in the server with the data from this
|
||||||
* enterprise.
|
* enterprise.
|
||||||
*
|
*
|
||||||
* @see API: <a href=
|
* @see API: <a href=
|
||||||
|
@ -498,7 +498,7 @@ public class Enterprise extends DomainWithLimitsWrapper<EnterpriseDto> {
|
||||||
DatacenterLimitsDto limitForDatacenter = getLimits(datacenter);
|
DatacenterLimitsDto limitForDatacenter = getLimits(datacenter);
|
||||||
|
|
||||||
ExtendedUtils utils = (ExtendedUtils) context.getUtils();
|
ExtendedUtils utils = (ExtendedUtils) context.getUtils();
|
||||||
// The "rel" for the unmanaged networks is the same than teh one used for
|
// The "rel" for the unmanaged networks is the same than the one used for
|
||||||
// external networks
|
// external networks
|
||||||
HttpResponse response = utils.getAbiquoHttpClient().get(limitForDatacenter.searchLink("externalnetworks"));
|
HttpResponse response = utils.getAbiquoHttpClient().get(limitForDatacenter.searchLink("externalnetworks"));
|
||||||
|
|
||||||
|
@ -680,7 +680,7 @@ public class Enterprise extends DomainWithLimitsWrapper<EnterpriseDto> {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Prohibe the given datacenter to be used by this enterprise. Deletes a
|
* Prohibit the given datacenter to be used by this enterprise. Deletes a
|
||||||
* {@link Limits} object.
|
* {@link Limits} object.
|
||||||
*
|
*
|
||||||
* @param datacenter
|
* @param datacenter
|
||||||
|
|
|
@ -140,7 +140,7 @@ public class Limits extends DomainWithLimitsWrapper<DatacenterLimitsDto> {
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "Limits [id=" + getId() + ", repositoryHard=" + getRepositoryHard() + ", repositorySoft="
|
return "Limits [id=" + getId() + ", repositoryHard=" + getRepositoryHard() + ", repositorySoft="
|
||||||
+ getRepositorySoft() + ", cpuCounthard=" + getCpuCountHardLimit() + ", cpuCountSoft="
|
+ getRepositorySoft() + ", cpuCountHard=" + getCpuCountHardLimit() + ", cpuCountSoft="
|
||||||
+ getCpuCountSoftLimit() + ", hdHardInMB=" + getHdHardLimitInMb() + ", hdSoftInMB=" + getHdSoftLimitInMb()
|
+ getCpuCountSoftLimit() + ", hdHardInMB=" + getHdHardLimitInMb() + ", hdSoftInMB=" + getHdSoftLimitInMb()
|
||||||
+ ", publicIPsHard=" + getPublicIpsHard() + ", publicIpsSoft=" + getPublicIpsSoft() + ", ramHardInMB="
|
+ ", publicIPsHard=" + getPublicIpsHard() + ", publicIpsSoft=" + getPublicIpsSoft() + ", ramHardInMB="
|
||||||
+ getRamHardLimitInMb() + ", ramSoftInMB=" + getRamSoftLimitInMb() + ", storageHard=" + getStorageHard()
|
+ getRamHardLimitInMb() + ", ramSoftInMB=" + getRamSoftLimitInMb() + ", storageHard=" + getStorageHard()
|
||||||
|
|
|
@ -119,7 +119,7 @@ public class User extends DomainWrapper<UserDto> {
|
||||||
target = context.getApi().getEnterpriseApi().updateUser(target);
|
target = context.getApi().getEnterpriseApi().updateUser(target);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<VirtualDatacenter> listPermitedVirtualDatacenters() {
|
public List<VirtualDatacenter> listPermittedVirtualDatacenters() {
|
||||||
List<Integer> ids = extractAvailableDatacenters();
|
List<Integer> ids = extractAvailableDatacenters();
|
||||||
|
|
||||||
// null value means all virtual datacenters all allowed
|
// null value means all virtual datacenters all allowed
|
||||||
|
@ -132,12 +132,12 @@ public class User extends DomainWrapper<UserDto> {
|
||||||
return Lists.newArrayList(listVirtualDatacenters.execute(ids));
|
return Lists.newArrayList(listVirtualDatacenters.execute(ids));
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<VirtualDatacenter> listPermitedVirtualDatacenters(final Predicate<VirtualDatacenter> filter) {
|
public List<VirtualDatacenter> listPermittedVirtualDatacenters(final Predicate<VirtualDatacenter> filter) {
|
||||||
return Lists.newLinkedList(filter(listPermitedVirtualDatacenters(), filter));
|
return Lists.newLinkedList(filter(listPermittedVirtualDatacenters(), filter));
|
||||||
}
|
}
|
||||||
|
|
||||||
public VirtualDatacenter findPermitedVirtualDatacenter(final Predicate<VirtualDatacenter> filter) {
|
public VirtualDatacenter findPermittedVirtualDatacenter(final Predicate<VirtualDatacenter> filter) {
|
||||||
return Iterables.getFirst(filter(listPermitedVirtualDatacenters(), filter), null);
|
return Iterables.getFirst(filter(listPermittedVirtualDatacenters(), filter), null);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -152,9 +152,9 @@ public class User extends DomainWrapper<UserDto> {
|
||||||
* list is empty, user will get access to all virtual datacenters.
|
* list is empty, user will get access to all virtual datacenters.
|
||||||
*
|
*
|
||||||
* @param vdc
|
* @param vdc
|
||||||
* List of virtual datancers from the user's enterprise.
|
* List of virtual datacenters from the user's enterprise.
|
||||||
*/
|
*/
|
||||||
public void setPermitedVirtualDatacenters(final List<VirtualDatacenter> vdcs) {
|
public void setPermittedVirtualDatacenters(final List<VirtualDatacenter> vdcs) {
|
||||||
List<Integer> ids = new ArrayList<Integer>();
|
List<Integer> ids = new ArrayList<Integer>();
|
||||||
|
|
||||||
for (VirtualDatacenter vdc : vdcs) {
|
for (VirtualDatacenter vdc : vdcs) {
|
||||||
|
|
|
@ -315,7 +315,7 @@ public class Event extends DomainWrapper<EventDto> {
|
||||||
+ ", subnet=" + getSubnet() + ", idVirtualApp=" + getIdVirtualApp() + ", virtualApp=" + getVirtualApp()
|
+ ", subnet=" + getSubnet() + ", idVirtualApp=" + getIdVirtualApp() + ", virtualApp=" + getVirtualApp()
|
||||||
+ ", idVirtualDatacenter=" + getIdVirtualDatacenter() + ", virtualDatacenter=" + getVirtualDatacenter()
|
+ ", idVirtualDatacenter=" + getIdVirtualDatacenter() + ", virtualDatacenter=" + getVirtualDatacenter()
|
||||||
+ ", idVirtualMachine=" + getIdVirtualMachine() + ", virtualMachine=" + getVirtualMachine()
|
+ ", idVirtualMachine=" + getIdVirtualMachine() + ", virtualMachine=" + getVirtualMachine()
|
||||||
+ ", stackstrace=" + getStacktrace() + ", performedBy=" + getPerformedBy() + ", severity=" + getSeverity()
|
+ ", stacktrace=" + getStacktrace() + ", performedBy=" + getPerformedBy() + ", severity=" + getSeverity()
|
||||||
+ "]";
|
+ "]";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,7 +42,7 @@ public class AbiquoException extends RuntimeException {
|
||||||
/** Serial UID. */
|
/** Serial UID. */
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
/** The HTTP statuc. */
|
/** The HTTP status. */
|
||||||
private Status httpStatus;
|
private Status httpStatus;
|
||||||
|
|
||||||
/** The errors. */
|
/** The errors. */
|
||||||
|
|
|
@ -696,7 +696,7 @@ public class Datacenter extends DomainWrapper<DatacenterDto> {
|
||||||
* {@link org.jclouds.abiquo.domain.network.Network#toExternalNetwork},
|
* {@link org.jclouds.abiquo.domain.network.Network#toExternalNetwork},
|
||||||
* {@link org.jclouds.abiquo.domain.network.Network#toPublicNetwork} and
|
* {@link org.jclouds.abiquo.domain.network.Network#toPublicNetwork} and
|
||||||
* {@link org.jclouds.abiquo.domain.network.Network#toUnmanagedNetwork} can
|
* {@link org.jclouds.abiquo.domain.network.Network#toUnmanagedNetwork} can
|
||||||
* be used to convert the Network into the appropiate domain object.
|
* be used to convert the Network into the appropriate domain object.
|
||||||
*
|
*
|
||||||
* @param id
|
* @param id
|
||||||
* Unique ID of the network in this datacenter.
|
* Unique ID of the network in this datacenter.
|
||||||
|
@ -1108,7 +1108,7 @@ public class Datacenter extends DomainWrapper<DatacenterDto> {
|
||||||
* VirtualMachineTemplateResource#
|
* VirtualMachineTemplateResource#
|
||||||
* VirtualMachineTemplateResource-Retrieveallvirtualmachinetemplates</a>
|
* VirtualMachineTemplateResource-Retrieveallvirtualmachinetemplates</a>
|
||||||
* @return Virtual machine template with the given id in the given
|
* @return Virtual machine template with the given id in the given
|
||||||
* enterpriess or <code>null</code> if it does not exist.
|
* enterprise or <code>null</code> if it does not exist.
|
||||||
*/
|
*/
|
||||||
public VirtualMachineTemplate getTemplateInRepository(final Enterprise enterprise, final Integer id) {
|
public VirtualMachineTemplate getTemplateInRepository(final Enterprise enterprise, final Integer id) {
|
||||||
VirtualMachineTemplateDto template = context.getApi().getVirtualMachineTemplateApi()
|
VirtualMachineTemplateDto template = context.getApi().getVirtualMachineTemplateApi()
|
||||||
|
|
|
@ -180,7 +180,7 @@ public class Machine extends AbstractPhysicalMachine {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the list of virtual machines in the physical machine sinchronizing
|
* Gets the list of virtual machines in the physical machine synchronizing
|
||||||
* virtual machines from remote hypervisor with abiquo's database.
|
* virtual machines from remote hypervisor with abiquo's database.
|
||||||
*
|
*
|
||||||
* @return The list of virtual machines in the physical machine.
|
* @return The list of virtual machines in the physical machine.
|
||||||
|
@ -199,7 +199,7 @@ public class Machine extends AbstractPhysicalMachine {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the list of virtual machines in the physical machine matching the
|
* Gets the list of virtual machines in the physical machine matching the
|
||||||
* given filter sinchronizing virtual machines from remote hypervisor with
|
* given filter synchronizing virtual machines from remote hypervisor with
|
||||||
* abiquo's database.
|
* abiquo's database.
|
||||||
*
|
*
|
||||||
* @param filter
|
* @param filter
|
||||||
|
@ -213,7 +213,7 @@ public class Machine extends AbstractPhysicalMachine {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets a single virtual machine in the physical machine matching the given
|
* Gets a single virtual machine in the physical machine matching the given
|
||||||
* filter sinchronizing virtual machines from remote hypervisor with abiquo's
|
* filter synchronizing virtual machines from remote hypervisor with abiquo's
|
||||||
* database.
|
* database.
|
||||||
*
|
*
|
||||||
* @param filter
|
* @param filter
|
||||||
|
|
|
@ -163,7 +163,7 @@ public class StoragePool extends DomainWrapper<StoragePoolDto> {
|
||||||
* Get the tier assigned to the pool. The storage pool needs to be persisted
|
* Get the tier assigned to the pool. The storage pool needs to be persisted
|
||||||
* in Abiquo first.
|
* in Abiquo first.
|
||||||
*
|
*
|
||||||
* @return The tier assinged to this storage pool.
|
* @return The tier assigned to this storage pool.
|
||||||
*/
|
*/
|
||||||
public Tier getTier() {
|
public Tier getTier() {
|
||||||
RESTLink link = checkNotNull(target.searchLink(ParentLinkName.TIER), ValidationErrors.MISSING_REQUIRED_LINK + " "
|
RESTLink link = checkNotNull(target.searchLink(ParentLinkName.TIER), ValidationErrors.MISSING_REQUIRED_LINK + " "
|
||||||
|
|
|
@ -203,7 +203,7 @@ public class ExternalNetwork extends Network<ExternalIp> {
|
||||||
dto.setMask(mask);
|
dto.setMask(mask);
|
||||||
dto.setPrimaryDNS(primaryDNS);
|
dto.setPrimaryDNS(primaryDNS);
|
||||||
dto.setSecondaryDNS(secondaryDNS);
|
dto.setSecondaryDNS(secondaryDNS);
|
||||||
dto.setSufixDNS(sufixDNS);
|
dto.setSufixDNS(suffixDNS);
|
||||||
dto.setDefaultNetwork(defaultNetwork == null ? Boolean.FALSE : defaultNetwork);
|
dto.setDefaultNetwork(defaultNetwork == null ? Boolean.FALSE : defaultNetwork);
|
||||||
dto.setUnmanaged(Boolean.FALSE);
|
dto.setUnmanaged(Boolean.FALSE);
|
||||||
dto.setType(NetworkType.EXTERNAL);
|
dto.setType(NetworkType.EXTERNAL);
|
||||||
|
@ -218,7 +218,7 @@ public class ExternalNetwork extends Network<ExternalIp> {
|
||||||
public static Builder fromExternalNetwork(final ExternalNetwork in) {
|
public static Builder fromExternalNetwork(final ExternalNetwork in) {
|
||||||
return ExternalNetwork.builder(in.context, in.datacenter, in.enterprise).name(in.getName()).tag(in.getTag())
|
return ExternalNetwork.builder(in.context, in.datacenter, in.enterprise).name(in.getName()).tag(in.getTag())
|
||||||
.gateway(in.getGateway()).address(in.getAddress()).mask(in.getMask()).primaryDNS(in.getPrimaryDNS())
|
.gateway(in.getGateway()).address(in.getAddress()).mask(in.getMask()).primaryDNS(in.getPrimaryDNS())
|
||||||
.secondaryDNS(in.getSecondaryDNS()).sufixDNS(in.getSufixDNS()).defaultNetwork(in.getDefaultNetwork());
|
.secondaryDNS(in.getSecondaryDNS()).suffixDNS(in.getSuffixDNS()).defaultNetwork(in.getDefaultNetwork());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -104,7 +104,7 @@ public abstract class Network<T extends Ip<?, ?>> extends DomainWrapper<VLANNetw
|
||||||
|
|
||||||
protected String secondaryDNS;
|
protected String secondaryDNS;
|
||||||
|
|
||||||
protected String sufixDNS;
|
protected String suffixDNS;
|
||||||
|
|
||||||
protected Boolean defaultNetwork;
|
protected Boolean defaultNetwork;
|
||||||
|
|
||||||
|
@ -156,8 +156,8 @@ public abstract class Network<T extends Ip<?, ?>> extends DomainWrapper<VLANNetw
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public T sufixDNS(final String sufixDNS) {
|
public T suffixDNS(final String suffixDNS) {
|
||||||
this.sufixDNS = sufixDNS;
|
this.suffixDNS = suffixDNS;
|
||||||
return (T) this;
|
return (T) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -234,7 +234,7 @@ public abstract class Network<T extends Ip<?, ?>> extends DomainWrapper<VLANNetw
|
||||||
return target.getSecondaryDNS();
|
return target.getSecondaryDNS();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getSufixDNS() {
|
public String getSuffixDNS() {
|
||||||
return target.getSufixDNS();
|
return target.getSufixDNS();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -274,8 +274,8 @@ public abstract class Network<T extends Ip<?, ?>> extends DomainWrapper<VLANNetw
|
||||||
target.setSecondaryDNS(secondaryDNS);
|
target.setSecondaryDNS(secondaryDNS);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setSufixDNS(final String sufixDNS) {
|
public void setSuffixDNS(final String suffixDNS) {
|
||||||
target.setSufixDNS(sufixDNS);
|
target.setSufixDNS(suffixDNS);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTag(final Integer tag) {
|
public void setTag(final Integer tag) {
|
||||||
|
@ -286,7 +286,7 @@ public abstract class Network<T extends Ip<?, ?>> extends DomainWrapper<VLANNetw
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "Network [id=" + getId() + ", address=" + getAddress() + ", defaultNetwork=" + getDefaultNetwork()
|
return "Network [id=" + getId() + ", address=" + getAddress() + ", defaultNetwork=" + getDefaultNetwork()
|
||||||
+ ", gateway=" + getGateway() + ", mask=" + getMask() + ", name=" + getName() + ", primaryDNS="
|
+ ", gateway=" + getGateway() + ", mask=" + getMask() + ", name=" + getName() + ", primaryDNS="
|
||||||
+ getPrimaryDNS() + ", secondaryDNS=" + getSecondaryDNS() + ", suffixDNS=" + getSufixDNS() + ", tag="
|
+ getPrimaryDNS() + ", secondaryDNS=" + getSecondaryDNS() + ", suffixDNS=" + getSuffixDNS() + ", tag="
|
||||||
+ getTag() + ", type=" + getType() + "]";
|
+ getTag() + ", type=" + getType() + "]";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -142,7 +142,7 @@ public class PrivateNetwork extends Network<PrivateIp> {
|
||||||
dto.setMask(mask);
|
dto.setMask(mask);
|
||||||
dto.setPrimaryDNS(primaryDNS);
|
dto.setPrimaryDNS(primaryDNS);
|
||||||
dto.setSecondaryDNS(secondaryDNS);
|
dto.setSecondaryDNS(secondaryDNS);
|
||||||
dto.setSufixDNS(sufixDNS);
|
dto.setSufixDNS(suffixDNS);
|
||||||
dto.setDefaultNetwork(defaultNetwork);
|
dto.setDefaultNetwork(defaultNetwork);
|
||||||
dto.setUnmanaged(false);
|
dto.setUnmanaged(false);
|
||||||
dto.setType(NetworkType.INTERNAL);
|
dto.setType(NetworkType.INTERNAL);
|
||||||
|
@ -156,7 +156,7 @@ public class PrivateNetwork extends Network<PrivateIp> {
|
||||||
public static Builder fromPrivateNetwork(final PrivateNetwork in) {
|
public static Builder fromPrivateNetwork(final PrivateNetwork in) {
|
||||||
return PrivateNetwork.builder(in.context).name(in.getName()).tag(in.getTag()).gateway(in.getGateway())
|
return PrivateNetwork.builder(in.context).name(in.getName()).tag(in.getTag()).gateway(in.getGateway())
|
||||||
.address(in.getAddress()).mask(in.getMask()).primaryDNS(in.getPrimaryDNS())
|
.address(in.getAddress()).mask(in.getMask()).primaryDNS(in.getPrimaryDNS())
|
||||||
.secondaryDNS(in.getSecondaryDNS()).sufixDNS(in.getSufixDNS()).defaultNetwork(in.getDefaultNetwork())
|
.secondaryDNS(in.getSecondaryDNS()).suffixDNS(in.getSuffixDNS()).defaultNetwork(in.getDefaultNetwork())
|
||||||
.virtualDatacenter(in.virtualDatacenter);
|
.virtualDatacenter(in.virtualDatacenter);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -164,7 +164,7 @@ public class PublicNetwork extends Network<PublicIp> {
|
||||||
dto.setMask(mask);
|
dto.setMask(mask);
|
||||||
dto.setPrimaryDNS(primaryDNS);
|
dto.setPrimaryDNS(primaryDNS);
|
||||||
dto.setSecondaryDNS(secondaryDNS);
|
dto.setSecondaryDNS(secondaryDNS);
|
||||||
dto.setSufixDNS(sufixDNS);
|
dto.setSufixDNS(suffixDNS);
|
||||||
dto.setDefaultNetwork(defaultNetwork);
|
dto.setDefaultNetwork(defaultNetwork);
|
||||||
dto.setUnmanaged(false);
|
dto.setUnmanaged(false);
|
||||||
dto.setType(NetworkType.PUBLIC);
|
dto.setType(NetworkType.PUBLIC);
|
||||||
|
@ -178,7 +178,7 @@ public class PublicNetwork extends Network<PublicIp> {
|
||||||
public static Builder fromPublicNetwork(final PublicNetwork in) {
|
public static Builder fromPublicNetwork(final PublicNetwork in) {
|
||||||
return PublicNetwork.builder(in.context, in.datacenter).name(in.getName()).tag(in.getTag())
|
return PublicNetwork.builder(in.context, in.datacenter).name(in.getName()).tag(in.getTag())
|
||||||
.gateway(in.getGateway()).address(in.getAddress()).mask(in.getMask()).primaryDNS(in.getPrimaryDNS())
|
.gateway(in.getGateway()).address(in.getAddress()).mask(in.getMask()).primaryDNS(in.getPrimaryDNS())
|
||||||
.secondaryDNS(in.getSecondaryDNS()).sufixDNS(in.getSufixDNS()).defaultNetwork(in.getDefaultNetwork());
|
.secondaryDNS(in.getSecondaryDNS()).suffixDNS(in.getSuffixDNS()).defaultNetwork(in.getDefaultNetwork());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -204,7 +204,7 @@ public class UnmanagedNetwork extends Network<UnmanagedIp> {
|
||||||
dto.setMask(mask);
|
dto.setMask(mask);
|
||||||
dto.setPrimaryDNS(primaryDNS);
|
dto.setPrimaryDNS(primaryDNS);
|
||||||
dto.setSecondaryDNS(secondaryDNS);
|
dto.setSecondaryDNS(secondaryDNS);
|
||||||
dto.setSufixDNS(sufixDNS);
|
dto.setSufixDNS(suffixDNS);
|
||||||
dto.setDefaultNetwork(defaultNetwork);
|
dto.setDefaultNetwork(defaultNetwork);
|
||||||
dto.setUnmanaged(true);
|
dto.setUnmanaged(true);
|
||||||
dto.setType(NetworkType.UNMANAGED);
|
dto.setType(NetworkType.UNMANAGED);
|
||||||
|
@ -219,7 +219,7 @@ public class UnmanagedNetwork extends Network<UnmanagedIp> {
|
||||||
public static Builder fromUnmanagedNetwork(final UnmanagedNetwork in) {
|
public static Builder fromUnmanagedNetwork(final UnmanagedNetwork in) {
|
||||||
return UnmanagedNetwork.builder(in.context, in.datacenter, in.enterprise).name(in.getName()).tag(in.getTag())
|
return UnmanagedNetwork.builder(in.context, in.datacenter, in.enterprise).name(in.getName()).tag(in.getTag())
|
||||||
.gateway(in.getGateway()).address(in.getAddress()).mask(in.getMask()).primaryDNS(in.getPrimaryDNS())
|
.gateway(in.getGateway()).address(in.getAddress()).mask(in.getMask()).primaryDNS(in.getPrimaryDNS())
|
||||||
.secondaryDNS(in.getSecondaryDNS()).sufixDNS(in.getSufixDNS()).defaultNetwork(in.getDefaultNetwork());
|
.secondaryDNS(in.getSecondaryDNS()).suffixDNS(in.getSuffixDNS()).defaultNetwork(in.getDefaultNetwork());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@ public class LinkUtils {
|
||||||
*
|
*
|
||||||
* @param links
|
* @param links
|
||||||
* The list with the links to filter.
|
* The list with the links to filter.
|
||||||
* @return A lsit with all links taht point to a NIC.
|
* @return A list with all links that point to a NIC.
|
||||||
*/
|
*/
|
||||||
public static List<RESTLink> filterNicLinks(final List<RESTLink> links) {
|
public static List<RESTLink> filterNicLinks(final List<RESTLink> links) {
|
||||||
return Lists.newLinkedList(filter(links, LinkPredicates.isNic()));
|
return Lists.newLinkedList(filter(links, LinkPredicates.isNic()));
|
||||||
|
|
|
@ -523,12 +523,12 @@ public interface CloudApi {
|
||||||
AcceptedRequestDto<String> deployVirtualMachine(VirtualMachineDto virtualMachine, VirtualMachineTaskDto options);
|
AcceptedRequestDto<String> deployVirtualMachine(VirtualMachineDto virtualMachine, VirtualMachineTaskDto options);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Uneploy a virtual machine with task options.
|
* Undeploy a virtual machine with task options.
|
||||||
*
|
*
|
||||||
* @param virtualMachine
|
* @param virtualMachine
|
||||||
* The virtual machine to undeploy.
|
* The virtual machine to undeploy.
|
||||||
* @param options
|
* @param options
|
||||||
* extra deploy unoptions.
|
* extra undeploy options.
|
||||||
* @return Response message to the undeploy request.
|
* @return Response message to the undeploy request.
|
||||||
*/
|
*/
|
||||||
@Timeout(duration = 90, timeUnit = TimeUnit.SECONDS)
|
@Timeout(duration = 90, timeUnit = TimeUnit.SECONDS)
|
||||||
|
|
|
@ -178,7 +178,7 @@ public interface EnterpriseApi {
|
||||||
final DatacenterLimitsDto limits);
|
final DatacenterLimitsDto limits);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retreives the limits for the given enterprise and datacenter.
|
* Retrieves the limits for the given enterprise and datacenter.
|
||||||
*
|
*
|
||||||
* @param enterprise
|
* @param enterprise
|
||||||
* The enterprise.
|
* The enterprise.
|
||||||
|
@ -189,7 +189,7 @@ public interface EnterpriseApi {
|
||||||
DatacentersLimitsDto getLimits(EnterpriseDto enterprise, DatacenterDto datacenter);
|
DatacentersLimitsDto getLimits(EnterpriseDto enterprise, DatacenterDto datacenter);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retreives limits for the given enterprise and any datacenter.
|
* Retrieves limits for the given enterprise and any datacenter.
|
||||||
*
|
*
|
||||||
* @param enterprise
|
* @param enterprise
|
||||||
* The enterprise.
|
* The enterprise.
|
||||||
|
@ -217,7 +217,7 @@ public interface EnterpriseApi {
|
||||||
/*********************** User ********************** */
|
/*********************** User ********************** */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retreives users of the given enterprise.
|
* Retrieves users of the given enterprise.
|
||||||
*
|
*
|
||||||
* @param enterprise
|
* @param enterprise
|
||||||
* The enterprise.
|
* The enterprise.
|
||||||
|
@ -294,7 +294,7 @@ public interface EnterpriseApi {
|
||||||
* @param enterpriseId
|
* @param enterpriseId
|
||||||
* Id of the enterprise which information will be refreshed.
|
* Id of the enterprise which information will be refreshed.
|
||||||
* @param datacenterRepositoryId
|
* @param datacenterRepositoryId
|
||||||
* Id of the datacenter repository contaning the templates.
|
* Id of the datacenter repository containing the templates.
|
||||||
*/
|
*/
|
||||||
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
|
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
|
||||||
void refreshTemplateRepository(Integer enterpriseId, Integer datacenterRepositoryId);
|
void refreshTemplateRepository(Integer enterpriseId, Integer datacenterRepositoryId);
|
||||||
|
@ -336,7 +336,7 @@ public interface EnterpriseApi {
|
||||||
*
|
*
|
||||||
* @param enterprise
|
* @param enterprise
|
||||||
* The enterprise.
|
* The enterprise.
|
||||||
* @return The list of reserverd machines by the enterprise.
|
* @return The list of reserved machines by the enterprise.
|
||||||
*/
|
*/
|
||||||
MachinesDto listReservedMachines(EnterpriseDto enterprise);
|
MachinesDto listReservedMachines(EnterpriseDto enterprise);
|
||||||
|
|
||||||
|
|
|
@ -233,7 +233,7 @@ public interface InfrastructureApi {
|
||||||
final HypervisorType hypervisorType, final String user, final String password, final MachineOptions options);
|
final HypervisorType hypervisorType, final String user, final String password, final MachineOptions options);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retreives limits for the given datacenter and any enterprise.
|
* Retrieves limits for the given datacenter and any enterprise.
|
||||||
*
|
*
|
||||||
* @param datacenter
|
* @param datacenter
|
||||||
* The datacenter.
|
* The datacenter.
|
||||||
|
@ -321,7 +321,7 @@ public interface InfrastructureApi {
|
||||||
/*********************** Hypervisor ***********************/
|
/*********************** Hypervisor ***********************/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retreives the hypervisor type of a remote a machine.
|
* Retrieves the hypervisor type of a remote a machine.
|
||||||
*
|
*
|
||||||
* @param datacenter
|
* @param datacenter
|
||||||
* The datacenter.
|
* The datacenter.
|
||||||
|
@ -332,7 +332,7 @@ public interface InfrastructureApi {
|
||||||
String getHypervisorTypeFromMachine(DatacenterDto datacenter, DatacenterOptions options);
|
String getHypervisorTypeFromMachine(DatacenterDto datacenter, DatacenterOptions options);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retreives the hypervisor types in the datacenter.
|
* Retrieves the hypervisor types in the datacenter.
|
||||||
*
|
*
|
||||||
* @param datacenter
|
* @param datacenter
|
||||||
* The datacenter.
|
* The datacenter.
|
||||||
|
@ -516,7 +516,7 @@ public interface InfrastructureApi {
|
||||||
* Clone a service profile.
|
* Clone a service profile.
|
||||||
*
|
*
|
||||||
* @param rack
|
* @param rack
|
||||||
* The managed rack where thw service profile will be created.
|
* The managed rack where the service profile will be created.
|
||||||
* @param logicServer
|
* @param logicServer
|
||||||
* The original logic server.
|
* The original logic server.
|
||||||
* @param organization
|
* @param organization
|
||||||
|
@ -630,7 +630,7 @@ public interface InfrastructureApi {
|
||||||
* The datacenter.
|
* The datacenter.
|
||||||
* @return The list of remote services for the datacenter.
|
* @return The list of remote services for the datacenter.
|
||||||
*/
|
*/
|
||||||
RemoteServicesDto listRemoteServices(DatacenterDto dataceter);
|
RemoteServicesDto listRemoteServices(DatacenterDto datacenter);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new remote service in a datacenter.
|
* Create a new remote service in a datacenter.
|
||||||
|
@ -710,7 +710,7 @@ public interface InfrastructureApi {
|
||||||
*
|
*
|
||||||
* @param machine
|
* @param machine
|
||||||
* The machine to check
|
* The machine to check
|
||||||
* @paran boolean that indicates a database synchronization
|
* @param sync boolean that indicates a database synchronization
|
||||||
* @return A machineStateDto with a machine state value from enum
|
* @return A machineStateDto with a machine state value from enum
|
||||||
* MachineState
|
* MachineState
|
||||||
*/
|
*/
|
||||||
|
@ -778,8 +778,8 @@ public interface InfrastructureApi {
|
||||||
/**
|
/**
|
||||||
* Power off a physical machine in a UCS rack.
|
* Power off a physical machine in a UCS rack.
|
||||||
*
|
*
|
||||||
* @param machime
|
* @param machine
|
||||||
* The phyisical machine.
|
* The physical machine.
|
||||||
*/
|
*/
|
||||||
@EnterpriseEdition
|
@EnterpriseEdition
|
||||||
void powerOff(MachineDto machine);
|
void powerOff(MachineDto machine);
|
||||||
|
@ -787,17 +787,17 @@ public interface InfrastructureApi {
|
||||||
/**
|
/**
|
||||||
* Power on a physical machine in a UCS rack.
|
* Power on a physical machine in a UCS rack.
|
||||||
*
|
*
|
||||||
* @param machime
|
* @param machine
|
||||||
* The phyisical machine.
|
* The physical machine.
|
||||||
*/
|
*/
|
||||||
@EnterpriseEdition
|
@EnterpriseEdition
|
||||||
void powerOn(MachineDto machine);
|
void powerOn(MachineDto machine);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the logic server associated with a machine in a Cisc UCS rack.
|
* Get the logic server associated with a machine in a Cisco UCS rack.
|
||||||
*
|
*
|
||||||
* @param machime
|
* @param machine
|
||||||
* The phyisical machine.
|
* The physical machine.
|
||||||
* @return The logic server.
|
* @return The logic server.
|
||||||
*/
|
*/
|
||||||
@EnterpriseEdition
|
@EnterpriseEdition
|
||||||
|
@ -806,8 +806,8 @@ public interface InfrastructureApi {
|
||||||
/**
|
/**
|
||||||
* Turn off locator led of a physical machine in a UCS rack.
|
* Turn off locator led of a physical machine in a UCS rack.
|
||||||
*
|
*
|
||||||
* @param machime
|
* @param machine
|
||||||
* The phyisical machine.
|
* The physical machine.
|
||||||
*/
|
*/
|
||||||
@EnterpriseEdition
|
@EnterpriseEdition
|
||||||
void ledOn(MachineDto machine);
|
void ledOn(MachineDto machine);
|
||||||
|
@ -815,8 +815,8 @@ public interface InfrastructureApi {
|
||||||
/**
|
/**
|
||||||
* Light locator led of a physical machine in a UCS rack.
|
* Light locator led of a physical machine in a UCS rack.
|
||||||
*
|
*
|
||||||
* @param machime
|
* @param machine
|
||||||
* The phyisical machine.
|
* The physical machine.
|
||||||
*/
|
*/
|
||||||
@EnterpriseEdition
|
@EnterpriseEdition
|
||||||
void ledOff(MachineDto machine);
|
void ledOff(MachineDto machine);
|
||||||
|
@ -824,8 +824,8 @@ public interface InfrastructureApi {
|
||||||
/**
|
/**
|
||||||
* Get led locator info from a physical machine in a UCS rack.
|
* Get led locator info from a physical machine in a UCS rack.
|
||||||
*
|
*
|
||||||
* @param machime
|
* @param machine
|
||||||
* The phyisical machine.
|
* The physical machine.
|
||||||
* @return Led locator information.
|
* @return Led locator information.
|
||||||
*/
|
*/
|
||||||
@EnterpriseEdition
|
@EnterpriseEdition
|
||||||
|
|
|
@ -53,7 +53,7 @@ public interface VirtualMachineTemplateApi {
|
||||||
* @param enterpriseId
|
* @param enterpriseId
|
||||||
* Id of the enterprise.
|
* Id of the enterprise.
|
||||||
* @param datacenterRepositoryId
|
* @param datacenterRepositoryId
|
||||||
* Id of the datacenter repository contaning the templates.
|
* Id of the datacenter repository containing the templates.
|
||||||
* @return The list of virtual machine templates for the enterprise in the
|
* @return The list of virtual machine templates for the enterprise in the
|
||||||
* datacenter repository.
|
* datacenter repository.
|
||||||
*/
|
*/
|
||||||
|
@ -66,7 +66,7 @@ public interface VirtualMachineTemplateApi {
|
||||||
* @param enterpriseId
|
* @param enterpriseId
|
||||||
* Id of the enterprise.
|
* Id of the enterprise.
|
||||||
* @param datacenterRepositoryId
|
* @param datacenterRepositoryId
|
||||||
* Id of the datacenter repository contaning the templates.
|
* Id of the datacenter repository containing the templates.
|
||||||
* @param options
|
* @param options
|
||||||
* The options to query the virtual machine templates.
|
* The options to query the virtual machine templates.
|
||||||
* @return The filtered list of virtual machine templates for the enterprise
|
* @return The filtered list of virtual machine templates for the enterprise
|
||||||
|
@ -81,13 +81,13 @@ public interface VirtualMachineTemplateApi {
|
||||||
* @param enterpriseId
|
* @param enterpriseId
|
||||||
* Id of the enterprise.
|
* Id of the enterprise.
|
||||||
* @param datacenterRepositoryId
|
* @param datacenterRepositoryId
|
||||||
* Id of the datacenter repository contaning the templates.
|
* Id of the datacenter repository containing the templates.
|
||||||
* @param enterpriseId
|
* @param enterpriseId
|
||||||
* The id of the virtual machine template.
|
* The id of the virtual machine template.
|
||||||
* @return The virtual machine template or <code>null</code> if it does not
|
* @return The virtual machine template or <code>null</code> if it does not
|
||||||
* exist.
|
* exist.
|
||||||
*/
|
*/
|
||||||
VirtualMachineTemplateDto getVirtualMachineTemplate(Integer entepriseId, Integer datacenterRepositoryId,
|
VirtualMachineTemplateDto getVirtualMachineTemplate(Integer enterpriseId, Integer datacenterRepositoryId,
|
||||||
Integer virtualMachineTemplateId);
|
Integer virtualMachineTemplateId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -171,7 +171,7 @@ public interface VirtualMachineTemplateAsyncApi {
|
||||||
@BinderParam(AppendToPath.class) DiskFormatType targetFormat);
|
@BinderParam(AppendToPath.class) DiskFormatType targetFormat);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see VirtualMachineTemplateApi#updateConversion(ConversinoDto)
|
* @see VirtualMachineTemplateApi#updateConversion(ConversionDto)
|
||||||
*/
|
*/
|
||||||
@PUT
|
@PUT
|
||||||
@ResponseParser(ReturnTaskReferenceOrNull.class)
|
@ResponseParser(ReturnTaskReferenceOrNull.class)
|
||||||
|
|
|
@ -62,7 +62,7 @@ public class AbiquoErrorHandler implements HttpErrorHandler {
|
||||||
switch (response.getStatusCode()) {
|
switch (response.getStatusCode()) {
|
||||||
case 401:
|
case 401:
|
||||||
case 403:
|
case 403:
|
||||||
// Autorization exceptions do not return an errors DTO, so we
|
// Authorization exceptions do not return an errors DTO, so we
|
||||||
// encapsulate a
|
// encapsulate a
|
||||||
// generic exception
|
// generic exception
|
||||||
exception = new AuthorizationException(defaultMessage, new HttpResponseException(command, response,
|
exception = new AuthorizationException(defaultMessage, new HttpResponseException(command, response,
|
||||||
|
|
|
@ -35,7 +35,7 @@ import com.google.inject.ImplementedBy;
|
||||||
@ImplementedBy(BaseAsyncTaskMonitor.class)
|
@ImplementedBy(BaseAsyncTaskMonitor.class)
|
||||||
public interface AsyncTaskMonitor extends MonitoringService {
|
public interface AsyncTaskMonitor extends MonitoringService {
|
||||||
/**
|
/**
|
||||||
* Monitor the given {@link AsyncTask}s and block until they finishe.
|
* Monitor the given {@link AsyncTask}s and block until they finish.
|
||||||
*
|
*
|
||||||
* @param tasks
|
* @param tasks
|
||||||
* The {@link AsyncTask}s to monitor.
|
* The {@link AsyncTask}s to monitor.
|
||||||
|
|
|
@ -24,7 +24,7 @@ import java.lang.annotation.RetentionPolicy;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Indicates that the annotated element will access Abiquo Enterprise Edition
|
* Indicates that the annotated element will access Abiquo Enterprise Edition
|
||||||
* functionallity. If the target Abiquo Cloud platform is a Community Edition
|
* functionality. If the target Abiquo Cloud platform is a Community Edition
|
||||||
* version, the invocation of the method may have unexpected results.
|
* version, the invocation of the method may have unexpected results.
|
||||||
*
|
*
|
||||||
* @author Ignasi Barrera
|
* @author Ignasi Barrera
|
||||||
|
|
|
@ -25,7 +25,7 @@ import java.lang.annotation.RetentionPolicy;
|
||||||
import java.lang.annotation.Target;
|
import java.lang.annotation.Target;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Indicates the link to be used to generate the enpoind for the request.
|
* Indicates the link to be used to generate the endpoint for the request.
|
||||||
*
|
*
|
||||||
* @author Ignasi Barrera
|
* @author Ignasi Barrera
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -140,7 +140,7 @@ public class VirtualDatacenterLiveApiTest extends BaseAbiquoApiLiveApiTest {
|
||||||
PublicIp apiIp = env.virtualDatacenter.findPurchasedPublicIp(IpPredicates.<PublicIp> address(publicIp.getIp()));
|
PublicIp apiIp = env.virtualDatacenter.findPurchasedPublicIp(IpPredicates.<PublicIp> address(publicIp.getIp()));
|
||||||
assertNotNull(apiIp);
|
assertNotNull(apiIp);
|
||||||
|
|
||||||
env.virtualDatacenter.releaseePublicIp(apiIp);
|
env.virtualDatacenter.releasePublicIp(apiIp);
|
||||||
apiIp = env.virtualDatacenter.findPurchasedPublicIp(IpPredicates.<PublicIp> address(publicIp.getIp()));
|
apiIp = env.virtualDatacenter.findPurchasedPublicIp(IpPredicates.<PublicIp> address(publicIp.getIp()));
|
||||||
assertNull(apiIp);
|
assertNull(apiIp);
|
||||||
}
|
}
|
||||||
|
|
|
@ -91,7 +91,7 @@ public class VirtualMachineNetworkingLiveApiTest extends BaseAbiquoApiLiveApiTes
|
||||||
assertEquals(nics.get(0).getId(), privateIp.getId());
|
assertEquals(nics.get(0).getId(), privateIp.getId());
|
||||||
|
|
||||||
String address = publicIpCloud.getIp();
|
String address = publicIpCloud.getIp();
|
||||||
env.virtualDatacenter.releaseePublicIp(publicIpCloud);
|
env.virtualDatacenter.releasePublicIp(publicIpCloud);
|
||||||
assertNull(env.virtualDatacenter.findPurchasedPublicIp(IpPredicates.<PublicIp> address(address)));
|
assertNull(env.virtualDatacenter.findPurchasedPublicIp(IpPredicates.<PublicIp> address(address)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -78,7 +78,7 @@ public class ListAttachedNicsLiveApiTest extends BaseAbiquoStrategyLiveApiTest {
|
||||||
protected void tearDownStrategy() {
|
protected void tearDownStrategy() {
|
||||||
env.virtualMachine.setNics(Lists.<Ip<?, ?>> newArrayList(privateIp));
|
env.virtualMachine.setNics(Lists.<Ip<?, ?>> newArrayList(privateIp));
|
||||||
String address = publicIp.getIp();
|
String address = publicIp.getIp();
|
||||||
env.virtualDatacenter.releaseePublicIp(publicIp);
|
env.virtualDatacenter.releasePublicIp(publicIp);
|
||||||
assertNull(env.virtualDatacenter.findPurchasedPublicIp(IpPredicates.<PublicIp> address(address)));
|
assertNull(env.virtualDatacenter.findPurchasedPublicIp(IpPredicates.<PublicIp> address(address)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ public abstract class AbstractRole {
|
||||||
private String roleType;
|
private String roleType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Required. You must specifye either a WindowsProvisioningConfigurationSet or
|
* Required. You must specify either a WindowsProvisioningConfigurationSet or
|
||||||
* LinuxProvisioningConfigurationSet configuration set.
|
* LinuxProvisioningConfigurationSet configuration set.
|
||||||
*
|
*
|
||||||
* Optional. You can specify a NetworkConfigurationSet which contains the metadata required to
|
* Optional. You can specify a NetworkConfigurationSet which contains the metadata required to
|
||||||
|
|
|
@ -124,7 +124,7 @@ public interface HostedServiceApi {
|
||||||
*
|
*
|
||||||
* @param serviceName
|
* @param serviceName
|
||||||
* the unique DNS Prefix value in the Windows Azure Management Portal
|
* the unique DNS Prefix value in the Windows Azure Management Portal
|
||||||
* @param deploylentName
|
* @param deploymentName
|
||||||
* the unique DNS Prefix value in the Windows Azure Management Portal
|
* the unique DNS Prefix value in the Windows Azure Management Portal
|
||||||
*/
|
*/
|
||||||
String deleteDeployment(String serviceName, String deploymentName);
|
String deleteDeployment(String serviceName, String deploymentName);
|
||||||
|
@ -135,7 +135,7 @@ public interface HostedServiceApi {
|
||||||
*
|
*
|
||||||
* @param serviceName
|
* @param serviceName
|
||||||
* the unique DNS Prefix value in the Windows Azure Management Portal
|
* the unique DNS Prefix value in the Windows Azure Management Portal
|
||||||
* @param deploylentName
|
* @param deploymentName
|
||||||
* the unique DNS Prefix value in the Windows Azure Management Portal
|
* the unique DNS Prefix value in the Windows Azure Management Portal
|
||||||
*/
|
*/
|
||||||
Deployment getDeployment(String serviceName, String deploymentName);
|
Deployment getDeployment(String serviceName, String deploymentName);
|
||||||
|
|
|
@ -266,7 +266,7 @@ public class VirtualSystemSettingData {
|
||||||
* Action to take for the virtual system when the software executed by the virtual system fails.
|
* Action to take for the virtual system when the software executed by the virtual system fails.
|
||||||
*
|
*
|
||||||
* Failures in this case means a failure that is detectable by the host platform, such as a
|
* Failures in this case means a failure that is detectable by the host platform, such as a
|
||||||
* non-interuptable wait state condition.
|
* non-interruptible wait state condition.
|
||||||
*/
|
*/
|
||||||
@XmlType
|
@XmlType
|
||||||
@XmlEnum(Integer.class)
|
@XmlEnum(Integer.class)
|
||||||
|
@ -502,7 +502,7 @@ public class VirtualSystemSettingData {
|
||||||
/**
|
/**
|
||||||
* Action to take for the virtual system when the software executed by the virtual system fails.
|
* Action to take for the virtual system when the software executed by the virtual system fails.
|
||||||
* Failures in this case means a failure that is detectable by the host platform, such as a
|
* Failures in this case means a failure that is detectable by the host platform, such as a
|
||||||
* non-interuptable wait state condition.
|
* non-interruptible wait state condition.
|
||||||
*/
|
*/
|
||||||
public AutomaticRecoveryAction getAutomaticRecoveryAction() {
|
public AutomaticRecoveryAction getAutomaticRecoveryAction() {
|
||||||
return automaticRecoveryAction;
|
return automaticRecoveryAction;
|
||||||
|
|
|
@ -34,7 +34,7 @@ public enum StoreType {
|
||||||
*/
|
*/
|
||||||
S3,
|
S3,
|
||||||
/**
|
/**
|
||||||
* Openstack swift store
|
* OpenStack swift store
|
||||||
*/
|
*/
|
||||||
SWIFT,
|
SWIFT,
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1370,7 +1370,7 @@ public class Checks {
|
||||||
|
|
||||||
private static void checkCimResourceAllocationSettingData(RasdItem val) {
|
private static void checkCimResourceAllocationSettingData(RasdItem val) {
|
||||||
// TODO Could do more assertions...
|
// TODO Could do more assertions...
|
||||||
assertNotNull(val, String.format(NOT_NULL_OBJ_FMT, "ResouorceAllocatoinSettingData"));
|
assertNotNull(val, String.format(NOT_NULL_OBJ_FMT, "ResouorceAllocationSettingData"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void checkOrgNetwork(OrgNetwork network) {
|
public static void checkOrgNetwork(OrgNetwork network) {
|
||||||
|
|
|
@ -117,8 +117,8 @@ public class IMachineToNodeMetadata implements Function<IMachine, NodeMetadata>
|
||||||
String hostIP = adapter.getNatDriver().getHostIP();
|
String hostIP = adapter.getNatDriver().getHostIP();
|
||||||
if(!hostIP.isEmpty())
|
if(!hostIP.isEmpty())
|
||||||
publicIpAddresses.add(hostIP);
|
publicIpAddresses.add(hostIP);
|
||||||
for (String nameProtocolnumberAddressInboudportGuestTargetport : adapter.getNatDriver().getRedirects()) {
|
for (String nameProtocolnumberAddressInboundportGuestTargetport : adapter.getNatDriver().getRedirects()) {
|
||||||
Iterable<String> stuff = Splitter.on(',').split(nameProtocolnumberAddressInboudportGuestTargetport);
|
Iterable<String> stuff = Splitter.on(',').split(nameProtocolnumberAddressInboundportGuestTargetport);
|
||||||
String protocolNumber = Iterables.get(stuff, 1);
|
String protocolNumber = Iterables.get(stuff, 1);
|
||||||
String hostAddress = Iterables.get(stuff, 2);
|
String hostAddress = Iterables.get(stuff, 2);
|
||||||
String inboundPort = Iterables.get(stuff, 3);
|
String inboundPort = Iterables.get(stuff, 3);
|
||||||
|
|
|
@ -76,10 +76,10 @@ public class IMachineToSshClient implements Function<IMachine, SshClient> {
|
||||||
|
|
||||||
if (networkAdapter.getAttachmentType()
|
if (networkAdapter.getAttachmentType()
|
||||||
.equals(NetworkAttachmentType.NAT)) {
|
.equals(NetworkAttachmentType.NAT)) {
|
||||||
for (String nameProtocolnumberAddressInboudportGuestTargetport : networkAdapter
|
for (String nameProtocolnumberAddressInboundPortGuestTargetport : networkAdapter
|
||||||
.getNatDriver().getRedirects()) {
|
.getNatDriver().getRedirects()) {
|
||||||
Iterable<String> stuff = Splitter.on(',').split(
|
Iterable<String> stuff = Splitter.on(',').split(
|
||||||
nameProtocolnumberAddressInboudportGuestTargetport);
|
nameProtocolnumberAddressInboundPortGuestTargetport);
|
||||||
String protocolNumber = Iterables.get(stuff, 1);
|
String protocolNumber = Iterables.get(stuff, 1);
|
||||||
String hostAddress = Iterables.get(stuff, 2);
|
String hostAddress = Iterables.get(stuff, 2);
|
||||||
String inboundPort = Iterables.get(stuff, 3);
|
String inboundPort = Iterables.get(stuff, 3);
|
||||||
|
|
|
@ -36,7 +36,7 @@ public class StringToKeyCode implements Function<String, List<Integer>> {
|
||||||
|
|
||||||
private List<Integer> stringToKeycode(String s) {
|
private List<Integer> stringToKeycode(String s) {
|
||||||
if (containsSpecialCharacter(s)) {
|
if (containsSpecialCharacter(s)) {
|
||||||
return transforSpecialCharIntoKeycodes(s);
|
return transformSpecialCharIntoKeycodes(s);
|
||||||
} else {
|
} else {
|
||||||
return transformStandardCharacterIntoKeycodes(s);
|
return transformStandardCharacterIntoKeycodes(s);
|
||||||
}
|
}
|
||||||
|
@ -53,7 +53,7 @@ public class StringToKeyCode implements Function<String, List<Integer>> {
|
||||||
return values;
|
return values;
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<Integer> transforSpecialCharIntoKeycodes(String s) {
|
private List<Integer> transformSpecialCharIntoKeycodes(String s) {
|
||||||
List<Integer> values = new ArrayList<Integer>();
|
List<Integer> values = new ArrayList<Integer>();
|
||||||
for (String special : s.split("<")) {
|
for (String special : s.split("<")) {
|
||||||
Collection<Integer> value = KeyboardScancodes.SPECIAL_KEYBOARD_BUTTON_MAP_LIST.get("<" + special);
|
Collection<Integer> value = KeyboardScancodes.SPECIAL_KEYBOARD_BUTTON_MAP_LIST.get("<" + special);
|
||||||
|
|
|
@ -138,7 +138,7 @@ public class CreateAndRegisterMachineFromIsoIfNotAlreadyExistsTest {
|
||||||
IVirtualBox vBox = createNiceMock(IVirtualBox.class);
|
IVirtualBox vBox = createNiceMock(IVirtualBox.class);
|
||||||
String vmName = "jclouds-image-my-ubuntu-image";
|
String vmName = "jclouds-image-my-ubuntu-image";
|
||||||
|
|
||||||
String errorMessage = "VirtualBox error: Soem other VBox error";
|
String errorMessage = "VirtualBox error: Some other VBox error";
|
||||||
VBoxException vBoxException = new VBoxException(createNiceMock(Throwable.class), errorMessage);
|
VBoxException vBoxException = new VBoxException(createNiceMock(Throwable.class), errorMessage);
|
||||||
|
|
||||||
expect(manager.getVBox()).andReturn(vBox).anyTimes();
|
expect(manager.getVBox()).andReturn(vBox).anyTimes();
|
||||||
|
|
|
@ -58,7 +58,7 @@ public class AWSEC2ComputeServiceContextModuleTest {
|
||||||
for (int i = 0; i < 2; i++) {
|
for (int i = 0; i < 2; i++) {
|
||||||
try {
|
try {
|
||||||
Image image = cacheLoader.load(regionAndName);
|
Image image = cacheLoader.load(regionAndName);
|
||||||
fail("Expected Authrization exception, but got "+image);
|
fail("Expected Authorization exception, but got " + image);
|
||||||
} catch (AuthorizationException e) {
|
} catch (AuthorizationException e) {
|
||||||
// success
|
// success
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,7 @@ import com.google.inject.Singleton;
|
||||||
/**
|
/**
|
||||||
* Parses the list of generic options.
|
* Parses the list of generic options.
|
||||||
*
|
*
|
||||||
* GoGrid uses options as containers for id/name/descrOptiontion objects.
|
* GoGrid uses options as containers for id/name/description objects.
|
||||||
*
|
*
|
||||||
* @author Oleksiy Yarmula
|
* @author Oleksiy Yarmula
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -34,7 +34,7 @@ import org.jclouds.concurrent.Timeout;
|
||||||
public interface BoxDotNetClient {
|
public interface BoxDotNetClient {
|
||||||
/*
|
/*
|
||||||
* Note all these delegate to methods in BoxDotNetAsyncClient with a specified or inherited timeout.
|
* Note all these delegate to methods in BoxDotNetAsyncClient with a specified or inherited timeout.
|
||||||
* The singatures should match those of BoxDotNetAsyncClient, except the returnvals should not be
|
* The signatures should match those of BoxDotNetAsyncClient, except the returnvals should not be
|
||||||
* wrapped in a Future
|
* wrapped in a Future
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
@ -364,7 +364,7 @@ public interface IBMSmartCloudClient {
|
||||||
* code 402 if payment is required before more storage volumes may
|
* code 402 if payment is required before more storage volumes may
|
||||||
* be created
|
* be created
|
||||||
* @throws IllegalStateException
|
* @throws IllegalStateException
|
||||||
* code 409 ifhere are not enough resources in the cloud to
|
* code 409 if there are not enough resources in the cloud to
|
||||||
* fulfill this request
|
* fulfill this request
|
||||||
* <p/>
|
* <p/>
|
||||||
* code 412 One or more of the supplied parameters are invalid for
|
* code 412 One or more of the supplied parameters are invalid for
|
||||||
|
@ -437,7 +437,7 @@ public interface IBMSmartCloudClient {
|
||||||
* allocated
|
* allocated
|
||||||
*
|
*
|
||||||
* @throws IllegalStateException
|
* @throws IllegalStateException
|
||||||
* code 409 ifhere are not enough resources in the cloud to
|
* code 409 if there are not enough resources in the cloud to
|
||||||
* fulfill this request
|
* fulfill this request
|
||||||
*/
|
*/
|
||||||
Address allocateAddressInLocation(String locationId, String offeringID);
|
Address allocateAddressInLocation(String locationId, String offeringID);
|
||||||
|
|
|
@ -227,7 +227,7 @@ public class AdminAccessBuilderSpec {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Parse authorizeAdminPublickKey */
|
/** Parse authorizeAdminPublicKey */
|
||||||
static class AuthorizeAdminPublicKeyParser extends BooleanParser {
|
static class AuthorizeAdminPublicKeyParser extends BooleanParser {
|
||||||
@Override
|
@Override
|
||||||
protected void parseBoolean(AdminAccessBuilderSpec spec, boolean value) {
|
protected void parseBoolean(AdminAccessBuilderSpec spec, boolean value) {
|
||||||
|
|
Loading…
Reference in New Issue