You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/03/31 09:13:21 UTC
[08/52] [partial] Moving jclouds dependencies to accurate parent
directories
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/SecurityGroupInZone.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/SecurityGroupInZone.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/SecurityGroupInZone.java
deleted file mode 100644
index 28e2b0f..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/SecurityGroupInZone.java
+++ /dev/null
@@ -1,46 +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.openstack.nova.v2_0.domain.zonescoped;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import org.jclouds.openstack.nova.v2_0.domain.SecurityGroup;
-
-/**
- * @author Adrian Cole
- */
-public class SecurityGroupInZone extends ZoneAndName {
- protected final SecurityGroup securityGroup;
-
- public SecurityGroupInZone(SecurityGroup securityGroup, String zoneId) {
- super(zoneId, checkNotNull(securityGroup, "securityGroup").getName());
- this.securityGroup = securityGroup;
- }
-
- public SecurityGroup getSecurityGroup() {
- return securityGroup;
- }
-
- // superclass hashCode/equals are good enough, and help us use ZoneAndName and ServerInZone
- // interchangeably as Map keys
-
- @Override
- public String toString() {
- return "[securityGroup=" + securityGroup + ", zoneId=" + zoneId + "]";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ServerInZone.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ServerInZone.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ServerInZone.java
deleted file mode 100644
index 2249cf7..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ServerInZone.java
+++ /dev/null
@@ -1,46 +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.openstack.nova.v2_0.domain.zonescoped;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import org.jclouds.openstack.nova.v2_0.domain.Server;
-
-/**
- * @author Adrian Cole
- */
-public class ServerInZone extends ZoneAndId {
- protected final Server server;
-
- public ServerInZone(Server server, String zoneId) {
- super(zoneId, checkNotNull(server, "server").getId());
- this.server = server;
- }
-
- public Server getServer() {
- return server;
- }
-
- // superclass hashCode/equals are good enough, and help us use ZoneAndId and ServerInZone
- // interchangeably as Map keys
-
- @Override
- public String toString() {
- return "[server=" + server + ", zoneId=" + zoneId + "]";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneAndId.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneAndId.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneAndId.java
deleted file mode 100644
index 6c6f0c6..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneAndId.java
+++ /dev/null
@@ -1,86 +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.openstack.nova.v2_0.domain.zonescoped;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Iterables;
-
-/**
- * @author Adam Lowe
- */
-public class ZoneAndId {
- public static ZoneAndId fromSlashEncoded(String id) {
- Iterable<String> parts = Splitter.on('/').split(checkNotNull(id, "id"));
- checkArgument(Iterables.size(parts) == 2, "id must be in format zoneId/id");
- return new ZoneAndId(Iterables.get(parts, 0), Iterables.get(parts, 1));
- }
-
- public static ZoneAndId fromZoneAndId(String zoneId, String id) {
- return new ZoneAndId(zoneId, id);
- }
-
- private static String slashEncodeZoneAndId(String zoneId, String id) {
- return checkNotNull(zoneId, "zoneId") + "/" + checkNotNull(id, "id");
- }
-
- public String slashEncode() {
- return slashEncodeZoneAndId(zoneId, id);
- }
-
- protected final String zoneId;
- protected final String id;
-
- protected ZoneAndId(String zoneId, String id) {
- this.zoneId = checkNotNull(zoneId, "zoneId");
- this.id = checkNotNull(id, "id");
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(zoneId, id);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- ZoneAndId other = (ZoneAndId) obj;
- return Objects.equal(zoneId, other.zoneId) && Objects.equal(id, other.id);
- }
-
- public String getZone() {
- return zoneId;
- }
-
- public String getId() {
- return id;
- }
-
- @Override
- public String toString() {
- return "[zoneId=" + zoneId + ", id=" + id + "]";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneAndName.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneAndName.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneAndName.java
deleted file mode 100644
index fdb49e1..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneAndName.java
+++ /dev/null
@@ -1,111 +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.openstack.nova.v2_0.domain.zonescoped;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.base.Splitter;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.Iterables;
-
-/**
- * Helpful when looking for resources by zone and name
- *
- * @author Adrian Cole
- */
-public class ZoneAndName {
-
- public static final Function<ZoneAndName, String> NAME_FUNCTION = new Function<ZoneAndName, String>() {
-
- @Override
- public String apply(ZoneAndName input) {
- return input.getName();
- }
-
- };
-
- public static final Function<ZoneAndName, String> ZONE_FUNCTION = new Function<ZoneAndName, String>() {
-
- @Override
- public String apply(ZoneAndName input) {
- return input.getZone();
- }
-
- };
-
- public static ZoneAndName fromSlashEncoded(String name) {
- Iterable<String> parts = Splitter.on('/').split(checkNotNull(name, "name"));
- checkArgument(Iterables.size(parts) == 2, "name must be in format zoneId/name");
- return new ZoneAndName(Iterables.get(parts, 0), Iterables.get(parts, 1));
- }
-
- public static ZoneAndName fromZoneAndName(String zoneId, String name) {
- return new ZoneAndName(zoneId, name);
- }
-
- private static String slashEncodeZoneAndName(String zoneId, String name) {
- return checkNotNull(zoneId, "zoneId") + "/" + checkNotNull(name, "name");
- }
-
- public String slashEncode() {
- return slashEncodeZoneAndName(zoneId, name);
- }
-
- protected final String zoneId;
- protected final String name;
-
- protected ZoneAndName(String zoneId, String name) {
- this.zoneId = checkNotNull(zoneId, "zoneId");
- this.name = checkNotNull(name, "name");
- }
-
- public String getZone() {
- return zoneId;
- }
-
- public String getName() {
- return name;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- ZoneAndName that = ZoneAndName.class.cast(o);
- return equal(this.zoneId, that.zoneId) && equal(this.name, that.name);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(zoneId, name);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- protected ToStringHelper string() {
- return Objects.toStringHelper("").add("zoneId", zoneId).add("name", name);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneSecurityGroupNameAndPorts.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneSecurityGroupNameAndPorts.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneSecurityGroupNameAndPorts.java
deleted file mode 100644
index 4182d91..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneSecurityGroupNameAndPorts.java
+++ /dev/null
@@ -1,62 +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.openstack.nova.v2_0.domain.zonescoped;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * @author Adrian Cole
- */
-public class ZoneSecurityGroupNameAndPorts extends ZoneAndName {
- protected final Set<Integer> ports;
-
- public ZoneSecurityGroupNameAndPorts(String zoneId, String name, Iterable<Integer> ports) {
- super(zoneId, name);
- this.ports = ImmutableSet.<Integer> copyOf(checkNotNull(ports, "ports"));
- }
-
- public Set<Integer> getPorts() {
- return ports;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- ZoneSecurityGroupNameAndPorts that = ZoneSecurityGroupNameAndPorts.class.cast(o);
- return super.equals(that) && equal(this.ports, that.ports);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), ports);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("ports", ports);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneState.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneState.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneState.java
deleted file mode 100644
index c786095..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneState.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. jclouds 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.openstack.nova.v2_0.domain.zonescoped;
-
-import com.google.common.base.Objects;
-
-/**
- * @author Inbar Stolberg
- */
-public class ZoneState {
-
- private final boolean available;
-
- protected ZoneState(boolean available) {
- this.available = available;
- }
-
- public boolean available() {
- return this.available;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(available);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this != obj) return false;
- if (obj == null || getClass() != obj.getClass()) return false;
- ZoneState that = ZoneState.class.cast(obj);
- return Objects.equal(this.available, that.available);
- }
-
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper(this)
- .add("available", available);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneAPI.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneAPI.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneAPI.java
deleted file mode 100644
index d248681..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneAPI.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. jclouds 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.openstack.nova.v2_0.extensions;
-
-
-import com.google.common.annotations.Beta;
-import com.google.common.collect.FluentIterable;
-import org.jclouds.openstack.nova.v2_0.domain.zonescoped.AvailabilityZone;
-import org.jclouds.openstack.v2_0.ServiceType;
-import org.jclouds.openstack.v2_0.services.Extension;
-
-/**
- * @author Inbar Stolberg
- */
-@Beta
-@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.ADMIN_ACTIONS)
-public interface AvailabilityZoneAPI {
-
- /**
- * @return all availability zones
- */
- FluentIterable<? extends AvailabilityZone> list();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneAsyncApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneAsyncApi.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneAsyncApi.java
deleted file mode 100644
index d85f305..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneAsyncApi.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. jclouds 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.openstack.nova.v2_0.extensions;
-
-
-import com.google.common.annotations.Beta;
-import com.google.common.collect.FluentIterable;
-import com.google.common.util.concurrent.ListenableFuture;
-import org.jclouds.Fallbacks;
-import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
-import org.jclouds.openstack.nova.v2_0.domain.zonescoped.AvailabilityZone;
-import org.jclouds.openstack.v2_0.ServiceType;
-import org.jclouds.openstack.v2_0.services.Extension;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.MediaType;
-
-/**
- * @author Inbar Stolberg
- */
-
-@Beta
-@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.ADMIN_ACTIONS)
-@RequestFilters(AuthenticateRequest.class)
-public interface AvailabilityZoneAsyncApi {
-
- /**
- * @return all availability zones
- */
- @GET
- @Path("/os-availability-zone")
- @SelectJson("availabilityZoneInfo")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(Fallbacks.EmptyFluentIterableOnNotFoundOr404.class)
- ListenableFuture<? extends FluentIterable<? extends AvailabilityZone>> list();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ExtensionNamespaces.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ExtensionNamespaces.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ExtensionNamespaces.java
deleted file mode 100644
index a249190..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ExtensionNamespaces.java
+++ /dev/null
@@ -1,110 +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.openstack.nova.v2_0.extensions;
-
-/**
- * Extension namespaces
- *
- * @author Adrian Cole
- * @see <a href= "http://nova.openstack.org/api_ext/" />
- */
-public interface ExtensionNamespaces {
- /**
- * Keypair Support
- */
- public static final String KEYPAIRS = "http://docs.openstack.org/ext/keypairs/api/v1.1";
- /**
- * Volumes support
- */
- public static final String VOLUMES = "http://docs.openstack.org/ext/volumes/api/v1.1";
- /**
- * Volume types support
- */
- public static final String VOLUME_TYPES = "http://docs.openstack.org/ext/volume_types/api/v1.1";
- /**
- * Security group support
- */
- public static final String SECURITY_GROUPS = "http://docs.openstack.org/ext/securitygroups/api/v1.1";
- /**
- * Floating IPs support
- */
- public static final String FLOATING_IPS = "http://docs.openstack.org/ext/floating_ips/api/v1.1";
- /**
- * Multiple network support
- */
- public static final String MULTINIC = "http://docs.openstack.org/ext/multinic/api/v1.1";
- /**
- * Host administration
- */
- public static final String HOSTS = "http://docs.openstack.org/ext/hosts/api/v1.1";
- /**
- * Quotas management support
- */
- public static final String QUOTAS = "http://docs.openstack.org/ext/quotas-sets/api/v1.1";
- /**
- * Instance type (flavor) extra specs
- */
- public static final String FLAVOR_EXTRA_SPECS = "http://docs.openstack.org/ext/flavor_extra_specs/api/v1.1";
- /**
- * Provide additional data for flavors
- */
- public static final String FLAVOR_EXTRA_DATA = "http://docs.openstack.org/ext/flavor_extra_data/api/v1.1";
- /**
- * Virtual interface support
- */
- public static final String VIRTUAL_INTERFACES = "http://docs.openstack.org/ext/virtual_interfaces/api/v1.1";
- /**
- * Extended support to the Create Server v1.1 API
- */
- public static final String CREATESERVEREXT = "http://docs.openstack.org/ext/createserverext/api/v1.1";
- /**
- * Virtual Storage Arrays support
- */
- public static final String VSA = "http://docs.openstack.org/ext/vsa/api/v1.1";
- /**
- * Simple tenant usage extension
- */
- public static final String SIMPLE_TENANT_USAGE = "http://docs.openstack.org/ext/os-simple-tenant-usage/api/v1.1";
- /**
- * Instance rescue mode
- */
- public static final String RESCUE = "http://docs.openstack.org/ext/rescue/api/v1.1";
- /**
- * Admin Action extension
- */
- public static final String ADMIN_ACTIONS = "http://docs.openstack.org/ext/admin-actions/api/v1.1";
-
- /**
- * Extended Server Status extension
- */
- public static final String EXTENDED_STATUS = "http://docs.openstack.org/compute/ext/extended_status/api/v1.1";
-
- /**
- * Quota Classes extension
- */
- public static final String QUOTA_CLASSES = "http://docs.openstack.org/ext/quota-classes-sets/api/v1.1";
-
- /**
- * Disk Config extension
- */
- public static final String DISK_CONFIG = "http://docs.openstack.org/compute/ext/disk_config/api/v1.1";
-
- /**
- * Aggregates extension
- */
- public static final String AGGREGATES = "http://docs.openstack.org/ext/aggregates/api/v1.1";
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApi.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApi.java
deleted file mode 100644
index 946463c..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApi.java
+++ /dev/null
@@ -1,77 +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.openstack.nova.v2_0.extensions;
-
-import java.util.Map;
-import org.jclouds.openstack.v2_0.ServiceType;
-import org.jclouds.openstack.v2_0.services.Extension;
-
-import com.google.common.annotations.Beta;
-
-/**
- * Provide access to extra metadata for Nova flavors.
- *
- * @author Adam Lowe
- * @see <a href="http://nova.openstack.org/api/nova.api.openstack.compute.contrib.flavorextraspecs.html"/>
- * @see org.jclouds.openstack.nova.v2_0.features.FlavorApi
- * @see org.jclouds.openstack.nova.v2_0.extensions.FlavorExtraSpecsAsyncApi
- */
-@Beta
-@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.FLAVOR_EXTRA_SPECS)
-public interface FlavorExtraSpecsApi {
-
- /**
- * Retrieve all extra specs for a flavor
- *
- * @return the set of extra metadata for the flavor
- */
- Map<String, String> getMetadata(String flavorId);
-
- /**
- * Creates or updates the extra specs for a given flavor
- *
- * @param flavorId the id of the flavor to modify
- * @param specs the extra specs to apply
- */
- Boolean updateMetadata(String flavorId, Map<String, String> specs);
-
- /**
- * Return a single extra spec value
- *
- * @param flavorId the id of the flavor to modify
- * @param key the extra spec key to retrieve
- */
- String getMetadataKey(String flavorId, String key);
-
- /**
- * Creates or updates a single extra spec value
- *
- * @param flavorId the id of the flavor to modify
- * @param key the extra spec key (when creating ensure this does not include whitespace or other difficult characters)
- * @param value the value to associate with the key
- */
- Boolean updateMetadataEntry(String flavorId, String key, String value);
-
- /**
- * Deletes an extra spec
- *
- * @param flavorId the id of the flavor to modify
- * @param key the extra spec key to delete
- */
- Boolean deleteMetadataKey(String flavorId, String key);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsAsyncApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsAsyncApi.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsAsyncApi.java
deleted file mode 100644
index f788e6e..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsAsyncApi.java
+++ /dev/null
@@ -1,118 +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.openstack.nova.v2_0.extensions;
-
-import java.util.Map;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptyMapOnNotFoundOr404;
-import org.jclouds.Fallbacks.FalseOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
-import org.jclouds.openstack.v2_0.ServiceType;
-import org.jclouds.openstack.v2_0.services.Extension;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.MapBinder;
-import org.jclouds.rest.annotations.Payload;
-import org.jclouds.rest.annotations.PayloadParam;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-import org.jclouds.rest.annotations.Unwrap;
-import org.jclouds.rest.binders.BindToJsonPayload;
-
-import com.google.common.annotations.Beta;
-import com.google.common.util.concurrent.ListenableFuture;
-
-/**
- * Provide access to extra metadata for Nova flavors.
- *
- * @author Adam Lowe
- * @see <a href="http://nova.openstack.org/api/nova.api.openstack.compute.contrib.flavorextraspecs.html"/>
- * @see org.jclouds.openstack.nova.v2_0.features.FlavorApi
- * @see FlavorExtraSpecsApi
- */
-@Beta
-@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.FLAVOR_EXTRA_SPECS)
-@RequestFilters(AuthenticateRequest.class)
-@Consumes(MediaType.APPLICATION_JSON)
-public interface FlavorExtraSpecsAsyncApi {
-
- /**
- * @see FlavorExtraSpecsApi#getMetadata(String)
- */
- @Named("flavor:getmetadata")
- @GET
- @SelectJson("extra_specs")
- @Path("/flavors/{flavor_id}/os-extra_specs")
- @Fallback(EmptyMapOnNotFoundOr404.class)
- ListenableFuture<Map<String, String>> getMetadata(@PathParam("flavor_id") String flavorId);
-
- /**
- * @see FlavorExtraSpecsApi#updateMetadataEntry(String, String, String)
- */
- @Named("flavor:updatemetadata")
- @POST
- @Path("/flavors/{flavor_id}/os-extra_specs")
- @Produces(MediaType.APPLICATION_JSON)
- @Fallback(FalseOnNotFoundOr404.class)
- @MapBinder(BindToJsonPayload.class)
- ListenableFuture<Boolean> updateMetadata(@PathParam("flavor_id") String flavorId, @PayloadParam("extra_specs") Map<String, String> specs);
-
- /**
- * @see FlavorExtraSpecsApi#getMetadataKey(String, String)
- */
- @Named("flavor:getmetadata")
- @GET
- @Path("/flavors/{flavor_id}/os-extra_specs/{key}")
- @Unwrap
- @Fallback(NullOnNotFoundOr404.class)
- ListenableFuture<String> getMetadataKey(@PathParam("flavor_id") String flavorId, @PathParam("key") String key);
-
- /**
- * @see FlavorExtraSpecsApi#updateMetadataEntry(String, String, String)
- */
- @Named("flavor:updatemetadata")
- @PUT
- @Path("/flavors/{flavor_id}/os-extra_specs/{key}")
- @Produces(MediaType.APPLICATION_JSON)
- @Fallback(FalseOnNotFoundOr404.class)
- @Payload("%7B\"{key}\":\"{value}\"%7D")
- ListenableFuture<Boolean> updateMetadataEntry(@PathParam("flavor_id") String flavorId,
- @PathParam("key") @PayloadParam("key") String key,
- @PayloadParam("value") String value);
-
- /**
- * @see FlavorExtraSpecsApi#deleteMetadataKey(String, String)
- */
- @Named("flavor:deletemetadata")
- @DELETE
- @Path("/flavors/{flavor_id}/os-extra_specs/{key}")
- @Fallback(FalseOnNotFoundOr404.class)
- ListenableFuture<Boolean> deleteMetadataKey(@PathParam("flavor_id") String flavorId,
- @PathParam("key") String key);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApi.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApi.java
deleted file mode 100644
index ddf720f..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApi.java
+++ /dev/null
@@ -1,98 +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.openstack.nova.v2_0.extensions;
-
-import org.jclouds.openstack.nova.v2_0.domain.FloatingIP;
-import org.jclouds.openstack.v2_0.ServiceType;
-import org.jclouds.openstack.v2_0.services.Extension;
-
-import com.google.common.annotations.Beta;
-import com.google.common.collect.FluentIterable;
-
-/**
- * Provides synchronous access to Floating IPs.
- * <p/>
- *
- * @see FloatingIPAsyncApi
- * @author Jeremy Daggett
- */
-@Beta
-@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.FLOATING_IPS)
-public interface FloatingIPApi {
-
- /**
- * List all Floating IP addresses
- *
- * @return all Floating IPs
- */
- FluentIterable<? extends FloatingIP> list();
-
- /**
- * Get a specific Floating IP address
- *
- * @return all Floating IPs
- */
- FloatingIP get(String id);
-
- /**
- * Allocate a Floating IP address
- *
- * @return a newly created FloatingIP
- */
- FloatingIP create();
-
- /**
- * Allocate a Floating IP address from a pool
- *
- * @param pool
- * Pool to allocate IP address from
- * @return a newly created FloatingIP
- */
- FloatingIP allocateFromPool(String pool);
-
- /**
- * Decreate a Floating IP address
- *
- * @param id
- * the Floating IP id
- */
- void delete(String id);
-
- /**
- * Add a Floating IP address to a Server
- *
- * @param serverId
- * the serverId
- * @param address
- * the IP address to add
- *
- * NOTE: Possibly move this to ServerApi?
- */
- void addToServer(String address, String serverId);
-
- /**
- * Remove a Floating IP address from a Server
- *
- * @param serverId
- * the serverId
- * @param address
- * the IP address to remove
- *
- * NOTE: Possibly move this to ServerApi?
- */
- void removeFromServer(String address, String serverId);
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPAsyncApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPAsyncApi.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPAsyncApi.java
deleted file mode 100644
index f6cc543..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPAsyncApi.java
+++ /dev/null
@@ -1,145 +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.openstack.nova.v2_0.extensions;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
-import org.jclouds.openstack.nova.v2_0.domain.FloatingIP;
-import org.jclouds.openstack.v2_0.ServiceType;
-import org.jclouds.openstack.v2_0.services.Extension;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.Payload;
-import org.jclouds.rest.annotations.PayloadParam;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-import com.google.common.annotations.Beta;
-import com.google.common.collect.FluentIterable;
-import com.google.common.util.concurrent.ListenableFuture;
-
-/**
- * Provides asynchronous access to Floating IPs via the REST API.
- * <p/>
- *
- * @see FloatingIPApi
- * @author Jeremy Daggett
- * @see ExtensionAsyncApi
- * @see <a href= "http://docs.openstack.org/api/openstack-compute/2/content/Extensions-d1e1444.html"
- * />
- * @see <a href="http://nova.openstack.org/api_ext" />
- * @see <a href="http://wiki.openstack.org/os_api_floating_ip"/>
- */
-@Beta
-@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.FLOATING_IPS)
-@RequestFilters(AuthenticateRequest.class)
-public interface FloatingIPAsyncApi {
-
- /**
- * @see FloatingIPApi#list
- */
- @Named("floatingip:list")
- @GET
- @Path("/os-floating-ips")
- @SelectJson("floating_ips")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptyFluentIterableOnNotFoundOr404.class)
- ListenableFuture<? extends FluentIterable<? extends FloatingIP>> list();
-
- /**
- * @see FloatingIPApi#get
- */
- @Named("floatingip:get")
- @GET
- @Path("/os-floating-ips/{id}")
- @SelectJson("floating_ip")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- ListenableFuture<? extends FloatingIP> get(@PathParam("id") String id);
-
- /**
- * @see FloatingIPApi#create
- */
- @Named("floatingip:create")
- @POST
- @Path("/os-floating-ips")
- @SelectJson("floating_ip")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- @Payload("{}")
- ListenableFuture<? extends FloatingIP> create();
-
- /**
- * @see org.jclouds.openstack.nova.v2_0.extensions.FloatingIPApi#allocateFromPool
- */
- @Named("floatingip:create")
- @POST
- @Path("/os-floating-ips")
- @SelectJson("floating_ip")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- @Payload("%7B\"pool\":\"{pool}\"%7D")
- ListenableFuture<? extends FloatingIP> allocateFromPool(@PayloadParam("pool") String pool);
-
-
- /**
- * @see FloatingIPApi#delete
- */
- @Named("floatingip:delete")
- @DELETE
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- @Path("/os-floating-ips/{id}")
- ListenableFuture<Void> delete(@PathParam("id") String id);
-
- /**
- * @see FloatingIPApi#addToServer
- */
- @Named("floatingip:add")
- @POST
- @Path("/servers/{server}/action")
- @Consumes
- @Produces(MediaType.APPLICATION_JSON)
- @Payload("%7B\"addFloatingIp\":%7B\"address\":\"{address}\"%7D%7D")
- ListenableFuture<Void> addToServer(@PayloadParam("address") String address,
- @PathParam("server") String serverId);
-
- /**
- * @see FloatingIPApi#removeFromServer
- */
- @Named("floatingip:remove")
- @POST
- @Path("/servers/{server}/action")
- @Consumes
- @Produces(MediaType.APPLICATION_JSON)
- @Payload("%7B\"removeFloatingIp\":%7B\"address\":\"{address}\"%7D%7D")
- ListenableFuture<Void> removeFromServer(@PayloadParam("address") String address,
- @PathParam("server") String serverId);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApi.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApi.java
deleted file mode 100644
index 95b8f42..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApi.java
+++ /dev/null
@@ -1,103 +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.openstack.nova.v2_0.extensions;
-
-import org.jclouds.openstack.nova.v2_0.domain.Host;
-import org.jclouds.openstack.nova.v2_0.domain.HostResourceUsage;
-import org.jclouds.openstack.v2_0.ServiceType;
-import org.jclouds.openstack.v2_0.services.Extension;
-
-import com.google.common.annotations.Beta;
-import com.google.common.collect.FluentIterable;
-
-/**
- * Provides asynchronous access to Host Administration features via the REST API.
- * <p/>
- *
- * @author Adam Lowe
- * @see HostAdministrationAsyncApi
- */
-@Beta
-@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.HOSTS)
-public interface HostAdministrationApi {
-
- /**
- * Returns the list of hosts
- *
- * @return the usage information
- */
- FluentIterable<? extends Host> list();
-
- /**
- * Retrieves the physical/usage resource on a specific host
- *
- * @return the usage information
- */
- FluentIterable<? extends HostResourceUsage> listResourceUsage(String hostId);
-
- /**
- * Allow the specified host to accept new instances.
- *
- * @return true if successful
- */
- boolean enable(String hostId);
-
- /**
- * Prevent the specified host from accepting new instances.
- *
- * @return true if successful
- */
- boolean disable(String hostId);
-
- /**
- * Start host maintenance window.
- * <p/>
- * Note: this triggers guest VMs evacuation.
- *
- * @return true if successful
- */
- boolean startMaintenance(String hostId);
-
- /**
- * Stop host maintenance window.
- *
- * @return true if successful
- */
- boolean stopMaintenance(String hostId);
-
- /**
- * Startup a host.
- *
- * @return true if successful
- */
- boolean startup(String hostId);
-
- /**
- * Shutdown a host.
- *
- * @return true if successful
- */
- boolean shutdown(String hostId);
-
- /**
- * Reboot a host.
- *
- * @return true if successful
- */
- boolean reboot(String hostId);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationAsyncApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationAsyncApi.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationAsyncApi.java
deleted file mode 100644
index cf066c2..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationAsyncApi.java
+++ /dev/null
@@ -1,157 +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.openstack.nova.v2_0.extensions;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404;
-import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
-import org.jclouds.openstack.nova.v2_0.domain.Host;
-import org.jclouds.openstack.nova.v2_0.domain.HostResourceUsage;
-import org.jclouds.openstack.nova.v2_0.functions.FieldValueResponseParsers.MaintenanceModeDisabledResponseParser;
-import org.jclouds.openstack.nova.v2_0.functions.FieldValueResponseParsers.MaintenanceModeEnabledResponseParser;
-import org.jclouds.openstack.nova.v2_0.functions.FieldValueResponseParsers.PowerIsRebootResponseParser;
-import org.jclouds.openstack.nova.v2_0.functions.FieldValueResponseParsers.PowerIsShutdownResponseParser;
-import org.jclouds.openstack.nova.v2_0.functions.FieldValueResponseParsers.PowerIsStartupResponseParser;
-import org.jclouds.openstack.nova.v2_0.functions.FieldValueResponseParsers.StatusDisabledResponseParser;
-import org.jclouds.openstack.nova.v2_0.functions.FieldValueResponseParsers.StatusEnabledResponseParser;
-import org.jclouds.openstack.v2_0.ServiceType;
-import org.jclouds.openstack.v2_0.services.Extension;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.Payload;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.ResponseParser;
-import org.jclouds.rest.annotations.SelectJson;
-
-import com.google.common.annotations.Beta;
-import com.google.common.collect.FluentIterable;
-import com.google.common.util.concurrent.ListenableFuture;
-
-/**
- * Provides asynchronous access to Host Administration features via the REST API.
- * <p/>
- *
- * @author Adam Lowe
- * @see HostAdministrationApi
- * @see <a href= "http://docs.openstack.org/api/openstack-compute/2/content/Extensions-d1e1444.html"/>
- * @see <a href="http://nova.openstack.org/api_ext" />
- * @see <a href="http://nova.openstack.org/api/nova.api.openstack.compute.contrib.hosts.html" />
- */
-@Beta
-@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.HOSTS)
-@RequestFilters(AuthenticateRequest.class)
-@Path("/os-hosts")
-@Consumes(MediaType.APPLICATION_JSON)
-public interface HostAdministrationAsyncApi {
-
- /**
- * @see HostAdministrationApi#list()
- */
- @Named("hostadmin:list")
- @GET
- @SelectJson("hosts")
- @Fallback(EmptyFluentIterableOnNotFoundOr404.class)
- ListenableFuture<? extends FluentIterable<? extends Host>> list();
-
- /**
- * @see HostAdministrationApi#listResourceUsage(String)
- */
- @Named("hostadmin:listresource")
- @GET
- @Path("/{id}")
- @SelectJson("host")
- @Fallback(EmptyFluentIterableOnNotFoundOr404.class)
- ListenableFuture<? extends FluentIterable<? extends HostResourceUsage>> listResourceUsage(@PathParam("id") String hostId);
-
- /**
- * @see HostAdministrationApi#enable(String)
- */
- @Named("hostadmin:enable")
- @PUT
- @Produces(MediaType.APPLICATION_JSON)
- @Path("/{id}")
- @Payload("{\"status\":\"enable\"}")
- @ResponseParser(StatusEnabledResponseParser.class)
- ListenableFuture<Boolean> enable(@PathParam("id") String hostId);
-
- /**
- * @see HostAdministrationApi#disable(String)
- */
- @Named("hostadmin:disable")
- @PUT
- @Produces(MediaType.APPLICATION_JSON)
- @Path("/{id}")
- @Payload("{\"status\":\"disable\"}")
- @ResponseParser(StatusDisabledResponseParser.class)
- ListenableFuture<Boolean> disable(@PathParam("id") String hostId);
-
- /**
- * @see HostAdministrationApi#startMaintenance(String)
- */
- @Named("hostadmin:startmaintenance")
- @PUT
- @Produces(MediaType.APPLICATION_JSON)
- @Path("/{id}")
- @Payload("{\"maintenance_mode\":\"enable\"}")
- @ResponseParser(MaintenanceModeEnabledResponseParser.class)
- ListenableFuture<Boolean> startMaintenance(@PathParam("id") String hostId);
-
- /**
- * @see HostAdministrationApi#stopMaintenance(String)
- */
- @Named("hostadmin:stopmaintenance")
- @PUT
- @Produces(MediaType.APPLICATION_JSON)
- @Path("/{id}")
- @Payload("{\"maintenance_mode\":\"disable\"}")
- @ResponseParser(MaintenanceModeDisabledResponseParser.class)
- ListenableFuture<Boolean> stopMaintenance(@PathParam("id") String hostId);
-
- /**
- * @see HostAdministrationApi#startup(String)
- */
- @Named("hostadmin:startup")
- @GET
- @Path("/{id}/startup")
- @ResponseParser(PowerIsStartupResponseParser.class)
- ListenableFuture<Boolean> startup(@PathParam("id") String hostId);
-
- /**
- * @see HostAdministrationApi#shutdown(String)
- */
- @Named("hostadmin:shutdown")
- @GET
- @Path("/{id}/shutdown")
- @ResponseParser(PowerIsShutdownResponseParser.class)
- ListenableFuture<Boolean> shutdown(@PathParam("id") String hostId);
-
- /**
- * @see HostAdministrationApi#reboot(String)
- */
- @Named("hostadmin:reboot")
- @GET
- @Path("/{id}/reboot")
- @ResponseParser(PowerIsRebootResponseParser.class)
- ListenableFuture<Boolean> reboot(@PathParam("id") String hostId);
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApi.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApi.java
deleted file mode 100644
index a6461aa..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApi.java
+++ /dev/null
@@ -1,87 +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.openstack.nova.v2_0.extensions;
-
-import java.util.Map;
-import org.jclouds.openstack.nova.v2_0.domain.HostAggregate;
-import org.jclouds.openstack.v2_0.ServiceType;
-import org.jclouds.openstack.v2_0.services.Extension;
-
-import com.google.common.annotations.Beta;
-import com.google.common.collect.FluentIterable;
-
-/**
- * Provide access to Host Aggregates in Nova (alias "OS-AGGREGATES")
- *
- * @author Adam Lowe
- * @see HostAggregateAsyncApi
- * @see <a href="http://nova.openstack.org/api_ext/ext_aggregates.html"/>
- * @see <a href="http://wiki.openstack.org/host-aggregates"/>
- */
-@Beta
-@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.AGGREGATES)
-public interface HostAggregateApi {
-
- /**
- * @return the set of host aggregates.
- */
- FluentIterable<? extends HostAggregate> list();
-
- /**
- * Retrieves the details of an aggregate, hosts and metadata included.
- *
- * @return the details of the aggregate requested.
- */
- HostAggregate get(String id);
-
- /**
- * Creates an aggregate, given its name and availability zone.
- *
- * @return the newly created Aggregate
- */
- HostAggregate createInAvailabilityZone(String name, String availabilityZone);
-
- /**
- * Updates the name of an aggregate.
- */
- HostAggregate updateName(String id, String name);
-
- /**
- * Updates the availability zone an aggregate.
- */
- HostAggregate updateAvailabilityZone(String id, String availabilityZone);
-
- /**
- * Removes an aggregate.
- */
- Boolean delete(String id);
-
- /**
- * Adds a host to an aggregate
- */
- HostAggregate addHost(String id, String host);
-
- /**
- * Removes a host from an aggregate
- */
- HostAggregate removeHost(String id, String host);
-
- /**
- * Adds metadata to an aggregate
- */
- HostAggregate setMetadata(String id, Map<String, String> metadata);
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateAsyncApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateAsyncApi.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateAsyncApi.java
deleted file mode 100644
index 1ee3dc7..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateAsyncApi.java
+++ /dev/null
@@ -1,161 +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.openstack.nova.v2_0.extensions;
-
-import java.util.Map;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404;
-import org.jclouds.Fallbacks.FalseOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
-import org.jclouds.openstack.nova.v2_0.domain.HostAggregate;
-import org.jclouds.openstack.v2_0.ServiceType;
-import org.jclouds.openstack.v2_0.services.Extension;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.PayloadParam;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-import org.jclouds.rest.annotations.WrapWith;
-
-import com.google.common.annotations.Beta;
-import com.google.common.collect.FluentIterable;
-import com.google.common.util.concurrent.ListenableFuture;
-
-/**
- * Provide access to Aggregates in Nova.
- *
- * @author Adam Lowe
- * @see HostAggregateApi
- */
-@Beta
-@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.AGGREGATES)
-@RequestFilters(AuthenticateRequest.class)
-@Path("/os-aggregates")
-public interface HostAggregateAsyncApi {
-
- /**
- * @see HostAggregateApi#list()
- */
- @Named("hostaggregate:list")
- @GET
- @SelectJson("aggregates")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptyFluentIterableOnNotFoundOr404.class)
- ListenableFuture<? extends FluentIterable<? extends HostAggregate>> list();
-
- /**
- * @see HostAggregateApi#get(String)
- */
- @Named("hostaggregate:get")
- @GET
- @Path("/{id}")
- @SelectJson("aggregate")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- ListenableFuture<? extends HostAggregate> get(@PathParam("id") String id);
-
- /**
- * @see HostAggregateApi#createInAvailabilityZone(String, String)
- */
- @Named("hostaggregate:create")
- @POST
- @SelectJson("aggregate")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @WrapWith("aggregate")
- ListenableFuture<? extends HostAggregate> createInAvailabilityZone(@PayloadParam("name") String name,
- @PayloadParam("availability_zone") String availabilityZone);
-
- /**
- * @see HostAggregateApi#updateName
- */
- @Named("hostaggregate:update")
- @POST
- @Path("/{id}")
- @SelectJson("aggregate")
- @Consumes(MediaType.APPLICATION_JSON)
- @WrapWith("aggregate")
- ListenableFuture<? extends HostAggregate> updateName(@PathParam("id") String id, @PayloadParam("name") String name);
-
- /**
- * @see HostAggregateApi#updateAvailabilityZone
- */
- @Named("hostaggregate:update")
- @POST
- @Path("/{id}")
- @SelectJson("aggregate")
- @Consumes(MediaType.APPLICATION_JSON)
- @WrapWith("aggregate")
- ListenableFuture<? extends HostAggregate> updateAvailabilityZone(@PathParam("id") String id, @PayloadParam("availability_zone") String availabilityZone);
-
- /**
- * @see HostAggregateApi#delete(String)
- */
- @Named("hostaggregate:delete")
- @DELETE
- @Path("/{id}")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(FalseOnNotFoundOr404.class)
- ListenableFuture<Boolean> delete(@PathParam("id") String id);
-
- /**
- * @see HostAggregateApi#addHost(String,String)
- */
- @Named("hostaggregate:addhost")
- @POST
- @Path("/{id}/action")
- @SelectJson("aggregate")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @WrapWith("add_host")
- ListenableFuture<? extends HostAggregate> addHost(@PathParam("id") String id, @PayloadParam("host") String host);
-
-
- /**
- * @see HostAggregateApi#removeHost(String,String)
- */
- @Named("hostaggregate:removehost")
- @POST
- @Path("/{id}/action")
- @SelectJson("aggregate")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @WrapWith("remove_host")
- ListenableFuture<? extends HostAggregate> removeHost(@PathParam("id") String id, @PayloadParam("host") String host);
-
- /**
- * @see HostAggregateApi#setMetadata
- */
- @Named("hostaggregate:setmetadata")
- @POST
- @Path("/{id}/action")
- @SelectJson("aggregate")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @WrapWith("set_metadata")
- ListenableFuture<? extends HostAggregate> setMetadata(@PathParam("id") String id, @PayloadParam("metadata") Map<String, String> metadata);
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApi.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApi.java
deleted file mode 100644
index 6b4af7b..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApi.java
+++ /dev/null
@@ -1,65 +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.openstack.nova.v2_0.extensions;
-
-import org.jclouds.openstack.nova.v2_0.domain.KeyPair;
-import org.jclouds.openstack.v2_0.ServiceType;
-import org.jclouds.openstack.v2_0.services.Extension;
-
-import com.google.common.annotations.Beta;
-import com.google.common.collect.FluentIterable;
-
-/**
- * Provides synchronous access to Security Groups.
- * <p/>
- *
- * @see KeyPairAsyncApi
- * @author Jeremy Daggett
- */
-@Beta
-@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.KEYPAIRS)
-public interface KeyPairApi {
-
- /**
- * List all Key Pairs.
- *
- * @return all Key Pairs
- */
- FluentIterable<? extends KeyPair> list();
-
- /**
- * Create a Key Pair.
- *
- * @return a Key Pair
- */
- KeyPair create(String name);
-
- /**
- * Create a Key Pair with a public key.
- *
- * @return a Key Pair with a public key.
- */
- KeyPair createWithPublicKey(String name, String publicKey);
-
- /**
- * Delete a Key Pairs.
- *
- * @return
- */
- boolean delete(String name);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairAsyncApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairAsyncApi.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairAsyncApi.java
deleted file mode 100644
index 246aec8..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairAsyncApi.java
+++ /dev/null
@@ -1,101 +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.openstack.nova.v2_0.extensions;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptyFluentIterableOnNotFoundOr404;
-import org.jclouds.Fallbacks.FalseOnNotFoundOr404;
-import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
-import org.jclouds.openstack.nova.v2_0.binders.BindKeyPairToJsonPayload;
-import org.jclouds.openstack.nova.v2_0.domain.KeyPair;
-import org.jclouds.openstack.nova.v2_0.functions.internal.ParseKeyPairs;
-import org.jclouds.openstack.v2_0.ServiceType;
-import org.jclouds.openstack.v2_0.services.Extension;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.MapBinder;
-import org.jclouds.rest.annotations.Payload;
-import org.jclouds.rest.annotations.PayloadParam;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.ResponseParser;
-import org.jclouds.rest.annotations.SelectJson;
-
-import com.google.common.annotations.Beta;
-import com.google.common.collect.FluentIterable;
-import com.google.common.util.concurrent.ListenableFuture;
-
-/**
- * Provides asynchronous access to Key Pairs via the REST API.
- * <p/>
- *
- * @see KeyPairApi
- * @author Jeremy Daggett
- * @see ExtensionAsyncApi
- * @see <a href=
- * "http://docs.openstack.org/api/openstack-compute/2/content/Extensions-d1e1444.html"
- * />
- * @see <a href="http://nova.openstack.org/api_ext" />
- * @see <a href="http://nova.openstack.org/api_ext/ext_keypairs.html" />
- */
-@Beta
-@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.KEYPAIRS)
-@RequestFilters(AuthenticateRequest.class)
-public interface KeyPairAsyncApi {
-
- @Named("keypair:list")
- @GET
- @Path("/os-keypairs")
- @ResponseParser(ParseKeyPairs.class)
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptyFluentIterableOnNotFoundOr404.class)
- ListenableFuture<? extends FluentIterable<? extends KeyPair>> list();
-
- @Named("keypair:create")
- @POST
- @Path("/os-keypairs")
- @SelectJson("keypair")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @Payload("%7B\"keypair\":%7B\"name\":\"{name}\"%7D%7D")
- ListenableFuture<? extends KeyPair> create(@PayloadParam("name") String name);
-
- @Named("keypair:create")
- @POST
- @Path("/os-keypairs")
- @SelectJson("keypair")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @MapBinder(BindKeyPairToJsonPayload.class)
- ListenableFuture<? extends KeyPair> createWithPublicKey(@PayloadParam("name") String name,
- @PayloadParam("public_key") String publicKey);
-
- @Named("keypair:delete")
- @DELETE
- @Path("/os-keypairs/{name}")
- @Fallback(FalseOnNotFoundOr404.class)
- @Consumes
- ListenableFuture<Boolean> delete(@PathParam("name") String name);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApi.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApi.java
deleted file mode 100644
index ea59d0f..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApi.java
+++ /dev/null
@@ -1,57 +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.openstack.nova.v2_0.extensions;
-
-import org.jclouds.openstack.nova.v2_0.domain.Quota;
-import org.jclouds.openstack.v2_0.ServiceType;
-import org.jclouds.openstack.v2_0.services.Extension;
-
-import com.google.common.annotations.Beta;
-
-/**
- * The quotas extension enables limiters placed on the resources used per tenant (project) for virtual instances. It is
- * used with the OpenStack Compute API 1.1 for administrators who need to control the amount of volumes, memory, floating
- * IP addresses, instances, or cores allowed within a defined tenant or project.
- * <p/>
- * To use this extension, you need to have administrative rights to the tenants upon which you are placing quotas.
- *
- * @author Adam Lowe
- * @see QuotaAsyncApi
- * @see <a href="http://nova.openstack.org/api_ext/ext_quotas.html"/>
- */
-@Beta
-@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.QUOTAS)
-public interface QuotaApi {
-
- /**
- * @return the quota settings for the tenant
- */
- Quota getByTenant(String tenantId);
-
- /**
- * Update the quotas for a given tenant
- *
- * @return true if successful
- */
- boolean updateQuotaOfTenant(Quota quota, String tenantId);
-
- /**
- * @return the set of default quotas for the tenant
- */
- Quota getDefaultsForTenant(String tenantId);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaAsyncApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaAsyncApi.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaAsyncApi.java
deleted file mode 100644
index b364fcb..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaAsyncApi.java
+++ /dev/null
@@ -1,89 +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.openstack.nova.v2_0.extensions;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
-import org.jclouds.openstack.nova.v2_0.domain.Quota;
-import org.jclouds.openstack.v2_0.ServiceType;
-import org.jclouds.openstack.v2_0.services.Extension;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.MapBinder;
-import org.jclouds.rest.annotations.PayloadParam;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-import org.jclouds.rest.binders.BindToJsonPayload;
-
-import com.google.common.annotations.Beta;
-import com.google.common.util.concurrent.ListenableFuture;
-
-/**
- * Provide access to Quota information for Nova tenants.
- *
- * @author Adam Lowe
- * @see QuotaApi
- * @see <a href="http://nova.openstack.org/api_ext/ext_quotas.html"/>
- */
-@Beta
-@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.QUOTAS)
-@RequestFilters(AuthenticateRequest.class)
-@Path("/os-quota-sets")
-public interface QuotaAsyncApi {
-
- /**
- * @see QuotaApi#getDefaultsForTenant(String)
- */
- @Named("quota:get")
- @GET
- @SelectJson("quota_set")
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/{tenant_id}")
- @Fallback(NullOnNotFoundOr404.class)
- ListenableFuture<? extends Quota> getByTenant(@PathParam("tenant_id") String tenantId);
-
- /**
- * @see QuotaApi#updateQuotaOfTenant
- */
- @Named("quota:update")
- @PUT
- @Path("/{tenant_id}")
- @Produces(MediaType.APPLICATION_JSON)
- @MapBinder(BindToJsonPayload.class)
- ListenableFuture<Boolean> updateQuotaOfTenant(@PayloadParam("quota_set") Quota quota,
- @PathParam("tenant_id") String tenantId);
-
- /**
- * @see QuotaApi#getDefaultsForTenant(String)
- */
- @Named("quota:get")
- @GET
- @SelectJson("quota_set")
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/{tenant_id}/defaults")
- @Fallback(NullOnNotFoundOr404.class)
- ListenableFuture<? extends Quota> getDefaultsForTenant(@PathParam("tenant_id") String tenantId);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaClassApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaClassApi.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaClassApi.java
deleted file mode 100644
index 4a6c010..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaClassApi.java
+++ /dev/null
@@ -1,51 +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.openstack.nova.v2_0.extensions;
-
-import org.jclouds.openstack.nova.v2_0.domain.QuotaClass;
-import org.jclouds.openstack.v2_0.ServiceType;
-import org.jclouds.openstack.v2_0.services.Extension;
-
-import com.google.common.annotations.Beta;
-
-/**
- * Provides synchronous access to Quota Classes via the REST API.
- * <p/>
- * To use this extension, you need to have administrative rights to the tenants upon which you are placing quotas.
- *
- * @author Adam Lowe
- * @see QuotaClassAsyncApi
- * @see <a href="http://nova.openstack.org/api/nova.api.openstack.compute.contrib.quota_classes.html"/>
- * @see <a href="http://wiki.openstack.org/QuotaClass"/>
- */
-@Beta
-@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.QUOTA_CLASSES)
-public interface QuotaClassApi {
-
- /**
- * @return the quota settings for the tenant
- */
- QuotaClass get(String id);
-
- /**
- * Update the quotas for a given tenant
- *
- * @return true if successful
- */
- boolean update(String id, QuotaClass quotas);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/19c8cdaf/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaClassAsyncApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaClassAsyncApi.java b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaClassAsyncApi.java
deleted file mode 100644
index f07148f..0000000
--- a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaClassAsyncApi.java
+++ /dev/null
@@ -1,78 +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.openstack.nova.v2_0.extensions;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
-import org.jclouds.openstack.nova.v2_0.domain.QuotaClass;
-import org.jclouds.openstack.v2_0.ServiceType;
-import org.jclouds.openstack.v2_0.services.Extension;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.MapBinder;
-import org.jclouds.rest.annotations.PayloadParam;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-import org.jclouds.rest.binders.BindToJsonPayload;
-
-import com.google.common.annotations.Beta;
-import com.google.common.util.concurrent.ListenableFuture;
-
-/**
- * Provides asynchronous access to Quota Classes via the REST API.
- *
- * @author Adam Lowe
- * @see QuotaClassApi
- * @see <a href="http://nova.openstack.org/api/nova.api.openstack.compute.contrib.quota_classes.html"/>
- * @see <a href="http://wiki.openstack.org/QuotaClass"/>
- */
-@Beta
-@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.QUOTA_CLASSES)
-@RequestFilters(AuthenticateRequest.class)
-@Path("/os-quota-class-sets")
-public interface QuotaClassAsyncApi {
-
- /**
- * @see QuotaClassApi#get
- */
- @Named("quotaclass:get")
- @GET
- @SelectJson("quota_class_set")
- @Consumes(MediaType.APPLICATION_JSON)
- @Path("/{id}")
- @Fallback(NullOnNotFoundOr404.class)
- ListenableFuture<? extends QuotaClass> get(@PathParam("id") String id);
-
- /**
- * @see QuotaClassApi#update
- */
- @Named("quotaclass:update")
- @PUT
- @Path("/{id}")
- @Produces(MediaType.APPLICATION_JSON)
- @MapBinder(BindToJsonPayload.class)
- ListenableFuture<Boolean> update(@PathParam("id") String id, @PayloadParam("quota_class_set") QuotaClass quotas);
-
-}