From 2af7272d668c5d3d7dda7f4992f4e2825f26535e Mon Sep 17 00:00:00 2001 From: danikov Date: Fri, 16 Mar 2012 19:17:18 +0000 Subject: [PATCH] fix Network class name collision in Checks --- .../org/jclouds/vcloud/director/v1_5/domain/Checks.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/domain/Checks.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/domain/Checks.java index e5971bb552..47bbdfd29a 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/domain/Checks.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/domain/Checks.java @@ -372,8 +372,8 @@ public class Checks { public static void checkNetworkConfiguration(NetworkConfiguration config) { // required - assertNotNull(config.getFenceMode(), String.format(NOT_NULL_OBJECT_FMT, - "fenceMode", "NetworkConfiguration")); + assertNotNull(config.getFenceMode(), String.format(OBJ_FIELD_REQ, + "NetworkConfiguration", "fenceMode")); assertTrue(Network.FenceMode.ALL.contains(config.getFenceMode()), String.format(REQUIRED_VALUE_OBJECT_FMT, "fenceMode", "NetworkConfiguration", config.getFenceMode(), Iterables.toString(Network.FenceMode.ALL))); @@ -1119,7 +1119,7 @@ public class Checks { // Check optional fields if (section.getNetworks() != null) { - for (Network network : section.getNetworks()) { + for (org.jclouds.vcloud.director.v1_5.domain.ovf.Network network : section.getNetworks()) { checkNetwork(network); } } @@ -1128,7 +1128,7 @@ public class Checks { checkOvfSectionType(section); } - public static void checkNetwork(Network network) { + public static void checkNetwork(org.jclouds.vcloud.director.v1_5.domain.ovf.Network network) { assertNotNull(network, String.format(NOT_NULL_OBJ_FMT, "Network")); // Check optional fields