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/ConfigurationEntry.java
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java
deleted file mode 100644
index ceb0f84..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java
+++ /dev/null
@@ -1,166 +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;
-
-/**
- * Representation of the API configuration entry response
- */
-public class ConfigurationEntry implements Comparable<ConfigurationEntry> {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return new ConcreteBuilder().fromConfigurationEntry(this);
-   }
-
-   public abstract static class Builder<T extends Builder<T>> {
-      protected abstract T self();
-
-      protected String category;
-      protected String description;
-      protected String name;
-      protected String value;
-
-      /**
-       * @see ConfigurationEntry#getCategory()
-       */
-      public T category(String category) {
-         this.category = category;
-         return self();
-      }
-
-      /**
-       * @see ConfigurationEntry#getDescription()
-       */
-      public T description(String description) {
-         this.description = description;
-         return self();
-      }
-
-      /**
-       * @see ConfigurationEntry#getName()
-       */
-      public T name(String name) {
-         this.name = name;
-         return self();
-      }
-
-      /**
-       * @see ConfigurationEntry#getValue()
-       */
-      public T value(String value) {
-         this.value = value;
-         return self();
-      }
-
-      public ConfigurationEntry build() {
-         return new ConfigurationEntry(category, description, name, value);
-      }
-
-      public T fromConfigurationEntry(ConfigurationEntry in) {
-         return this
-               .category(in.getCategory())
-               .description(in.getDescription())
-               .name(in.getName())
-               .value(in.getValue());
-      }
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-      @Override
-      protected ConcreteBuilder self() {
-         return this;
-      }
-   }
-
-   private final String category;
-   private final String description;
-   private final String name;
-   private final String value;
-
-   @ConstructorProperties({
-         "category", "description", "name", "value"
-   })
-   protected ConfigurationEntry(@Nullable String category, @Nullable String 
description, String name, @Nullable String value) {
-      this.category = category;
-      this.description = description;
-      this.name = checkNotNull(name, "name");
-      this.value = value;
-   }
-
-   @Nullable
-   public String getCategory() {
-      return this.category;
-   }
-
-   @Nullable
-   public String getDescription() {
-      return this.description;
-   }
-
-   public String getName() {
-      return this.name;
-   }
-
-   @Nullable
-   public String getValue() {
-      return this.value;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(category, description, name, value);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null || getClass() != obj.getClass()) return false;
-      ConfigurationEntry that = ConfigurationEntry.class.cast(obj);
-      return Objects.equal(this.category, that.category)
-            && Objects.equal(this.description, that.description)
-            && Objects.equal(this.name, that.name)
-            && Objects.equal(this.value, that.value);
-   }
-
-   protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this)
-            .add("category", category).add("description", 
description).add("name", name).add("value", value);
-   }
-
-   @Override
-   public String toString() {
-      return string().toString();
-   }
-
-   @Override
-   public int compareTo(ConfigurationEntry other) {
-      return name.compareTo(other.getName());
-   }
-}

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/DiskOffering.java
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java
deleted file mode 100644
index 9f9377f..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java
+++ /dev/null
@@ -1,295 +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.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Class DiskOffering
- */
-public class DiskOffering implements Comparable<DiskOffering> {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return new ConcreteBuilder().fromDiskOffering(this);
-   }
-
-   public abstract static class Builder<T extends Builder<T>> {
-      protected abstract T self();
-
-      protected String id;
-      protected String name;
-      protected String displayText;
-      protected Date created;
-      protected String domain;
-      protected String domainId;
-      protected int diskSize;
-      protected boolean customized;
-      protected ImmutableSet.Builder<String> tags = 
ImmutableSet.<String>builder();
-
-      /**
-       * @see DiskOffering#getId()
-       */
-      public T id(String id) {
-         this.id = id;
-         return self();
-      }
-
-      /**
-       * @see DiskOffering#getName()
-       */
-      public T name(String name) {
-         this.name = name;
-         return self();
-      }
-
-      /**
-       * @see DiskOffering#getDisplayText()
-       */
-      public T displayText(String displayText) {
-         this.displayText = displayText;
-         return self();
-      }
-
-      /**
-       * @see DiskOffering#getCreated()
-       */
-      public T created(Date created) {
-         this.created = created;
-         return self();
-      }
-
-      /**
-       * @see DiskOffering#getDomain()
-       */
-      public T domain(String domain) {
-         this.domain = domain;
-         return self();
-      }
-
-      /**
-       * @see DiskOffering#getDomainId()
-       */
-      public T domainId(String domainId) {
-         this.domainId = domainId;
-         return self();
-      }
-
-      /**
-       * @see DiskOffering#getDiskSize()
-       */
-      public T diskSize(int diskSize) {
-         this.diskSize = diskSize;
-         return self();
-      }
-
-      /**
-       * @see DiskOffering#isCustomized()
-       */
-      public T customized(boolean customized) {
-         this.customized = customized;
-         return self();
-      }
-
-      /**
-       * @see DiskOffering#getTags()
-       */
-      public T tags(Iterable<String> tags) {
-         this.tags = ImmutableSet.<String>builder().addAll(tags);
-         return self();
-      }
-      
-      /**
-       * @see DiskOffering#getTags()
-       */
-      public T tag(String tag) {
-         this.tags.add(tag);
-         return self();
-      }
-      
-      public DiskOffering build() {
-         return new DiskOffering(id, name, displayText, created, domain, 
domainId, diskSize, customized, tags.build());
-      }
-
-      public T fromDiskOffering(DiskOffering in) {
-         return this
-               .id(in.getId())
-               .name(in.getName())
-               .displayText(in.getDisplayText())
-               .created(in.getCreated())
-               .domain(in.getDomain())
-               .domainId(in.getDomainId())
-               .diskSize(in.getDiskSize())
-               .customized(in.isCustomized())
-               .tags(in.getTags());
-      }
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-      @Override
-      protected ConcreteBuilder self() {
-         return this;
-      }
-   }
-
-   private final String id;
-   private final String name;
-   private final String displayText;
-   private final Date created;
-   private final String domain;
-   private final String domainId;
-   private final int diskSize;
-   private final boolean customized;
-   private final Set<String> tags;
-
-   @ConstructorProperties({
-         "id", "name", "displaytext", "created", "domain", "domainid", 
"disksize", "iscustomized", "tags"
-   })
-   protected DiskOffering(String id, @Nullable String name, @Nullable String 
displayText, @Nullable Date created,
-                          @Nullable String domain, @Nullable String domainId, 
int diskSize, boolean customized,
-                          @Nullable Iterable<String> tags) {
-      this.id = checkNotNull(id, "id");
-      this.name = name;
-      this.displayText = displayText;
-      this.created = created;
-      this.domain = domain;
-      this.domainId = domainId;
-      this.diskSize = diskSize;
-      this.customized = customized;
-      this.tags = tags != null ? ImmutableSet.copyOf(tags) : 
ImmutableSet.<String> of();
-   }
-
-   /**
-    * @return the id of the disk offering
-    */
-   public String getId() {
-      return this.id;
-   }
-
-   /**
-    * @return the name of the disk offering
-    */
-   @Nullable
-   public String getName() {
-      return this.name;
-   }
-
-   /**
-    * @return an alternate display text of the disk offering.
-    */
-   @Nullable
-   public String getDisplayText() {
-      return this.displayText;
-   }
-
-   /**
-    * @return the date this disk offering was created
-    */
-   @Nullable
-   public Date getCreated() {
-      return this.created;
-   }
-
-   /**
-    * @return Domain name for the offering
-    */
-   @Nullable
-   public String getDomain() {
-      return this.domain;
-   }
-
-   /**
-    * @return the domain id of the disk offering
-    */
-   @Nullable
-   public String getDomainId() {
-      return this.domainId;
-   }
-
-   /**
-    * @return the size of the disk offering in GB
-    */
-   public int getDiskSize() {
-      return this.diskSize;
-   }
-
-   /**
-    * @return the ha support in the disk offering
-    */
-   public boolean isCustomized() {
-      return this.customized;
-   }
-
-   /**
-    * @return the tags for the disk offering
-    */
-   public Set<String> getTags() {
-      return this.tags;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(id, name, displayText, created, domain, 
domainId, diskSize, customized, tags);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null || getClass() != obj.getClass()) return false;
-      DiskOffering that = DiskOffering.class.cast(obj);
-      return Objects.equal(this.id, that.id)
-            && Objects.equal(this.name, that.name)
-            && Objects.equal(this.displayText, that.displayText)
-            && Objects.equal(this.created, that.created)
-            && Objects.equal(this.domain, that.domain)
-            && Objects.equal(this.domainId, that.domainId)
-            && Objects.equal(this.diskSize, that.diskSize)
-            && Objects.equal(this.customized, that.customized)
-            && Objects.equal(this.tags, that.tags);
-   }
-
-   protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this)
-            .add("id", id).add("name", name).add("displayText", 
displayText).add("created", created).add("domain", domain)
-            .add("domainId", domainId).add("diskSize", 
diskSize).add("customized", customized).add("tags", tags);
-   }
-
-   @Override
-   public String toString() {
-      return string().toString();
-   }
-
-   @Override
-   public int compareTo(DiskOffering other) {
-      return id.compareTo(other.getId());
-   }
-
-}

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/Domain.java
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Domain.java
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Domain.java
deleted file mode 100644
index 29f0fd4..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Domain.java
+++ /dev/null
@@ -1,220 +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;
-
-/**
- * Representation of the API domain response
- */
-public class Domain implements Comparable<Domain> {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return new ConcreteBuilder().fromDomain(this);
-   }
-
-   public abstract static class Builder<T extends Builder<T>> {
-      protected abstract T self();
-
-      protected String id;
-      protected boolean hasChild;
-      protected long level;
-      protected String name;
-      protected String networkDomain;
-      protected String parentDomainId;
-      protected String parentDomainName;
-
-      /**
-       * @see Domain#getId()
-       */
-      public T id(String id) {
-         this.id = id;
-         return self();
-      }
-
-      /**
-       * @see Domain#hasChild()
-       */
-      public T hasChild(boolean hasChild) {
-         this.hasChild = hasChild;
-         return self();
-      }
-
-      /**
-       * @see Domain#getLevel()
-       */
-      public T level(long level) {
-         this.level = level;
-         return self();
-      }
-
-      /**
-       * @see Domain#getName()
-       */
-      public T name(String name) {
-         this.name = name;
-         return self();
-      }
-
-      /**
-       * @see Domain#getNetworkDomain()
-       */
-      public T networkDomain(String networkDomain) {
-         this.networkDomain = networkDomain;
-         return self();
-      }
-
-      /**
-       * @see Domain#getParentDomainId()
-       */
-      public T parentDomainId(String parentDomainId) {
-         this.parentDomainId = parentDomainId;
-         return self();
-      }
-
-      /**
-       * @see Domain#getParentDomainName()
-       */
-      public T parentDomainName(String parentDomainName) {
-         this.parentDomainName = parentDomainName;
-         return self();
-      }
-
-      public Domain build() {
-         return new Domain(id, hasChild, level, name, networkDomain, 
parentDomainId, parentDomainName);
-      }
-
-      public T fromDomain(Domain in) {
-         return this
-               .id(in.getId())
-               .hasChild(in.hasChild())
-               .level(in.getLevel())
-               .name(in.getName())
-               .networkDomain(in.getNetworkDomain())
-               .parentDomainId(in.getParentDomainId())
-               .parentDomainName(in.getParentDomainName());
-      }
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-      @Override
-      protected ConcreteBuilder self() {
-         return this;
-      }
-   }
-
-   private final String id;
-   private final boolean hasChild;
-   private final long level;
-   private final String name;
-   private final String networkDomain;
-   private final String parentDomainId;
-   private final String parentDomainName;
-
-   @ConstructorProperties({
-         "id", "haschild", "level", "name", "networkdomain", "parentdomainid", 
"parentdomainname"
-   })
-   protected Domain(String id, boolean hasChild, long level, @Nullable String 
name, @Nullable String networkDomain,
-                    @Nullable String parentDomainId, @Nullable String 
parentDomainName) {
-      this.id = checkNotNull(id, "id");
-      this.hasChild = hasChild;
-      this.level = level;
-      this.name = name;
-      this.networkDomain = networkDomain;
-      this.parentDomainId = parentDomainId;
-      this.parentDomainName = parentDomainName;
-   }
-
-   public String getId() {
-      return this.id;
-   }
-
-   public boolean hasChild() {
-      return this.hasChild;
-   }
-
-   public long getLevel() {
-      return this.level;
-   }
-
-   @Nullable
-   public String getName() {
-      return this.name;
-   }
-
-   @Nullable
-   public String getNetworkDomain() {
-      return this.networkDomain;
-   }
-
-   @Nullable
-   public String getParentDomainId() {
-      return this.parentDomainId;
-   }
-
-   @Nullable
-   public String getParentDomainName() {
-      return this.parentDomainName;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(id, hasChild, level, name, networkDomain, 
parentDomainId, parentDomainName);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null || getClass() != obj.getClass()) return false;
-      Domain that = Domain.class.cast(obj);
-      return Objects.equal(this.id, that.id)
-            && Objects.equal(this.hasChild, that.hasChild)
-            && Objects.equal(this.level, that.level)
-            && Objects.equal(this.name, that.name)
-            && Objects.equal(this.networkDomain, that.networkDomain)
-            && Objects.equal(this.parentDomainId, that.parentDomainId)
-            && Objects.equal(this.parentDomainName, that.parentDomainName);
-   }
-
-   protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this)
-            .add("id", id).add("hasChild", hasChild).add("level", 
level).add("name", name).add("networkDomain", 
networkDomain).add("parentDomainId", parentDomainId).add("parentDomainName", 
parentDomainName);
-   }
-
-   @Override
-   public String toString() {
-      return string().toString();
-   }
-
-   @Override
-   public int compareTo(Domain other) {
-      return id.compareTo(other.getId());
-   }
-
-}

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/EncryptedPasswordAndPrivateKey.java
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java
deleted file mode 100644
index bb81cd1..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java
+++ /dev/null
@@ -1,114 +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 java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-public final class EncryptedPasswordAndPrivateKey {
-
-   public static Builder builder() {
-      return new Builder();
-   }
-
-   public Builder toBuilder() {
-      return builder().fromEncryptedPasswordAndPrivateKey(this);
-   }
-
-   public static final class Builder {
-
-      protected String encryptedPassword;
-      protected String privateKey;
-
-      /**
-       * @see EncryptedPasswordAndPrivateKey#getEncryptedPassword()
-       */
-      public Builder encryptedPassword(String encryptedPassword) {
-         this.encryptedPassword = encryptedPassword;
-         return this;
-      }
-
-      /**
-       * @see EncryptedPasswordAndPrivateKey#getPrivateKey()
-       */
-      public Builder privateKey(String privateKey) {
-         this.privateKey = privateKey;
-         return this;
-      }
-
-      public EncryptedPasswordAndPrivateKey build() {
-         return new EncryptedPasswordAndPrivateKey(encryptedPassword, 
privateKey);
-      }
-
-      public Builder 
fromEncryptedPasswordAndPrivateKey(EncryptedPasswordAndPrivateKey in) {
-         return encryptedPassword(in.getEncryptedPassword())
-               .privateKey(in.getPrivateKey());
-      }
-   }
-
-   private final String encryptedPassword;
-   private final String privateKey;
-
-   @ConstructorProperties({
-         "encryptedPassword", "privateKey"
-   })
-   public EncryptedPasswordAndPrivateKey(@Nullable String encryptedPassword, 
@Nullable String privateKey) {
-      this.encryptedPassword = encryptedPassword;
-      this.privateKey = privateKey;
-   }
-
-   /**
-    * @return the encrypted password String representation
-    */
-   @Nullable
-   public String getEncryptedPassword() {
-      return this.encryptedPassword;
-   }
-
-   /**
-    * @return get the string representation of the private key
-    */
-   @Nullable
-   public String getPrivateKey() {
-      return this.privateKey;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(encryptedPassword, privateKey);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null || getClass() != obj.getClass()) return false;
-      EncryptedPasswordAndPrivateKey that = 
EncryptedPasswordAndPrivateKey.class.cast(obj);
-      return Objects.equal(this.encryptedPassword, that.encryptedPassword)
-            && Objects.equal(this.privateKey, that.privateKey);
-   }
-
-   @Override
-   public String toString() {
-      return MoreObjects.toStringHelper(this).omitNullValues()
-            .add("encryptedPassword", encryptedPassword).add("privateKey", 
privateKey).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/Event.java
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Event.java
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Event.java
deleted file mode 100644
index 87c442b..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Event.java
+++ /dev/null
@@ -1,333 +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 Event
- */
-public class Event implements Comparable<Event> {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return new ConcreteBuilder().fromEvent(this);
-   }
-
-   public abstract static class Builder<T extends Builder<T>> {
-      protected abstract T self();
-
-      protected String id;
-      protected String account;
-      protected String description;
-      protected Date created;
-      protected String domain;
-      protected String domainId;
-      protected String level;
-      protected String parentId;
-      protected String state;
-      protected String type;
-      protected String username;
-
-      /**
-       * @see Event#getId()
-       */
-      public T id(String id) {
-         this.id = id;
-         return self();
-      }
-
-      /**
-       * @see Event#getAccount()
-       */
-      public T account(String account) {
-         this.account = account;
-         return self();
-      }
-
-      /**
-       * @see Event#getDescription()
-       */
-      public T description(String description) {
-         this.description = description;
-         return self();
-      }
-
-      /**
-       * @see Event#getCreated()
-       */
-      public T created(Date created) {
-         this.created = created;
-         return self();
-      }
-
-      /**
-       * @see Event#getDomain()
-       */
-      public T domain(String domain) {
-         this.domain = domain;
-         return self();
-      }
-
-      /**
-       * @see Event#getDomainId()
-       */
-      public T domainId(String domainId) {
-         this.domainId = domainId;
-         return self();
-      }
-
-      /**
-       * @see Event#getLevel()
-       */
-      public T level(String level) {
-         this.level = level;
-         return self();
-      }
-
-      /**
-       * @see Event#getParentId()
-       */
-      public T parentId(String parentId) {
-         this.parentId = parentId;
-         return self();
-      }
-
-      /**
-       * @see Event#getState()
-       */
-      public T state(String state) {
-         this.state = state;
-         return self();
-      }
-
-      /**
-       * @see Event#getType()
-       */
-      public T type(String type) {
-         this.type = type;
-         return self();
-      }
-
-      /**
-       * @see Event#getUsername()
-       */
-      public T username(String username) {
-         this.username = username;
-         return self();
-      }
-
-      public Event build() {
-         return new Event(id, account, description, created, domain, domainId, 
level, parentId, state, type, username);
-      }
-
-      public T fromEvent(Event in) {
-         return this
-               .id(in.getId())
-               .account(in.getAccount())
-               .description(in.getDescription())
-               .created(in.getCreated())
-               .domain(in.getDomain())
-               .domainId(in.getDomainId())
-               .level(in.getLevel())
-               .parentId(in.getParentId())
-               .state(in.getState())
-               .type(in.getType())
-               .username(in.getUsername());
-      }
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-      @Override
-      protected ConcreteBuilder self() {
-         return this;
-      }
-   }
-
-   private final String id;
-   private final String account;
-   private final String description;
-   private final Date created;
-   private final String domain;
-   private final String domainId;
-   private final String level;
-   private final String parentId;
-   private final String state;
-   private final String type;
-   private final String username;
-
-   @ConstructorProperties({
-         "id", "account", "description", "created", "domain", "domainId", 
"level", "parentId", "state", "type", "username"
-   })
-   protected Event(String id, @Nullable String account, @Nullable String 
description, @Nullable Date created,
-                   @Nullable String domain, @Nullable String domainId, 
@Nullable String level, @Nullable String parentId,
-                   @Nullable String state, @Nullable String type, @Nullable 
String username) {
-      this.id = checkNotNull(id, "id");
-      this.account = account;
-      this.description = description;
-      this.created = created;
-      this.domain = domain;
-      this.domainId = domainId;
-      this.level = level;
-      this.parentId = parentId;
-      this.state = state;
-      this.type = type;
-      this.username = username;
-   }
-
-   /**
-    * @return the ID of the event
-    */
-   public String getId() {
-      return this.id;
-   }
-
-   /**
-    * @return the account name for the account that owns the object being 
acted on in the event
-    *         (e.g. the owner of the virtual machine, ip address, or security 
group)
-    */
-   @Nullable
-   public String getAccount() {
-      return this.account;
-   }
-
-   /**
-    * @return the description of the event
-    */
-   @Nullable
-   public String getDescription() {
-      return this.description;
-   }
-
-   /**
-    * @return the date the event was created
-    */
-   @Nullable
-   public Date getCreated() {
-      return this.created;
-   }
-
-   /**
-    * @return the name of the account's domain
-    */
-   @Nullable
-   public String getDomain() {
-      return this.domain;
-   }
-
-   /**
-    * @return the id of the account's domain
-    */
-   @Nullable
-   public String getDomainId() {
-      return this.domainId;
-   }
-
-   /**
-    * @return the event level (INFO, WARN, ERROR)
-    */
-   @Nullable
-   public String getLevel() {
-      return this.level;
-   }
-
-   /**
-    * @return whether the event is parented
-    */
-   @Nullable
-   public String getParentId() {
-      return this.parentId;
-   }
-
-   /**
-    * @return the state of the event
-    */
-   @Nullable
-   public String getState() {
-      return this.state;
-   }
-
-   /**
-    * @return the type of the event (see event types)
-    */
-   @Nullable
-   public String getType() {
-      return this.type;
-   }
-
-   /**
-    * @return the name of the user who performed the action (can be different 
from the account if
-    *         an admin is performing an action for a user, e.g. 
starting/stopping a user's virtual machine)
-    */
-   @Nullable
-   public String getUsername() {
-      return this.username;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(id, account, description, created, domain, 
domainId, level, parentId, state, type, username);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null || getClass() != obj.getClass()) return false;
-      Event that = Event.class.cast(obj);
-      return Objects.equal(this.id, that.id)
-            && Objects.equal(this.account, that.account)
-            && Objects.equal(this.description, that.description)
-            && Objects.equal(this.created, that.created)
-            && Objects.equal(this.domain, that.domain)
-            && Objects.equal(this.domainId, that.domainId)
-            && Objects.equal(this.level, that.level)
-            && Objects.equal(this.parentId, that.parentId)
-            && Objects.equal(this.state, that.state)
-            && Objects.equal(this.type, that.type)
-            && Objects.equal(this.username, that.username);
-   }
-
-   protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this)
-            .add("id", id).add("account", account).add("description", 
description).add("created", created)
-            .add("domain", domain).add("domainId", domainId).add("level", 
level).add("parentId", parentId)
-            .add("state", state).add("type", type).add("username", username);
-   }
-
-   @Override
-   public String toString() {
-      return string().toString();
-   }
-
-   @Override
-   public int compareTo(Event other) {
-      return id.compareTo(other.getId());
-   }
-
-}

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/ExtractMode.java
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ExtractMode.java
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ExtractMode.java
deleted file mode 100644
index 79517c4..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ExtractMode.java
+++ /dev/null
@@ -1,32 +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;
-
-public enum ExtractMode {
-
-   HTTP_DOWNLOAD, FTP_UPLOAD, UNRECOGNIZED;
-
-   public static ExtractMode fromValue(String format) {
-      try {
-         return valueOf(checkNotNull(format, "format"));
-      } 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/FirewallRule.java
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java
deleted file mode 100644
index 37e79e2..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java
+++ /dev/null
@@ -1,338 +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.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.collect.ImmutableSet;
-
-/**
- * Class FirewallRule
- */
-public class FirewallRule implements Comparable<FirewallRule> {
-
-   /**
-    */
-   public static enum Protocol {
-      TCP,
-      UDP,
-      ICMP,
-      UNKNOWN;
-
-      public static Protocol fromValue(String value) {
-         try {
-            return valueOf(value.toUpperCase());
-         } catch (IllegalArgumentException e) {
-            return UNKNOWN;
-         }
-      }
-
-      @Override
-      public String toString() {
-         return name().toUpperCase();
-      }
-   }
-
-   public static enum State {
-      STAGED,     // Rule been created but has never got through network rule 
conflict detection.
-      // Rules in this state can not be sent to network elements.
-      ADD,        // Add means the rule has been created and has gone through 
network rule conflict detection.
-      ACTIVE,     // Rule has been sent to the network elements and reported 
to be active.
-      DELETING,   // Revoke means this rule has been revoked. If this rule has 
been sent to the
-      // network elements, the rule will be deleted from database.
-      UNKNOWN;
-
-      public static State fromValue(String value) {
-         try {
-            return valueOf(value.toUpperCase());
-         } catch (IllegalArgumentException e) {
-            return UNKNOWN;
-         }
-      }
-
-      @Override
-      public String toString() {
-         return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
-      }
-   }
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return new ConcreteBuilder().fromFirewallRule(this);
-   }
-
-   public abstract static class Builder<T extends Builder<T>> {
-      protected abstract T self();
-
-      protected String id;
-      protected Set<String> CIDRs = ImmutableSet.of();
-      protected int startPort;
-      protected int endPort;
-      protected String icmpCode;
-      protected String icmpType;
-      protected String ipAddress;
-      protected String ipAddressId;
-      protected FirewallRule.Protocol protocol;
-      protected FirewallRule.State state;
-
-      /**
-       * @see FirewallRule#getId()
-       */
-      public T id(String id) {
-         this.id = id;
-         return self();
-      }
-
-      /**
-       * @see FirewallRule#getCIDRs()
-       */
-      public T CIDRs(Set<String> CIDRs) {
-         this.CIDRs = ImmutableSet.copyOf(checkNotNull(CIDRs, "CIDRs"));
-         return self();
-      }
-
-      public T CIDRs(String... in) {
-         return CIDRs(ImmutableSet.copyOf(in));
-      }
-
-      /**
-       * @see FirewallRule#getStartPort()
-       */
-      public T startPort(int startPort) {
-         this.startPort = startPort;
-         return self();
-      }
-
-      /**
-       * @see FirewallRule#getEndPort()
-       */
-      public T endPort(int endPort) {
-         this.endPort = endPort;
-         return self();
-      }
-
-      /**
-       * @see FirewallRule#getIcmpCode()
-       */
-      public T icmpCode(String icmpCode) {
-         this.icmpCode = icmpCode;
-         return self();
-      }
-
-      /**
-       * @see FirewallRule#getIcmpType()
-       */
-      public T icmpType(String icmpType) {
-         this.icmpType = icmpType;
-         return self();
-      }
-
-      /**
-       * @see FirewallRule#getIpAddress()
-       */
-      public T ipAddress(String ipAddress) {
-         this.ipAddress = ipAddress;
-         return self();
-      }
-
-      /**
-       * @see FirewallRule#getIpAddressId()
-       */
-      public T ipAddressId(String ipAddressId) {
-         this.ipAddressId = ipAddressId;
-         return self();
-      }
-
-      /**
-       * @see FirewallRule#getProtocol()
-       */
-      public T protocol(FirewallRule.Protocol protocol) {
-         this.protocol = protocol;
-         return self();
-      }
-
-      /**
-       * @see FirewallRule#getState()
-       */
-      public T state(FirewallRule.State state) {
-         this.state = state;
-         return self();
-      }
-
-      public FirewallRule build() {
-         return new FirewallRule(id, CIDRs, startPort, endPort, icmpCode, 
icmpType, ipAddress, ipAddressId, protocol, state);
-      }
-
-      public T fromFirewallRule(FirewallRule in) {
-         return this
-               .id(in.getId())
-               .CIDRs(in.getCIDRs())
-               .startPort(in.getStartPort())
-               .endPort(in.getEndPort())
-               .icmpCode(in.getIcmpCode())
-               .icmpType(in.getIcmpType())
-               .ipAddress(in.getIpAddress())
-               .ipAddressId(in.getIpAddressId())
-               .protocol(in.getProtocol())
-               .state(in.getState());
-      }
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-      @Override
-      protected ConcreteBuilder self() {
-         return this;
-      }
-   }
-
-   private final String id;
-   private final Set<String> CIDRs;
-   private final int startPort;
-   private final int endPort;
-   private final String icmpCode;
-   private final String icmpType;
-   private final String ipAddress;
-   private final String ipAddressId;
-   private final FirewallRule.Protocol protocol;
-   private final FirewallRule.State state;
-
-   @ConstructorProperties({
-         "id", "cidrlist", "startport", "endport", "icmpcode", "icmptype", 
"ipaddress", "ipaddressid", "protocol", "state"
-   })
-   private FirewallRule(String id, @Nullable String CIDRs, int startPort, int 
endPort, @Nullable String icmpCode,
-                        @Nullable String icmpType, @Nullable String ipAddress, 
@Nullable String ipAddressId,
-                        @Nullable Protocol protocol, @Nullable State state) {
-      this(id, splitStringOnCommas(CIDRs), startPort, endPort, icmpCode, 
icmpType, ipAddress, ipAddressId, protocol, state);
-   }
-
-   private static Set<String> splitStringOnCommas(String in) {
-      return in == null ? ImmutableSet.<String>of() : 
ImmutableSet.copyOf(in.split(","));
-   }
-
-
-   protected FirewallRule(String id, @Nullable Iterable<String> CIDRs, int 
startPort, int endPort, @Nullable String icmpCode,
-                          @Nullable String icmpType, @Nullable String 
ipAddress, @Nullable String ipAddressId,
-                          @Nullable FirewallRule.Protocol protocol, @Nullable 
FirewallRule.State state) {
-      this.id = checkNotNull(id, "id");
-      this.CIDRs = CIDRs == null ? ImmutableSet.<String>of() : 
ImmutableSet.copyOf(CIDRs);
-      this.startPort = startPort;
-      this.endPort = endPort;
-      this.icmpCode = icmpCode;
-      this.icmpType = icmpType;
-      this.ipAddress = ipAddress;
-      this.ipAddressId = ipAddressId;
-      this.protocol = protocol;
-      this.state = state;
-   }
-
-   public String getId() {
-      return this.id;
-   }
-
-   public Set<String> getCIDRs() {
-      return this.CIDRs;
-   }
-
-   public int getStartPort() {
-      return this.startPort;
-   }
-
-   public int getEndPort() {
-      return this.endPort;
-   }
-
-   @Nullable
-   public String getIcmpCode() {
-      return this.icmpCode;
-   }
-
-   @Nullable
-   public String getIcmpType() {
-      return this.icmpType;
-   }
-
-   @Nullable
-   public String getIpAddress() {
-      return this.ipAddress;
-   }
-
-   @Nullable
-   public String getIpAddressId() {
-      return this.ipAddressId;
-   }
-
-   @Nullable
-   public FirewallRule.Protocol getProtocol() {
-      return this.protocol;
-   }
-
-   @Nullable
-   public FirewallRule.State getState() {
-      return this.state;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(id, CIDRs, startPort, endPort, icmpCode, 
icmpType, ipAddress, ipAddressId, protocol, state);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null || getClass() != obj.getClass()) return false;
-      FirewallRule that = FirewallRule.class.cast(obj);
-      return Objects.equal(this.id, that.id)
-            && Objects.equal(this.CIDRs, that.CIDRs)
-            && Objects.equal(this.startPort, that.startPort)
-            && Objects.equal(this.endPort, that.endPort)
-            && Objects.equal(this.icmpCode, that.icmpCode)
-            && Objects.equal(this.icmpType, that.icmpType)
-            && Objects.equal(this.ipAddress, that.ipAddress)
-            && Objects.equal(this.ipAddressId, that.ipAddressId)
-            && Objects.equal(this.protocol, that.protocol)
-            && Objects.equal(this.state, that.state);
-   }
-
-   protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this)
-            .add("id", id).add("CIDRs", CIDRs).add("startPort", 
startPort).add("endPort", endPort).add("icmpCode", icmpCode)
-            .add("icmpType", icmpType).add("ipAddress", 
ipAddress).add("ipAddressId", ipAddressId).add("protocol", 
protocol).add("state", state);
-   }
-
-   @Override
-   public String toString() {
-      return string().toString();
-   }
-
-   @Override
-   public int compareTo(FirewallRule other) {
-      return id.compareTo(other.getId());
-   }
-
-}

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/GuestIPType.java
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/GuestIPType.java
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/GuestIPType.java
deleted file mode 100644
index 27e43ec..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/GuestIPType.java
+++ /dev/null
@@ -1,60 +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 org.jclouds.cloudstack.features.OfferingApi#listNetworkOfferings
- */
-public enum GuestIPType {
-
-   /**
-    * guest IP address will be issued by Dhcp server in the guest virtual
-    * network. Dhcp role is played by domain router.
-    */
-   VIRTUAL,
-
-   /**
-    * traffic directly to the network and VMs created here are assigned an IP
-    * directly from the network as configured
-    */
-   DIRECT,
-
-   /**
-    * TODO: add comments to explain the meaning (cs3 only)
-    */
-   SHARED,
-   ISOLATED,
-
-   UNRECOGNIZED;
-
-   @Override
-   public String toString() {
-      return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
-   }
-
-   public static GuestIPType 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/Host.java
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Host.java
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Host.java
deleted file mode 100644
index d80982b..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Host.java
+++ /dev/null
@@ -1,959 +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.CaseFormat.UPPER_CAMEL;
-import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE;
-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.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Represents a host issued by Cloudstack
- */
-public class Host implements Comparable<Host> {
-
-   public static enum ClusterType {
-      CLOUD_MANAGED,
-      EXTERNAL_MANAGED,
-      UNKNOWN;
-
-      public static ClusterType fromValue(String value) {
-         try {
-            return valueOf(UPPER_CAMEL.to(UPPER_UNDERSCORE, value));
-         } catch (IllegalArgumentException e) {
-            return UNKNOWN;
-         }
-      }
-
-      @Override
-      public String toString() {
-         return UPPER_UNDERSCORE.to(UPPER_CAMEL, name());
-      }
-   }
-
-   public static enum State {
-      CONNECTING,
-      UP,
-      DOWN,
-      DISCONNECTED,
-      UPDATING,
-      PREPARE_FOR_MAINTENANCE,
-      ERROR_IN_MAINTENANCE,
-      MAINTENANCE,
-      ALERT,
-      REMOVED,
-      REBALANCING,
-      UNKNOWN;
-
-      public static State fromValue(String value) {
-         try {
-            return valueOf(UPPER_CAMEL.to(UPPER_UNDERSCORE, value));
-         } catch (IllegalArgumentException e) {
-            return UNKNOWN;
-         }
-      }
-
-      @Override
-      public String toString() {
-         return UPPER_UNDERSCORE.to(UPPER_CAMEL, name());
-      }
-   }
-
-   public static enum Type {
-      STORAGE,
-      ROUTING,
-      SECONDARY_STORAGE,
-      SECONDARY_STORAGE_CMD_EXECUTOR,
-      CONSOLE_PROXY,
-      EXTERNAL_FIREWALL,
-      EXTERNAL_LOAD_BALANCER,
-      PXE_SERVER,
-      TRAFFIC_MONITOR,
-      EXTERNAL_DHCP,
-      SECONDARY_STORAGE_VM,
-      LOCAL_SECONDARY_STORAGE,
-      UNKNOWN;
-
-      public static Type fromValue(String value) {
-         try {
-            if (value.equals("SecondaryStorageVM")) {
-               return SECONDARY_STORAGE_VM;
-            }
-            return valueOf(UPPER_CAMEL.to(UPPER_UNDERSCORE, value));
-
-         } catch (IllegalArgumentException e) {
-            return UNKNOWN;
-         }
-      }
-
-      @Override
-      public String toString() {
-         if (this == SECONDARY_STORAGE_VM) {
-            return "SecondaryStorageVM"; // note the inconsistency in VM naming
-         }
-         return UPPER_UNDERSCORE.to(UPPER_CAMEL, name());
-      }
-   }
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return new ConcreteBuilder().fromHost(this);
-   }
-
-   public abstract static class Builder<T extends Builder<T>> {
-      protected abstract T self();
-
-      protected String id;
-      protected AllocationState allocationState;
-      protected int averageLoad;
-      protected String capabilities;
-      protected String clusterId;
-      protected String clusterName;
-      protected Host.ClusterType clusterType;
-      protected String cpuAllocated;
-      protected int cpuNumber;
-      protected int cpuSpeed;
-      protected String cpuUsed;
-      protected float cpuWithOverProvisioning;
-      protected Date created;
-      protected Date disconnected;
-      protected long diskSizeAllocated;
-      protected long diskSizeTotal;
-      protected String events;
-      protected boolean hasEnoughCapacity;
-      protected ImmutableSet.Builder<String> tags = 
ImmutableSet.<String>builder();
-      protected String hypervisor;
-      protected String ipAddress;
-      protected boolean localStorageActive;
-      protected String jobId;
-      protected AsyncJob.Status jobStatus;
-      protected Date lastPinged;
-      protected String managementServerId;
-      protected long memoryAllocated;
-      protected long memoryTotal;
-      protected long memoryUsed;
-      protected String name;
-      protected long networkKbsRead;
-      protected long networkKbsWrite;
-      protected String osCategoryId;
-      protected String osCategoryName;
-      protected String podId;
-      protected String podName;
-      protected Date removed;
-      protected Host.State state;
-      protected Host.Type type;
-      protected String version;
-      protected String zoneId;
-      protected String zoneName;
-
-      /**
-       * @see Host#getId()
-       */
-      public T id(String id) {
-         this.id = id;
-         return self();
-      }
-
-      /**
-       * @see Host#getAllocationState()
-       */
-      public T allocationState(AllocationState allocationState) {
-         this.allocationState = allocationState;
-         return self();
-      }
-
-      /**
-       * @see Host#getAverageLoad()
-       */
-      public T averageLoad(int averageLoad) {
-         this.averageLoad = averageLoad;
-         return self();
-      }
-
-      /**
-       * @see Host#getCapabilities()
-       */
-      public T capabilities(String capabilities) {
-         this.capabilities = capabilities;
-         return self();
-      }
-
-      /**
-       * @see Host#getClusterId()
-       */
-      public T clusterId(String clusterId) {
-         this.clusterId = clusterId;
-         return self();
-      }
-
-      /**
-       * @see Host#getClusterName()
-       */
-      public T clusterName(String clusterName) {
-         this.clusterName = clusterName;
-         return self();
-      }
-
-      /**
-       * @see Host#getClusterType()
-       */
-      public T clusterType(Host.ClusterType clusterType) {
-         this.clusterType = clusterType;
-         return self();
-      }
-
-      /**
-       * @see Host#getCpuAllocated()
-       */
-      public T cpuAllocated(String cpuAllocated) {
-         this.cpuAllocated = cpuAllocated;
-         return self();
-      }
-
-      /**
-       * @see Host#getCpuNumber()
-       */
-      public T cpuNumber(int cpuNumber) {
-         this.cpuNumber = cpuNumber;
-         return self();
-      }
-
-      /**
-       * @see Host#getCpuSpeed()
-       */
-      public T cpuSpeed(int cpuSpeed) {
-         this.cpuSpeed = cpuSpeed;
-         return self();
-      }
-
-      /**
-       * @see Host#getCpuUsed()
-       */
-      public T cpuUsed(String cpuUsed) {
-         this.cpuUsed = cpuUsed;
-         return self();
-      }
-
-      /**
-       * @see Host#getCpuWithOverProvisioning()
-       */
-      public T cpuWithOverProvisioning(float cpuWithOverProvisioning) {
-         this.cpuWithOverProvisioning = cpuWithOverProvisioning;
-         return self();
-      }
-
-      /**
-       * @see Host#getCreated()
-       */
-      public T created(Date created) {
-         this.created = created;
-         return self();
-      }
-
-      /**
-       * @see Host#getDisconnected()
-       */
-      public T disconnected(Date disconnected) {
-         this.disconnected = disconnected;
-         return self();
-      }
-
-      /**
-       * @see Host#getDiskSizeAllocated()
-       */
-      public T diskSizeAllocated(long diskSizeAllocated) {
-         this.diskSizeAllocated = diskSizeAllocated;
-         return self();
-      }
-
-      /**
-       * @see Host#getDiskSizeTotal()
-       */
-      public T diskSizeTotal(long diskSizeTotal) {
-         this.diskSizeTotal = diskSizeTotal;
-         return self();
-      }
-
-      /**
-       * @see Host#getEvents()
-       */
-      public T events(String events) {
-         this.events = events;
-         return self();
-      }
-
-      /**
-       * @see Host#isHasEnoughCapacity()
-       */
-      public T hasEnoughCapacity(boolean hasEnoughCapacity) {
-         this.hasEnoughCapacity = hasEnoughCapacity;
-         return self();
-      }
-
-      /**
-       * @see Host#getTags()
-       */
-      public T tags(Iterable<String> tags) {
-         this.tags = ImmutableSet.<String>builder().addAll(tags);
-         return self();
-      }
-      
-      /**
-       * @see Host#getTags()
-       */
-      public T tag(String tag) {
-         this.tags.add(tag);
-         return self();
-      }
-      
-      /**
-       * @see Host#getHypervisor()
-       */
-      public T hypervisor(String hypervisor) {
-         this.hypervisor = hypervisor;
-         return self();
-      }
-
-      /**
-       * @see Host#getIpAddress()
-       */
-      public T ipAddress(String ipAddress) {
-         this.ipAddress = ipAddress;
-         return self();
-      }
-
-      /**
-       * @see Host#isLocalStorageActive()
-       */
-      public T localStorageActive(boolean localStorageActive) {
-         this.localStorageActive = localStorageActive;
-         return self();
-      }
-
-      /**
-       * @see Host#getJobId()
-       */
-      public T jobId(String jobId) {
-         this.jobId = jobId;
-         return self();
-      }
-
-      /**
-       * @see Host#getJobStatus()
-       */
-      public T jobStatus(AsyncJob.Status jobStatus) {
-         this.jobStatus = jobStatus;
-         return self();
-      }
-
-      /**
-       * @see Host#getLastPinged()
-       */
-      public T lastPinged(Date lastPinged) {
-         this.lastPinged = lastPinged;
-         return self();
-      }
-
-      /**
-       * @see Host#getManagementServerId()
-       */
-      public T managementServerId(String managementServerId) {
-         this.managementServerId = managementServerId;
-         return self();
-      }
-
-      /**
-       * @see Host#getMemoryAllocated()
-       */
-      public T memoryAllocated(long memoryAllocated) {
-         this.memoryAllocated = memoryAllocated;
-         return self();
-      }
-
-      /**
-       * @see Host#getMemoryTotal()
-       */
-      public T memoryTotal(long memoryTotal) {
-         this.memoryTotal = memoryTotal;
-         return self();
-      }
-
-      /**
-       * @see Host#getMemoryUsed()
-       */
-      public T memoryUsed(long memoryUsed) {
-         this.memoryUsed = memoryUsed;
-         return self();
-      }
-
-      /**
-       * @see Host#getName()
-       */
-      public T name(String name) {
-         this.name = name;
-         return self();
-      }
-
-      /**
-       * @see Host#getNetworkKbsRead()
-       */
-      public T networkKbsRead(long networkKbsRead) {
-         this.networkKbsRead = networkKbsRead;
-         return self();
-      }
-
-      /**
-       * @see Host#getNetworkKbsWrite()
-       */
-      public T networkKbsWrite(long networkKbsWrite) {
-         this.networkKbsWrite = networkKbsWrite;
-         return self();
-      }
-
-      /**
-       * @see Host#getOsCategoryId()
-       */
-      public T osCategoryId(String osCategoryId) {
-         this.osCategoryId = osCategoryId;
-         return self();
-      }
-
-      /**
-       * @see Host#getOsCategoryName()
-       */
-      public T osCategoryName(String osCategoryName) {
-         this.osCategoryName = osCategoryName;
-         return self();
-      }
-
-      /**
-       * @see Host#getPodId()
-       */
-      public T podId(String podId) {
-         this.podId = podId;
-         return self();
-      }
-
-      /**
-       * @see Host#getPodName()
-       */
-      public T podName(String podName) {
-         this.podName = podName;
-         return self();
-      }
-
-      /**
-       * @see Host#getRemoved()
-       */
-      public T removed(Date removed) {
-         this.removed = removed;
-         return self();
-      }
-
-      /**
-       * @see Host#getState()
-       */
-      public T state(Host.State state) {
-         this.state = state;
-         return self();
-      }
-
-      /**
-       * @see Host#getType()
-       */
-      public T type(Host.Type type) {
-         this.type = type;
-         return self();
-      }
-
-      /**
-       * @see Host#getVersion()
-       */
-      public T version(String version) {
-         this.version = version;
-         return self();
-      }
-
-      /**
-       * @see Host#getZoneId()
-       */
-      public T zoneId(String zoneId) {
-         this.zoneId = zoneId;
-         return self();
-      }
-
-      /**
-       * @see Host#getZoneName()
-       */
-      public T zoneName(String zoneName) {
-         this.zoneName = zoneName;
-         return self();
-      }
-
-
-      public Host build() {
-         return new Host(id, allocationState, averageLoad, capabilities, 
clusterId, clusterName, clusterType, cpuAllocated, cpuNumber, cpuSpeed, 
cpuUsed, cpuWithOverProvisioning, created, disconnected, diskSizeAllocated, 
diskSizeTotal, events, hasEnoughCapacity, tags.build(), hypervisor, ipAddress, 
localStorageActive, jobId, jobStatus, lastPinged, managementServerId, 
memoryAllocated, memoryTotal, memoryUsed, name, networkKbsRead, 
networkKbsWrite, osCategoryId, osCategoryName, podId, podName, removed, state, 
type, version, zoneId, zoneName);
-      }
-
-      public T fromHost(Host in) {
-         return this
-               .id(in.getId())
-               .allocationState(in.getAllocationState())
-               .averageLoad(in.getAverageLoad())
-               .capabilities(in.getCapabilities())
-               .clusterId(in.getClusterId())
-               .clusterName(in.getClusterName())
-               .clusterType(in.getClusterType())
-               .cpuAllocated(in.getCpuAllocated())
-               .cpuNumber(in.getCpuNumber())
-               .cpuSpeed(in.getCpuSpeed())
-               .cpuUsed(in.getCpuUsed())
-               .cpuWithOverProvisioning(in.getCpuWithOverProvisioning())
-               .created(in.getCreated())
-               .disconnected(in.getDisconnected())
-               .diskSizeAllocated(in.getDiskSizeAllocated())
-               .diskSizeTotal(in.getDiskSizeTotal())
-               .events(in.getEvents())
-               .hasEnoughCapacity(in.isHasEnoughCapacity())
-               .tags(in.getTags())
-               .hypervisor(in.getHypervisor())
-               .ipAddress(in.getIpAddress())
-               .localStorageActive(in.isLocalStorageActive())
-               .jobId(in.getJobId())
-               .jobStatus(in.getJobStatus())
-               .lastPinged(in.getLastPinged())
-               .managementServerId(in.getManagementServerId())
-               .memoryAllocated(in.getMemoryAllocated())
-               .memoryTotal(in.getMemoryTotal())
-               .memoryUsed(in.getMemoryUsed())
-               .name(in.getName())
-               .networkKbsRead(in.getNetworkKbsRead())
-               .networkKbsWrite(in.getNetworkKbsWrite())
-               .osCategoryId(in.getOsCategoryId())
-               .osCategoryName(in.getOsCategoryName())
-               .podId(in.getPodId())
-               .podName(in.getPodName())
-               .removed(in.getRemoved())
-               .state(in.getState())
-               .type(in.getType())
-               .version(in.getVersion())
-               .zoneId(in.getZoneId())
-               .zoneName(in.getZoneName());
-      }
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-      @Override
-      protected ConcreteBuilder self() {
-         return this;
-      }
-   }
-
-   private final String id;
-   private final AllocationState allocationState;
-   private final int averageLoad;
-   private final String capabilities;
-   private final String clusterId;
-   private final String clusterName;
-   private final Host.ClusterType clusterType;
-   private final String cpuAllocated;
-   private final int cpuNumber;
-   private final int cpuSpeed;
-   private final String cpuUsed;
-   private final float cpuWithOverProvisioning;
-   private final Date created;
-   private final Date disconnected;
-   private final long diskSizeAllocated;
-   private final long diskSizeTotal;
-   private final String events;
-   private final boolean hasEnoughCapacity;
-   private final Set<String> tags;
-   private final String hypervisor;
-   private final String ipAddress;
-   private final boolean localStorageActive;
-   private final String jobId;
-   private final AsyncJob.Status jobStatus;
-   private final Date lastPinged;
-   private final String managementServerId;
-   private final long memoryAllocated;
-   private final long memoryTotal;
-   private final long memoryUsed;
-   private final String name;
-   private final long networkKbsRead;
-   private final long networkKbsWrite;
-   private final String osCategoryId;
-   private final String osCategoryName;
-   private final String podId;
-   private final String podName;
-   private final Date removed;
-   private final Host.State state;
-   private final Host.Type type;
-   private final String version;
-   private final String zoneId;
-   private final String zoneName;
-
-   @ConstructorProperties({
-         "id", "allocationstate", "averageload", "capabilities", "clusterid", 
"clustername", "clustertype", "cpuallocated", "cpunumber", "cpuspeed", 
"cpuused", "cpuwithoverprovisioning", "created", "disconnected", 
"disksizeallocated", "disksizetotal", "events", "hasenoughcapacity", 
"hosttags", "hypervisor", "ipaddress", "islocalstorageactive", "jobid", 
"jobstatus", "lastpinged", "managementserverid", "memoryallocated", 
"memorytotal", "memoryused", "name", "networkkbsread", "networkkbswrite", 
"oscategoryid", "oscategoryname", "podid", "podname", "removed", "state", 
"type", "version", "zoneid", "zonename"
-   })
-   protected Host(String id, @Nullable AllocationState allocationState, int 
averageLoad, @Nullable String capabilities,
-                  @Nullable String clusterId, @Nullable String clusterName, 
@Nullable Host.ClusterType clusterType,
-                  @Nullable String cpuAllocated, int cpuNumber, int cpuSpeed, 
@Nullable String cpuUsed,
-                  float cpuWithOverProvisioning, @Nullable Date created, 
@Nullable Date disconnected, long diskSizeAllocated,
-                  long diskSizeTotal, @Nullable String events, boolean 
hasEnoughCapacity, @Nullable Iterable<String> tags,
-                  @Nullable String hypervisor, @Nullable String ipAddress, 
boolean localStorageActive, @Nullable String jobId,
-                  @Nullable AsyncJob.Status jobStatus, @Nullable Date 
lastPinged, @Nullable String managementServerId,
-                  long memoryAllocated, long memoryTotal, long memoryUsed, 
@Nullable String name, long networkKbsRead, long networkKbsWrite,
-                  @Nullable String osCategoryId, @Nullable String 
osCategoryName, @Nullable String podId, @Nullable String podName,
-                  @Nullable Date removed, @Nullable Host.State state, 
@Nullable Host.Type type, @Nullable String version, @Nullable String zoneId,
-                  @Nullable String zoneName) {
-      this.id = checkNotNull(id, "id");
-      this.allocationState = allocationState;
-      this.averageLoad = averageLoad;
-      this.capabilities = capabilities;
-      this.clusterId = clusterId;
-      this.clusterName = clusterName;
-      this.clusterType = clusterType;
-      this.cpuAllocated = cpuAllocated;
-      this.cpuNumber = cpuNumber;
-      this.cpuSpeed = cpuSpeed;
-      this.cpuUsed = cpuUsed;
-      this.cpuWithOverProvisioning = cpuWithOverProvisioning;
-      this.created = created;
-      this.disconnected = disconnected;
-      this.diskSizeAllocated = diskSizeAllocated;
-      this.diskSizeTotal = diskSizeTotal;
-      this.events = events;
-      this.hasEnoughCapacity = hasEnoughCapacity;
-      this.tags = tags != null ? ImmutableSet.copyOf(tags) : 
ImmutableSet.<String> of();
-      this.hypervisor = hypervisor;
-      this.ipAddress = ipAddress;
-      this.localStorageActive = localStorageActive;
-      this.jobId = jobId;
-      this.jobStatus = jobStatus;
-      this.lastPinged = lastPinged;
-      this.managementServerId = managementServerId;
-      this.memoryAllocated = memoryAllocated;
-      this.memoryTotal = memoryTotal;
-      this.memoryUsed = memoryUsed;
-      this.name = name;
-      this.networkKbsRead = networkKbsRead;
-      this.networkKbsWrite = networkKbsWrite;
-      this.osCategoryId = osCategoryId;
-      this.osCategoryName = osCategoryName;
-      this.podId = podId;
-      this.podName = podName;
-      this.removed = removed;
-      this.state = state;
-      this.type = type;
-      this.version = version;
-      this.zoneId = zoneId;
-      this.zoneName = zoneName;
-   }
-
-   public String getId() {
-      return this.id;
-   }
-
-   @Nullable
-   public AllocationState getAllocationState() {
-      return this.allocationState;
-   }
-
-   public int getAverageLoad() {
-      return this.averageLoad;
-   }
-
-   @Nullable
-   public String getCapabilities() {
-      return this.capabilities;
-   }
-
-   @Nullable
-   public String getClusterId() {
-      return this.clusterId;
-   }
-
-   @Nullable
-   public String getClusterName() {
-      return this.clusterName;
-   }
-
-   @Nullable
-   public Host.ClusterType getClusterType() {
-      return this.clusterType;
-   }
-
-   @Nullable
-   public String getCpuAllocated() {
-      return this.cpuAllocated;
-   }
-
-   public int getCpuNumber() {
-      return this.cpuNumber;
-   }
-
-   public int getCpuSpeed() {
-      return this.cpuSpeed;
-   }
-
-   @Nullable
-   public String getCpuUsed() {
-      return this.cpuUsed;
-   }
-
-   public float getCpuWithOverProvisioning() {
-      return this.cpuWithOverProvisioning;
-   }
-
-   @Nullable
-   public Date getCreated() {
-      return this.created;
-   }
-
-   @Nullable
-   public Date getDisconnected() {
-      return this.disconnected;
-   }
-
-   public long getDiskSizeAllocated() {
-      return this.diskSizeAllocated;
-   }
-
-   public long getDiskSizeTotal() {
-      return this.diskSizeTotal;
-   }
-
-   @Nullable
-   public String getEvents() {
-      return this.events;
-   }
-
-   public boolean isHasEnoughCapacity() {
-      return this.hasEnoughCapacity;
-   }
-
-   /**
-    * @return the tags for the host
-    */
-   public Set<String> getTags() {
-      return this.tags;
-   }
-
-
-   @Nullable
-   public String getHypervisor() {
-      return this.hypervisor;
-   }
-
-   @Nullable
-   public String getIpAddress() {
-      return this.ipAddress;
-   }
-
-   public boolean isLocalStorageActive() {
-      return this.localStorageActive;
-   }
-
-   @Nullable
-   public String getJobId() {
-      return this.jobId;
-   }
-
-   @Nullable
-   public AsyncJob.Status getJobStatus() {
-      return this.jobStatus;
-   }
-
-   @Nullable
-   public Date getLastPinged() {
-      return this.lastPinged;
-   }
-
-   @Nullable
-   public String getManagementServerId() {
-      return this.managementServerId;
-   }
-
-   public long getMemoryAllocated() {
-      return this.memoryAllocated;
-   }
-
-   public long getMemoryTotal() {
-      return this.memoryTotal;
-   }
-
-   public long getMemoryUsed() {
-      return this.memoryUsed;
-   }
-
-   @Nullable
-   public String getName() {
-      return this.name;
-   }
-
-   public long getNetworkKbsRead() {
-      return this.networkKbsRead;
-   }
-
-   public long getNetworkKbsWrite() {
-      return this.networkKbsWrite;
-   }
-
-   @Nullable
-   public String getOsCategoryId() {
-      return this.osCategoryId;
-   }
-
-   @Nullable
-   public String getOsCategoryName() {
-      return this.osCategoryName;
-   }
-
-   @Nullable
-   public String getPodId() {
-      return this.podId;
-   }
-
-   @Nullable
-   public String getPodName() {
-      return this.podName;
-   }
-
-   @Nullable
-   public Date getRemoved() {
-      return this.removed;
-   }
-
-   @Nullable
-   public Host.State getState() {
-      return this.state;
-   }
-
-   @Nullable
-   public Host.Type getType() {
-      return this.type;
-   }
-
-   @Nullable
-   public String getVersion() {
-      return this.version;
-   }
-
-   @Nullable
-   public String getZoneId() {
-      return this.zoneId;
-   }
-
-   @Nullable
-   public String getZoneName() {
-      return this.zoneName;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(id, allocationState, averageLoad, capabilities, 
clusterId, clusterName, clusterType, cpuAllocated, cpuNumber, cpuSpeed, 
cpuUsed, cpuWithOverProvisioning, created, disconnected, diskSizeAllocated, 
diskSizeTotal, events, hasEnoughCapacity, tags, hypervisor, ipAddress, 
localStorageActive, jobId, jobStatus, lastPinged, managementServerId, 
memoryAllocated, memoryTotal, memoryUsed, name, networkKbsRead, 
networkKbsWrite, osCategoryId, osCategoryName, podId, podName, removed, state, 
type, version, zoneId, zoneName);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null || getClass() != obj.getClass()) return false;
-      Host that = Host.class.cast(obj);
-      return Objects.equal(this.id, that.id)
-            && Objects.equal(this.allocationState, that.allocationState)
-            && Objects.equal(this.averageLoad, that.averageLoad)
-            && Objects.equal(this.capabilities, that.capabilities)
-            && Objects.equal(this.clusterId, that.clusterId)
-            && Objects.equal(this.clusterName, that.clusterName)
-            && Objects.equal(this.clusterType, that.clusterType)
-            && Objects.equal(this.cpuAllocated, that.cpuAllocated)
-            && Objects.equal(this.cpuNumber, that.cpuNumber)
-            && Objects.equal(this.cpuSpeed, that.cpuSpeed)
-            && Objects.equal(this.cpuUsed, that.cpuUsed)
-            && Objects.equal(this.cpuWithOverProvisioning, 
that.cpuWithOverProvisioning)
-            && Objects.equal(this.created, that.created)
-            && Objects.equal(this.disconnected, that.disconnected)
-            && Objects.equal(this.diskSizeAllocated, that.diskSizeAllocated)
-            && Objects.equal(this.diskSizeTotal, that.diskSizeTotal)
-            && Objects.equal(this.events, that.events)
-            && Objects.equal(this.hasEnoughCapacity, that.hasEnoughCapacity)
-            && Objects.equal(this.tags, that.tags)
-            && Objects.equal(this.hypervisor, that.hypervisor)
-            && Objects.equal(this.ipAddress, that.ipAddress)
-            && Objects.equal(this.localStorageActive, that.localStorageActive)
-            && Objects.equal(this.jobId, that.jobId)
-            && Objects.equal(this.jobStatus, that.jobStatus)
-            && Objects.equal(this.lastPinged, that.lastPinged)
-            && Objects.equal(this.managementServerId, that.managementServerId)
-            && Objects.equal(this.memoryAllocated, that.memoryAllocated)
-            && Objects.equal(this.memoryTotal, that.memoryTotal)
-            && Objects.equal(this.memoryUsed, that.memoryUsed)
-            && Objects.equal(this.name, that.name)
-            && Objects.equal(this.networkKbsRead, that.networkKbsRead)
-            && Objects.equal(this.networkKbsWrite, that.networkKbsWrite)
-            && Objects.equal(this.osCategoryId, that.osCategoryId)
-            && Objects.equal(this.osCategoryName, that.osCategoryName)
-            && Objects.equal(this.podId, that.podId)
-            && Objects.equal(this.podName, that.podName)
-            && Objects.equal(this.removed, that.removed)
-            && Objects.equal(this.state, that.state)
-            && Objects.equal(this.type, that.type)
-            && Objects.equal(this.version, that.version)
-            && Objects.equal(this.zoneId, that.zoneId)
-            && Objects.equal(this.zoneName, that.zoneName);
-   }
-
-   protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this)
-            .add("id", id).add("allocationState", 
allocationState).add("averageLoad", averageLoad)
-            .add("capabilities", capabilities).add("clusterId", 
clusterId).add("clusterName", clusterName)
-            .add("clusterType", clusterType).add("cpuAllocated", 
cpuAllocated).add("cpuNumber", cpuNumber)
-            .add("cpuSpeed", cpuSpeed).add("cpuUsed", 
cpuUsed).add("cpuWithOverProvisioning", cpuWithOverProvisioning)
-            .add("created", created).add("disconnected", 
disconnected).add("diskSizeAllocated", diskSizeAllocated)
-            .add("diskSizeTotal", diskSizeTotal).add("events", 
events).add("hasEnoughCapacity", hasEnoughCapacity)
-            .add("tags", tags).add("hypervisor", hypervisor).add("ipAddress", 
ipAddress)
-            .add("localStorageActive", localStorageActive).add("jobId", 
jobId).add("jobStatus", jobStatus)
-            .add("lastPinged", lastPinged).add("managementServerId", 
managementServerId).add("memoryAllocated", memoryAllocated)
-            .add("memoryTotal", memoryTotal).add("memoryUsed", 
memoryUsed).add("name", name).add("networkKbsRead", networkKbsRead)
-            .add("networkKbsWrite", networkKbsWrite).add("osCategoryId", 
osCategoryId).add("osCategoryName", osCategoryName)
-            .add("podId", podId).add("podName", podName).add("removed", 
removed).add("state", state).add("type", type)
-            .add("version", version).add("zoneId", zoneId).add("zoneName", 
zoneName);
-   }
-
-   @Override
-   public String toString() {
-      return string().toString();
-   }
-
-   @Override
-   public int compareTo(Host other) {
-      return this.getId().compareTo(other.getId());
-   }
-}

Reply via email to