Repository: jclouds Updated Branches: refs/heads/master 34f6d6c7f -> 5d82b40d7
http://git-wip-us.apache.org/repos/asf/jclouds/blob/5d82b40d/providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeVolumeApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeVolumeApiLiveTest.java b/providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeVolumeApiLiveTest.java deleted file mode 100644 index 6aab68b..0000000 --- a/providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeVolumeApiLiveTest.java +++ /dev/null @@ -1,28 +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.hpcloud.compute.features; - -import org.jclouds.openstack.nova.v2_0.extensions.VolumeApiLiveTest; -import org.testng.annotations.Test; - -@Test(groups = "live", testName = "HPCloudComputeVolumeApiLiveTest") -public class HPCloudComputeVolumeApiLiveTest extends VolumeApiLiveTest { - public HPCloudComputeVolumeApiLiveTest() { - provider = "hpcloud-compute"; - } - -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/5d82b40d/providers/hpcloud-compute/src/test/resources/access_hpcloud.json ---------------------------------------------------------------------- diff --git a/providers/hpcloud-compute/src/test/resources/access_hpcloud.json b/providers/hpcloud-compute/src/test/resources/access_hpcloud.json deleted file mode 100644 index d44e7bb..0000000 --- a/providers/hpcloud-compute/src/test/resources/access_hpcloud.json +++ /dev/null @@ -1,346 +0,0 @@ -{ - "access": { - "token": { - "expires": "2014-05-07T08:38:39.421Z", - "id": "HPAuth10_xxxx", - "tenant": { - "id": "123456789", - "name": "test-project1" - } - }, - "user": { - "id": "10951776012508", - "name": "ccustine", - "otherAttributes": { - "domainStatus": "enabled", - "domainStatusCode": "00" - }, - "roles": [ - { - "id": "00000000004004", - "serviceId": "100", - "name": "domainuser" - }, - { - "id": "00000000004016", - "serviceId": "120", - "name": "netadmin", - "tenantId": "123456789" - }, - { - "id": "00000000004014", - "serviceId": "150", - "name": "cdn-admin", - "tenantId": "123456789" - }, - { - "id": "00000000004022", - "serviceId": "110", - "name": "Admin", - "tenantId": "123456789" - }, - { - "id": "00000000004032", - "serviceId": "160", - "name": "mysql-user", - "tenantId": "123456789" - }, - { - "id": "00000000004024", - "serviceId": "140", - "name": "user", - "tenantId": "123456789" - }, - { - "id": "00000000004013", - "serviceId": "130", - "name": "block-admin", - "tenantId": "123456789" - }, - { - "id": "00000000004025", - "serviceId": "120", - "name": "sysadmin", - "tenantId": "123456789" - }, - { - "id": "91643347410087", - "serviceId": "240", - "name": "dns-admin", - "tenantId": "123456789" - }, - { - "id": "00000000004003", - "serviceId": "100", - "name": "domainadmin" - }, - { - "id": "10419409370304", - "serviceId": "170", - "name": "net-admin", - "tenantId": "123456789" - } - ] - }, - "serviceCatalog": [ - { - "name": "Usage Reporting", - "type": "metering", - "endpoints": [ - { - "publicURL": "", - "region": "region-a.geo-1", - "versionId": "2", - "versionInfo": "https://region-a.geo-1.usage-reporting-internal.hpcloudsvc.com:8777";, - "versionList": "https://region-a.geo-1.usage-reporting-internal.hpcloudsvc.com:8777"; - }, - { - "publicURL": "", - "region": "region-b.geo-1", - "versionId": "2", - "versionInfo": "https://region-b.geo-1.usage-reporting-internal.hpcloudsvc.com:8777";, - "versionList": "https://region-b.geo-1.usage-reporting-internal.hpcloudsvc.com:8777"; - } - ] - }, - { - "name": "Networking", - "type": "network", - "endpoints": [ - { - "tenantId": "123456789", - "publicURL": "", - "publicURL2": "", - "region": "az-1.region-a.geo-1", - "versionId": "", - "versionInfo": "", - "versionList": "" - }, - { - "tenantId": "123456789", - "publicURL": "https://region-a.geo-1.network.hpcloudsvc.com";, - "publicURL2": "", - "region": "region-a.geo-1", - "versionId": "2.0", - "versionInfo": "https://region-a.geo-1.network.hpcloudsvc.com";, - "versionList": "https://region-a.geo-1.network.hpcloudsvc.com"; - }, - { - "tenantId": "123456789", - "publicURL": "https://region-b.geo-1.network.hpcloudsvc.com";, - "publicURL2": "", - "region": "region-b.geo-1", - "versionId": "2.0", - "versionInfo": "https://region-b.geo-1.network.hpcloudsvc.com";, - "versionList": "https://region-b.geo-1.network.hpcloudsvc.com"; - } - ] - }, - { - "name": "Relational DB MySQL", - "type": "database", - "endpoints": [ - { - "tenantId": "123456789", - "publicURL": "https://region-a.geo-1.database.hpcloudsvc.com/v1.0/123456789";, - "publicURL2": "", - "region": "region-a.geo-1", - "versionId": "v13.6", - "versionInfo": "https://region-a.geo-1.database.hpcloudsvc.com/v1.0";, - "versionList": "https://region-a.geo-1.database.hpcloudsvc.com"; - } - ] - }, - { - "name": "CDN", - "type": "hpext:cdn", - "endpoints": [ - { - "tenantId": "123456789", - "publicURL": "https://region-a.geo-1.cdnmgmt.hpcloudsvc.com/v1.0/123456789";, - "region": "region-a.geo-1", - "versionId": "1.0", - "versionInfo": "https://region-a.geo-1.cdnmgmt.hpcloudsvc.com/v1.0/";, - "versionList": "https://region-a.geo-1.cdnmgmt.hpcloudsvc.com/"; - }, - { - "tenantId": "123456789", - "publicURL": "https://region-b.geo-1.cdnmgmt.hpcloudsvc.com/v1.0/123456789";, - "region": "region-b.geo-1", - "versionId": "1.0", - "versionInfo": "https://region-b.geo-1.cdnmgmt.hpcloudsvc.com/v1.0/";, - "versionList": "https://region-b.geo-1.cdnmgmt.hpcloudsvc.com/"; - } - ] - }, - { - "name": "Object Storage", - "type": "object-store", - "endpoints": [ - { - "tenantId": "123456789", - "publicURL": "https://region-a.geo-1.objects.hpcloudsvc.com/v1/123456789";, - "region": "region-a.geo-1", - "versionId": "1.0", - "versionInfo": "https://region-a.geo-1.objects.hpcloudsvc.com/v1.0/";, - "versionList": "https://region-a.geo-1.objects.hpcloudsvc.com"; - }, - { - "tenantId": "123456789", - "publicURL": "https://region-b.geo-1.objects.hpcloudsvc.com:443/v1/123456789";, - "region": "region-b.geo-1", - "versionId": "1", - "versionInfo": "https://region-b.geo-1.objects.hpcloudsvc.com:443/v1/";, - "versionList": "https://region-b.geo-1.objects.hpcloudsvc.com:443"; - } - ] - }, - { - "name": "Identity", - "type": "identity", - "endpoints": [ - { - "publicURL": "https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0/";, - "region": "region-a.geo-1", - "versionId": "2.0", - "versionInfo": "https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0/";, - "versionList": "https://region-a.geo-1.identity.hpcloudsvc.com:35357"; - }, - { - "publicURL": "https://region-a.geo-1.identity.hpcloudsvc.com:35357/v3/";, - "region": "region-a.geo-1", - "versionId": "3.0", - "versionInfo": "https://region-a.geo-1.identity.hpcloudsvc.com:35357/v3/";, - "versionList": "https://region-a.geo-1.identity.hpcloudsvc.com:35357"; - }, - { - "publicURL": "https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0/";, - "region": "region-b.geo-1", - "versionId": "2.0", - "versionInfo": "https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0/";, - "versionList": "https://region-b.geo-1.identity.hpcloudsvc.com:35357"; - }, - { - "publicURL": "https://region-b.geo-1.identity.hpcloudsvc.com:35357/v3/";, - "region": "region-b.geo-1", - "versionId": "3.0", - "versionInfo": "https://region-b.geo-1.identity.hpcloudsvc.com:35357/v3/";, - "versionList": "https://region-b.geo-1.identity.hpcloudsvc.com:35357"; - } - ] - }, - { - "name": "Image Management", - "type": "image", - "endpoints": [ - { - "tenantId": "123456789", - "publicURL": "https://glance1.uswest.hpcloud.net:9292/v1.0";, - "publicURL2": "", - "region": "az-1.region-a.geo-1", - "versionId": "1.0", - "versionInfo": "https://glance1.uswest.hpcloud.net:9292/v1.0/";, - "versionList": "https://glance1.uswest.hpcloud.net:9292"; - }, - { - "tenantId": "123456789", - "publicURL": "https://region-a.geo-1.images.hpcloudsvc.com:443/v1.0";, - "publicURL2": "", - "region": "region-a.geo-1", - "versionId": "1.0", - "versionInfo": "https://region-a.geo-1.images.hpcloudsvc.com:443/v1.0";, - "versionList": "https://region-a.geo-1.images.hpcloudsvc.com:443"; - }, - { - "tenantId": "123456789", - "publicURL": "https://region-b.geo-1.images.hpcloudsvc.com:443/v1.0";, - "publicURL2": "", - "region": "region-b.geo-1", - "versionId": "1.0", - "versionInfo": "https://region-b.geo-1.images.hpcloudsvc.com:443/v1.0";, - "versionList": "https://region-b.geo-1.images.hpcloudsvc.com:443"; - } - ] - }, - { - "name": "DNS", - "type": "hpext:dns", - "endpoints": [ - { - "tenantId": "123456789", - "publicURL": "https://region-a.geo-1.dns.hpcloudsvc.com/v1/";, - "publicURL2": "", - "region": "region-a.geo-1", - "versionId": "1", - "versionInfo": "https://region-a.geo-1.dns.hpcloudsvc.com/v1/";, - "versionList": "https://region-a.geo-1.dns.hpcloudsvc.com/"; - } - ] - }, - { - "name": "Block Storage", - "type": "volume", - "endpoints": [ - { - "tenantId": "123456789", - "publicURL": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/123456789";, - "publicURL2": "", - "region": "az-1.region-a.geo-1", - "versionId": "1.1", - "versionInfo": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/";, - "versionList": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com"; - }, - { - "tenantId": "123456789", - "publicURL": "https://region-a.geo-1.block.hpcloudsvc.com/v1/123456789";, - "publicURL2": "", - "region": "region-a.geo-1", - "versionId": "1.0", - "versionInfo": "https://region-a.geo-1.block.hpcloudsvc.com/v1";, - "versionList": "https://region-a.geo-1.block.hpcloudsvc.com"; - }, - { - "tenantId": "123456789", - "publicURL": "https://region-b.geo-1.block.hpcloudsvc.com/v1/123456789";, - "publicURL2": "", - "region": "region-b.geo-1", - "versionId": "1.0", - "versionInfo": "https://region-b.geo-1.block.hpcloudsvc.com/v1";, - "versionList": "https://region-b.geo-1.block.hpcloudsvc.com"; - } - ] - }, - { - "name": "Compute", - "type": "compute", - "endpoints": [ - { - "tenantId": "123456789", - "publicURL": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/123456789";, - "publicURL2": "https://az-1.region-a.geo-1.ec2-compute.hpcloudsvc.com/services/Cloud";, - "region": "az-1.region-a.geo-1", - "versionId": "1.1", - "versionInfo": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/";, - "versionList": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com"; - }, - { - "tenantId": "123456789", - "publicURL": "https://region-a.geo-1.compute.hpcloudsvc.com/v2/123456789";, - "region": "region-a.geo-1", - "versionId": "2", - "versionInfo": "https://region-a.geo-1.compute.hpcloudsvc.com/v2/";, - "versionList": "https://region-a.geo-1.compute.hpcloudsvc.com"; - }, - { - "tenantId": "123456789", - "publicURL": "https://region-b.geo-1.compute.hpcloudsvc.com/v2/123456789";, - "region": "region-b.geo-1", - "versionId": "2", - "versionInfo": "https://region-b.geo-1.compute.hpcloudsvc.com/v2/";, - "versionList": "https://region-b.geo-1.compute.hpcloudsvc.com"; - } - ] - } - ] - } -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/5d82b40d/providers/pom.xml ---------------------------------------------------------------------- diff --git a/providers/pom.xml b/providers/pom.xml index 4326f86..ec6fffe 100644 --- a/providers/pom.xml +++ b/providers/pom.xml @@ -53,8 +53,6 @@ <module>go2cloud-jhb1</module> <module>google-compute-engine</module> <module>softlayer</module> - <module>hpcloud-compute</module> - <module>hpcloud-blockstorage</module> <module>rackspace-cloudfiles-us</module> <module>rackspace-cloudfiles-uk</module> <module>rackspace-clouddns-us</module>
