PublicIpInstanceIdPair has different id format to node

This commit is contained in:
Andrew Donald Kennedy 2011-12-21 11:05:29 +00:00
parent ddbf39e4a6
commit ee0bade6ad
1 changed files with 3 additions and 2 deletions

View File

@ -22,6 +22,7 @@ import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import com.google.common.base.Splitter;
import org.jclouds.compute.BaseComputeServiceLiveTest; import org.jclouds.compute.BaseComputeServiceLiveTest;
import org.jclouds.compute.ComputeServiceContext; import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.compute.ComputeServiceContextFactory; import org.jclouds.compute.ComputeServiceContextFactory;
@ -173,7 +174,7 @@ public class EC2ComputeServiceLiveTest extends BaseComputeServiceLiveTest {
} }
} }
@Test(enabled = true, dependsOnMethods = "testCompareSizes") @Test(enabled = true) //, dependsOnMethods = "testCompareSizes")
public void testAutoIpAllocation() throws Exception { public void testAutoIpAllocation() throws Exception {
ComputeServiceContext context = null; ComputeServiceContext context = null;
String group = this.group + "aip"; String group = this.group + "aip";
@ -211,7 +212,7 @@ public class EC2ComputeServiceLiveTest extends BaseComputeServiceLiveTest {
// check that the elastic ip is in node.publicAddresses // check that the elastic ip is in node.publicAddresses
PublicIpInstanceIdPair ipidpair = Iterables.get(ipidpairs, 0); PublicIpInstanceIdPair ipidpair = Iterables.get(ipidpairs, 0);
assertEquals(ipidpair.getInstanceId(), node.getId()); assertEquals(region + "/" + ipidpair.getInstanceId(), node.getId());
// delete the node // delete the node
context.getComputeService().destroyNodesMatching(NodePredicates.inGroup(group)); context.getComputeService().destroyNodesMatching(NodePredicates.inGroup(group));