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/LoginResponse.java
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java
deleted file mode 100644
index 8161e63..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java
+++ /dev/null
@@ -1,339 +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.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Representation of the login API call response
- */
-public class LoginResponse {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return new ConcreteBuilder().fromLoginResponse(this);
-   }
-
-   public abstract static class Builder<T extends Builder<T>> {
-      protected abstract T self();
-
-      protected String username;
-      protected String userId;
-      protected String password;
-      protected String domainId;
-      protected long timeout;
-      protected boolean registered;
-      protected String accountName;
-      protected String firstName;
-      protected String lastName;
-      protected Account.Type accountType;
-      protected String timezone;
-      protected String timezoneOffset;
-      protected String sessionKey;
-      protected String jSessionId;
-
-      /**
-       * @see LoginResponse#getUsername()
-       */
-      public T username(String username) {
-         this.username = username;
-         return self();
-      }
-
-      /**
-       * @see LoginResponse#getUserId()
-       */
-      public T userId(String userId) {
-         this.userId = userId;
-         return self();
-      }
-
-      /**
-       * @see LoginResponse#getPassword()
-       */
-      public T password(String password) {
-         this.password = password;
-         return self();
-      }
-
-      /**
-       * @see LoginResponse#getDomainId()
-       */
-      public T domainId(String domainId) {
-         this.domainId = domainId;
-         return self();
-      }
-
-      /**
-       * @see LoginResponse#getTimeout()
-       */
-      public T timeout(long timeout) {
-         this.timeout = timeout;
-         return self();
-      }
-
-      /**
-       * @see LoginResponse#isRegistered()
-       */
-      public T registered(boolean registered) {
-         this.registered = registered;
-         return self();
-      }
-
-      /**
-       * @see LoginResponse#getAccountName()
-       */
-      public T accountName(String accountName) {
-         this.accountName = accountName;
-         return self();
-      }
-
-      /**
-       * @see LoginResponse#getFirstName()
-       */
-      public T firstName(String firstName) {
-         this.firstName = firstName;
-         return self();
-      }
-
-      /**
-       * @see LoginResponse#getLastName()
-       */
-      public T lastName(String lastName) {
-         this.lastName = lastName;
-         return self();
-      }
-
-      /**
-       * @see LoginResponse#getAccountType()
-       */
-      public T accountType(Account.Type accountType) {
-         this.accountType = accountType;
-         return self();
-      }
-
-      /**
-       * @see LoginResponse#getTimezone()
-       */
-      public T timezone(String timezone) {
-         this.timezone = timezone;
-         return self();
-      }
-
-      /**
-       * @see LoginResponse#getTimezoneOffset()
-       */
-      public T timezoneOffset(String timezoneOffset) {
-         this.timezoneOffset = timezoneOffset;
-         return self();
-      }
-
-      /**
-       * @see LoginResponse#getSessionKey()
-       */
-      public T sessionKey(String sessionKey) {
-         this.sessionKey = sessionKey;
-         return self();
-      }
-
-      /**
-       * @see LoginResponse#getJSessionId()
-       */
-      public T jSessionId(String jSessionId) {
-         this.jSessionId = jSessionId;
-         return self();
-      }
-
-      public LoginResponse build() {
-         return new LoginResponse(username, userId, password, domainId, 
timeout, registered, accountName, firstName, lastName, accountType, timezone, 
timezoneOffset, sessionKey, jSessionId);
-      }
-
-      public T fromLoginResponse(LoginResponse in) {
-         return this
-               .username(in.getUsername())
-               .userId(in.getUserId())
-               .password(in.getPassword())
-               .domainId(in.getDomainId())
-               .timeout(in.getTimeout())
-               .registered(in.isRegistered())
-               .accountName(in.getAccountName())
-               .firstName(in.getFirstName())
-               .lastName(in.getLastName())
-               .accountType(in.getAccountType())
-               .timezone(in.getTimezone())
-               .timezoneOffset(in.getTimezoneOffset())
-               .sessionKey(in.getSessionKey())
-               .jSessionId(in.getJSessionId());
-      }
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-      @Override
-      protected ConcreteBuilder self() {
-         return this;
-      }
-   }
-
-   private final String username;
-   private final String userId;
-   private final String password;
-   private final String domainId;
-   private final long timeout;
-   private final boolean registered;
-   private final String accountName;
-   private final String firstName;
-   private final String lastName;
-   private final Account.Type accountType;
-   private final String timezone;
-   private final String timezoneOffset;
-   private final String sessionKey;
-   private final String jSessionId;
-
-   @ConstructorProperties({
-         "username", "userid", "password", "domainid", "timeout", 
"registered", "account", "firstname", "lastname", "type", "timezone", 
"timezoneoffset", "sessionkey", "jSessionId"
-   })
-   protected LoginResponse(@Nullable String username, @Nullable String userId, 
@Nullable String password, @Nullable String domainId, long timeout, boolean 
registered, @Nullable String accountName, @Nullable String firstName, @Nullable 
String lastName, @Nullable Account.Type accountType, @Nullable String timezone, 
@Nullable String timezoneOffset, @Nullable String sessionKey, @Nullable String 
jSessionId) {
-      this.username = username;
-      this.userId = userId;
-      this.password = password;
-      this.domainId = domainId;
-      this.timeout = timeout;
-      this.registered = registered;
-      this.accountName = accountName;
-      this.firstName = firstName;
-      this.lastName = lastName;
-      this.accountType = accountType;
-      this.timezone = timezone;
-      this.timezoneOffset = timezoneOffset;
-      this.sessionKey = sessionKey;
-      this.jSessionId = jSessionId;
-   }
-
-   @Nullable
-   public String getUsername() {
-      return this.username;
-   }
-
-   @Nullable
-   public String getUserId() {
-      return this.userId;
-   }
-
-   @Nullable
-   public String getPassword() {
-      return this.password;
-   }
-
-   @Nullable
-   public String getDomainId() {
-      return this.domainId;
-   }
-
-   public long getTimeout() {
-      return this.timeout;
-   }
-
-   public boolean isRegistered() {
-      return this.registered;
-   }
-
-   @Nullable
-   public String getAccountName() {
-      return this.accountName;
-   }
-
-   @Nullable
-   public String getFirstName() {
-      return this.firstName;
-   }
-
-   @Nullable
-   public String getLastName() {
-      return this.lastName;
-   }
-
-   @Nullable
-   public Account.Type getAccountType() {
-      return this.accountType;
-   }
-
-   @Nullable
-   public String getTimezone() {
-      return this.timezone;
-   }
-
-   @Nullable
-   public String getTimezoneOffset() {
-      return this.timezoneOffset;
-   }
-
-   @Nullable
-   public String getSessionKey() {
-      return this.sessionKey;
-   }
-
-   @Nullable
-   public String getJSessionId() {
-      return this.jSessionId;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(username, userId, password, domainId, timeout, 
registered, accountName, firstName, lastName, accountType, timezone, 
timezoneOffset, sessionKey, jSessionId);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null || getClass() != obj.getClass()) return false;
-      LoginResponse that = LoginResponse.class.cast(obj);
-      return Objects.equal(this.username, that.username)
-            && Objects.equal(this.userId, that.userId)
-            && Objects.equal(this.password, that.password)
-            && Objects.equal(this.domainId, that.domainId)
-            && Objects.equal(this.timeout, that.timeout)
-            && Objects.equal(this.registered, that.registered)
-            && Objects.equal(this.accountName, that.accountName)
-            && Objects.equal(this.firstName, that.firstName)
-            && Objects.equal(this.lastName, that.lastName)
-            && Objects.equal(this.accountType, that.accountType)
-            && Objects.equal(this.timezone, that.timezone)
-            && Objects.equal(this.timezoneOffset, that.timezoneOffset)
-            && Objects.equal(this.sessionKey, that.sessionKey)
-            && Objects.equal(this.jSessionId, that.jSessionId);
-   }
-
-   protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this)
-            .add("username", username).add("userId", userId).add("password", 
password).add("domainId", domainId).add("timeout", timeout).add("registered", 
registered).add("accountName", accountName).add("firstName", 
firstName).add("lastName", lastName).add("accountType", 
accountType).add("timezone", timezone).add("timezoneOffset", 
timezoneOffset).add("sessionKey", sessionKey).add("jSessionId", jSessionId);
-   }
-
-   @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/NIC.java
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NIC.java
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NIC.java
deleted file mode 100644
index 0f8eae8..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NIC.java
+++ /dev/null
@@ -1,325 +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.net.URI;
-
-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 NIC
- */
-public class NIC {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return new ConcreteBuilder().fromNIC(this);
-   }
-
-   public abstract static class Builder<T extends Builder<T>> {
-      protected abstract T self();
-
-      protected String id;
-      protected URI broadcastURI;
-      protected String gateway;
-      protected String IPAddress;
-      protected boolean isDefault;
-      protected URI isolationURI;
-      protected String netmask;
-      protected String macAddress;
-      protected String networkId;
-      protected TrafficType trafficType;
-      protected GuestIPType guestIPType;
-
-      /**
-       * @see NIC#getId()
-       */
-      public T id(String id) {
-         this.id = id;
-         return self();
-      }
-
-      /**
-       * @see NIC#getBroadcastURI()
-       */
-      public T broadcastURI(URI broadcastURI) {
-         this.broadcastURI = broadcastURI;
-         return self();
-      }
-
-      /**
-       * @see NIC#getGateway()
-       */
-      public T gateway(String gateway) {
-         this.gateway = gateway;
-         return self();
-      }
-
-      /**
-       * @see NIC#getIPAddress()
-       */
-      public T IPAddress(String IPAddress) {
-         this.IPAddress = IPAddress;
-         return self();
-      }
-
-      /**
-       * @see NIC#isDefault()
-       */
-      public T isDefault(boolean isDefault) {
-         this.isDefault = isDefault;
-         return self();
-      }
-
-      /**
-       * @see NIC#getIsolationURI()
-       */
-      public T isolationURI(URI isolationURI) {
-         this.isolationURI = isolationURI;
-         return self();
-      }
-
-      /**
-       * @see NIC#getNetmask()
-       */
-      public T netmask(String netmask) {
-         this.netmask = netmask;
-         return self();
-      }
-
-      /**
-       * @see NIC#getMacAddress()
-       */
-      public T macAddress(String macAddress) {
-         this.macAddress = macAddress;
-         return self();
-      }
-
-      /**
-       * @see NIC#getNetworkId()
-       */
-      public T networkId(String networkId) {
-         this.networkId = networkId;
-         return self();
-      }
-
-      /**
-       * @see NIC#getTrafficType()
-       */
-      public T trafficType(TrafficType trafficType) {
-         this.trafficType = trafficType;
-         return self();
-      }
-
-      /**
-       * @see NIC#getGuestIPType()
-       */
-      public T guestIPType(GuestIPType guestIPType) {
-         this.guestIPType = guestIPType;
-         return self();
-      }
-
-      public NIC build() {
-         return new NIC(id, broadcastURI, gateway, IPAddress, isDefault, 
isolationURI, netmask, macAddress, networkId, trafficType, guestIPType);
-      }
-
-      public T fromNIC(NIC in) {
-         return this
-               .id(in.getId())
-               .broadcastURI(in.getBroadcastURI())
-               .gateway(in.getGateway())
-               .IPAddress(in.getIPAddress())
-               .isDefault(in.isDefault())
-               .isolationURI(in.getIsolationURI())
-               .netmask(in.getNetmask())
-               .macAddress(in.getMacAddress())
-               .networkId(in.getNetworkId())
-               .trafficType(in.getTrafficType())
-               .guestIPType(in.getGuestIPType());
-      }
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-      @Override
-      protected ConcreteBuilder self() {
-         return this;
-      }
-   }
-
-   private final String id;
-   private final URI broadcastURI;
-   private final String gateway;
-   private final String IPAddress;
-   private final boolean isDefault;
-   private final URI isolationURI;
-   private final String netmask;
-   private final String macAddress;
-   private final String networkId;
-   private final TrafficType trafficType;
-   private final GuestIPType guestIPType;
-
-   @ConstructorProperties({
-         "id", "broadcasturi", "gateway", "ipaddress", "isdefault", 
"isolationuri", "netmask", "macaddress", "networkid", "traffictype", "type"
-   })
-   protected NIC(String id, @Nullable URI broadcastURI, @Nullable String 
gateway, @Nullable String IPAddress, boolean isDefault,
-                 @Nullable URI isolationURI, @Nullable String netmask, 
@Nullable String macAddress, @Nullable String networkId,
-                 @Nullable TrafficType trafficType, @Nullable GuestIPType 
guestIPType) {
-      this.id = checkNotNull(id, "id");
-      this.broadcastURI = broadcastURI;
-      this.gateway = gateway;
-      this.IPAddress = IPAddress;
-      this.isDefault = isDefault;
-      this.isolationURI = isolationURI;
-      this.netmask = netmask;
-      this.macAddress = macAddress;
-      this.networkId = networkId;
-      this.trafficType = trafficType;
-      this.guestIPType = guestIPType;
-   }
-
-   /**
-    * the ID of the nic
-    */
-   public String getId() {
-      return this.id;
-   }
-
-   /**
-    * the broadcast uri of the nic
-    */
-   @Nullable
-   public URI getBroadcastURI() {
-      return this.broadcastURI;
-   }
-
-   /**
-    * the gateway of the nic
-    */
-   @Nullable
-   public String getGateway() {
-      return this.gateway;
-   }
-
-   /**
-    * the ip address of the nic
-    */
-   @Nullable
-   public String getIPAddress() {
-      return this.IPAddress;
-   }
-
-   /**
-    * true if nic is default, false otherwise
-    */
-   public boolean isDefault() {
-      return this.isDefault;
-   }
-
-   /**
-    * the isolation uri of the nic
-    */
-   @Nullable
-   public URI getIsolationURI() {
-      return this.isolationURI;
-   }
-
-   /**
-    * the netmask of the nic
-    */
-   @Nullable
-   public String getNetmask() {
-      return this.netmask;
-   }
-
-   /**
-    * the MAC Address of the NIC
-    */
-   @Nullable
-   public String getMacAddress() {
-      return this.macAddress;
-   }
-
-   /**
-    * the ID of the corresponding network
-    */
-   @Nullable
-   public String getNetworkId() {
-      return this.networkId;
-   }
-
-   /**
-    * the traffic type of the nic
-    */
-   @Nullable
-   public TrafficType getTrafficType() {
-      return this.trafficType;
-   }
-
-   /**
-    * the type of the nic
-    */
-   @Nullable
-   public GuestIPType getGuestIPType() {
-      return this.guestIPType;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(id, broadcastURI, gateway, IPAddress, isDefault, 
isolationURI, netmask, macAddress, networkId, trafficType, guestIPType);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null || getClass() != obj.getClass()) return false;
-      NIC that = NIC.class.cast(obj);
-      return Objects.equal(this.id, that.id)
-            && Objects.equal(this.broadcastURI, that.broadcastURI)
-            && Objects.equal(this.gateway, that.gateway)
-            && Objects.equal(this.IPAddress, that.IPAddress)
-            && Objects.equal(this.isDefault, that.isDefault)
-            && Objects.equal(this.isolationURI, that.isolationURI)
-            && Objects.equal(this.netmask, that.netmask)
-            && Objects.equal(this.macAddress, that.macAddress)
-            && Objects.equal(this.networkId, that.networkId)
-            && Objects.equal(this.trafficType, that.trafficType)
-            && Objects.equal(this.guestIPType, that.guestIPType);
-   }
-
-   protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this)
-            .add("id", id).add("broadcastURI", broadcastURI).add("gateway", 
gateway).add("IPAddress", IPAddress)
-            .add("isDefault", isDefault).add("isolationURI", 
isolationURI).add("netmask", netmask).add("macAddress", macAddress)
-            .add("networkId", networkId).add("trafficType", 
trafficType).add("guestIPType", guestIPType);
-   }
-
-   @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/Network.java
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Network.java
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Network.java
deleted file mode 100644
index a6ec5a4..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Network.java
+++ /dev/null
@@ -1,748 +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.net.URI;
-import java.util.List;
-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.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSortedSet;
-
-/**
- * Class Network
- */
-public class Network {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return new ConcreteBuilder().fromNetwork(this);
-   }
-
-   public abstract static class Builder<T extends Builder<T>> {
-      protected abstract T self();
-
-      protected String id;
-      protected String account;
-      protected String broadcastDomainType;
-      protected URI broadcastURI;
-      protected String displayText;
-      protected String DNS1;
-      protected String DNS2;
-      protected String domain;
-      protected String domainId;
-      protected String endIP;
-      protected String gateway;
-      protected boolean isDefault;
-      protected boolean isShared;
-      protected boolean isSystem;
-      protected String netmask;
-      protected String networkDomain;
-      protected String networkOfferingAvailability;
-      protected String networkOfferingDisplayText;
-      protected String networkOfferingId;
-      protected String networkOfferingName;
-      protected String related;
-      protected String startIP;
-      protected String name;
-      protected String state;
-      protected GuestIPType guestIPType;
-      protected String VLAN;
-      protected TrafficType trafficType;
-      protected String zoneId;
-      protected ImmutableSet.Builder<String> tags = 
ImmutableSet.<String>builder();
-      protected boolean securityGroupEnabled;
-      protected Set<? extends NetworkService> services = 
ImmutableSortedSet.of();
-
-      /**
-       * @see Network#getId()
-       */
-      public T id(String id) {
-         this.id = id;
-         return self();
-      }
-
-      /**
-       * @see Network#getAccount()
-       */
-      public T account(String account) {
-         this.account = account;
-         return self();
-      }
-
-      /**
-       * @see Network#getBroadcastDomainType()
-       */
-      public T broadcastDomainType(String broadcastDomainType) {
-         this.broadcastDomainType = broadcastDomainType;
-         return self();
-      }
-
-      /**
-       * @see Network#getBroadcastURI()
-       */
-      public T broadcastURI(URI broadcastURI) {
-         this.broadcastURI = broadcastURI;
-         return self();
-      }
-
-      /**
-       * @see Network#getDisplayText()
-       */
-      public T displayText(String displayText) {
-         this.displayText = displayText;
-         return self();
-      }
-
-      /**
-       * @return the DNS for the Network
-       */
-      public T DNS(List<String> DNS) {
-         if (!DNS.isEmpty()) this.DNS1 = DNS.get(0);
-         if (DNS.size() > 1) this.DNS2 = DNS.get(1);
-         return self();
-      }
-
-      /**
-       * @see Network#getDomain()
-       */
-      public T domain(String domain) {
-         this.domain = domain;
-         return self();
-      }
-
-      /**
-       * @see Network#getDomainId()
-       */
-      public T domainId(String domainId) {
-         this.domainId = domainId;
-         return self();
-      }
-
-      /**
-       * @see Network#getEndIP()
-       */
-      public T endIP(String endIP) {
-         this.endIP = endIP;
-         return self();
-      }
-
-      /**
-       * @see Network#getGateway()
-       */
-      public T gateway(String gateway) {
-         this.gateway = gateway;
-         return self();
-      }
-
-      /**
-       * @see Network#isDefault()
-       */
-      public T isDefault(boolean isDefault) {
-         this.isDefault = isDefault;
-         return self();
-      }
-
-      /**
-       * @see Network#isShared()
-       */
-      public T isShared(boolean isShared) {
-         this.isShared = isShared;
-         return self();
-      }
-
-      /**
-       * @see Network#isSystem()
-       */
-      public T isSystem(boolean isSystem) {
-         this.isSystem = isSystem;
-         return self();
-      }
-
-      /**
-       * @see Network#getNetmask()
-       */
-      public T netmask(String netmask) {
-         this.netmask = netmask;
-         return self();
-      }
-
-      /**
-       * @see Network#getNetworkDomain()
-       */
-      public T networkDomain(String networkDomain) {
-         this.networkDomain = networkDomain;
-         return self();
-      }
-
-      /**
-       * @see Network#getNetworkOfferingAvailability()
-       */
-      public T networkOfferingAvailability(String networkOfferingAvailability) 
{
-         this.networkOfferingAvailability = networkOfferingAvailability;
-         return self();
-      }
-
-      /**
-       * @see Network#getNetworkOfferingDisplayText()
-       */
-      public T networkOfferingDisplayText(String networkOfferingDisplayText) {
-         this.networkOfferingDisplayText = networkOfferingDisplayText;
-         return self();
-      }
-
-      /**
-       * @see Network#getNetworkOfferingId()
-       */
-      public T networkOfferingId(String networkOfferingId) {
-         this.networkOfferingId = networkOfferingId;
-         return self();
-      }
-
-      /**
-       * @see Network#getNetworkOfferingName()
-       */
-      public T networkOfferingName(String networkOfferingName) {
-         this.networkOfferingName = networkOfferingName;
-         return self();
-      }
-
-      /**
-       * @see Network#getRelated()
-       */
-      public T related(String related) {
-         this.related = related;
-         return self();
-      }
-
-      /**
-       * @see Network#getStartIP()
-       */
-      public T startIP(String startIP) {
-         this.startIP = startIP;
-         return self();
-      }
-
-      /**
-       * @see Network#getName()
-       */
-      public T name(String name) {
-         this.name = name;
-         return self();
-      }
-
-      /**
-       * @see Network#getState()
-       */
-      public T state(String state) {
-         this.state = state;
-         return self();
-      }
-
-      /**
-       * @see Network#getGuestIPType()
-       */
-      public T guestIPType(GuestIPType guestIPType) {
-         this.guestIPType = guestIPType;
-         return self();
-      }
-
-      /**
-       * @see Network#getVLAN()
-       */
-      public T VLAN(String VLAN) {
-         this.VLAN = VLAN;
-         return self();
-      }
-
-      /**
-       * @see Network#getTrafficType()
-       */
-      public T trafficType(TrafficType trafficType) {
-         this.trafficType = trafficType;
-         return self();
-      }
-
-      /**
-       * @see Network#getZoneId()
-       */
-      public T zoneId(String zoneId) {
-         this.zoneId = zoneId;
-         return self();
-      }
-
-      /**
-       * @see Network#getTags()
-       */
-      public T tags(Iterable<String> tags) {
-         this.tags = ImmutableSet.<String>builder().addAll(tags);
-         return self();
-      }
-      
-      /**
-       * @see Network#getTags()
-       */
-      public T tag(String tag) {
-         this.tags.add(tag);
-         return self();
-      }
-      
-
-      /**
-       * @see Network#isSecurityGroupEnabled()
-       */
-      public T securityGroupEnabled(boolean securityGroupEnabled) {
-         this.securityGroupEnabled = securityGroupEnabled;
-         return self();
-      }
-
-      /**
-       * @see Network#getServices()
-       */
-      public T services(Set<? extends NetworkService> services) {
-         this.services = services;
-         return self();
-      }
-
-      public Network build() {
-         return new Network(id, account, broadcastDomainType, broadcastURI, 
displayText, DNS1, DNS2, domain, domainId, endIP, gateway, isDefault, isShared, 
isSystem, netmask, networkDomain, networkOfferingAvailability, 
networkOfferingDisplayText, networkOfferingId, networkOfferingName, related, 
startIP, name, state, guestIPType, VLAN, trafficType, zoneId, tags.build(), 
securityGroupEnabled, services);
-      }
-
-      public T fromNetwork(Network in) {
-         return this
-               .id(in.getId())
-               .account(in.getAccount())
-               .broadcastDomainType(in.getBroadcastDomainType())
-               .broadcastURI(in.getBroadcastURI())
-               .displayText(in.getDisplayText())
-               .DNS(in.getDNS())
-               .domain(in.getDomain())
-               .domainId(in.getDomainId())
-               .endIP(in.getEndIP())
-               .gateway(in.getGateway())
-               .isDefault(in.isDefault())
-               .isShared(in.isShared())
-               .isSystem(in.isSystem())
-               .netmask(in.getNetmask())
-               .networkDomain(in.getNetworkDomain())
-               
.networkOfferingAvailability(in.getNetworkOfferingAvailability())
-               .networkOfferingDisplayText(in.getNetworkOfferingDisplayText())
-               .networkOfferingId(in.getNetworkOfferingId())
-               .networkOfferingName(in.getNetworkOfferingName())
-               .related(in.getRelated())
-               .startIP(in.getStartIP())
-               .name(in.getName())
-               .state(in.getState())
-               .guestIPType(in.getGuestIPType())
-               .VLAN(in.getVLAN())
-               .trafficType(in.getTrafficType())
-               .zoneId(in.getZoneId())
-               .tags(in.getTags())
-               .securityGroupEnabled(in.isSecurityGroupEnabled())
-               .services(in.getServices());
-      }
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-      @Override
-      protected ConcreteBuilder self() {
-         return this;
-      }
-   }
-
-   private final String id;
-   private final String account;
-   private final String broadcastDomainType;
-   private final URI broadcastURI;
-   private final String displayText;
-   private final String DNS1;
-   private final String DNS2;
-   private final String domain;
-   private final String domainId;
-   private final String endIP;
-   private final String gateway;
-   private final boolean isDefault;
-   private final boolean isShared;
-   private final boolean isSystem;
-   private final String netmask;
-   private final String networkDomain;
-   private final String networkOfferingAvailability;
-   private final String networkOfferingDisplayText;
-   private final String networkOfferingId;
-   private final String networkOfferingName;
-   private final String related;
-   private final String startIP;
-   private final String name;
-   private final String state;
-   private final GuestIPType guestIPType;
-   private final String VLAN;
-   private final TrafficType trafficType;
-   private final String zoneId;
-   private final Set<String> tags;
-   private final boolean securityGroupEnabled;
-   private final Set<? extends NetworkService> services;
-
-   @ConstructorProperties({
-         "id", "account", "broadcastdomaintype", "broadcasturi", 
"displaytext", "dns1", "dns2", "domain", "domainid", "endip", "gateway", 
"isdefault", "isshared", "issystem", "netmask", "networkdomain", 
"networkofferingavailability", "networkofferingdisplaytext", 
"networkofferingid", "networkofferingname", "related", "startip", "name", 
"state", "type", "vlan", "traffictype", "zoneid", "tags", 
"securitygroupenabled", "service"
-   })
-   protected Network(String id, @Nullable String account, @Nullable String 
broadcastDomainType, @Nullable URI broadcastURI,
-                     @Nullable String displayText, @Nullable String DNS1, 
@Nullable String DNS2, @Nullable String domain, @Nullable String domainId,
-                     @Nullable String endIP, @Nullable String gateway, boolean 
isDefault, boolean isShared, boolean isSystem,
-                     @Nullable String netmask, @Nullable String networkDomain, 
@Nullable String networkOfferingAvailability,
-                     @Nullable String networkOfferingDisplayText, @Nullable 
String networkOfferingId, @Nullable String networkOfferingName,
-                     @Nullable String related, @Nullable String startIP, 
@Nullable String name, @Nullable String state,
-                     @Nullable GuestIPType guestIPType, @Nullable String VLAN, 
@Nullable TrafficType trafficType,
-                     @Nullable String zoneId, @Nullable Iterable<String> tags, 
boolean securityGroupEnabled, Set<? extends NetworkService> services) {
-      this.id = checkNotNull(id, "id");
-      this.account = account;
-      this.broadcastDomainType = broadcastDomainType;
-      this.broadcastURI = broadcastURI;
-      this.displayText = displayText;
-      this.DNS1 = DNS1;
-      this.DNS2 = DNS2;
-      this.domain = domain;
-      this.domainId = domainId;
-      this.endIP = endIP;
-      this.gateway = gateway;
-      this.isDefault = isDefault;
-      this.isShared = isShared;
-      this.isSystem = isSystem;
-      this.netmask = netmask;
-      this.networkDomain = networkDomain;
-      this.networkOfferingAvailability = networkOfferingAvailability;
-      this.networkOfferingDisplayText = networkOfferingDisplayText;
-      this.networkOfferingId = networkOfferingId;
-      this.networkOfferingName = networkOfferingName;
-      this.related = related;
-      this.startIP = startIP;
-      this.name = name;
-      this.state = state;
-      this.guestIPType = guestIPType;
-      this.VLAN = VLAN;
-      this.trafficType = trafficType;
-      this.zoneId = zoneId;
-      this.tags = tags != null ? ImmutableSet.copyOf(tags) : 
ImmutableSet.<String> of();
-      this.securityGroupEnabled = securityGroupEnabled;
-      this.services = ImmutableSortedSet.copyOf(services);
-   }
-
-   /**
-    * @return network id
-    */
-   public String getId() {
-      return this.id;
-   }
-
-   /**
-    * @return the account associated with the network
-    */
-   @Nullable
-   public String getAccount() {
-      return this.account;
-   }
-
-   /**
-    * @return Broadcast domain type of the network
-    */
-   @Nullable
-   public String getBroadcastDomainType() {
-      return this.broadcastDomainType;
-   }
-
-   /**
-    * @return broadcast uri of the network
-    */
-   @Nullable
-   public URI getBroadcastURI() {
-      return this.broadcastURI;
-   }
-
-   /**
-    * @return the display text of the zone
-    */
-   @Nullable
-   public String getDisplayText() {
-      return this.displayText;
-   }
-
-   public List<String> getDNS() {
-      ImmutableList.Builder<String> builder = ImmutableList.builder();
-      if (DNS1 != null && !"".equals(DNS1))
-         builder.add(DNS1);
-      if (DNS2 != null && !"".equals(DNS2))
-         builder.add(DNS2);
-      return builder.build();
-   }
-
-   /**
-    * @return Domain name for the Network
-    */
-   @Nullable
-   public String getDomain() {
-      return this.domain;
-   }
-
-   /**
-    * @return the domain id of the Network
-    */
-   @Nullable
-   public String getDomainId() {
-      return this.domainId;
-   }
-
-   /**
-    * @return the end ip of the network
-    */
-   @Nullable
-   public String getEndIP() {
-      return this.endIP;
-   }
-
-   /**
-    * @return the network's gateway
-    */
-   @Nullable
-   public String getGateway() {
-      return this.gateway;
-   }
-
-   /**
-    * @return true if network offering is default, false otherwise
-    */
-   public boolean isDefault() {
-      return this.isDefault;
-   }
-
-   /**
-    * @return true if network offering is shared, false otherwise
-    */
-   public boolean isShared() {
-      return this.isShared;
-   }
-
-   /**
-    * @return true if network offering is system, false otherwise
-    */
-   public boolean isSystem() {
-      return this.isSystem;
-   }
-
-   /**
-    * @return the network's netmask
-    */
-   @Nullable
-   public String getNetmask() {
-      return this.netmask;
-   }
-
-   /**
-    * @return the network domain
-    */
-   @Nullable
-   public String getNetworkDomain() {
-      return this.networkDomain;
-   }
-
-   /**
-    * @return availability of the network offering the network is created from
-    */
-   @Nullable
-   public String getNetworkOfferingAvailability() {
-      return this.networkOfferingAvailability;
-   }
-
-   /**
-    * @return display text of the network offering the network is created from
-    */
-   @Nullable
-   public String getNetworkOfferingDisplayText() {
-      return this.networkOfferingDisplayText;
-   }
-
-   /**
-    * @return network offering id the network is created from
-    */
-   @Nullable
-   public String getNetworkOfferingId() {
-      return this.networkOfferingId;
-   }
-
-   /**
-    * @return name of the network offering the network is created from
-    */
-   @Nullable
-   public String getNetworkOfferingName() {
-      return this.networkOfferingName;
-   }
-
-   /**
-    * @return related to what other network configuration
-    */
-   @Nullable
-   public String getRelated() {
-      return this.related;
-   }
-
-   /**
-    * @return the start ip of the network
-    */
-   @Nullable
-   public String getStartIP() {
-      return this.startIP;
-   }
-
-   /**
-    * @return network name
-    */
-   @Nullable
-   public String getName() {
-      return this.name;
-   }
-
-   /**
-    * @return state of the network
-    */
-   @Nullable
-   public String getState() {
-      return this.state;
-   }
-
-   /**
-    * @return the GuestIPType of the network
-    */
-   public GuestIPType getGuestIPType() {
-      return this.guestIPType;
-   }
-
-   /**
-    * @return the vlan range of the zone
-    */
-   @Nullable
-   public String getVLAN() {
-      return this.VLAN;
-   }
-
-   /**
-    * @return the traffic type for this network offering
-    */
-   @Nullable
-   public TrafficType getTrafficType() {
-      return this.trafficType;
-   }
-
-   /**
-    * @return zone id of the network
-    */
-   @Nullable
-   public String getZoneId() {
-      return this.zoneId;
-   }
-
-   /**
-    * @return the tags for the Network
-    */
-   public Set<String> getTags() {
-      return this.tags;
-   }
-
-   /**
-    * @return true if security group is enabled, false otherwise
-    */
-   public boolean isSecurityGroupEnabled() {
-      return this.securityGroupEnabled;
-   }
-
-   /**
-    * @return the list of services
-    */
-   public Set<? extends NetworkService> getServices() {
-      return this.services;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(id, account, broadcastDomainType, broadcastURI, 
displayText, DNS1, DNS2, domain, domainId, endIP, gateway, isDefault, isShared, 
isSystem, netmask, networkDomain, networkOfferingAvailability, 
networkOfferingDisplayText, networkOfferingId, networkOfferingName, related, 
startIP, name, state, guestIPType, VLAN, trafficType, zoneId, tags, 
securityGroupEnabled, services);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null || getClass() != obj.getClass()) return false;
-      Network that = Network.class.cast(obj);
-      return Objects.equal(this.id, that.id)
-            && Objects.equal(this.account, that.account)
-            && Objects.equal(this.broadcastDomainType, 
that.broadcastDomainType)
-            && Objects.equal(this.broadcastURI, that.broadcastURI)
-            && Objects.equal(this.displayText, that.displayText)
-            && Objects.equal(this.DNS1, that.DNS1)
-            && Objects.equal(this.DNS2, that.DNS2)
-            && Objects.equal(this.domain, that.domain)
-            && Objects.equal(this.domainId, that.domainId)
-            && Objects.equal(this.endIP, that.endIP)
-            && Objects.equal(this.gateway, that.gateway)
-            && Objects.equal(this.isDefault, that.isDefault)
-            && Objects.equal(this.isShared, that.isShared)
-            && Objects.equal(this.isSystem, that.isSystem)
-            && Objects.equal(this.netmask, that.netmask)
-            && Objects.equal(this.networkDomain, that.networkDomain)
-            && Objects.equal(this.networkOfferingAvailability, 
that.networkOfferingAvailability)
-            && Objects.equal(this.networkOfferingDisplayText, 
that.networkOfferingDisplayText)
-            && Objects.equal(this.networkOfferingId, that.networkOfferingId)
-            && Objects.equal(this.networkOfferingName, 
that.networkOfferingName)
-            && Objects.equal(this.related, that.related)
-            && Objects.equal(this.startIP, that.startIP)
-            && Objects.equal(this.name, that.name)
-            && Objects.equal(this.state, that.state)
-            && Objects.equal(this.guestIPType, that.guestIPType)
-            && Objects.equal(this.VLAN, that.VLAN)
-            && Objects.equal(this.trafficType, that.trafficType)
-            && Objects.equal(this.zoneId, that.zoneId)
-            && Objects.equal(this.tags, that.tags)
-            && Objects.equal(this.securityGroupEnabled, 
that.securityGroupEnabled)
-            && Objects.equal(this.services, that.services);
-   }
-
-   protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this)
-            .add("id", id).add("account", account).add("broadcastDomainType", 
broadcastDomainType).add("broadcastURI", broadcastURI)
-            .add("displayText", displayText).add("DNS1", DNS1).add("DNS2", 
DNS2).add("domain", domain).add("domainId", domainId)
-            .add("endIP", endIP).add("gateway", gateway).add("isDefault", 
isDefault).add("isShared", isShared).add("isSystem", isSystem)
-            .add("netmask", netmask).add("networkDomain", 
networkDomain).add("networkOfferingAvailability", networkOfferingAvailability)
-            .add("networkOfferingDisplayText", 
networkOfferingDisplayText).add("networkOfferingId", networkOfferingId)
-            .add("networkOfferingName", networkOfferingName).add("related", 
related).add("startIP", startIP).add("name", name)
-            .add("state", state).add("guestIPType", guestIPType).add("VLAN", 
VLAN).add("trafficType", trafficType)
-            .add("zoneId", zoneId).add("tags", 
tags).add("securityGroupEnabled", securityGroupEnabled).add("services", 
services);
-   }
-
-   @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/NetworkOffering.java
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java
deleted file mode 100644
index 9937391..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java
+++ /dev/null
@@ -1,356 +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 NetworkOffering
- */
-public class NetworkOffering implements Comparable<NetworkOffering> {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return new ConcreteBuilder().fromNetworkOffering(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 NetworkOfferingAvailabilityType availability;
-      protected Integer maxConnections;
-      protected boolean isDefault;
-      protected boolean supportsVLAN;
-      protected TrafficType trafficType;
-      protected GuestIPType guestIPType;
-      protected int networkRate;
-      protected ImmutableSet.Builder<String> tags = 
ImmutableSet.<String>builder();
-
-      /**
-       * @see NetworkOffering#getId()
-       */
-      public T id(String id) {
-         this.id = id;
-         return self();
-      }
-
-      /**
-       * @see NetworkOffering#getName()
-       */
-      public T name(String name) {
-         this.name = name;
-         return self();
-      }
-
-      /**
-       * @see NetworkOffering#getDisplayText()
-       */
-      public T displayText(String displayText) {
-         this.displayText = displayText;
-         return self();
-      }
-
-      /**
-       * @see NetworkOffering#getCreated()
-       */
-      public T created(Date created) {
-         this.created = created;
-         return self();
-      }
-
-      /**
-       * @see NetworkOffering#getAvailability()
-       */
-      public T availability(NetworkOfferingAvailabilityType availability) {
-         this.availability = availability;
-         return self();
-      }
-
-      /**
-       * @see NetworkOffering#getMaxConnections()
-       */
-      public T maxConnections(Integer maxConnections) {
-         this.maxConnections = maxConnections;
-         return self();
-      }
-
-      /**
-       * @see NetworkOffering#isDefault()
-       */
-      public T isDefault(boolean isDefault) {
-         this.isDefault = isDefault;
-         return self();
-      }
-
-      /**
-       * @see NetworkOffering#supportsVLAN()
-       */
-      public T supportsVLAN(boolean supportsVLAN) {
-         this.supportsVLAN = supportsVLAN;
-         return self();
-      }
-
-      /**
-       * @see NetworkOffering#getTrafficType()
-       */
-      public T trafficType(TrafficType trafficType) {
-         this.trafficType = trafficType;
-         return self();
-      }
-
-      /**
-       * @see NetworkOffering#getGuestIPType()
-       */
-      public T guestIPType(GuestIPType guestIPType) {
-         this.guestIPType = guestIPType;
-         return self();
-      }
-
-      /**
-       * @see NetworkOffering#getNetworkRate()
-       */
-      public T networkRate(int networkRate) {
-         this.networkRate = networkRate;
-         return self();
-      }
-      
-      /**
-       * @see NetworkOffering#getTags()
-       */
-      public T tags(Iterable<String> tags) {
-         this.tags = ImmutableSet.<String>builder().addAll(tags);
-         return self();
-      }
-      
-      /**
-       * @see NetworkOffering#getTags()
-       */
-      public T tag(String tag) {
-         this.tags.add(tag);
-         return self();
-      }
-      
-
-      public NetworkOffering build() {
-         return new NetworkOffering(id, name, displayText, created, 
availability, maxConnections, isDefault, supportsVLAN, trafficType, 
guestIPType, networkRate, tags.build());
-      }
-
-      public T fromNetworkOffering(NetworkOffering in) {
-         return this
-               .id(in.getId())
-               .name(in.getName())
-               .displayText(in.getDisplayText())
-               .created(in.getCreated())
-               .availability(in.getAvailability())
-               .maxConnections(in.getMaxConnections())
-               .isDefault(in.isDefault())
-               .supportsVLAN(in.supportsVLAN())
-               .trafficType(in.getTrafficType())
-               .guestIPType(in.getGuestIPType())
-               .networkRate(in.getNetworkRate())
-               .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 NetworkOfferingAvailabilityType availability;
-   private final Integer maxConnections;
-   private final boolean isDefault;
-   private final boolean supportsVLAN;
-   private final TrafficType trafficType;
-   private final GuestIPType guestIPType;
-   private final int networkRate;
-   private final Set<String> tags;
-
-   @ConstructorProperties({
-         "id", "name", "displaytext", "created", "availability", 
"maxconnections", "isdefault", "specifyvlan", "traffictype", "guestiptype", 
"networkrate", "tags"
-   })
-   protected NetworkOffering(String id, @Nullable String name, @Nullable 
String displayText, @Nullable Date created, @Nullable 
NetworkOfferingAvailabilityType availability, @Nullable Integer maxConnections, 
boolean isDefault, boolean supportsVLAN, @Nullable TrafficType trafficType, 
@Nullable GuestIPType guestIPType, int networkRate, @Nullable Iterable<String> 
tags) {
-      this.id = checkNotNull(id, "id");
-      this.name = name;
-      this.displayText = displayText;
-      this.created = created;
-      this.availability = availability;
-      this.maxConnections = maxConnections;
-      this.isDefault = isDefault;
-      this.supportsVLAN = supportsVLAN;
-      this.trafficType = trafficType;
-      this.guestIPType = guestIPType;
-      this.networkRate = networkRate;
-      this.tags = tags != null ? ImmutableSet.copyOf(tags) : 
ImmutableSet.<String> of();
-   }
-
-   /**
-    * @return the id of the network offering
-    */
-   public String getId() {
-      return this.id;
-   }
-
-   /**
-    * @return the name of the network offering
-    */
-   @Nullable
-   public String getName() {
-      return this.name;
-   }
-
-   /**
-    * @return an alternate display text of the network offering.
-    */
-   @Nullable
-   public String getDisplayText() {
-      return this.displayText;
-   }
-
-   /**
-    * @return the date this network offering was created
-    */
-   @Nullable
-   public Date getCreated() {
-      return this.created;
-   }
-
-   /**
-    * @return Availability name for the offering
-    */
-   @Nullable
-   public NetworkOfferingAvailabilityType getAvailability() {
-      return this.availability;
-   }
-
-   /**
-    * @return the max number of concurrent connection the network offering
-    *         supports
-    */
-   @Nullable
-   public Integer getMaxConnections() {
-      return this.maxConnections;
-   }
-
-   /**
-    * @return true if network offering is default, false otherwise
-    */
-   public boolean isDefault() {
-      return this.isDefault;
-   }
-
-   /**
-    * @return true if network offering supports vlans, false otherwise
-    */
-   public boolean supportsVLAN() {
-      return this.supportsVLAN;
-   }
-
-   /**
-    * @return the traffic type for this network offering
-    */
-   @Nullable
-   public TrafficType getTrafficType() {
-      return this.trafficType;
-   }
-
-   /**
-    * @return the guest ip type for this network offering
-    */
-   @Nullable
-   public GuestIPType getGuestIPType() {
-      return this.guestIPType;
-   }
-
-   /**
-    * @return data transfer rate in megabits per second allowed.
-    */
-   public int getNetworkRate() {
-      return this.networkRate;
-   }
-
-   /**
-    * @return the tags for the network offering
-    */
-   public Set<String> getTags() {
-      return this.tags;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(id, name, displayText, created, availability, 
maxConnections, isDefault, supportsVLAN, trafficType, guestIPType, networkRate, 
tags);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null || getClass() != obj.getClass()) return false;
-      NetworkOffering that = NetworkOffering.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.availability, that.availability)
-            && Objects.equal(this.maxConnections, that.maxConnections)
-            && Objects.equal(this.isDefault, that.isDefault)
-            && Objects.equal(this.supportsVLAN, that.supportsVLAN)
-            && Objects.equal(this.trafficType, that.trafficType)
-            && Objects.equal(this.guestIPType, that.guestIPType)
-            && Objects.equal(this.networkRate, that.networkRate)
-            && 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("availability", 
availability).add("maxConnections", maxConnections).add("isDefault", 
isDefault).add("supportsVLAN", supportsVLAN).add("trafficType", 
trafficType).add("guestIPType", guestIPType).add("networkRate", 
networkRate).add("tags", tags);
-   }
-
-   @Override
-   public String toString() {
-      return string().toString();
-   }
-
-   @Override
-   public int compareTo(NetworkOffering o) {
-      return id.compareTo(o.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/NetworkOfferingAvailabilityType.java
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkOfferingAvailabilityType.java
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkOfferingAvailabilityType.java
deleted file mode 100644
index 55f9065..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkOfferingAvailabilityType.java
+++ /dev/null
@@ -1,45 +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;
-
-public enum NetworkOfferingAvailabilityType {
-
-   DEFAULT,
-
-   REQUIRED, /* default value for Guest Virtual network offering */
-
-   OPTIONAL, /* default value for Guest Direct network offering */
-
-   UNRECOGNIZED;
-
-   @Override
-   public String toString() {
-      return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
-   }
-
-   public static NetworkOfferingAvailabilityType 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/NetworkService.java
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java
deleted file mode 100644
index 800bc23..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java
+++ /dev/null
@@ -1,242 +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.Map;
-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;
-import com.google.common.collect.ImmutableSortedMap;
-import com.google.common.collect.ImmutableSortedSet;
-import com.google.common.collect.Sets;
-
-/**
- * Class NetworkService
- */
-public class NetworkService implements Comparable<NetworkService> {
-
-   public static class Capability implements Comparable<Capability> {
-
-      public static Builder<?> builder() {
-         return new ConcreteBuilder();
-      }
-
-      public Builder<?> toBuilder() {
-         return new ConcreteBuilder().fromCapability(this);
-      }
-
-      public abstract static class Builder<T extends Builder<T>> {
-         protected abstract T self();
-
-         protected String name;
-         protected String value;
-
-         /**
-          * @see Capability#getName()
-          */
-         public T name(String name) {
-            this.name = name;
-            return self();
-         }
-
-         /**
-          * @see Capability#getValue()
-          */
-         public T value(String value) {
-            this.value = value;
-            return self();
-         }
-
-         public Capability build() {
-            return new Capability(name, value);
-         }
-
-         public T fromCapability(Capability in) {
-            return this
-                  .name(in.getName())
-                  .value(in.getValue());
-         }
-
-      }
-
-      private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-         @Override
-         protected ConcreteBuilder self() {
-            return this;
-         }
-      }
-
-      private final String name;
-      private final String value;
-
-      @ConstructorProperties({
-            "name", "value"
-      })
-      protected Capability(String name, @Nullable String value) {
-         this.name = checkNotNull(name, "name");
-         this.value = value;
-      }
-
-      public String getName() {
-         return this.name;
-      }
-
-      @Nullable
-      public String getValue() {
-         return this.value;
-      }
-
-      @Override
-      public int hashCode() {
-         return Objects.hashCode(name, value);
-      }
-
-      @Override
-      public boolean equals(Object obj) {
-         if (this == obj) return true;
-         if (obj == null || getClass() != obj.getClass()) return false;
-         Capability that = Capability.class.cast(obj);
-         return Objects.equal(this.name, that.name)
-               && Objects.equal(this.value, that.value);
-      }
-
-      protected ToStringHelper string() {
-         return MoreObjects.toStringHelper(this)
-               .add("name", name).add("value", value);
-      }
-
-      @Override
-      public String toString() {
-         return string().toString();
-      }
-
-      @Override
-      public int compareTo(Capability o) {
-         return name.compareTo(o.getName());
-      }
-   }
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return new ConcreteBuilder().fromNetworkService(this);
-   }
-
-   public abstract static class Builder<T extends Builder<T>> {
-      protected abstract T self();
-
-      protected String name;
-      protected Set<Capability> capabilities = Sets.newHashSet();
-
-      /**
-       * @see NetworkService#getName()
-       */
-      public T name(String name) {
-         this.name = name;
-         return self();
-      }
-
-      /**
-       * @see NetworkService#getCapabilities()
-       */
-      public T capabilities(Map<String, String> capabilities) {
-         for (Map.Entry<String, String> entry : capabilities.entrySet()) {
-            
this.capabilities.add(Capability.builder().name(entry.getKey()).value(entry.getValue()).build());
-         }
-         return self();
-      }
-
-      public NetworkService build() {
-         return new NetworkService(name, capabilities);
-      }
-
-      public T fromNetworkService(NetworkService in) {
-         return this
-               .name(in.getName())
-               .capabilities(in.getCapabilities());
-      }
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-      @Override
-      protected ConcreteBuilder self() {
-         return this;
-      }
-   }
-
-   private final String name;
-   private final Set<Capability> capabilities;
-
-   @ConstructorProperties({
-         "name", "capability"
-   })
-   protected NetworkService(String name, @Nullable Set<Capability> 
capabilities) {
-      this.name = checkNotNull(name, "name");
-      this.capabilities = capabilities == null ? ImmutableSet.<Capability>of() 
: ImmutableSortedSet.copyOf(capabilities);
-   }
-
-   public String getName() {
-      return this.name;
-   }
-
-   public Map<String, String> getCapabilities() {
-      // so tests and serialization comes out expected
-      ImmutableSortedMap.Builder<String, String> returnVal = 
ImmutableSortedMap.naturalOrder();
-      for (Capability capability : capabilities) {
-         returnVal.put(capability.name, capability.value);
-      }
-      return returnVal.build();
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(name, capabilities);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null || getClass() != obj.getClass()) return false;
-      NetworkService that = NetworkService.class.cast(obj);
-      return Objects.equal(this.name, that.name)
-            && Objects.equal(this.capabilities, that.capabilities);
-   }
-
-   protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this).add("name", 
name).add("capabilities", capabilities);
-   }
-
-   @Override
-   public String toString() {
-      return string().toString();
-   }
-
-   @Override
-   public int compareTo(NetworkService o) {
-      return name.compareTo(o.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/NetworkType.java
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkType.java
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkType.java
deleted file mode 100644
index b014e74..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkType.java
+++ /dev/null
@@ -1,45 +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 TemplateApi#listZones
- */
-public enum NetworkType {
-   BASIC,
-
-   ADVANCED,
-
-   UNRECOGNIZED;
-
-   @Override
-   public String toString() {
-      return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
-   }
-
-   public static NetworkType 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/OSType.java
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/OSType.java
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/OSType.java
deleted file mode 100644
index b03738f..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/OSType.java
+++ /dev/null
@@ -1,156 +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;
-
-/**
- * Class OSType
- */
-public class OSType implements Comparable<OSType> {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return new ConcreteBuilder().fromOSType(this);
-   }
-
-   public abstract static class Builder<T extends Builder<T>> {
-      protected abstract T self();
-
-      protected String id;
-      protected String OSCategoryId;
-      protected String description;
-
-      /**
-       * @see OSType#getId()
-       */
-      public T id(String id) {
-         this.id = id;
-         return self();
-      }
-
-      /**
-       * @see OSType#getOSCategoryId()
-       */
-      public T OSCategoryId(String OSCategoryId) {
-         this.OSCategoryId = OSCategoryId;
-         return self();
-      }
-
-      /**
-       * @see OSType#getDescription()
-       */
-      public T description(String description) {
-         this.description = description;
-         return self();
-      }
-
-      public OSType build() {
-         return new OSType(id, OSCategoryId, description);
-      }
-
-      public T fromOSType(OSType in) {
-         return this
-               .id(in.getId())
-               .OSCategoryId(in.getOSCategoryId())
-               .description(in.getDescription());
-      }
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-      @Override
-      protected ConcreteBuilder self() {
-         return this;
-      }
-   }
-
-   private final String id;
-   private final String OSCategoryId;
-   private final String description;
-
-   @ConstructorProperties({
-         "id", "oscategoryid", "description"
-   })
-   protected OSType(String id, @Nullable String OSCategoryId, @Nullable String 
description) {
-      this.id = checkNotNull(id, "id");
-      this.OSCategoryId = OSCategoryId;
-      this.description = description;
-   }
-
-   /**
-    * @return the ID of the OS type
-    */
-   public String getId() {
-      return this.id;
-   }
-
-   /**
-    * @return the ID of the OS category
-    */
-   @Nullable
-   public String getOSCategoryId() {
-      return this.OSCategoryId;
-   }
-
-   /**
-    * @return the name/description of the OS type
-    */
-   @Nullable
-   public String getDescription() {
-      return this.description;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(id, OSCategoryId, description);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null || getClass() != obj.getClass()) return false;
-      OSType that = OSType.class.cast(obj);
-      return Objects.equal(this.id, that.id)
-            && Objects.equal(this.OSCategoryId, that.OSCategoryId)
-            && Objects.equal(this.description, that.description);
-   }
-
-   protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this).add("id", 
id).add("OSCategoryId", OSCategoryId).add("description", description);
-   }
-
-   @Override
-   public String toString() {
-      return string().toString();
-   }
-
-   @Override
-   public int compareTo(OSType o) {
-      return id.compareTo(o.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/PermissionOperation.java
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/PermissionOperation.java
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/PermissionOperation.java
deleted file mode 100644
index 5da62af..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/PermissionOperation.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 PermissionOperation {
-
-   add, remove, reset, UNRECOGNIZED;
-
-   public static PermissionOperation 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/Pod.java
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Pod.java
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Pod.java
deleted file mode 100644
index 4186812..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Pod.java
+++ /dev/null
@@ -1,283 +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 a Pod in CloudStack.
- */
-public class Pod implements Comparable<Pod> {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return new ConcreteBuilder().fromPod(this);
-   }
-
-   public abstract static class Builder<T extends Builder<T>> {
-      protected abstract T self();
-
-      protected String id;
-      protected String name;
-      protected String zoneId;
-      protected String zoneName;
-      protected String gateway;
-      protected String netmask;
-      protected String startIp;
-      protected String endIp;
-      protected AllocationState allocationState;
-
-      /**
-       * @see Pod#getId()
-       */
-      public T id(String id) {
-         this.id = id;
-         return self();
-      }
-
-      /**
-       * @see Pod#getName()
-       */
-      public T name(String name) {
-         this.name = name;
-         return self();
-      }
-
-      /**
-       * @see Pod#getZoneId()
-       */
-      public T zoneId(String zoneId) {
-         this.zoneId = zoneId;
-         return self();
-      }
-
-      /**
-       * @see Pod#getZoneName()
-       */
-      public T zoneName(String zoneName) {
-         this.zoneName = zoneName;
-         return self();
-      }
-
-      /**
-       * @see Pod#getGateway()
-       */
-      public T gateway(String gateway) {
-         this.gateway = gateway;
-         return self();
-      }
-
-      /**
-       * @see Pod#getNetmask()
-       */
-      public T netmask(String netmask) {
-         this.netmask = netmask;
-         return self();
-      }
-
-      /**
-       * @see Pod#getStartIp()
-       */
-      public T startIp(String startIp) {
-         this.startIp = startIp;
-         return self();
-      }
-
-      /**
-       * @see Pod#getEndIp()
-       */
-      public T endIp(String endIp) {
-         this.endIp = endIp;
-         return self();
-      }
-
-      /**
-       * @see Pod#getAllocationState()
-       */
-      public T allocationState(AllocationState allocationState) {
-         this.allocationState = allocationState;
-         return self();
-      }
-
-      public Pod build() {
-         return new Pod(id, name, zoneId, zoneName, gateway, netmask, startIp, 
endIp, allocationState);
-      }
-
-      public T fromPod(Pod in) {
-         return this
-               .id(in.getId())
-               .name(in.getName())
-               .zoneId(in.getZoneId())
-               .zoneName(in.getZoneName())
-               .gateway(in.getGateway())
-               .netmask(in.getNetmask())
-               .startIp(in.getStartIp())
-               .endIp(in.getEndIp())
-               .allocationState(in.getAllocationState());
-      }
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-      @Override
-      protected ConcreteBuilder self() {
-         return this;
-      }
-   }
-
-   private final String id;
-   private final String name;
-   private final String zoneId;
-   private final String zoneName;
-   private final String gateway;
-   private final String netmask;
-   private final String startIp;
-   private final String endIp;
-   private final AllocationState allocationState;
-
-   @ConstructorProperties({
-         "id", "name", "zoneid", "zonename", "gateway", "netmask", "startip", 
"endip", "allocationstate"
-   })
-   protected Pod(String id, @Nullable String name, @Nullable String zoneId, 
@Nullable String zoneName, @Nullable String gateway, @Nullable String netmask, 
@Nullable String startIp, @Nullable String endIp, @Nullable AllocationState 
allocationState) {
-      this.id = checkNotNull(id, "id");
-      this.name = name;
-      this.zoneId = zoneId;
-      this.zoneName = zoneName;
-      this.gateway = gateway;
-      this.netmask = netmask;
-      this.startIp = startIp;
-      this.endIp = endIp;
-      this.allocationState = allocationState;
-   }
-
-   /**
-    * @return id the ID of the Pod
-    */
-   public String getId() {
-      return this.id;
-   }
-
-   /**
-    * @return name the name of the Pod
-    */
-   @Nullable
-   public String getName() {
-      return this.name;
-   }
-
-   /**
-    * @return zoneId the Zone ID of the Pod
-    */
-   @Nullable
-   public String getZoneId() {
-      return this.zoneId;
-   }
-
-   /**
-    * @return zoneName the Zone name of the Pod
-    */
-   @Nullable
-   public String getZoneName() {
-      return this.zoneName;
-   }
-
-   /**
-    * @return gateway the gateway of the Pod
-    */
-   @Nullable
-   public String getGateway() {
-      return this.gateway;
-   }
-
-   /**
-    * @return netmask the netmask of the Pod
-    */
-   @Nullable
-   public String getNetmask() {
-      return this.netmask;
-   }
-
-   /**
-    * @return startIp the starting IP for the Pod
-    */
-   @Nullable
-   public String getStartIp() {
-      return this.startIp;
-   }
-
-   /**
-    * @return endIp the ending IP for the Pod
-    */
-   @Nullable
-   public String getEndIp() {
-      return this.endIp;
-   }
-
-   /**
-    * @return the allocation state of the cluster
-    */
-   @Nullable
-   public AllocationState getAllocationState() {
-      return this.allocationState;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(id, name, zoneId, zoneName, gateway, netmask, 
startIp, endIp, allocationState);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj) return true;
-      if (obj == null || getClass() != obj.getClass()) return false;
-      Pod that = Pod.class.cast(obj);
-      return Objects.equal(this.id, that.id)
-            && Objects.equal(this.name, that.name)
-            && Objects.equal(this.zoneId, that.zoneId)
-            && Objects.equal(this.zoneName, that.zoneName)
-            && 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.allocationState, that.allocationState);
-   }
-
-   protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this)
-            .add("id", id).add("name", name).add("zoneId", 
zoneId).add("zoneName", zoneName).add("gateway", gateway).add("netmask", 
netmask).add("startIp", startIp).add("endIp", endIp).add("allocationState", 
allocationState);
-   }
-
-   @Override
-   public String toString() {
-      return string().toString();
-   }
-
-   @Override
-   public int compareTo(Pod other) {
-      return this.id.compareTo(other.id);
-   }
-}

Reply via email to