Addressed some of the offline comments made by Adrian

apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java

@@ -21,14 +21,15 @@ package org.jclouds.cloudstack.suppliers;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.NoSuchElementException;
-import java.util.logging.Logger;
 
+import javax.annotation.Resource;
 import javax.inject.Inject;
 
 import org.jclouds.cloudstack.CloudStackClient;
 import org.jclouds.cloudstack.domain.Account;
 import org.jclouds.cloudstack.domain.User;
 import org.jclouds.cloudstack.predicates.UserPredicates;
+import org.jclouds.logging.Logger;
 import org.jclouds.rest.annotations.Identity;
 
 import com.google.common.base.Predicate;
@@ -40,6 +41,10 @@ import com.google.common.collect.Iterables;
  * @author Adrian Cole
  */
 public class GetCurrentUser implements Supplier<User> {
+
+   @Resource
+   protected Logger logger = Logger.NULL;
+
    private final CloudStackClient client;
    private final String identity;
 
@@ -62,11 +67,7 @@ public class GetCurrentUser implements Supplier<User> {
       }
 
       if (currentUser.getAccountType() != Account.Type.USER) {
-         Logger.getAnonymousLogger().warning("You are using an administrative account to start a machine");
+         logger.warn("Expecting an user account: {}", currentUser);
-         /* throw new IllegalArgumentException(String.format(
-               "invalid account type: %s, please specify an apiKey of a USER, for example: %s",
-               currentUser.getAccountType(), Iterables.filter(users, UserPredicates.isUserAccount())));
-         */
       }
       return currentUser;
    }

apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackExperimentLiveTest.java

@@ -33,7 +33,6 @@ import java.util.logging.Logger;
 
 import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
 import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.domain.NetworkType;
 import org.jclouds.cloudstack.domain.TrafficType;
 import org.jclouds.cloudstack.features.BaseCloudStackClientLiveTest;
 import org.jclouds.cloudstack.options.ListNetworksOptions;
@@ -54,7 +53,7 @@ public class CloudStackExperimentLiveTest extends BaseCloudStackClientLiveTest {
       provider = "cloudstack";
    }
 
-   protected void deleteNetworkByVLAN(String vlan, long zoneId) throws URISyntaxException {
+   protected void deleteNetworksInZoneWithVlanId(long zoneId, String vlanId) {
       Set<Network> networks = domainAdminContext.getApi().getNetworkClient().listNetworks(
          ListNetworksOptions.Builder
             .isDefault(false)
@@ -64,7 +63,7 @@ public class CloudStackExperimentLiveTest extends BaseCloudStackClientLiveTest {
       );
 
       // Warning: the vlan id is not set in the response - using an workaround
-      URI broadcastUri = new URI("vlan://" + vlan);
+      URI broadcastUri = URI.create("vlan://" + vlanId);
       for(Network net : networks) {
          if (broadcastUri.equals(net.getBroadcastURI())) {
             long jobId = domainAdminContext.getApi().getNetworkClient().deleteNetwork(net.getId());
@@ -74,13 +73,14 @@ public class CloudStackExperimentLiveTest extends BaseCloudStackClientLiveTest {
    }
 
    @Test
-   public void testAndExperiment() throws URISyntaxException {
+   public void testAndExperiment() {
       if (!domainAdminEnabled) {
          Logger.getAnonymousLogger().log(Level.SEVERE, "domainAdmin credentials not present, skipping test");
          return;
       }
 
       String group = prefix + "-vlan";
+      String vlanId = "2";
       Network network = null;
       Set<? extends NodeMetadata> nodes = null;
       try {
@@ -92,7 +92,7 @@ public class CloudStackExperimentLiveTest extends BaseCloudStackClientLiveTest {
          long zoneId = Long.parseLong(template.getLocation().getId());
 
          // cleanup before running the test
-         deleteNetworkByVLAN("2", zoneId);
+         deleteNetworksInZoneWithVlanId(zoneId, vlanId);
 
          // find a network offering that supports vlans in our zone
          long offeringId = get(
@@ -103,7 +103,7 @@ public class CloudStackExperimentLiveTest extends BaseCloudStackClientLiveTest {
                .getNetworkClient()
                // startIP/endIP/netmask/gateway must be specified together
                .createNetworkInZone(zoneId, offeringId, group, group,
-                     vlan("2").startIP("192.168.1.2").netmask("255.255.255.0").gateway("192.168.1.1"));
+                     vlan(vlanId).startIP("192.168.1.2").netmask("255.255.255.0").gateway("192.168.1.1"));
 
          // set options to specify this network id
          template.getOptions().as(CloudStackTemplateOptions.class).networkId(network.getId());

apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/BaseCloudStackClientLiveTest.java

@@ -216,11 +216,8 @@ public class BaseCloudStackClientLiveTest extends BaseVersionedServiceLiveTest {
       }
 
       if (currentUser.getAccountType() != type) {
-         Logger.getAnonymousLogger().warning("You are using an administrative account for testing");
+         Logger.getAnonymousLogger().warning(
-         /* throw new IllegalArgumentException(String.format(
+            String.format("Expecting an user with type %s. Got: %s", type.toString(), currentUser.toString()));
-               "invalid account type: %s, please specify an apiKey of %s, for example: %s",
-               currentUser.getAccountType(), type, Iterables.filter(users, UserPredicates.accountTypeEquals(type))));
-          */
       }
       return currentUser;
    }