diff --git a/vcloud/core/src/test/resources/log4j.xml b/vcloud/core/src/test/resources/log4j.xml
index a273f75ea3..c54a752ef0 100755
--- a/vcloud/core/src/test/resources/log4j.xml
+++ b/vcloud/core/src/test/resources/log4j.xml
@@ -19,3 +19,86 @@
====================================================================
-->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/InternetServiceLiveTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/InternetServiceLiveTest.java
index a09feaa5b9..18c1b2b1fc 100644
--- a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/InternetServiceLiveTest.java
+++ b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/InternetServiceLiveTest.java
@@ -21,6 +21,7 @@ package org.jclouds.vcloud.terremark;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.testng.Assert.assertEquals;
+import java.util.Set;
import java.util.SortedSet;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
@@ -65,21 +66,24 @@ public class InternetServiceLiveTest {
.changeNameTo("test-33"));
assertEquals(is.getName(), "test-33");
services.add(is);
- // PublicIpAddress ip = is.getPublicIpAddress();
- // current bug in terremark
- // for (int port : new int[] { 80, 8080 }) {
- // services.add(tmClient.addInternetServiceToExistingIp(ip.getId(), "test-" + port,
- // Protocol.HTTP, port));
- // }
+ PublicIpAddress ip = is.getPublicIpAddress();
+ for (int port : new int[] { 80, 8080 }) {
+ services.add(tmClient.addInternetServiceToExistingIp(ip.getId(), "test-" + port,
+ Protocol.HTTP, port));
+ }
}
private void delete(SortedSet set) {
+ Set publicIps = Sets.newHashSet();
for (InternetService service : set) {
for (Node node : tmClient.getNodes(service.getId())) {
tmClient.deleteNode(node.getId());
}
tmClient.deleteInternetService(service.getId());
- tmClient.deletePublicIp(service.getPublicIpAddress().getId());
+ publicIps.add(service.getPublicIpAddress().getId());
+ }
+ for (int id : publicIps) {
+ tmClient.deletePublicIp(id);
}
}
diff --git a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeClientLiveTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeClientLiveTest.java
index ddb55fa2f3..f3532b44bb 100644
--- a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeClientLiveTest.java
+++ b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeClientLiveTest.java
@@ -115,10 +115,9 @@ public class TerremarkVCloudComputeClientLiveTest {
@Test(dependsOnMethods = "testGetAnyPrivateAddress")
public void testSshLoadBalanceIp() {
- // InetAddress publicIp = client.createPublicAddressMappedToPorts(tmClient.getVApp(id), 22,
- // 80,
- // 443, 8080); /// error 500
- InetAddress publicIp = client.createPublicAddressMappedToPorts(tmClient.getVApp(id), 22);
+ InetAddress publicIp = client.createPublicAddressMappedToPorts(tmClient.getVApp(id), 22,
+ 80,
+ 443, 8080); /// error 500
assert addressTester.apply(publicIp);
// client.exec(publicIp, "uname -a");
}
diff --git a/vcloud/terremark/src/test/resources/log4j.xml b/vcloud/terremark/src/test/resources/log4j.xml
index a273f75ea3..c54a752ef0 100755
--- a/vcloud/terremark/src/test/resources/log4j.xml
+++ b/vcloud/terremark/src/test/resources/log4j.xml
@@ -19,3 +19,86 @@
====================================================================
-->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file