Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix Network class name collision in Checks

This commit is contained in:
danikov 2012-03-16 19:17:18 +00:00
parent 9206bc0342
commit 2af7272d66
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/domain/Checks.java
View File

@ -372,8 +372,8 @@ public class Checks {
public static void checkNetworkConfiguration(NetworkConfiguration config) { public static void checkNetworkConfiguration(NetworkConfiguration config) {
// required // required
assertNotNull(config.getFenceMode(), String.format(NOT_NULL_OBJECT_FMT, assertNotNull(config.getFenceMode(), String.format(OBJ_FIELD_REQ,
"fenceMode", "NetworkConfiguration")); "NetworkConfiguration", "fenceMode"));
assertTrue(Network.FenceMode.ALL.contains(config.getFenceMode()), String.format(REQUIRED_VALUE_OBJECT_FMT, assertTrue(Network.FenceMode.ALL.contains(config.getFenceMode()), String.format(REQUIRED_VALUE_OBJECT_FMT,
"fenceMode", "NetworkConfiguration", config.getFenceMode(), Iterables.toString(Network.FenceMode.ALL))); "fenceMode", "NetworkConfiguration", config.getFenceMode(), Iterables.toString(Network.FenceMode.ALL)));
@ -1119,7 +1119,7 @@ public class Checks {
// Check optional fields // Check optional fields
if (section.getNetworks() != null) { if (section.getNetworks() != null) {
for (Network network : section.getNetworks()) { for (org.jclouds.vcloud.director.v1_5.domain.ovf.Network network : section.getNetworks()) {
checkNetwork(network); checkNetwork(network);
} }
} }
@ -1128,7 +1128,7 @@ public class Checks {
checkOvfSectionType(section); 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")); assertNotNull(network, String.format(NOT_NULL_OBJ_FMT, "Network"));
// Check optional fields // Check optional fields