Repository: jclouds-labs-openstack Updated Branches: refs/heads/master 23a293ec5 -> 92112318c
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/92112318/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiMockTest.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiMockTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiMockTest.java index a1ac790..fd4a50e 100644 --- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiMockTest.java +++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiMockTest.java @@ -16,13 +16,13 @@ */ package org.jclouds.openstack.neutron.v2.internal; -import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes; -import org.jclouds.openstack.neutron.v2.NeutronApi; -import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest; +import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; import java.util.Properties; -import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; +import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes; +import org.jclouds.openstack.neutron.v2.NeutronApi; +import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest; /** * Base class for writing Neutron Mock tests http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/92112318/openstack-neutron/src/test/resources/extension_details.json ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/test/resources/extension_details.json b/openstack-neutron/src/test/resources/extension_details.json new file mode 100644 index 0000000..9e10fef --- /dev/null +++ b/openstack-neutron/src/test/resources/extension_details.json @@ -0,0 +1,10 @@ +{ + "extension": { + "name": "Neutron L3 Router", + "namespace": "http://docs.openstack.org/ext/neutron/router/api/v1.0";, + "alias": "router", + "updated": "2012-07-20T10:00:00-00:00", + "description": "Router abstraction for basic L3 forwarding between L2 Neutron networks and access to external networks via a NAT gateway.", + "links": [] + } +} http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/92112318/openstack-neutron/src/test/resources/extension_list.json ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/test/resources/extension_list.json b/openstack-neutron/src/test/resources/extension_list.json new file mode 100644 index 0000000..9f85e1e --- /dev/null +++ b/openstack-neutron/src/test/resources/extension_list.json @@ -0,0 +1,140 @@ +{ + "extensions": [ + { + "updated": "2013-01-20T00:00:00-00:00", + "name": "Neutron Service Type Management", + "links": [], + "namespace": "http://docs.openstack.org/ext/neutron/service-type/api/v1.0";, + "alias": "service-type", + "description": "API for retrieving service providers for Neutron advanced services" + }, + { + "updated": "2012-10-05T10:00:00-00:00", + "name": "security-group", + "links": [], + "namespace": "http://docs.openstack.org/ext/securitygroups/api/v2.0";, + "alias": "security-group", + "description": "The security groups extension." + }, + { + "updated": "2013-02-07T10:00:00-00:00", + "name": "L3 Agent Scheduler", + "links": [], + "namespace": "http://docs.openstack.org/ext/l3_agent_scheduler/api/v1.0";, + "alias": "l3_agent_scheduler", + "description": "Schedule routers among l3 agents" + }, + { + "updated": "2013-02-07T10:00:00-00:00", + "name": "Loadbalancer Agent Scheduler", + "links": [], + "namespace": "http://docs.openstack.org/ext/lbaas_agent_scheduler/api/v1.0";, + "alias": "lbaas_agent_scheduler", + "description": "Schedule pools among lbaas agents" + }, + { + "updated": "2013-03-28T10:00:00-00:00", + "name": "Neutron L3 Configurable external gateway mode", + "links": [], + "namespace": "http://docs.openstack.org/ext/neutron/ext-gw-mode/api/v1.0";, + "alias": "ext-gw-mode", + "description": "Extension of the router abstraction for specifying whether SNAT should occur on the external gateway" + }, + { + "updated": "2014-02-03T10:00:00-00:00", + "name": "Port Binding", + "links": [], + "namespace": "http://docs.openstack.org/ext/binding/api/v1.0";, + "alias": "binding", + "description": "Expose port bindings of a virtual port to external application" + }, + { + "updated": "2012-09-07T10:00:00-00:00", + "name": "Provider Network", + "links": [], + "namespace": "http://docs.openstack.org/ext/provider/api/v1.0";, + "alias": "provider", + "description": "Expose mapping of virtual networks to physical networks" + }, + { + "updated": "2013-02-03T10:00:00-00:00", + "name": "agent", + "links": [], + "namespace": "http://docs.openstack.org/ext/agent/api/v2.0";, + "alias": "agent", + "description": "The agent management extension." + }, + { + "updated": "2012-07-29T10:00:00-00:00", + "name": "Quota management support", + "links": [], + "namespace": "http://docs.openstack.org/network/ext/quotas-sets/api/v2.0";, + "alias": "quotas", + "description": "Expose functions for quotas management per tenant" + }, + { + "updated": "2013-02-07T10:00:00-00:00", + "name": "DHCP Agent Scheduler", + "links": [], + "namespace": "http://docs.openstack.org/ext/dhcp_agent_scheduler/api/v1.0";, + "alias": "dhcp_agent_scheduler", + "description": "Schedule networks among dhcp agents" + }, + { + "updated": "2013-06-27T10:00:00-00:00", + "name": "Multi Provider Network", + "links": [], + "namespace": "http://docs.openstack.org/ext/multi-provider/api/v1.0";, + "alias": "multi-provider", + "description": "Expose mapping of virtual networks to multiple physical networks" + }, + { + "updated": "2013-01-14T10:00:00-00:00", + "name": "Neutron external network", + "links": [], + "namespace": "http://docs.openstack.org/ext/neutron/external_net/api/v1.0";, + "alias": "external-net", + "description": "Adds external network attribute to network resource." + }, + { + "updated": "2012-07-20T10:00:00-00:00", + "name": "Neutron L3 Router", + "links": [], + "namespace": "http://docs.openstack.org/ext/neutron/router/api/v1.0";, + "alias": "router", + "description": "Router abstraction for basic L3 forwarding between L2 Neutron networks and access to external networks via a NAT gateway." + }, + { + "updated": "2013-07-23T10:00:00-00:00", + "name": "Allowed Address Pairs", + "links": [], + "namespace": "http://docs.openstack.org/ext/allowedaddresspairs/api/v2.0";, + "alias": "allowed-address-pairs", + "description": "Provides allowed address pairs" + }, + { + "updated": "2013-03-17T12:00:00-00:00", + "name": "Neutron Extra DHCP opts", + "links": [], + "namespace": "http://docs.openstack.org/ext/neutron/extra_dhcp_opt/api/v1.0";, + "alias": "extra_dhcp_opt", + "description": "Extra options configuration for DHCP. For example PXE boot options to DHCP clients can be specified (e.g. tftp-server, server-ip-address, bootfile-name)" + }, + { + "updated": "2012-10-07T10:00:00-00:00", + "name": "LoadBalancing service", + "links": [], + "namespace": "http://wiki.openstack.org/neutron/LBaaS/API_1.0";, + "alias": "lbaas", + "description": "Extension for LoadBalancing service" + }, + { + "updated": "2013-02-01T10:00:00-00:00", + "name": "Neutron Extra Route", + "links": [], + "namespace": "http://docs.openstack.org/ext/neutron/extraroutes/api/v1.0";, + "alias": "extraroute", + "description": "Extra routes configuration for L3 router" + } + ] +} http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/92112318/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiLiveTest.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiLiveTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiLiveTest.java index 36bdc21..9558a16 100644 --- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiLiveTest.java +++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiLiveTest.java @@ -32,18 +32,14 @@ import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.TimeUnit; -import javax.ws.rs.PathParam; - import org.jclouds.http.options.GetOptions; import org.jclouds.io.Payload; import org.jclouds.openstack.swift.v1.CopyObjectException; import org.jclouds.openstack.swift.v1.SwiftApi; -import org.jclouds.openstack.swift.v1.binders.SetPayload; import org.jclouds.openstack.swift.v1.domain.ObjectList; import org.jclouds.openstack.swift.v1.domain.SwiftObject; import org.jclouds.openstack.swift.v1.internal.BaseSwiftApiLiveTest; import org.jclouds.openstack.swift.v1.options.ListContainerOptions; -import org.jclouds.rest.annotations.BinderParam; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/92112318/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java index d267f11..eaece48 100644 --- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java +++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java @@ -18,8 +18,6 @@ package org.jclouds.openstack.swift.v1.features; import static com.google.common.base.Charsets.US_ASCII; import static com.google.common.net.HttpHeaders.EXPIRES; -import static com.google.common.net.HttpHeaders.RANGE; -import static com.google.common.net.HttpHeaders.LAST_MODIFIED; import static org.jclouds.Constants.PROPERTY_MAX_RETRIES; import static org.jclouds.Constants.PROPERTY_RETRY_DELAY_START; import static org.jclouds.Constants.PROPERTY_SO_TIMEOUT;
