From c7381501f047a1c54cb25a08f863e5622385b71b Mon Sep 17 00:00:00 2001 From: Andrew Donald Kennedy Date: Fri, 23 Mar 2012 16:48:24 +0000 Subject: [PATCH] Issue 830: Change fenceMode to ISOLATED --- .../java/org/jclouds/vcloud/director/v1_5/domain/Network.java | 2 +- .../v1_5/internal/BaseVCloudDirectorClientLiveTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Network.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Network.java index 44e917ad5b..24dcfe1edc 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Network.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Network.java @@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlSeeAlso; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; -@XmlSeeAlso( {OrgNetwork.class, ExternalNetwork.class} ) +@XmlSeeAlso({ OrgNetwork.class, ExternalNetwork.class }) public abstract class Network extends EntityType { public static final class FenceMode { diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorClientLiveTest.java index e3b4c519f6..71aed1de7e 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorClientLiveTest.java @@ -50,6 +50,7 @@ import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.InstantiateVAppTemplateParams; import org.jclouds.vcloud.director.v1_5.domain.InstantiationParams; import org.jclouds.vcloud.director.v1_5.domain.Link; +import org.jclouds.vcloud.director.v1_5.domain.Network; import org.jclouds.vcloud.director.v1_5.domain.NetworkConfigSection; import org.jclouds.vcloud.director.v1_5.domain.NetworkConfiguration; import org.jclouds.vcloud.director.v1_5.domain.Org; @@ -70,7 +71,6 @@ import org.jclouds.vcloud.director.v1_5.predicates.ReferencePredicates; import org.jclouds.vcloud.director.v1_5.predicates.TaskStatusEquals; import org.jclouds.vcloud.director.v1_5.predicates.TaskSuccess; import org.testng.annotations.BeforeClass; -import org.testng.annotations.BeforeGroups; import org.testng.annotations.Listeners; import org.testng.annotations.Test; @@ -323,7 +323,7 @@ public abstract class BaseVCloudDirectorClientLiveTest extends BaseVersionedServ // Build the configuration object NetworkConfiguration networkConfiguration = NetworkConfiguration.builder() .parentNetwork(parentNetwork.get()) - .fenceMode("bridged") + .fenceMode(Network.FenceMode.ISOLATED) .build(); return networkConfiguration;