You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/11/29 17:41:17 UTC

[30/39] stratos git commit: Removing jclouds/cloudstack fork in dependencies

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java
deleted file mode 100644
index a4584db..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-public class TemplatePermission {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return new ConcreteBuilder().fromTemplatePermission(this);
-   }
-
-   public abstract static class Builder<T extends Builder<T>> {
-      protected abstract T self();
-
-      protected String id;
-      protected String account;
-      protected String domainId;
-      protected boolean isPublic;
-
-      /**
-       * @see TemplatePermission#getId()
-       */
-      public T id(String id) {
-         this.id = id;
-         return self();
-      }
-
-      /**
-       * @see TemplatePermission#getAccount()
-       */
-      public T account(String account) {
-         this.account = account;
-         return self();
-      }
-
-      /**
-       * @see TemplatePermission#getDomainId()
-       */
-      public T domainId(String domainId) {
-         this.domainId = domainId;
-         return self();
-      }
-
-      /**
-       * @see TemplatePermission#isPublic()
-       */
-      public T isPublic(boolean isPublic) {
-         this.isPublic = isPublic;
-         return self();
-      }
-
-      public TemplatePermission build() {
-         return new TemplatePermission(id, account, domainId, isPublic);
-      }
-
-      public T fromTemplatePermission(TemplatePermission in) {
-         return this
-               .id(in.getId())
-               .account(in.getAccount())
-               .domainId(in.getDomainId())
-               .isPublic(in.isPublic());
-      }
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-      @Override
-      protected ConcreteBuilder self() {
-         return this;
-      }
-   }
-
-   private final String id;
-   private final String account;
-   private final String domainId;
-   private final boolean isPublic;
-
-   @ConstructorProperties({
-         "id", "account", "domainid", "ispublic"
-   })
-   protected TemplatePermission(String id, @Nullable String account, @Nullable String domainId, boolean isPublic) {
-      this.id = checkNotNull(id, "id");
-      this.account = account;
-      this.domainId = domainId;
-      this.isPublic = isPublic;
-   }
-
-   /**
-    * Gets the template ID
-    *
-    * @return the template ID
-    */
-   public String getId() {
-      return this.id;
-   }
-
-   /**
-    * Gets the list of accounts the template is available for
-    *
-    * @return the list of accounts the template is available for
-    */
-   @Nullable
-   public String getAccount() {
-      return this.account;
-   }
-
-   /**
-    * Gets the ID of the domain to which the template belongs
-    *
-    * @return the ID of the domain to which the template belongs
-    */
-   @Nullable
-   public String getDomainId() {
-      return this.domainId;
-   }
-
-   /**
-    * Returns true if this template is a public template, false otherwise
-    *
-    * @return true if this template is a public template, false otherwise
-    */
-   public boolean isPublic() {
-      return this.isPublic;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(id, account, domainId, isPublic);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null || getClass() != obj.getClass()) return false;
-      TemplatePermission that = TemplatePermission.class.cast(obj);
-      return Objects.equal(this.id, that.id)
-            && Objects.equal(this.account, that.account)
-            && Objects.equal(this.domainId, that.domainId)
-            && Objects.equal(this.isPublic, that.isPublic);
-   }
-
-   protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this)
-            .add("id", id).add("account", account).add("domainId", domainId).add("isPublic", isPublic);
-   }
-
-   @Override
-   public String toString() {
-      return string().toString();
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TrafficType.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TrafficType.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TrafficType.java
deleted file mode 100644
index 92de05c..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TrafficType.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.google.common.base.CaseFormat;
-
-/**
- * @see NetworkOfferingApi#listNetworkOfferings
- */
-public enum TrafficType {
-
-   /**
-    * traffic to the public internet
-    */
-   PUBLIC,
-   /**
-    * VM-to-VM traffic and VMs are assigned a virtual IP created by CloudStack
-    */
-   GUEST,
-   /**
-    * System network that only Admin can view, and only when isSystem is
-    * specified.
-    */
-   STORAGE,
-   /**
-    * System network that only Admin can view, and only when isSystem is
-    * specified.
-    */
-   MANAGEMENT,
-   /**
-    * System network that only Admin can view, and only when isSystem is
-    * specified.
-    */
-   CONTROL,
-
-   UNRECOGNIZED;
-
-   @Override
-   public String toString() {
-      return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
-   }
-
-   public static TrafficType fromValue(String type) {
-      try {
-         return valueOf(CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, checkNotNull(type, "type")));
-      } catch (IllegalArgumentException e) {
-         return UNRECOGNIZED;
-      }
-   }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java
deleted file mode 100644
index 5d413da..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java
+++ /dev/null
@@ -1,515 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-import java.util.Map;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
-/**
- * Represents a usage record from CloudStack
- */
-public class UsageRecord {
-
-   /**
-    */
-   public static enum UsageType {
-      RUNNING_VM(1),
-      ALLOCATED_VM(2),
-      IP_ADDRESS(3),
-      NETWORK_BYTES_SENT(4),
-      NETWORK_BYTES_RECEIVED(5),
-      VOLUME(6),
-      TEMPLATE(7),
-      ISO(8),
-      SNAPSHOT(9),
-      SECURITY_GROUP(10),
-      LOAD_BALANCER_POLICY(11),
-      PORT_FORWARDING_RULE(12),
-      NETWORK_OFFERING(13),
-      VPN_USERS(14),
-      UNRECOGNIZED(0);
-
-      private int code;
-
-      private static final Map<Integer, UsageType> INDEX = Maps.uniqueIndex(ImmutableSet.copyOf(UsageType.values()),
-            new Function<UsageType, Integer>() {
-
-               @Override
-               public Integer apply(UsageType input) {
-                  return input.code;
-               }
-
-            });
-
-      UsageType(int code) {
-         this.code = code;
-      }
-
-      @Override
-      public String toString() {
-         return "" + code;
-      }
-
-      public static UsageType fromValue(String usageType) {
-         Integer code = Integer.valueOf(checkNotNull(usageType, "usageType"));
-         return INDEX.containsKey(code) ? INDEX.get(code) : UNRECOGNIZED;
-      }
-
-   }
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return new ConcreteBuilder().fromUsageRecord(this);
-   }
-
-   public abstract static class Builder<T extends Builder<T>> {
-      protected abstract T self();
-
-      protected String id;
-      protected String description;
-      protected String accountId;
-      protected String accountName;
-      protected String domainId;
-      protected Date startDate;
-      protected Date endDate;
-      protected Date assignDate;
-      protected String releaseDate;
-      protected String zoneId;
-      protected String virtualMachineId;
-      protected String virtualMachineName;
-      protected String serviceOfferingId;
-      protected String templateId;
-      protected String ipAddress;
-      protected boolean isSourceNAT;
-      protected double rawUsageHours;
-      protected String usage;
-      protected String type;
-      protected UsageType usageType;
-
-      /**
-       * @see UsageRecord#getId()
-       */
-      public T id(String id) {
-         this.id = id;
-         return self();
-      }
-
-      /**
-       * @see UsageRecord#getDescription()
-       */
-      public T description(String description) {
-         this.description = description;
-         return self();
-      }
-
-      /**
-       * @see UsageRecord#getAccountId()
-       */
-      public T accountId(String accountId) {
-         this.accountId = accountId;
-         return self();
-      }
-
-      /**
-       * @see UsageRecord#getAccountName()
-       */
-      public T accountName(String accountName) {
-         this.accountName = accountName;
-         return self();
-      }
-
-      /**
-       * @see UsageRecord#getDomainId()
-       */
-      public T domainId(String domainId) {
-         this.domainId = domainId;
-         return self();
-      }
-
-      /**
-       * @see UsageRecord#getStartDate()
-       */
-      public T startDate(Date startDate) {
-         this.startDate = startDate;
-         return self();
-      }
-
-      /**
-       * @see UsageRecord#getEndDate()
-       */
-      public T endDate(Date endDate) {
-         this.endDate = endDate;
-         return self();
-      }
-
-      /**
-       * @see UsageRecord#getAssignDate()
-       */
-      public T assignDate(Date assignDate) {
-         this.assignDate = assignDate;
-         return self();
-      }
-
-      /**
-       * @see UsageRecord#getReleaseDate()
-       */
-      public T releaseDate(String releaseDate) {
-         this.releaseDate = releaseDate;
-         return self();
-      }
-
-      /**
-       * @see UsageRecord#getZoneId()
-       */
-      public T zoneId(String zoneId) {
-         this.zoneId = zoneId;
-         return self();
-      }
-
-      /**
-       * @see UsageRecord#getVirtualMachineId()
-       */
-      public T virtualMachineId(String virtualMachineId) {
-         this.virtualMachineId = virtualMachineId;
-         return self();
-      }
-
-      /**
-       * @see UsageRecord#getVirtualMachineName()
-       */
-      public T virtualMachineName(String virtualMachineName) {
-         this.virtualMachineName = virtualMachineName;
-         return self();
-      }
-
-      /**
-       * @see UsageRecord#getServiceOfferingId()
-       */
-      public T serviceOfferingId(String serviceOfferingId) {
-         this.serviceOfferingId = serviceOfferingId;
-         return self();
-      }
-
-      /**
-       * @see UsageRecord#getTemplateId()
-       */
-      public T templateId(String templateId) {
-         this.templateId = templateId;
-         return self();
-      }
-
-      /**
-       * @see UsageRecord#getIpAddress()
-       */
-      public T ipAddress(String ipAddress) {
-         this.ipAddress = ipAddress;
-         return self();
-      }
-
-      /**
-       * @see UsageRecord#isSourceNAT()
-       */
-      public T isSourceNAT(boolean isSourceNAT) {
-         this.isSourceNAT = isSourceNAT;
-         return self();
-      }
-
-      /**
-       * @see UsageRecord#getRawUsageHours()
-       */
-      public T rawUsageHours(double rawUsageHours) {
-         this.rawUsageHours = rawUsageHours;
-         return self();
-      }
-
-      /**
-       * @see UsageRecord#getUsage()
-       */
-      public T usage(String usage) {
-         this.usage = usage;
-         return self();
-      }
-
-      /**
-       * @see UsageRecord#getType()
-       */
-      public T type(String type) {
-         this.type = type;
-         return self();
-      }
-
-      /**
-       * @see UsageRecord#getUsageType()
-       */
-      public T usageType(UsageType usageType) {
-         this.usageType = usageType;
-         return self();
-      }
-
-      public UsageRecord build() {
-         return new UsageRecord(id, description, accountId, accountName, domainId, startDate, endDate, assignDate, releaseDate,
-               zoneId, virtualMachineId, virtualMachineName, serviceOfferingId, templateId, ipAddress, isSourceNAT, rawUsageHours,
-               usage, type, usageType);
-      }
-
-      public T fromUsageRecord(UsageRecord in) {
-         return this
-               .id(in.getId())
-               .description(in.getDescription())
-               .accountId(in.getAccountId())
-               .accountName(in.getAccountName())
-               .domainId(in.getDomainId())
-               .startDate(in.getStartDate())
-               .endDate(in.getEndDate())
-               .assignDate(in.getAssignDate())
-               .releaseDate(in.getReleaseDate())
-               .zoneId(in.getZoneId())
-               .virtualMachineId(in.getVirtualMachineId())
-               .virtualMachineName(in.getVirtualMachineName())
-               .serviceOfferingId(in.getServiceOfferingId())
-               .templateId(in.getTemplateId())
-               .ipAddress(in.getIpAddress())
-               .isSourceNAT(in.isSourceNAT())
-               .rawUsageHours(in.getRawUsageHours())
-               .usage(in.getUsage())
-               .type(in.getType())
-               .usageType(in.getUsageType());
-      }
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-      @Override
-      protected ConcreteBuilder self() {
-         return this;
-      }
-   }
-
-   private final String id;
-   private final String description;
-   private final String accountId;
-   private final String accountName;
-   private final String domainId;
-   private final Date startDate;
-   private final Date endDate;
-   private final Date assignDate;
-   private final String releaseDate;
-   private final String zoneId;
-   private final String virtualMachineId;
-   private final String virtualMachineName;
-   private final String serviceOfferingId;
-   private final String templateId;
-   private final String ipAddress;
-   private final boolean isSourceNAT;
-   private final double rawUsageHours;
-   private final String usage;
-   private final String type;
-   private final UsageType usageType;
-
-   @ConstructorProperties({
-         "usageid", "description", "accountid", "account", "domainid", "startdate", "enddate", "assigndate", "releasedate",
-         "zoneid", "virtualmachineid", "name", "offeringid", "templateid", "ipaddress", "issourcenat", "rawusage", "usage",
-         "type", "usagetype"
-   })
-   protected UsageRecord(String id, @Nullable String description, @Nullable String accountId, @Nullable String accountName,
-                         @Nullable String domainId, @Nullable Date startDate, @Nullable Date endDate, @Nullable Date assignDate,
-                         @Nullable String releaseDate, @Nullable String zoneId, @Nullable String virtualMachineId, @Nullable String virtualMachineName,
-                         @Nullable String serviceOfferingId, @Nullable String templateId, @Nullable String ipAddress,
-                         boolean isSourceNAT, double rawUsageHours, @Nullable String usage, @Nullable String type, @Nullable UsageType usageType) {
-      this.id = id;
-      this.description = description;
-      this.accountId = accountId;
-      this.accountName = accountName;
-      this.domainId = domainId;
-      this.startDate = startDate;
-      this.endDate = endDate;
-      this.assignDate = assignDate;
-      this.releaseDate = releaseDate;
-      this.zoneId = zoneId;
-      this.virtualMachineId = virtualMachineId;
-      this.virtualMachineName = virtualMachineName;
-      this.serviceOfferingId = serviceOfferingId;
-      this.templateId = templateId;
-      this.ipAddress = ipAddress;
-      this.isSourceNAT = isSourceNAT;
-      this.rawUsageHours = rawUsageHours;
-      this.usage = usage;
-      this.type = type;
-      this.usageType = usageType;
-   }
-
-   public String getId() {
-      return this.id;
-   }
-
-   @Nullable
-   public String getDescription() {
-      return this.description;
-   }
-
-   @Nullable
-   public String getAccountId() {
-      return this.accountId;
-   }
-
-   @Nullable
-   public String getAccountName() {
-      return this.accountName;
-   }
-
-   @Nullable
-   public String getDomainId() {
-      return this.domainId;
-   }
-
-   @Nullable
-   public Date getStartDate() {
-      return this.startDate;
-   }
-
-   @Nullable
-   public Date getEndDate() {
-      return this.endDate;
-   }
-
-   @Nullable
-   public Date getAssignDate() {
-      return this.assignDate;
-   }
-
-   @Nullable
-   public String getReleaseDate() {
-      return this.releaseDate;
-   }
-
-   @Nullable
-   public String getZoneId() {
-      return this.zoneId;
-   }
-
-   @Nullable
-   public String getVirtualMachineId() {
-      return this.virtualMachineId;
-   }
-
-   @Nullable
-   public String getVirtualMachineName() {
-      return this.virtualMachineName;
-   }
-
-   @Nullable
-   public String getServiceOfferingId() {
-      return this.serviceOfferingId;
-   }
-
-   @Nullable
-   public String getTemplateId() {
-      return this.templateId;
-   }
-
-   @Nullable
-   public String getIpAddress() {
-      return this.ipAddress;
-   }
-
-   public boolean isSourceNAT() {
-      return this.isSourceNAT;
-   }
-
-   public double getRawUsageHours() {
-      return this.rawUsageHours;
-   }
-
-   @Nullable
-   public String getUsage() {
-      return this.usage;
-   }
-
-   @Nullable
-   public String getType() {
-      return this.type;
-   }
-
-   @Nullable
-   public UsageType getUsageType() {
-      return this.usageType;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(id, description, accountId, accountName, domainId, startDate, endDate, assignDate, releaseDate,
-            zoneId, virtualMachineId, virtualMachineName, serviceOfferingId, templateId, ipAddress, isSourceNAT, rawUsageHours,
-            usage, type, usageType);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null || getClass() != obj.getClass()) return false;
-      UsageRecord that = UsageRecord.class.cast(obj);
-      return Objects.equal(this.id, that.id)
-            && Objects.equal(this.description, that.description)
-            && Objects.equal(this.accountId, that.accountId)
-            && Objects.equal(this.accountName, that.accountName)
-            && Objects.equal(this.domainId, that.domainId)
-            && Objects.equal(this.startDate, that.startDate)
-            && Objects.equal(this.endDate, that.endDate)
-            && Objects.equal(this.assignDate, that.assignDate)
-            && Objects.equal(this.releaseDate, that.releaseDate)
-            && Objects.equal(this.zoneId, that.zoneId)
-            && Objects.equal(this.virtualMachineId, that.virtualMachineId)
-            && Objects.equal(this.virtualMachineName, that.virtualMachineName)
-            && Objects.equal(this.serviceOfferingId, that.serviceOfferingId)
-            && Objects.equal(this.templateId, that.templateId)
-            && Objects.equal(this.ipAddress, that.ipAddress)
-            && Objects.equal(this.isSourceNAT, that.isSourceNAT)
-            && Objects.equal(this.rawUsageHours, that.rawUsageHours)
-            && Objects.equal(this.usage, that.usage)
-            && Objects.equal(this.type, that.type)
-            && Objects.equal(this.usageType, that.usageType);
-   }
-
-   protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this)
-            .add("id", id).add("description", description).add("accountId", accountId).add("accountName", accountName)
-            .add("domainId", domainId).add("startDate", startDate).add("endDate", endDate).add("assignDate", assignDate)
-            .add("releaseDate", releaseDate).add("zoneId", zoneId).add("virtualMachineId", virtualMachineId)
-            .add("virtualMachineName", virtualMachineName).add("serviceOfferingId", serviceOfferingId).add("templateId", templateId)
-            .add("ipAddress", ipAddress).add("isSourceNAT", isSourceNAT).add("rawUsageHours", rawUsageHours).add("usage", usage)
-            .add("type", type).add("usageType", usageType);
-   }
-
-   @Override
-   public String toString() {
-      return string().toString();
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/User.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/User.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/User.java
deleted file mode 100644
index 8c3d71c..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/User.java
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Class User
- */
-public class User {
-
-   /**
-    */
-   public static enum State {
-      ENABLED,
-      DISABLED,
-      UNKNOWN;
-
-      public static State fromValue(String value) {
-         try {
-            return valueOf(value.toUpperCase());
-         } catch (IllegalArgumentException e) {
-            return UNKNOWN;
-         }
-      }
-
-      @Override
-      public String toString() {
-         return name().toLowerCase();
-      }
-   }
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return new ConcreteBuilder().fromUser(this);
-   }
-
-   public abstract static class Builder<T extends Builder<T>> {
-      protected abstract T self();
-
-      protected String id;
-      protected String name;
-      protected String firstName;
-      protected String lastName;
-      protected String email;
-      protected Date created;
-      protected User.State state;
-      protected String account;
-      protected Account.Type accountType;
-      protected String domain;
-      protected String domainId;
-      protected String timeZone;
-      protected String apiKey;
-      protected String secretKey;
-
-      /**
-       * @see User#getId()
-       */
-      public T id(String id) {
-         this.id = id;
-         return self();
-      }
-
-      /**
-       * @see User#getName()
-       */
-      public T name(String name) {
-         this.name = name;
-         return self();
-      }
-
-      /**
-       * @see User#getFirstName()
-       */
-      public T firstName(String firstName) {
-         this.firstName = firstName;
-         return self();
-      }
-
-      /**
-       * @see User#getLastName()
-       */
-      public T lastName(String lastName) {
-         this.lastName = lastName;
-         return self();
-      }
-
-      /**
-       * @see User#getEmail()
-       */
-      public T email(String email) {
-         this.email = email;
-         return self();
-      }
-
-      /**
-       * @see User#getCreated()
-       */
-      public T created(Date created) {
-         this.created = created;
-         return self();
-      }
-
-      /**
-       * @see User#getState()
-       */
-      public T state(User.State state) {
-         this.state = state;
-         return self();
-      }
-
-      /**
-       * @see User#getAccount()
-       */
-      public T account(String account) {
-         this.account = account;
-         return self();
-      }
-
-      /**
-       * @see User#getAccountType()
-       */
-      public T accountType(Account.Type accountType) {
-         this.accountType = accountType;
-         return self();
-      }
-
-      /**
-       * @see User#getDomain()
-       */
-      public T domain(String domain) {
-         this.domain = domain;
-         return self();
-      }
-
-      /**
-       * @see User#getDomainId()
-       */
-      public T domainId(String domainId) {
-         this.domainId = domainId;
-         return self();
-      }
-
-      /**
-       * @see User#getTimeZone()
-       */
-      public T timeZone(String timeZone) {
-         this.timeZone = timeZone;
-         return self();
-      }
-
-      /**
-       * @see User#getApiKey()
-       */
-      public T apiKey(String apiKey) {
-         this.apiKey = apiKey;
-         return self();
-      }
-
-      /**
-       * @see User#getSecretKey()
-       */
-      public T secretKey(String secretKey) {
-         this.secretKey = secretKey;
-         return self();
-      }
-
-      public User build() {
-         return new User(id, name, firstName, lastName, email, created, state, account, accountType, domain, domainId, timeZone, apiKey, secretKey);
-      }
-
-      public T fromUser(User in) {
-         return this
-               .id(in.getId())
-               .name(in.getName())
-               .firstName(in.getFirstName())
-               .lastName(in.getLastName())
-               .email(in.getEmail())
-               .created(in.getCreated())
-               .state(in.getState())
-               .account(in.getAccount())
-               .accountType(in.getAccountType())
-               .domain(in.getDomain())
-               .domainId(in.getDomainId())
-               .timeZone(in.getTimeZone())
-               .apiKey(in.getApiKey())
-               .secretKey(in.getSecretKey());
-      }
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-      @Override
-      protected ConcreteBuilder self() {
-         return this;
-      }
-   }
-
-   private final String id;
-   private final String name;
-   private final String firstName;
-   private final String lastName;
-   private final String email;
-   private final Date created;
-   private final User.State state;
-   private final String account;
-   private final Account.Type accountType;
-   private final String domain;
-   private final String domainId;
-   private final String timeZone;
-   private final String apiKey;
-   private final String secretKey;
-
-   @ConstructorProperties({
-         "id", "username", "firstname", "lastname", "email", "created", "state", "account", "accounttype", "domain",
-         "domainid", "timezone", "apikey", "secretkey"
-   })
-   protected User(String id, @Nullable String name, @Nullable String firstName, @Nullable String lastName,
-                  @Nullable String email, @Nullable Date created, @Nullable User.State state, @Nullable String account,
-                  @Nullable Account.Type accountType, @Nullable String domain, @Nullable String domainId, @Nullable String timeZone,
-                  @Nullable String apiKey, @Nullable String secretKey) {
-      this.id = checkNotNull(id, "id");
-      this.name = name;
-      this.firstName = firstName;
-      this.lastName = lastName;
-      this.email = email;
-      this.created = created;
-      this.state = state;
-      this.account = account;
-      this.accountType = accountType;
-      this.domain = domain;
-      this.domainId = domainId;
-      this.timeZone = timeZone;
-      this.apiKey = apiKey;
-      this.secretKey = secretKey;
-   }
-
-   /**
-    * @return the user ID
-    */
-   public String getId() {
-      return this.id;
-   }
-
-   /**
-    * @return the user name
-    */
-   @Nullable
-   public String getName() {
-      return this.name;
-   }
-
-   /**
-    * @return the user firstname
-    */
-   @Nullable
-   public String getFirstName() {
-      return this.firstName;
-   }
-
-   /**
-    * @return the user lastname
-    */
-   @Nullable
-   public String getLastName() {
-      return this.lastName;
-   }
-
-   /**
-    * @return the user email address
-    */
-   @Nullable
-   public String getEmail() {
-      return this.email;
-   }
-
-   /**
-    * @return the date and time the user account was created
-    */
-   @Nullable
-   public Date getCreated() {
-      return this.created;
-   }
-
-   /**
-    * @return the user state
-    */
-   @Nullable
-   public User.State getState() {
-      return this.state;
-   }
-
-   /**
-    * @return the account name of the user
-    */
-   @Nullable
-   public String getAccount() {
-      return this.account;
-   }
-
-   /**
-    * @return the account type of the user
-    */
-   @Nullable
-   public Account.Type getAccountType() {
-      return this.accountType;
-   }
-
-   /**
-    * @return the domain name of the user
-    */
-   @Nullable
-   public String getDomain() {
-      return this.domain;
-   }
-
-   /**
-    * @return the domain ID of the user
-    */
-   @Nullable
-   public String getDomainId() {
-      return this.domainId;
-   }
-
-   /**
-    * @return the timezone user was created in
-    */
-   @Nullable
-   public String getTimeZone() {
-      return this.timeZone;
-   }
-
-   /**
-    * @return the api key of the user
-    */
-   @Nullable
-   public String getApiKey() {
-      return this.apiKey;
-   }
-
-   /**
-    * @return the secret key of the user
-    */
-   @Nullable
-   public String getSecretKey() {
-      return this.secretKey;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(id, name, firstName, lastName, email, created, state, account, accountType, domain, domainId, timeZone, apiKey, secretKey);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null || getClass() != obj.getClass()) return false;
-      User that = User.class.cast(obj);
-      return Objects.equal(this.id, that.id)
-            && Objects.equal(this.name, that.name)
-            && Objects.equal(this.firstName, that.firstName)
-            && Objects.equal(this.lastName, that.lastName)
-            && Objects.equal(this.email, that.email)
-            && Objects.equal(this.created, that.created)
-            && Objects.equal(this.state, that.state)
-            && Objects.equal(this.account, that.account)
-            && Objects.equal(this.accountType, that.accountType)
-            && Objects.equal(this.domain, that.domain)
-            && Objects.equal(this.domainId, that.domainId)
-            && Objects.equal(this.timeZone, that.timeZone)
-            && Objects.equal(this.apiKey, that.apiKey)
-            && Objects.equal(this.secretKey, that.secretKey);
-   }
-
-   protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this)
-            .add("id", id).add("name", name).add("firstName", firstName).add("lastName", lastName).add("email", email)
-            .add("created", created).add("state", state).add("account", account).add("accountType", accountType).add("domain", domain)
-            .add("domainId", domainId).add("timeZone", timeZone).add("apiKey", apiKey).add("secretKey", secretKey);
-   }
-
-   @Override
-   public String toString() {
-      return string().toString();
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java
deleted file mode 100644
index b3e5215..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Class VMGroup
- */
-public class VMGroup {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return new ConcreteBuilder().fromVMGroup(this);
-   }
-
-   public abstract static class Builder<T extends Builder<T>> {
-      protected abstract T self();
-
-      protected String id;
-      protected String account;
-      protected Date created;
-      protected String domain;
-      protected String domainId;
-      protected String name;
-
-      /**
-       * @see VMGroup#getId()
-       */
-      public T id(String id) {
-         this.id = id;
-         return self();
-      }
-
-      /**
-       * @see VMGroup#getAccount()
-       */
-      public T account(String account) {
-         this.account = account;
-         return self();
-      }
-
-      /**
-       * @see VMGroup#getCreated()
-       */
-      public T created(Date created) {
-         this.created = created;
-         return self();
-      }
-
-      /**
-       * @see VMGroup#getDomain()
-       */
-      public T domain(String domain) {
-         this.domain = domain;
-         return self();
-      }
-
-      /**
-       * @see VMGroup#getDomainId()
-       */
-      public T domainId(String domainId) {
-         this.domainId = domainId;
-         return self();
-      }
-
-      /**
-       * @see VMGroup#getName()
-       */
-      public T name(String name) {
-         this.name = name;
-         return self();
-      }
-
-      public VMGroup build() {
-         return new VMGroup(id, account, created, domain, domainId, name);
-      }
-
-      public T fromVMGroup(VMGroup in) {
-         return this
-               .id(in.getId())
-               .account(in.getAccount())
-               .created(in.getCreated())
-               .domain(in.getDomain())
-               .domainId(in.getDomainId())
-               .name(in.getName());
-      }
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-      @Override
-      protected ConcreteBuilder self() {
-         return this;
-      }
-   }
-
-   private final String id;
-   private final String account;
-   private final Date created;
-   private final String domain;
-   private final String domainId;
-   private final String name;
-
-   @ConstructorProperties({
-         "id", "account", "created", "domain", "domainid", "name"
-   })
-   protected VMGroup(String id, @Nullable String account, @Nullable Date created, @Nullable String domain,
-                     @Nullable String domainId, @Nullable String name) {
-      this.id = checkNotNull(id, "id");
-      this.account = account;
-      this.created = created;
-      this.domain = domain;
-      this.domainId = domainId;
-      this.name = name;
-   }
-
-   /**
-    * @return the VMGroup's ID
-    */
-   public String getId() {
-      return this.id;
-   }
-
-   /**
-    * @return the account that owns the VMGroup
-    */
-   @Nullable
-   public String getAccount() {
-      return this.account;
-   }
-
-   /**
-    * @return the VMGroup's creation timestamp
-    */
-   @Nullable
-   public Date getCreated() {
-      return this.created;
-   }
-
-   /**
-    * @return the domain that contains the VMGroup
-    */
-   @Nullable
-   public String getDomain() {
-      return this.domain;
-   }
-
-   /**
-    * @return the ID of the domain that contains the VMGroup
-    */
-   @Nullable
-   public String getDomainId() {
-      return this.domainId;
-   }
-
-   /**
-    * @return the name of the VMGroup
-    */
-   public String getName() {
-      return this.name;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(id, account, created, domain, domainId, name);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null || getClass() != obj.getClass()) return false;
-      VMGroup that = VMGroup.class.cast(obj);
-      return Objects.equal(this.id, that.id)
-            && Objects.equal(this.account, that.account)
-            && Objects.equal(this.created, that.created)
-            && Objects.equal(this.domain, that.domain)
-            && Objects.equal(this.domainId, that.domainId)
-            && Objects.equal(this.name, that.name);
-   }
-
-   protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this)
-            .add("id", id).add("account", account).add("created", created).add("domain", domain).add("domainId", domainId).add("name", name);
-   }
-
-   @Override
-   public String toString() {
-      return string().toString();
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java
deleted file mode 100644
index 0e23a38..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java
+++ /dev/null
@@ -1,1049 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-import java.util.Set;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.CaseFormat;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Class VirtualMachine
- */
-public class VirtualMachine {
-
-   /**
-    */
-   public static enum State {
-      STARTING, RUNNING, STOPPING, STOPPED, DESTROYED, EXPUNGING, MIGRATING, ERROR, UNKNOWN, SHUTDOWNED, UNRECOGNIZED;
-
-      @Override
-      public String toString() {
-         return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
-      }
-
-      public static State fromValue(String state) {
-         try {
-            return valueOf(CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, checkNotNull(state, "state")));
-         } catch (IllegalArgumentException e) {
-            return UNRECOGNIZED;
-         }
-      }
-
-   }
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return new ConcreteBuilder().fromVirtualMachine(this);
-   }
-
-   public abstract static class Builder<T extends Builder<T>> {
-      protected abstract T self();
-
-      protected String id;
-      protected String account;
-      protected long cpuCount;
-      protected long cpuSpeed;
-      protected String cpuUsed;
-      protected String displayName;
-      protected Date created;
-      protected String domain;
-      protected String domainId;
-      protected boolean usesVirtualNetwork;
-      protected String group;
-      protected String groupId;
-      protected String guestOSId;
-      protected boolean HAEnabled;
-      protected String hostId;
-      protected String hostname;
-      protected String IPAddress;
-      protected String ISODisplayText;
-      protected String ISOId;
-      protected String ISOName;
-      protected String jobId;
-      protected Integer jobStatus;
-      protected long memory;
-      protected String name;
-      protected Long networkKbsRead;
-      protected Long networkKbsWrite;
-      protected String password;
-      protected boolean passwordEnabled;
-      protected String publicIP;
-      protected String publicIPId;
-      protected String rootDeviceId;
-      protected String rootDeviceType;
-      protected String serviceOfferingId;
-      protected String serviceOfferingName;
-      protected VirtualMachine.State state;
-      protected String templateDisplayText;
-      protected String templateId;
-      protected String templateName;
-      protected String zoneId;
-      protected String zoneName;
-      protected Set<NIC> nics = ImmutableSet.of();
-      protected String hypervisor;
-      protected Set<SecurityGroup> securityGroups = ImmutableSet.of();
-
-      /**
-       * @see VirtualMachine#getId()
-       */
-      public T id(String id) {
-         this.id = id;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getAccount()
-       */
-      public T account(String account) {
-         this.account = account;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getCpuCount()
-       */
-      public T cpuCount(long cpuCount) {
-         this.cpuCount = cpuCount;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getCpuSpeed()
-       */
-      public T cpuSpeed(long cpuSpeed) {
-         this.cpuSpeed = cpuSpeed;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getCpuUsed()
-       */
-      public T cpuUsed(String cpuUsed) {
-         this.cpuUsed = cpuUsed;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getDisplayName()
-       */
-      public T displayName(String displayName) {
-         this.displayName = displayName;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getCreated()
-       */
-      public T created(Date created) {
-         this.created = created;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getDomain()
-       */
-      public T domain(String domain) {
-         this.domain = domain;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getDomainId()
-       */
-      public T domainId(String domainId) {
-         this.domainId = domainId;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#usesVirtualNetwork()
-       */
-      public T usesVirtualNetwork(boolean usesVirtualNetwork) {
-         this.usesVirtualNetwork = usesVirtualNetwork;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getGroup()
-       */
-      public T group(String group) {
-         this.group = group;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getGroupId()
-       */
-      public T groupId(String groupId) {
-         this.groupId = groupId;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getGuestOSId()
-       */
-      public T guestOSId(String guestOSId) {
-         this.guestOSId = guestOSId;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#isHAEnabled()
-       */
-      public T isHAEnabled(boolean HAEnabled) {
-         this.HAEnabled = HAEnabled;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getHostId()
-       */
-      public T hostId(String hostId) {
-         this.hostId = hostId;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getHostname()
-       */
-      public T hostname(String hostname) {
-         this.hostname = hostname;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getIPAddress()
-       */
-      public T IPAddress(String IPAddress) {
-         this.IPAddress = IPAddress;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getISODisplayText()
-       */
-      public T ISODisplayText(String ISODisplayText) {
-         this.ISODisplayText = ISODisplayText;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getISOId()
-       */
-      public T ISOId(String ISOId) {
-         this.ISOId = ISOId;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getISOName()
-       */
-      public T ISOName(String ISOName) {
-         this.ISOName = ISOName;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getJobId()
-       */
-      public T jobId(String jobId) {
-         this.jobId = jobId;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getJobStatus()
-       */
-      public T jobStatus(Integer jobStatus) {
-         this.jobStatus = jobStatus;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getMemory()
-       */
-      public T memory(long memory) {
-         this.memory = memory;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getName()
-       */
-      public T name(String name) {
-         this.name = name;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getNetworkKbsRead()
-       */
-      public T networkKbsRead(Long networkKbsRead) {
-         this.networkKbsRead = networkKbsRead;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getNetworkKbsWrite()
-       */
-      public T networkKbsWrite(Long networkKbsWrite) {
-         this.networkKbsWrite = networkKbsWrite;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getPassword()
-       */
-      public T password(String password) {
-         this.password = password;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#isPasswordEnabled()
-       */
-      public T passwordEnabled(boolean passwordEnabled) {
-         this.passwordEnabled = passwordEnabled;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getPublicIP()
-       */
-      public T publicIP(String publicIP) {
-         this.publicIP = publicIP;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getPublicIPId()
-       */
-      public T publicIPId(String publicIPId) {
-         this.publicIPId = publicIPId;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getRootDeviceId()
-       */
-      public T rootDeviceId(String rootDeviceId) {
-         this.rootDeviceId = rootDeviceId;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getRootDeviceType()
-       */
-      public T rootDeviceType(String rootDeviceType) {
-         this.rootDeviceType = rootDeviceType;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getServiceOfferingId()
-       */
-      public T serviceOfferingId(String serviceOfferingId) {
-         this.serviceOfferingId = serviceOfferingId;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getServiceOfferingName()
-       */
-      public T serviceOfferingName(String serviceOfferingName) {
-         this.serviceOfferingName = serviceOfferingName;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getState()
-       */
-      public T state(VirtualMachine.State state) {
-         this.state = state;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getTemplateDisplayText()
-       */
-      public T templateDisplayText(String templateDisplayText) {
-         this.templateDisplayText = templateDisplayText;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getTemplateId()
-       */
-      public T templateId(String templateId) {
-         this.templateId = templateId;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getTemplateName()
-       */
-      public T templateName(String templateName) {
-         this.templateName = templateName;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getZoneId()
-       */
-      public T zoneId(String zoneId) {
-         this.zoneId = zoneId;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getZoneName()
-       */
-      public T zoneName(String zoneName) {
-         this.zoneName = zoneName;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getNICs()
-       */
-      public T nics(Set<NIC> nics) {
-         this.nics = ImmutableSet.copyOf(checkNotNull(nics, "nics"));
-         return self();
-      }
-
-      public T nics(NIC... in) {
-         return nics(ImmutableSet.copyOf(in));
-      }
-
-      /**
-       * @see VirtualMachine#getHypervisor()
-       */
-      public T hypervisor(String hypervisor) {
-         this.hypervisor = hypervisor;
-         return self();
-      }
-
-      /**
-       * @see VirtualMachine#getSecurityGroups()
-       */
-      public T securityGroups(Set<SecurityGroup> securityGroups) {
-         this.securityGroups = ImmutableSet.copyOf(checkNotNull(securityGroups, "securityGroups"));
-         return self();
-      }
-
-      public T securityGroups(SecurityGroup... in) {
-         return securityGroups(ImmutableSet.copyOf(in));
-      }
-
-      public VirtualMachine build() {
-         return new VirtualMachine(id, account, cpuCount, cpuSpeed, cpuUsed, displayName, created, domain, domainId,
-               usesVirtualNetwork, group, groupId, guestOSId, HAEnabled, hostId, hostname, IPAddress, ISODisplayText, ISOId,
-               ISOName, jobId, jobStatus, memory, name, networkKbsRead, networkKbsWrite, password, passwordEnabled, publicIP,
-               publicIPId, rootDeviceId, rootDeviceType, serviceOfferingId, serviceOfferingName, state, templateDisplayText,
-               templateId, templateName, zoneId, zoneName, nics, hypervisor, securityGroups);
-      }
-
-      public T fromVirtualMachine(VirtualMachine in) {
-         return this
-               .id(in.getId())
-               .account(in.getAccount())
-               .cpuCount(in.getCpuCount())
-               .cpuSpeed(in.getCpuSpeed())
-               .cpuUsed(in.getCpuUsedAsString())
-               .displayName(in.getDisplayName())
-               .created(in.getCreated())
-               .domain(in.getDomain())
-               .domainId(in.getDomainId())
-               .usesVirtualNetwork(in.usesVirtualNetwork())
-               .group(in.getGroup())
-               .groupId(in.getGroupId())
-               .guestOSId(in.getGuestOSId())
-               .isHAEnabled(in.isHAEnabled())
-               .hostId(in.getHostId())
-               .hostname(in.getHostname())
-               .IPAddress(in.getIPAddress())
-               .ISODisplayText(in.getISODisplayText())
-               .ISOId(in.getISOId())
-               .ISOName(in.getISOName())
-               .jobId(in.getJobId())
-               .jobStatus(in.getJobStatus())
-               .memory(in.getMemory())
-               .name(in.getName())
-               .networkKbsRead(in.getNetworkKbsRead())
-               .networkKbsWrite(in.getNetworkKbsWrite())
-               .password(in.getPassword())
-               .passwordEnabled(in.isPasswordEnabled())
-               .publicIP(in.getPublicIP())
-               .publicIPId(in.getPublicIPId())
-               .rootDeviceId(in.getRootDeviceId())
-               .rootDeviceType(in.getRootDeviceType())
-               .serviceOfferingId(in.getServiceOfferingId())
-               .serviceOfferingName(in.getServiceOfferingName())
-               .state(in.getState())
-               .templateDisplayText(in.getTemplateDisplayText())
-               .templateId(in.getTemplateId())
-               .templateName(in.getTemplateName())
-               .zoneId(in.getZoneId())
-               .zoneName(in.getZoneName())
-               .nics(in.getNICs())
-               .hypervisor(in.getHypervisor())
-               .securityGroups(in.getSecurityGroups());
-      }
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-      @Override
-      protected ConcreteBuilder self() {
-         return this;
-      }
-   }
-
-   private final String id;
-   private final String account;
-   private final long cpuCount;
-   private final long cpuSpeed;
-   private final String cpuUsed;
-   private final String displayName;
-   private final Date created;
-   private final String domain;
-   private final String domainId;
-   private final boolean usesVirtualNetwork;
-   private final String group;
-   private final String groupId;
-   private final String guestOSId;
-   private final boolean HAEnabled;
-   private final String hostId;
-   private final String hostname;
-   private final String IPAddress;
-   private final String ISODisplayText;
-   private final String ISOId;
-   private final String ISOName;
-   private final String jobId;
-   private final Integer jobStatus;
-   private final long memory;
-   private final String name;
-   private final Long networkKbsRead;
-   private final Long networkKbsWrite;
-   private final String password;
-   private final boolean passwordEnabled;
-   private final String publicIP;
-   private final String publicIPId;
-   private final String rootDeviceId;
-   private final String rootDeviceType;
-   private final String serviceOfferingId;
-   private final String serviceOfferingName;
-   private final VirtualMachine.State state;
-   private final String templateDisplayText;
-   private final String templateId;
-   private final String templateName;
-   private final String zoneId;
-   private final String zoneName;
-   private final Set<NIC> nics;
-   private final String hypervisor;
-   private final Set<SecurityGroup> securityGroups;
-
-   @ConstructorProperties({
-         "id", "account", "cpunumber", "cpuspeed", "cpuused", "displayname", "created", "domain", "domainid", "forvirtualnetwork", "group", "groupid", "guestosid", "haenable", "hostid", "hostname", "ipaddress", "isodisplaytext", "isoid", "isoname", "jobid", "jobstatus", "memory", "name", "networkkbsread", "networkkbswrite", "password", "passwordenabled", "publicip", "publicipid", "rootdeviceid", "rootdevicetype", "serviceofferingid", "serviceofferingname", "state", "templatedisplaytext", "templateid", "templatename", "zoneid", "zonename", "nic", "hypervisor", "securitygroup"
-   })
-   protected VirtualMachine(String id, @Nullable String account, long cpuCount, long cpuSpeed, @Nullable String cpuUsed,
-                            @Nullable String displayName, @Nullable Date created, @Nullable String domain, @Nullable String domainId,
-                            boolean usesVirtualNetwork, @Nullable String group, @Nullable String groupId, @Nullable String guestOSId,
-                            boolean HAEnabled, @Nullable String hostId, @Nullable String hostname, String IPAddress, String ISODisplayText,
-                            @Nullable String ISOId, @Nullable String ISOName, @Nullable String jobId, @Nullable Integer jobStatus,
-                            long memory, @Nullable String name, @Nullable Long networkKbsRead, @Nullable Long networkKbsWrite, @Nullable String password,
-                            boolean passwordEnabled, @Nullable String publicIP, @Nullable String publicIPId, @Nullable String rootDeviceId,
-                            @Nullable String rootDeviceType, @Nullable String serviceOfferingId, @Nullable String serviceOfferingName,
-                            @Nullable VirtualMachine.State state, @Nullable String templateDisplayText, @Nullable String templateId,
-                            @Nullable String templateName, @Nullable String zoneId, @Nullable String zoneName, @Nullable Set<NIC> nics,
-                            @Nullable String hypervisor, @Nullable Set<SecurityGroup> securityGroups) {
-      Preconditions.checkArgument(Strings.isNullOrEmpty(cpuUsed) || cpuUsed.matches("^[0-9\\.|,\\-]+%$"), "cpuUsed value should be a decimal number followed by %");
-      this.id = checkNotNull(id, "id");
-      this.account = account;
-      this.cpuCount = cpuCount;
-      this.cpuSpeed = cpuSpeed;
-      this.cpuUsed = cpuUsed;
-      this.displayName = displayName;
-      this.created = created;
-      this.domain = domain;
-      this.domainId = domainId;
-      this.usesVirtualNetwork = usesVirtualNetwork;
-      this.group = group;
-      this.groupId = groupId;
-      this.guestOSId = guestOSId;
-      this.HAEnabled = HAEnabled;
-      this.hostId = hostId;
-      this.hostname = hostname;
-      this.IPAddress = IPAddress;
-      this.ISODisplayText = ISODisplayText;
-      this.ISOId = ISOId;
-      this.ISOName = ISOName;
-      this.jobId = jobId;
-      this.jobStatus = jobStatus;
-      this.memory = memory;
-      this.name = name;
-      this.networkKbsRead = networkKbsRead;
-      this.networkKbsWrite = networkKbsWrite;
-      this.password = password;
-      this.passwordEnabled = passwordEnabled;
-      this.publicIP = publicIP;
-      this.publicIPId = publicIPId;
-      this.rootDeviceId = rootDeviceId;
-      this.rootDeviceType = rootDeviceType;
-      this.serviceOfferingId = serviceOfferingId;
-      this.serviceOfferingName = serviceOfferingName;
-      this.state = state;
-      this.templateDisplayText = templateDisplayText;
-      this.templateId = templateId;
-      this.templateName = templateName;
-      this.zoneId = zoneId;
-      this.zoneName = zoneName;
-      this.nics = nics == null ? ImmutableSet.<NIC>of() : ImmutableSet.copyOf(nics);
-      this.hypervisor = hypervisor;
-      this.securityGroups = securityGroups == null ? ImmutableSet.<SecurityGroup>of() : ImmutableSet.copyOf(securityGroups);
-   }
-
-   /**
-    * @return the ID of the virtual machine
-    */
-   public String getId() {
-      return this.id;
-   }
-
-   /**
-    * @return the account associated with the virtual machine
-    */
-   @Nullable
-   public String getAccount() {
-      return this.account;
-   }
-
-   /**
-    * @return the number of cpu this virtual machine is running with
-    */
-   public long getCpuCount() {
-      return this.cpuCount;
-   }
-
-   /**
-    * @return the speed of each cpu
-    */
-   public long getCpuSpeed() {
-      return this.cpuSpeed;
-   }
-
-   /**
-    * @return the amount of the vm's CPU currently used
-    */
-   public float getCpuUsed() {
-      return cpuUsed != null ? Float.parseFloat(cpuUsed.substring(0, cpuUsed.length() - 1).replace(',', '.')) : 0.0f;
-   }
-
-   private String getCpuUsedAsString() {
-      return cpuUsed;
-   }
-
-   /**
-    * @return user generated name. The name of the virtual machine is returned
-    *         if no displayname exists.
-    */
-   @Nullable
-   public String getDisplayName() {
-      return this.displayName;
-   }
-
-   /**
-    * @return the date when this virtual machine was created
-    */
-   @Nullable
-   public Date getCreated() {
-      return this.created;
-   }
-
-   /**
-    * @return the name of the domain in which the virtual machine exists
-    */
-   @Nullable
-   public String getDomain() {
-      return this.domain;
-   }
-
-   /**
-    * @return the ID of the domain in which the virtual machine exists
-    */
-   @Nullable
-   public String getDomainId() {
-      return this.domainId;
-   }
-
-   /**
-    * @return the virtual network for the service offering
-    */
-   public boolean usesVirtualNetwork() {
-      return this.usesVirtualNetwork;
-   }
-
-   /**
-    * @return the group name of the virtual machine
-    */
-   @Nullable
-   public String getGroup() {
-      return this.group;
-   }
-
-   /**
-    * @return the group ID of the virtual machine
-    */
-   @Nullable
-   public String getGroupId() {
-      return this.groupId;
-   }
-
-   /**
-    * @return Os type ID of the virtual machine
-    */
-   @Nullable
-   public String getGuestOSId() {
-      return this.guestOSId;
-   }
-
-   /**
-    * @return true if high-availability is enabled, false otherwise
-    */
-   public boolean isHAEnabled() {
-      return this.HAEnabled;
-   }
-
-   /**
-    * @return the ID of the host for the virtual machine
-    */
-   @Nullable
-   public String getHostId() {
-      return this.hostId;
-   }
-
-   /**
-    * @return the name of the host for the virtual machine
-    */
-   @Nullable
-   public String getHostname() {
-      return this.hostname;
-   }
-
-   /**
-    * @return the ip address of the virtual machine
-    */
-   @Nullable
-   public String getIPAddress() {
-      return this.IPAddress;
-   }
-
-   /**
-    * @return an alternate display text of the ISO attached to the virtual
-    *         machine
-    */
-   @Nullable
-   public String getISODisplayText() {
-      return this.ISODisplayText;
-   }
-
-   /**
-    * @return the ID of the ISO attached to the virtual machine
-    */
-   @Nullable
-   public String getISOId() {
-      return this.ISOId;
-   }
-
-   /**
-    * @return the name of the ISO attached to the virtual machine
-    */
-   @Nullable
-   public String getISOName() {
-      return this.ISOName;
-   }
-
-   /**
-    * @return shows the current pending asynchronous job ID. This tag is not
-    *         returned if no current pending jobs are acting on the virtual
-    *         machine
-    */
-   @Nullable
-   public String getJobId() {
-      return this.jobId;
-   }
-
-   /**
-    * @return shows the current pending asynchronous job status
-    */
-   @Nullable
-   public Integer getJobStatus() {
-      return this.jobStatus;
-   }
-
-   /**
-    * @return the memory allocated for the virtual machine
-    */
-   public long getMemory() {
-      return this.memory;
-   }
-
-   /**
-    * @return the name of the virtual machine
-    */
-   @Nullable
-   public String getName() {
-      return this.name;
-   }
-
-   /**
-    * @return the incoming network traffic on the vm
-    */
-   @Nullable
-   public Long getNetworkKbsRead() {
-      return this.networkKbsRead;
-   }
-
-   /**
-    * @return the outgoing network traffic on the host
-    */
-   @Nullable
-   public Long getNetworkKbsWrite() {
-      return this.networkKbsWrite;
-   }
-
-   /**
-    * @return the password (if exists) of the virtual machine
-    */
-   @Nullable
-   public String getPassword() {
-      return this.password;
-   }
-
-   /**
-    * @return true if the password rest feature is enabled, false otherwise
-    */
-   public boolean isPasswordEnabled() {
-      return this.passwordEnabled;
-   }
-
-   /**
-    * @return public IP of this virtual machine
-    */
-   @Nullable
-   public String getPublicIP() {
-      return this.publicIP;
-   }
-
-   /**
-    * @return ID of the public IP of this virtual machine
-    */
-   @Nullable
-   public String getPublicIPId() {
-      return this.publicIPId;
-   }
-
-   /**
-    * @return device ID of the root volume
-    */
-   @Nullable
-   public String getRootDeviceId() {
-      return this.rootDeviceId;
-   }
-
-   /**
-    * @return device type of the root volume
-    */
-   @Nullable
-   public String getRootDeviceType() {
-      return this.rootDeviceType;
-   }
-
-   /**
-    * @return the ID of the service offering of the virtual machine
-    */
-   @Nullable
-   public String getServiceOfferingId() {
-      return this.serviceOfferingId;
-   }
-
-   /**
-    * @return the name of the service offering of the virtual machine
-    */
-   @Nullable
-   public String getServiceOfferingName() {
-      return this.serviceOfferingName;
-   }
-
-   /**
-    * @return the state of the virtual machine
-    */
-   @Nullable
-   public VirtualMachine.State getState() {
-      return this.state;
-   }
-
-   /**
-    * @return an alternate display text of the template for the virtual machine
-    */
-   @Nullable
-   public String getTemplateDisplayText() {
-      return this.templateDisplayText;
-   }
-
-   /**
-    * @return the ID of the template for the virtual machine. A -1 is returned
-    *         if the virtual machine was created from an ISO file.
-    */
-   @Nullable
-   public String getTemplateId() {
-      return this.templateId;
-   }
-
-   /**
-    * @return the name of the template for the virtual machine
-    */
-   @Nullable
-   public String getTemplateName() {
-      return this.templateName;
-   }
-
-   /**
-    * @return the ID of the availability zone for the virtual machine
-    */
-   @Nullable
-   public String getZoneId() {
-      return this.zoneId;
-   }
-
-   /**
-    * @return the name of the availability zone for the virtual machine
-    */
-   @Nullable
-   public String getZoneName() {
-      return this.zoneName;
-   }
-
-   public Set<NIC> getNICs() {
-      return this.nics;
-   }
-
-   /**
-    * @return type of the hypervisor
-    */
-   @Nullable
-   public String getHypervisor() {
-      return this.hypervisor;
-   }
-
-   /**
-    * @return list of security groups associated with the virtual machine
-    */
-   public Set<SecurityGroup> getSecurityGroups() {
-      return this.securityGroups;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(id, account, cpuCount, cpuSpeed, cpuUsed, displayName, created, domain, domainId, usesVirtualNetwork, group, groupId, guestOSId, HAEnabled, hostId, hostname, IPAddress, ISODisplayText, ISOId, ISOName, jobId, jobStatus, memory, name, networkKbsRead, networkKbsWrite, password, passwordEnabled, publicIP, publicIPId, rootDeviceId, rootDeviceType, serviceOfferingId, serviceOfferingName, state, templateDisplayText, templateId, templateName, zoneId, zoneName, nics, hypervisor, securityGroups);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null || getClass() != obj.getClass()) return false;
-      VirtualMachine that = VirtualMachine.class.cast(obj);
-      return Objects.equal(this.id, that.id)
-            && Objects.equal(this.account, that.account)
-            && Objects.equal(this.cpuCount, that.cpuCount)
-            && Objects.equal(this.cpuSpeed, that.cpuSpeed)
-            && Objects.equal(this.cpuUsed, that.cpuUsed)
-            && Objects.equal(this.displayName, that.displayName)
-            && Objects.equal(this.created, that.created)
-            && Objects.equal(this.domain, that.domain)
-            && Objects.equal(this.domainId, that.domainId)
-            && Objects.equal(this.usesVirtualNetwork, that.usesVirtualNetwork)
-            && Objects.equal(this.group, that.group)
-            && Objects.equal(this.groupId, that.groupId)
-            && Objects.equal(this.guestOSId, that.guestOSId)
-            && Objects.equal(this.HAEnabled, that.HAEnabled)
-            && Objects.equal(this.hostId, that.hostId)
-            && Objects.equal(this.hostname, that.hostname)
-            && Objects.equal(this.IPAddress, that.IPAddress)
-            && Objects.equal(this.ISODisplayText, that.ISODisplayText)
-            && Objects.equal(this.ISOId, that.ISOId)
-            && Objects.equal(this.ISOName, that.ISOName)
-            && Objects.equal(this.jobId, that.jobId)
-            && Objects.equal(this.jobStatus, that.jobStatus)
-            && Objects.equal(this.memory, that.memory)
-            && Objects.equal(this.name, that.name)
-            && Objects.equal(this.networkKbsRead, that.networkKbsRead)
-            && Objects.equal(this.networkKbsWrite, that.networkKbsWrite)
-            && Objects.equal(this.password, that.password)
-            && Objects.equal(this.passwordEnabled, that.passwordEnabled)
-            && Objects.equal(this.publicIP, that.publicIP)
-            && Objects.equal(this.publicIPId, that.publicIPId)
-            && Objects.equal(this.rootDeviceId, that.rootDeviceId)
-            && Objects.equal(this.rootDeviceType, that.rootDeviceType)
-            && Objects.equal(this.serviceOfferingId, that.serviceOfferingId)
-            && Objects.equal(this.serviceOfferingName, that.serviceOfferingName)
-            && Objects.equal(this.state, that.state)
-            && Objects.equal(this.templateDisplayText, that.templateDisplayText)
-            && Objects.equal(this.templateId, that.templateId)
-            && Objects.equal(this.templateName, that.templateName)
-            && Objects.equal(this.zoneId, that.zoneId)
-            && Objects.equal(this.zoneName, that.zoneName)
-            && Objects.equal(this.nics, that.nics)
-            && Objects.equal(this.hypervisor, that.hypervisor)
-            && Objects.equal(this.securityGroups, that.securityGroups);
-   }
-
-   protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this)
-            .add("id", id).add("account", account).add("cpuCount", cpuCount).add("cpuSpeed", cpuSpeed).add("cpuUsed", cpuUsed)
-            .add("displayName", displayName).add("created", created).add("domain", domain).add("domainId", domainId)
-            .add("usesVirtualNetwork", usesVirtualNetwork).add("group", group).add("groupId", groupId).add("guestOSId", guestOSId)
-            .add("HAEnabled", HAEnabled).add("hostId", hostId).add("hostname", hostname).add("IPAddress", IPAddress)
-            .add("ISODisplayText", ISODisplayText).add("ISOId", ISOId).add("ISOName", ISOName).add("jobId", jobId)
-            .add("jobStatus", jobStatus).add("memory", memory).add("name", name).add("networkKbsRead", networkKbsRead)
-            .add("networkKbsWrite", networkKbsWrite).add("password", password).add("passwordEnabled", passwordEnabled)
-            .add("publicIP", publicIP).add("publicIPId", publicIPId).add("rootDeviceId", rootDeviceId).add("rootDeviceType", rootDeviceType)
-            .add("serviceOfferingId", serviceOfferingId).add("serviceOfferingName", serviceOfferingName).add("state", state)
-            .add("templateDisplayText", templateDisplayText).add("templateId", templateId).add("templateName", templateName)
-            .add("zoneId", zoneId).add("zoneName", zoneName).add("nics", nics).add("hypervisor", hypervisor).add("securityGroups", securityGroups);
-   }
-
-   @Override
-   public String toString() {
-      return string().toString();
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java
deleted file mode 100644
index 49c7d18..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Represents the data object used in CloudStack's "Vlan" API.
- */
-public class VlanIPRange implements Comparable<VlanIPRange> {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return new ConcreteBuilder().fromVlanIPRange(this);
-   }
-
-   public abstract static class Builder<T extends Builder<T>> {
-      protected abstract T self();
-
-      protected String id;
-      protected String description;
-      protected boolean forVirtualNetwork;
-      protected String zoneId;
-      protected String vlan;
-      protected String account;
-      protected String domainId;
-      protected String domain;
-      protected String podId;
-      protected String podName;
-      protected String gateway;
-      protected String netmask;
-      protected String startIP;
-      protected String endIP;
-      protected String networkId;
-
-      /**
-       * @see VlanIPRange#getId()
-       */
-      public T id(String id) {
-         this.id = id;
-         return self();
-      }
-
-      /**
-       * @see VlanIPRange#getDescription()
-       */
-      public T description(String description) {
-         this.description = description;
-         return self();
-      }
-
-      /**
-       * @see VlanIPRange#isForVirtualNetwork()
-       */
-      public T forVirtualNetwork(boolean forVirtualNetwork) {
-         this.forVirtualNetwork = forVirtualNetwork;
-         return self();
-      }
-
-      /**
-       * @see VlanIPRange#getZoneId()
-       */
-      public T zoneId(String zoneId) {
-         this.zoneId = zoneId;
-         return self();
-      }
-
-      /**
-       * @see VlanIPRange#getVlan()
-       */
-      public T vlan(String vlan) {
-         this.vlan = vlan;
-         return self();
-      }
-
-      /**
-       * @see VlanIPRange#getAccount()
-       */
-      public T account(String account) {
-         this.account = account;
-         return self();
-      }
-
-      /**
-       * @see VlanIPRange#getDomainId()
-       */
-      public T domainId(String domainId) {
-         this.domainId = domainId;
-         return self();
-      }
-
-      /**
-       * @see VlanIPRange#getDomain()
-       */
-      public T domain(String domain) {
-         this.domain = domain;
-         return self();
-      }
-
-      /**
-       * @see VlanIPRange#getPodId()
-       */
-      public T podId(String podId) {
-         this.podId = podId;
-         return self();
-      }
-
-      /**
-       * @see VlanIPRange#getPodName()
-       */
-      public T podName(String podName) {
-         this.podName = podName;
-         return self();
-      }
-
-      /**
-       * @see VlanIPRange#getGateway()
-       */
-      public T gateway(String gateway) {
-         this.gateway = gateway;
-         return self();
-      }
-
-      /**
-       * @see VlanIPRange#getNetmask()
-       */
-      public T netmask(String netmask) {
-         this.netmask = netmask;
-         return self();
-      }
-
-      /**
-       * @see VlanIPRange#getStartIP()
-       */
-      public T startIP(String startIP) {
-         this.startIP = startIP;
-         return self();
-      }
-
-      /**
-       * @see VlanIPRange#getEndIP()
-       */
-      public T endIP(String endIP) {
-         this.endIP = endIP;
-         return self();
-      }
-
-      /**
-       * @see VlanIPRange#getNetworkId()
-       */
-      public T networkId(String networkId) {
-         this.networkId = networkId;
-         return self();
-      }
-
-      public VlanIPRange build() {
-         return new VlanIPRange(id, description, forVirtualNetwork, zoneId, vlan, account, domainId, domain, podId,
-               podName, gateway, netmask, startIP, endIP, networkId);
-      }
-
-      public T fromVlanIPRange(VlanIPRange in) {
-         return this
-               .id(in.getId())
-               .description(in.getDescription())
-               .forVirtualNetwork(in.isForVirtualNetwork())
-               .zoneId(in.getZoneId())
-               .vlan(in.getVlan())
-               .account(in.getAccount())
-               .domainId(in.getDomainId())
-               .domain(in.getDomain())
-               .podId(in.getPodId())
-               .podName(in.getPodName())
-               .gateway(in.getGateway())
-               .netmask(in.getNetmask())
-               .startIP(in.getStartIP())
-               .endIP(in.getEndIP())
-               .networkId(in.getNetworkId());
-      }
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-      @Override
-      protected ConcreteBuilder self() {
-         return this;
-      }
-   }
-
-   private final String id;
-   private final String description;
-   private final boolean forVirtualNetwork;
-   private final String zoneId;
-   private final String vlan;
-   private final String account;
-   private final String domainId;
-   private final String domain;
-   private final String podId;
-   private final String podName;
-   private final String gateway;
-   private final String netmask;
-   private final String startIP;
-   private final String endIP;
-   private final String networkId;
-
-   @ConstructorProperties({
-         "id", "description", "forvirtualnetwork", "zoneid", "vlan", "account", "domainid", "domain", "podid", "podname",
-         "gateway", "netmask", "startip", "endip", "networkid"
-   })
-   protected VlanIPRange(String id, @Nullable String description, boolean forVirtualNetwork, @Nullable String zoneId,
-                         @Nullable String vlan, @Nullable String account, @Nullable String domainId, @Nullable String domain,
-                         @Nullable String podId, @Nullable String podName, @Nullable String gateway, @Nullable String netmask,
-                         @Nullable String startIP, @Nullable String endIP, @Nullable String networkId) {
-      this.id = checkNotNull(id, "id");
-      this.description = description;
-      this.forVirtualNetwork = forVirtualNetwork;
-      this.zoneId = zoneId;
-      this.vlan = vlan;
-      this.account = account;
-      this.domainId = domainId;
-      this.domain = domain;
-      this.podId = podId;
-      this.podName = podName;
-      this.gateway = gateway;
-      this.netmask = netmask;
-      this.startIP = startIP;
-      this.endIP = endIP;
-      this.networkId = networkId;
-   }
-
-   public String getId() {
-      return this.id;
-   }
-
-   @Nullable
-   public String getDescription() {
-      return this.description;
-   }
-
-   public boolean isForVirtualNetwork() {
-      return this.forVirtualNetwork;
-   }
-
-   @Nullable
-   public String getZoneId() {
-      return this.zoneId;
-   }
-
-   @Nullable
-   public String getVlan() {
-      return this.vlan;
-   }
-
-   @Nullable
-   public String getAccount() {
-      return this.account;
-   }
-
-   @Nullable
-   public String getDomainId() {
-      return this.domainId;
-   }
-
-   @Nullable
-   public String getDomain() {
-      return this.domain;
-   }
-
-   @Nullable
-   public String getPodId() {
-      return this.podId;
-   }
-
-   @Nullable
-   public String getPodName() {
-      return this.podName;
-   }
-
-   @Nullable
-   public String getGateway() {
-      return this.gateway;
-   }
-
-   @Nullable
-   public String getNetmask() {
-      return this.netmask;
-   }
-
-   @Nullable
-   public String getStartIP() {
-      return this.startIP;
-   }
-
-   @Nullable
-   public String getEndIP() {
-      return this.endIP;
-   }
-
-   @Nullable
-   public String getNetworkId() {
-      return this.networkId;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(id, description, forVirtualNetwork, zoneId, vlan, account, domainId, domain, podId, podName, gateway, netmask, startIP, endIP, networkId);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null || getClass() != obj.getClass()) return false;
-      VlanIPRange that = VlanIPRange.class.cast(obj);
-      return Objects.equal(this.id, that.id)
-            && Objects.equal(this.description, that.description)
-            && Objects.equal(this.forVirtualNetwork, that.forVirtualNetwork)
-            && Objects.equal(this.zoneId, that.zoneId)
-            && Objects.equal(this.vlan, that.vlan)
-            && Objects.equal(this.account, that.account)
-            && Objects.equal(this.domainId, that.domainId)
-            && Objects.equal(this.domain, that.domain)
-            && Objects.equal(this.podId, that.podId)
-            && Objects.equal(this.podName, that.podName)
-            && Objects.equal(this.gateway, that.gateway)
-            && Objects.equal(this.netmask, that.netmask)
-            && Objects.equal(this.startIP, that.startIP)
-            && Objects.equal(this.endIP, that.endIP)
-            && Objects.equal(this.networkId, that.networkId);
-   }
-
-   protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this)
-            .add("id", id).add("description", description).add("forVirtualNetwork", forVirtualNetwork).add("zoneId", zoneId)
-            .add("vlan", vlan).add("account", account).add("domainId", domainId).add("domain", domain).add("podId", podId)
-            .add("podName", podName).add("gateway", gateway).add("netmask", netmask).add("startIP", startIP).add("endIP", endIP)
-            .add("networkId", networkId);
-   }
-
-   @Override
-   public String toString() {
-      return string().toString();
-   }
-
-   @Override
-   public int compareTo(VlanIPRange other) {
-      return this.id.compareTo(other.id);
-   }
-
-}