From 6ddd2072dccfa8c6ecf9b4b9bd9341ca57c48981 Mon Sep 17 00:00:00 2001 From: danikov Date: Wed, 28 Mar 2012 09:49:20 +0100 Subject: [PATCH 01/11] refractor out admin --- .../admin/VCloudDirectorAdminAsyncClient.java | 91 +++ .../v1_5/admin/VCloudDirectorAdminClient.java | 94 +++ .../vcloud/director/v1_5/domain/Role.java | 27 + .../{ => admin}/AdminCatalogAsyncClient.java | 5 +- .../{ => admin}/AdminCatalogClient.java | 5 +- .../{ => admin}/AdminNetworkAsyncClient.java | 5 +- .../{ => admin}/AdminNetworkClient.java | 5 +- .../{ => admin}/AdminOrgAsyncClient.java | 5 +- .../features/{ => admin}/AdminOrgClient.java | 5 +- .../{ => admin}/AdminQueryAsyncClient.java | 3 +- .../{ => admin}/AdminQueryClient.java | 3 +- .../{ => admin}/AdminVdcAsyncClient.java | 4 +- .../features/{ => admin}/AdminVdcClient.java | 6 +- .../{ => admin}/GroupAsyncClient.java | 2 +- .../features/{ => admin}/GroupClient.java | 2 +- .../features/{ => admin}/UserAsyncClient.java | 2 +- .../v1_5/features/{ => admin}/UserClient.java | 2 +- .../VCloudDirectorUserAsyncClient.java} | 59 +- .../VCloudDirectorUserClient.java} | 62 +- .../v1_5/NonClientOperationsLiveTest.java | 2 +- .../v1_5/VCloudDirectorClientExpectTest.java | 5 +- .../AdminCatalogClientExpectTest.java | 40 +- .../features/AdminCatalogClientLiveTest.java | 9 +- .../AdminNetworkClientExpectTest.java | 17 +- .../features/AdminNetworkClientLiveTest.java | 3 +- .../features/AdminOrgClientExpectTest.java | 664 +++++++++--------- .../v1_5/features/AdminOrgClientLiveTest.java | 3 +- .../features/AdminQueryClientExpectTest.java | 14 +- .../features/AdminQueryClientLiveTest.java | 3 +- .../features/AdminVdcClientExpectTest.java | 8 +- .../v1_5/features/AdminVdcClientLiveTest.java | 3 +- .../features/CatalogClientExpectTest.java | 117 ++- .../v1_5/features/CatalogClientLiveTest.java | 24 +- .../v1_5/features/GroupClientExpectTest.java | 13 +- .../v1_5/features/GroupClientLiveTest.java | 6 +- .../v1_5/features/MediaClientExpectTest.java | 32 +- .../features/NetworkClientExpectTest.java | 16 +- .../v1_5/features/NetworkClientLiveTest.java | 4 +- .../v1_5/features/OrgClientExpectTest.java | 20 +- .../v1_5/features/OrgClientLiveTest.java | 6 +- .../v1_5/features/QueryClientExpectTest.java | 8 +- .../v1_5/features/TaskClientExpectTest.java | 14 +- .../v1_5/features/UserClientExpectTest.java | 19 +- .../v1_5/features/UserClientLiveTest.java | 61 +- .../v1_5/features/VAppClientExpectTest.java | 120 ++-- .../VAppTemplateClientExpectTest.java | 3 +- .../v1_5/features/VdcClientExpectTest.java | 32 +- .../v1_5/features/VdcClientLiveTest.java | 4 +- ...aseVCloudDirectorRestClientExpectTest.java | 5 +- 49 files changed, 885 insertions(+), 777 deletions(-) create mode 100644 labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminAsyncClient.java create mode 100644 labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminClient.java create mode 100644 labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Role.java rename labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/{ => admin}/AdminCatalogAsyncClient.java (94%) rename labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/{ => admin}/AdminCatalogClient.java (93%) rename labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/{ => admin}/AdminNetworkAsyncClient.java (91%) rename labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/{ => admin}/AdminNetworkClient.java (91%) rename labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/{ => admin}/AdminOrgAsyncClient.java (96%) rename labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/{ => admin}/AdminOrgClient.java (96%) rename labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/{ => admin}/AdminQueryAsyncClient.java (97%) rename labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/{ => admin}/AdminQueryClient.java (97%) rename labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/{ => admin}/AdminVdcAsyncClient.java (94%) rename labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/{ => admin}/AdminVdcClient.java (90%) rename labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/{ => admin}/GroupAsyncClient.java (98%) rename labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/{ => admin}/GroupClient.java (97%) rename labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/{ => admin}/UserAsyncClient.java (98%) rename labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/{ => admin}/UserClient.java (97%) rename labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/{VCloudDirectorAsyncClient.java => user/VCloudDirectorUserAsyncClient.java} (65%) rename labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/{VCloudDirectorClient.java => user/VCloudDirectorUserClient.java} (66%) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminAsyncClient.java new file mode 100644 index 0000000000..e9331ea1fc --- /dev/null +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminAsyncClient.java @@ -0,0 +1,91 @@ +/** + * 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.vcloud.director.v1_5.admin; + +import org.jclouds.rest.annotations.Delegate; +import org.jclouds.vcloud.director.v1_5.domain.AdminOrg; +import org.jclouds.vcloud.director.v1_5.domain.AdminVdc; +import org.jclouds.vcloud.director.v1_5.domain.Catalog; +import org.jclouds.vcloud.director.v1_5.domain.Group; +import org.jclouds.vcloud.director.v1_5.domain.User; +import org.jclouds.vcloud.director.v1_5.domain.ovf.Network; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogAsyncClient; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminNetworkAsyncClient; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminOrgAsyncClient; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryAsyncClient; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminVdcAsyncClient; +import org.jclouds.vcloud.director.v1_5.features.admin.GroupAsyncClient; +import org.jclouds.vcloud.director.v1_5.features.admin.UserAsyncClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserAsyncClient; + +/** + * Provides asynchronous access to VCloudDirector Admin via their REST API. + * + * @see VCloudDirectorAdminClient + * @author danikov + */ +public interface VCloudDirectorAdminAsyncClient extends VCloudDirectorUserAsyncClient { + /** + * @return asynchronous access to admin query features + */ + @Override + @Delegate + AdminQueryAsyncClient getQueryClient(); + + + /** + * @return asynchronous access to {@link Catalog} admin features + */ + @Override + @Delegate + AdminCatalogAsyncClient getCatalogClient(); + + /** + * @return asynchronous access to admin {@link Group} features + */ + @Delegate + GroupAsyncClient getGroupClient(); + + /** + * @return asynchronous access to {@link AdminOrg} features + */ + @Override + @Delegate + AdminOrgAsyncClient getOrgClient(); + + /** + * @return asynchronous access to {@link User} features + */ + @Delegate + UserAsyncClient getUserClient(); + + /** + * @return asynchronous access to {@link AdminVdc} features + */ + @Override + @Delegate + AdminVdcAsyncClient getVdcClient(); + + /** + * @return asynchronous access to admin {@link Network} features + */ + @Override + @Delegate + AdminNetworkAsyncClient getNetworkClient(); +} diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminClient.java new file mode 100644 index 0000000000..de3e43beed --- /dev/null +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminClient.java @@ -0,0 +1,94 @@ +/** + * 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.vcloud.director.v1_5.admin; + +import java.util.concurrent.TimeUnit; + +import org.jclouds.concurrent.Timeout; +import org.jclouds.rest.annotations.Delegate; +import org.jclouds.vcloud.director.v1_5.domain.AdminOrg; +import org.jclouds.vcloud.director.v1_5.domain.AdminVdc; +import org.jclouds.vcloud.director.v1_5.domain.Catalog; +import org.jclouds.vcloud.director.v1_5.domain.Group; +import org.jclouds.vcloud.director.v1_5.domain.User; +import org.jclouds.vcloud.director.v1_5.domain.ovf.Network; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogClient; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminNetworkClient; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminOrgClient; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryClient; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminVdcClient; +import org.jclouds.vcloud.director.v1_5.features.admin.GroupClient; +import org.jclouds.vcloud.director.v1_5.features.admin.UserClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserAsyncClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; + +/** + * Provides synchronous access to VCloudDirector Admin. + * + * @see VCloudDirectorUserAsyncClient + * @author Adrian Cole + */ +@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS) +public interface VCloudDirectorAdminClient extends VCloudDirectorUserClient { + /** + * @return asynchronous access to admin query features + */ + @Override + @Delegate + AdminQueryClient getQueryClient(); + + /** + * @return synchronous access to {@link Catalog} admin features + */ + @Override + @Delegate + AdminCatalogClient getCatalogClient(); + + /** + * @return synchronous access to admin {@link Group} features + */ + @Delegate + GroupClient getGroupClient(); + + /** + * @return synchronous access to {@link AdminOrg} features + */ + @Override + @Delegate + AdminOrgClient getOrgClient(); + + /** + * @return synchronous access to {@link User} features + */ + @Delegate + UserClient getUserClient(); + + /** + * @return synchronous access to {@link AdminVdc} features + */ + @Delegate + AdminVdcClient getVdcClient(); + + /** + * @return synchronous access to admin {@link Network} features + */ + @Override + @Delegate + AdminNetworkClient getNetworkClient(); +} diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Role.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Role.java new file mode 100644 index 0000000000..1616f0ce1e --- /dev/null +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Role.java @@ -0,0 +1,27 @@ +package org.jclouds.vcloud.director.v1_5.domain; + +import java.util.Arrays; +import java.util.List; + +import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryClient; + +public class Role { //TODO: placeholder for implementation + + public static final class DefaultRoles { + public static final String USER = "vApp User"; + public static final String AUTHOR = "vApp Author"; + public static final String CATALOG_AUTHOR = "Catalog Author"; + public static final String CONSOLE = "Console Access Only"; + public static final String ORG_ADMIN = "Organization Administrator"; + + /** + * All default {@link AdminQueryClient#roleReferencesQueryAll()} values. + *

+ * This list must be updated whenever a new default role is added. + */ + public static final List ALL = Arrays.asList( + USER, AUTHOR, CATALOG_AUTHOR, CONSOLE, ORG_ADMIN + ); + } + +} diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogAsyncClient.java similarity index 94% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogAsyncClient.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogAsyncClient.java index 71e7572a8b..3915319f35 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogAsyncClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.features; +package org.jclouds.vcloud.director.v1_5.features.admin; import java.net.URI; @@ -40,6 +40,9 @@ import org.jclouds.vcloud.director.v1_5.domain.AdminCatalog; import org.jclouds.vcloud.director.v1_5.domain.Metadata; import org.jclouds.vcloud.director.v1_5.domain.Owner; import org.jclouds.vcloud.director.v1_5.domain.PublishCatalogParams; +import org.jclouds.vcloud.director.v1_5.features.CatalogAsyncClient; +import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncClient; +import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncClient.Writeable; import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest; import org.jclouds.vcloud.director.v1_5.functions.ThrowVCloudErrorOn4xx; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogClient.java similarity index 93% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClient.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogClient.java index 6ffa9cde0e..ae3727c564 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.features; +package org.jclouds.vcloud.director.v1_5.features.admin; import java.net.URI; import java.util.concurrent.TimeUnit; @@ -28,6 +28,9 @@ import org.jclouds.vcloud.director.v1_5.domain.AdminCatalog; import org.jclouds.vcloud.director.v1_5.domain.Metadata; import org.jclouds.vcloud.director.v1_5.domain.Owner; import org.jclouds.vcloud.director.v1_5.domain.PublishCatalogParams; +import org.jclouds.vcloud.director.v1_5.features.CatalogClient; +import org.jclouds.vcloud.director.v1_5.features.MetadataClient; +import org.jclouds.vcloud.director.v1_5.features.MetadataClient.Writeable; import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest; /** diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminNetworkAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkAsyncClient.java similarity index 91% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminNetworkAsyncClient.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkAsyncClient.java index 2842d11400..a0c2476dc5 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminNetworkAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkAsyncClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.features; +package org.jclouds.vcloud.director.v1_5.features.admin; import java.net.URI; @@ -38,6 +38,9 @@ import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.ExternalNetwork; import org.jclouds.vcloud.director.v1_5.domain.OrgNetwork; import org.jclouds.vcloud.director.v1_5.domain.Task; +import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncClient; +import org.jclouds.vcloud.director.v1_5.features.NetworkAsyncClient; +import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncClient.Writeable; import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest; import org.jclouds.vcloud.director.v1_5.functions.ThrowVCloudErrorOn4xx; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminNetworkClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkClient.java similarity index 91% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminNetworkClient.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkClient.java index 486e2f1e5a..44fca80ede 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminNetworkClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.features; +package org.jclouds.vcloud.director.v1_5.features.admin; import java.net.URI; import java.util.concurrent.TimeUnit; @@ -26,6 +26,9 @@ import org.jclouds.rest.annotations.Delegate; import org.jclouds.vcloud.director.v1_5.domain.Network; import org.jclouds.vcloud.director.v1_5.domain.OrgNetwork; import org.jclouds.vcloud.director.v1_5.domain.Task; +import org.jclouds.vcloud.director.v1_5.features.MetadataClient; +import org.jclouds.vcloud.director.v1_5.features.NetworkClient; +import org.jclouds.vcloud.director.v1_5.features.MetadataClient.Writeable; /** * Provides synchronous access to admin {@link Network} objects. diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgAsyncClient.java similarity index 96% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgAsyncClient.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgAsyncClient.java index f5da05318b..1ccc010dd9 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgAsyncClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.features; +package org.jclouds.vcloud.director.v1_5.features.admin; import java.net.URI; @@ -42,6 +42,9 @@ import org.jclouds.vcloud.director.v1_5.domain.OrgLeaseSettings; import org.jclouds.vcloud.director.v1_5.domain.OrgPasswordPolicySettings; import org.jclouds.vcloud.director.v1_5.domain.OrgSettings; import org.jclouds.vcloud.director.v1_5.domain.OrgVAppTemplateLeaseSettings; +import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncClient; +import org.jclouds.vcloud.director.v1_5.features.OrgAsyncClient; +import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncClient.Writeable; import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest; import org.jclouds.vcloud.director.v1_5.functions.ThrowVCloudErrorOn4xx; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgClient.java similarity index 96% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClient.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgClient.java index 1c300fe022..0b78baac20 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.features; +package org.jclouds.vcloud.director.v1_5.features.admin; import java.net.URI; import java.util.concurrent.TimeUnit; @@ -32,6 +32,9 @@ import org.jclouds.vcloud.director.v1_5.domain.OrgLeaseSettings; import org.jclouds.vcloud.director.v1_5.domain.OrgPasswordPolicySettings; import org.jclouds.vcloud.director.v1_5.domain.OrgSettings; import org.jclouds.vcloud.director.v1_5.domain.OrgVAppTemplateLeaseSettings; +import org.jclouds.vcloud.director.v1_5.features.MetadataClient; +import org.jclouds.vcloud.director.v1_5.features.OrgClient; +import org.jclouds.vcloud.director.v1_5.features.MetadataClient.Writeable; /** * Provides synchronous access to {@link Group} objects. diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryAsyncClient.java similarity index 97% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryAsyncClient.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryAsyncClient.java index 613641ff2d..1ab90dbf4f 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryAsyncClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.features; +package org.jclouds.vcloud.director.v1_5.features.admin; import java.util.concurrent.TimeUnit; @@ -32,6 +32,7 @@ import org.jclouds.rest.annotations.QueryParams; import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.vcloud.director.v1_5.domain.RoleReferences; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords; +import org.jclouds.vcloud.director.v1_5.features.QueryAsyncClient; import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest; import org.jclouds.vcloud.director.v1_5.functions.ThrowVCloudErrorOn4xx; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryClient.java similarity index 97% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClient.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryClient.java index 2b6c4982a1..977b88b1e8 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.features; +package org.jclouds.vcloud.director.v1_5.features.admin; import java.util.concurrent.TimeUnit; @@ -30,6 +30,7 @@ import org.jclouds.vcloud.director.v1_5.domain.User; import org.jclouds.vcloud.director.v1_5.domain.Vdc; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecordType; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords; +import org.jclouds.vcloud.director.v1_5.features.QueryClient; /** * Provides synchronous access to {@link AdminQuery} objects. diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminVdcAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminVdcAsyncClient.java similarity index 94% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminVdcAsyncClient.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminVdcAsyncClient.java index 4f2126f936..4087ac1128 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminVdcAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminVdcAsyncClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.features; +package org.jclouds.vcloud.director.v1_5.features.admin; import java.net.URI; @@ -36,6 +36,8 @@ import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.AdminVdc; import org.jclouds.vcloud.director.v1_5.domain.Task; +import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncClient; +import org.jclouds.vcloud.director.v1_5.features.VdcAsyncClient; import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncClient.Writeable; import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest; import org.jclouds.vcloud.director.v1_5.functions.ThrowVCloudErrorOn4xx; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminVdcClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminVdcClient.java similarity index 90% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminVdcClient.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminVdcClient.java index 0959d89bd2..05110045cc 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminVdcClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminVdcClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.features; +package org.jclouds.vcloud.director.v1_5.features.admin; import java.net.URI; import java.util.concurrent.TimeUnit; @@ -26,6 +26,10 @@ import org.jclouds.rest.annotations.Delegate; import org.jclouds.rest.annotations.EndpointParam; import org.jclouds.vcloud.director.v1_5.domain.AdminVdc; import org.jclouds.vcloud.director.v1_5.domain.Task; +import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncClient; +import org.jclouds.vcloud.director.v1_5.features.MetadataClient; +import org.jclouds.vcloud.director.v1_5.features.NetworkAsyncClient; +import org.jclouds.vcloud.director.v1_5.features.VdcClient; import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncClient.Writeable; /** diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/GroupAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupAsyncClient.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/GroupAsyncClient.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupAsyncClient.java index 77393fb11b..12f52d4865 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/GroupAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupAsyncClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.features; +package org.jclouds.vcloud.director.v1_5.features.admin; import java.net.URI; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/GroupClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupClient.java similarity index 97% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/GroupClient.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupClient.java index b28ee34dfd..5804b2bfd9 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/GroupClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.features; +package org.jclouds.vcloud.director.v1_5.features.admin; import java.net.URI; import java.util.concurrent.TimeUnit; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UserAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/UserAsyncClient.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UserAsyncClient.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/UserAsyncClient.java index 82c41560b3..73d3386532 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UserAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/UserAsyncClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.features; +package org.jclouds.vcloud.director.v1_5.features.admin; import java.net.URI; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UserClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/UserClient.java similarity index 97% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UserClient.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/UserClient.java index 350e03af21..a7cd86c3c3 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UserClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/UserClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.features; +package org.jclouds.vcloud.director.v1_5.features.admin; import java.net.URI; import java.util.concurrent.TimeUnit; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorUserAsyncClient.java similarity index 65% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorAsyncClient.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorUserAsyncClient.java index 25c7ff5967..429cd82d3d 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorUserAsyncClient.java @@ -16,35 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5; +package org.jclouds.vcloud.director.v1_5.user; import org.jclouds.rest.annotations.Delegate; -import org.jclouds.vcloud.director.v1_5.domain.AdminOrg; -import org.jclouds.vcloud.director.v1_5.domain.AdminVdc; import org.jclouds.vcloud.director.v1_5.domain.Catalog; -import org.jclouds.vcloud.director.v1_5.domain.Group; import org.jclouds.vcloud.director.v1_5.domain.Media; import org.jclouds.vcloud.director.v1_5.domain.Org; import org.jclouds.vcloud.director.v1_5.domain.Session; import org.jclouds.vcloud.director.v1_5.domain.Task; -import org.jclouds.vcloud.director.v1_5.domain.User; import org.jclouds.vcloud.director.v1_5.domain.VApp; import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; import org.jclouds.vcloud.director.v1_5.domain.Vdc; import org.jclouds.vcloud.director.v1_5.domain.ovf.Network; -import org.jclouds.vcloud.director.v1_5.features.AdminCatalogAsyncClient; -import org.jclouds.vcloud.director.v1_5.features.AdminNetworkAsyncClient; -import org.jclouds.vcloud.director.v1_5.features.AdminOrgAsyncClient; -import org.jclouds.vcloud.director.v1_5.features.AdminQueryAsyncClient; -import org.jclouds.vcloud.director.v1_5.features.AdminVdcAsyncClient; import org.jclouds.vcloud.director.v1_5.features.CatalogAsyncClient; -import org.jclouds.vcloud.director.v1_5.features.GroupAsyncClient; import org.jclouds.vcloud.director.v1_5.features.NetworkAsyncClient; import org.jclouds.vcloud.director.v1_5.features.OrgAsyncClient; import org.jclouds.vcloud.director.v1_5.features.QueryAsyncClient; import org.jclouds.vcloud.director.v1_5.features.TaskAsyncClient; import org.jclouds.vcloud.director.v1_5.features.UploadAsyncClient; -import org.jclouds.vcloud.director.v1_5.features.UserAsyncClient; import org.jclouds.vcloud.director.v1_5.features.VAppAsyncClient; import org.jclouds.vcloud.director.v1_5.features.VAppTemplateAsyncClient; import org.jclouds.vcloud.director.v1_5.features.VdcAsyncClient; @@ -54,10 +43,10 @@ import com.google.inject.Provides; /** * Provides asynchronous access to VCloudDirector via their REST API. * - * @see VCloudDirectorClient + * @see VCloudDirectorUserClient * @author Adrian Cole */ -public interface VCloudDirectorAsyncClient { +public interface VCloudDirectorUserAsyncClient { /** * * @return the current login session @@ -71,12 +60,6 @@ public interface VCloudDirectorAsyncClient { @Delegate QueryAsyncClient getQueryClient(); - /** - * @return asynchronous access to admin query features - */ - @Delegate - AdminQueryAsyncClient getAdminQueryClient(); - /** * @return asynchronous access to {@link Org} features */ @@ -130,40 +113,4 @@ public interface VCloudDirectorAsyncClient { */ @Delegate VAppTemplateAsyncClient getVAppTemplateClient(); - - /** - * @return asynchronous access to {@link Catalog} admin features - */ - @Delegate - AdminCatalogAsyncClient getAdminCatalogClient(); - - /** - * @return asynchronous access to admin {@link Group} features - */ - @Delegate - GroupAsyncClient getGroupClient(); - - /** - * @return asynchronous access to {@link AdminOrg} features - */ - @Delegate - AdminOrgAsyncClient getAdminOrgClient(); - - /** - * @return asynchronous access to {@link User} features - */ - @Delegate - UserAsyncClient getUserClient(); - - /** - * @return asynchronous access to {@link AdminVdc} features - */ - @Delegate - AdminVdcAsyncClient getAdminVdcClient(); - - /** - * @return asynchronous access to admin {@link Network} features - */ - @Delegate - AdminNetworkAsyncClient getAdminNetworkClient(); } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorUserClient.java similarity index 66% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorClient.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorUserClient.java index 01c8329235..4431be8626 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorUserClient.java @@ -16,39 +16,29 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5; +package org.jclouds.vcloud.director.v1_5.user; import java.util.concurrent.TimeUnit; import org.jclouds.concurrent.Timeout; import org.jclouds.rest.annotations.Delegate; -import org.jclouds.vcloud.director.v1_5.domain.AdminOrg; -import org.jclouds.vcloud.director.v1_5.domain.AdminVdc; +import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminAsyncClient; import org.jclouds.vcloud.director.v1_5.domain.Catalog; -import org.jclouds.vcloud.director.v1_5.domain.Group; import org.jclouds.vcloud.director.v1_5.domain.Media; import org.jclouds.vcloud.director.v1_5.domain.Org; import org.jclouds.vcloud.director.v1_5.domain.Session; import org.jclouds.vcloud.director.v1_5.domain.Task; -import org.jclouds.vcloud.director.v1_5.domain.User; import org.jclouds.vcloud.director.v1_5.domain.VApp; import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; import org.jclouds.vcloud.director.v1_5.domain.Vdc; import org.jclouds.vcloud.director.v1_5.domain.ovf.Network; -import org.jclouds.vcloud.director.v1_5.features.AdminCatalogClient; -import org.jclouds.vcloud.director.v1_5.features.AdminNetworkClient; -import org.jclouds.vcloud.director.v1_5.features.AdminOrgClient; -import org.jclouds.vcloud.director.v1_5.features.AdminQueryClient; -import org.jclouds.vcloud.director.v1_5.features.AdminVdcClient; import org.jclouds.vcloud.director.v1_5.features.CatalogClient; -import org.jclouds.vcloud.director.v1_5.features.GroupClient; import org.jclouds.vcloud.director.v1_5.features.MediaClient; import org.jclouds.vcloud.director.v1_5.features.NetworkClient; import org.jclouds.vcloud.director.v1_5.features.OrgClient; import org.jclouds.vcloud.director.v1_5.features.QueryClient; import org.jclouds.vcloud.director.v1_5.features.TaskClient; import org.jclouds.vcloud.director.v1_5.features.UploadClient; -import org.jclouds.vcloud.director.v1_5.features.UserClient; import org.jclouds.vcloud.director.v1_5.features.VAppClient; import org.jclouds.vcloud.director.v1_5.features.VAppTemplateClient; import org.jclouds.vcloud.director.v1_5.features.VdcClient; @@ -58,11 +48,11 @@ import com.google.inject.Provides; /** * Provides synchronous access to VCloudDirector. * - * @see VCloudDirectorAsyncClient - * @author Adrian Cole + * @see VCloudDirectorAdminAsyncClient + * @author danikov */ @Timeout(duration = 60, timeUnit = TimeUnit.SECONDS) -public interface VCloudDirectorClient { +public interface VCloudDirectorUserClient { /** * @return the current login session */ @@ -75,12 +65,6 @@ public interface VCloudDirectorClient { @Delegate QueryClient getQueryClient(); - /** - * @return asynchronous access to admin query features - */ - @Delegate - AdminQueryClient getAdminQueryClient(); - /** * @return synchronous access to {@link Org} features */ @@ -134,40 +118,4 @@ public interface VCloudDirectorClient { */ @Delegate VAppTemplateClient getVAppTemplateClient(); - - /** - * @return synchronous access to {@link Catalog} admin features - */ - @Delegate - AdminCatalogClient getAdminCatalogClient(); - - /** - * @return synchronous access to admin {@link Group} features - */ - @Delegate - GroupClient getGroupClient(); - - /** - * @return synchronous access to {@link AdminOrg} features - */ - @Delegate - AdminOrgClient getAdminOrgClient(); - - /** - * @return synchronous access to {@link User} features - */ - @Delegate - UserClient getUserClient(); - - /** - * @return synchronous access to {@link AdminVdc} features - */ - @Delegate - AdminVdcClient getAdminVdcClient(); - - /** - * @return synchronous access to admin {@link Network} features - */ - @Delegate - AdminNetworkClient getAdminNetworkClient(); } diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/NonClientOperationsLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/NonClientOperationsLiveTest.java index 60a08918a2..b5ad53292c 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/NonClientOperationsLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/NonClientOperationsLiveTest.java @@ -33,7 +33,7 @@ import org.jclouds.http.HttpResponse; import org.jclouds.util.Strings2; import org.jclouds.vcloud.director.v1_5.domain.OrgList; import org.jclouds.vcloud.director.v1_5.domain.SessionWithToken; -import org.jclouds.vcloud.director.v1_5.features.AdminCatalogClient; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogClient; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; import org.jclouds.xml.internal.JAXBParser; import org.testng.annotations.Test; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorClientExpectTest.java index 9306a3c754..10c58bb354 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorClientExpectTest.java @@ -22,17 +22,18 @@ import static org.testng.Assert.assertEquals; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; import org.jclouds.vcloud.director.v1_5.login.SessionClientExpectTest; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; import org.testng.annotations.Test; /** * @author Adrian Cole */ @Test(groups = "unit", testName = "VCloudDirectorClient") -public class VCloudDirectorClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class VCloudDirectorClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { public void testRestClientModuleWorksProperly() throws Exception { - VCloudDirectorClient clientWhenSessionsExist = requestSendsResponse(loginRequest, sessionResponse); + VCloudDirectorUserClient clientWhenSessionsExist = requestSendsResponse(loginRequest, sessionResponse); assertEquals(clientWhenSessionsExist.getCurrentSession(), SessionClientExpectTest.SESSION); } diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClientExpectTest.java index 9921d41933..74ecbec3a1 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClientExpectTest.java @@ -22,8 +22,8 @@ import static org.testng.Assert.assertEquals; import java.net.URI; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorClient; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; +import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient; import org.jclouds.vcloud.director.v1_5.domain.AdminCatalog; import org.jclouds.vcloud.director.v1_5.domain.CatalogItems; import org.jclouds.vcloud.director.v1_5.domain.Link; @@ -42,13 +42,7 @@ import com.google.common.collect.ImmutableSet; * @author grkvlt@apache.org */ @Test(groups = { "unit", "admin", "catalog" }, singleThreaded = true, testName = "CatalogClientExpectTest") -public class AdminCatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { - - private Reference orgRef = Reference.builder() - .type("application/vnd.vmware.vcloud.catalog+xml") - .name("QunyingTestCatalog") - .href(URI.create(endpoint + "/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4")) - .build(); +public class AdminCatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { private Reference catalogRef = Reference.builder() .type("application/vnd.vmware.vcloud.catalog+xml") @@ -58,7 +52,7 @@ public class AdminCatalogClientExpectTest extends BaseVCloudDirectorRestClientEx @Test public void testCreateCatalog() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/admin/org/???/catalogs") .xmlFilePayload("/catalog/admin/createCatalogSource.xml", VCloudDirectorMediaType.ADMIN_CATALOG) @@ -71,7 +65,7 @@ public class AdminCatalogClientExpectTest extends BaseVCloudDirectorRestClientEx AdminCatalog source = createCatalogSource(); AdminCatalog expected = createCatalog(); - assertEquals(client.getAdminCatalogClient().createCatalog(catalogRef.getHref(), source), expected); + assertEquals(client.getCatalogClient().createCatalog(catalogRef.getHref(), source), expected); } // FIXME temporarily disabling this test due to JAXB error: @@ -82,7 +76,7 @@ public class AdminCatalogClientExpectTest extends BaseVCloudDirectorRestClientEx // <{http://www.vmware.com/vcloud/v1.5}Task> @Test(enabled = false) public void testGetCatalog() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4") .acceptAnyMedia() @@ -93,7 +87,7 @@ public class AdminCatalogClientExpectTest extends BaseVCloudDirectorRestClientEx AdminCatalog expected = catalog(); - AdminCatalog actual = client.getAdminCatalogClient().getCatalog(catalogRef.getHref()); + AdminCatalog actual = client.getCatalogClient().getCatalog(catalogRef.getHref()); assertEquals(actual.getHref(), expected.getHref()); assertEquals(actual.getLinks(), expected.getLinks()); assertEquals(actual.getTasks(), expected.getTasks()); @@ -107,12 +101,12 @@ public class AdminCatalogClientExpectTest extends BaseVCloudDirectorRestClientEx assertEquals(actual.getOwner(), expected.getOwner()); - assertEquals(client.getAdminCatalogClient().getCatalog(catalogRef.getHref()), expected); + assertEquals(client.getCatalogClient().getCatalog(catalogRef.getHref()), expected); } @Test public void testModifyCatalog() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", "/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4") .xmlFilePayload("/catalog/admin/updateCatalogSource.xml", VCloudDirectorMediaType.ADMIN_CATALOG) @@ -124,12 +118,12 @@ public class AdminCatalogClientExpectTest extends BaseVCloudDirectorRestClientEx AdminCatalog expected = modifyCatalog(); - assertEquals(client.getAdminCatalogClient().updateCatalog(catalogRef.getHref(), expected), expected); + assertEquals(client.getCatalogClient().updateCatalog(catalogRef.getHref(), expected), expected); } @Test public void testGetOwner() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/owner") .acceptAnyMedia() @@ -151,12 +145,12 @@ public class AdminCatalogClientExpectTest extends BaseVCloudDirectorRestClientEx .build()) .build(); - assertEquals(client.getAdminCatalogClient().getOwner(catalogRef.getHref()), expected); + assertEquals(client.getCatalogClient().getOwner(catalogRef.getHref()), expected); } @Test public void testSetOwner() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", "/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/owner") .xmlFilePayload("/catalog/admin/updateOwnerSource.xml", VCloudDirectorMediaType.OWNER) @@ -174,12 +168,12 @@ public class AdminCatalogClientExpectTest extends BaseVCloudDirectorRestClientEx .build()) .build(); - client.getAdminCatalogClient().setOwner(catalogRef.getHref(), newOwner); + client.getCatalogClient().setOwner(catalogRef.getHref(), newOwner); } @Test public void testPublishCatalog() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/action/publish") .xmlFilePayload("/catalog/admin/publishCatalogParams.xml", VCloudDirectorMediaType.PUBLISH_CATALOG_PARAMS) @@ -192,12 +186,12 @@ public class AdminCatalogClientExpectTest extends BaseVCloudDirectorRestClientEx .isPublished(true) .build(); - client.getAdminCatalogClient().publishCatalog(catalogRef.getHref(), params); + client.getCatalogClient().publishCatalog(catalogRef.getHref(), params); } @Test public void testDeleteCatalog() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("DELETE", "/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4") .acceptAnyMedia() @@ -205,7 +199,7 @@ public class AdminCatalogClientExpectTest extends BaseVCloudDirectorRestClientEx new VcloudHttpResponsePrimer() .httpResponseBuilder().statusCode(204).build()); - client.getAdminCatalogClient().deleteCatalog(catalogRef.getHref()); + client.getCatalogClient().deleteCatalog(catalogRef.getHref()); } public static final AdminCatalog createCatalogSource() { diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClientLiveTest.java index add04a608b..1c652cb350 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClientLiveTest.java @@ -40,6 +40,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Owner; import org.jclouds.vcloud.director.v1_5.domain.PublishCatalogParams; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.User; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogClient; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; @@ -74,7 +75,7 @@ public class AdminCatalogClientLiveTest extends BaseVCloudDirectorClientLiveTest @Override @BeforeClass(alwaysRun = true) protected void setupRequiredClients() { - catalogClient = context.getApi().getAdminCatalogClient(); + catalogClient = adminContext.getApi().getCatalogClient(); orgRef = Iterables.getFirst(context.getApi().getOrgClient().getOrgList().getOrgs(), null).toAdminReference(endpoint); } @@ -109,8 +110,8 @@ public class AdminCatalogClientLiveTest extends BaseVCloudDirectorClientLiveTest @Test(testName = "PUT /admin/catalog/{id}/owner", dependsOnMethods = { "testGetCatalog" }) public void updateCatalogOwner() { - User newOwnerUser = UserClientLiveTest.randomTestUser("testUpdateCatalogOwner", context); - newOwnerUser = context.getApi().getUserClient().createUser(orgRef.getHref(), newOwnerUser); + User newOwnerUser = randomTestUser("testUpdateCatalogOwner"); + newOwnerUser = adminContext.getApi().getUserClient().createUser(orgRef.getHref(), newOwnerUser); assertNotNull(newOwnerUser, "failed to create temp user to test updateCatalogOwner"); Owner oldOwner = owner; @@ -129,7 +130,7 @@ public class AdminCatalogClientLiveTest extends BaseVCloudDirectorClientLiveTest } finally { catalogClient.setOwner(catalog.getHref(), oldOwner); owner = catalogClient.getOwner(catalog.getHref()); - context.getApi().getUserClient().deleteUser(newOwnerUser.getHref()); + adminContext.getApi().getUserClient().deleteUser(newOwnerUser.getHref()); } } diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminNetworkClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminNetworkClientExpectTest.java index 5d7d8bb3a4..498f473852 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminNetworkClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminNetworkClientExpectTest.java @@ -22,12 +22,13 @@ import static org.testng.Assert.assertEquals; import java.net.URI; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorClient; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; +import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient; import org.jclouds.vcloud.director.v1_5.domain.Link; import org.jclouds.vcloud.director.v1_5.domain.OrgNetwork; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.Task; +import org.jclouds.vcloud.director.v1_5.features.admin.GroupClient; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; import org.testng.annotations.Test; @@ -39,7 +40,7 @@ import com.google.common.collect.ImmutableSet; * @author danikov */ @Test(groups = { "unit", "admin", "network"}, singleThreaded = true, testName = "AdminNetworkClientExpectTest") -public class AdminNetworkClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class AdminNetworkClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { Reference networkRef = Reference.builder() .href(URI.create(endpoint+"/admin/network/b466c0c5-8a5c-4335-b703-a2e2e6b5f3e1")) @@ -47,7 +48,7 @@ public class AdminNetworkClientExpectTest extends BaseVCloudDirectorRestClientEx @Test public void testGetNetworkWithOrgNetwork() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/admin/network/b466c0c5-8a5c-4335-b703-a2e2e6b5f3e1") .acceptAnyMedia() @@ -58,12 +59,12 @@ public class AdminNetworkClientExpectTest extends BaseVCloudDirectorRestClientEx OrgNetwork expected = orgNetwork(); - assertEquals(client.getAdminNetworkClient().getNetwork(networkRef.getHref()), expected); + assertEquals(client.getNetworkClient().getNetwork(networkRef.getHref()), expected); } @Test public void testUpdateNetwork() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/admin/network/b466c0c5-8a5c-4335-b703-a2e2e6b5f3e1") .xmlFilePayload("/network/admin/updateNetworkSource.xml", VCloudDirectorMediaType.ORG_NETWORK) @@ -75,12 +76,12 @@ public class AdminNetworkClientExpectTest extends BaseVCloudDirectorRestClientEx Task expected = updateNetworkTask(); - assertEquals(client.getAdminNetworkClient().updateNetwork(networkRef.getHref(), updateNetwork()), expected); + assertEquals(client.getNetworkClient().updateNetwork(networkRef.getHref(), updateNetwork()), expected); } @Test(enabled = false) public void testResetNetwork() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/admin/network/b466c0c5-8a5c-4335-b703-a2e2e6b5f3e1/action/reset") .acceptMedia(VCloudDirectorMediaType.TASK) @@ -91,7 +92,7 @@ public class AdminNetworkClientExpectTest extends BaseVCloudDirectorRestClientEx Task expected = resetNetworkTask(); - assertEquals(client.getAdminNetworkClient().resetNetwork(networkRef.getHref()), expected); + assertEquals(client.getNetworkClient().resetNetwork(networkRef.getHref()), expected); } public final OrgNetwork orgNetwork() { diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminNetworkClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminNetworkClientLiveTest.java index b51db728c1..6818430fc2 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminNetworkClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminNetworkClientLiveTest.java @@ -39,6 +39,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.RouterInfo; import org.jclouds.vcloud.director.v1_5.domain.SyslogServerSettings; import org.jclouds.vcloud.director.v1_5.domain.Task; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminNetworkClient; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -67,7 +68,7 @@ public class AdminNetworkClientLiveTest extends BaseVCloudDirectorClientLiveTest @Override @BeforeClass(alwaysRun = true) protected void setupRequiredClients() { - networkClient = context.getApi().getAdminNetworkClient(); + networkClient = adminContext.getApi().getNetworkClient(); networkRef = Reference.builder().href(networkURI).build().toAdminReference(endpoint); } diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClientExpectTest.java index f2cd65ddf8..75729c42f2 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClientExpectTest.java @@ -22,8 +22,8 @@ import static org.testng.Assert.assertEquals; import java.net.URI; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorClient; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; +import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient; import org.jclouds.vcloud.director.v1_5.domain.AdminOrg; import org.jclouds.vcloud.director.v1_5.domain.CatalogsList; import org.jclouds.vcloud.director.v1_5.domain.GroupsList; @@ -40,6 +40,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.SmtpServerSettings; import org.jclouds.vcloud.director.v1_5.domain.UsersList; import org.jclouds.vcloud.director.v1_5.domain.Vdcs; +import org.jclouds.vcloud.director.v1_5.features.admin.GroupClient; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; import org.testng.annotations.Test; @@ -49,7 +50,7 @@ import org.testng.annotations.Test; * @author danikov */ @Test(groups = { "unit", "user", "org"}, singleThreaded = true, testName = "AdminOrgClientExpectTest") -public class AdminOrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class AdminOrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { private Reference orgRef = Reference.builder() .href(URI.create(endpoint + "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0")) @@ -57,7 +58,7 @@ public class AdminOrgClientExpectTest extends BaseVCloudDirectorRestClientExpect @Test public void testGetOrg() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0") .acceptAnyMedia() @@ -69,7 +70,335 @@ public class AdminOrgClientExpectTest extends BaseVCloudDirectorRestClientExpect AdminOrg expected = adminOrg(); - assertEquals(client.getAdminOrgClient().getOrg(orgRef.getHref()), expected); + assertEquals(client.getOrgClient().getOrg(orgRef.getHref()), expected); + } + + @Test(enabled = false) + public void testGetSettings() { + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, + new VcloudHttpRequestPrimer() + .apiCommand("GET", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/") + .acceptAnyMedia() + .httpRequestBuilder().build(), + new VcloudHttpResponsePrimer() + .xmlFilePayload("/org/admin/settings.xml", + VCloudDirectorMediaType.ORG_SETTINGS) + .httpResponseBuilder().build()); + + OrgSettings expected = settings(); + + assertEquals(client.getOrgClient().getSettings(orgRef.getHref()), expected); + } + + @Test(enabled = false) + public void testUpdateSettings() { + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, + new VcloudHttpRequestPrimer() + .apiCommand("PUT", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/") + .xmlFilePayload("/org/admin/updateSettingsSource.xml", + VCloudDirectorMediaType.ORG_SETTINGS) + .acceptMedia(VCloudDirectorMediaType.ORG_SETTINGS) + .httpRequestBuilder().build(), + new VcloudHttpResponsePrimer() + .xmlFilePayload("/org/admin/updateSettings.xml", + VCloudDirectorMediaType.ORG_SETTINGS) + .httpResponseBuilder().build()); + + OrgSettings expected = updateSettings(); + + assertEquals(client.getOrgClient().updateSettings(orgRef.getHref(), expected), expected); + } + + @Test + public void testGetEmailSettings() { + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, + new VcloudHttpRequestPrimer() + .apiCommand("GET", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/email") + .acceptAnyMedia() + .httpRequestBuilder().build(), + new VcloudHttpResponsePrimer() + .xmlFilePayload("/org/admin/emailSettings.xml", + VCloudDirectorMediaType.ORG_GENERAL_SETTINGS) + .httpResponseBuilder().build()); + + OrgEmailSettings expected = emailSettings(); + + assertEquals(client.getOrgClient().getEmailSettings(orgRef.getHref()), expected); + } + + @Test + public void testUpdateEmailSettings() { + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, + new VcloudHttpRequestPrimer() + .apiCommand("PUT", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/email") + .xmlFilePayload("/org/admin/updateEmailSettingsSource.xml", + VCloudDirectorMediaType.ORG_EMAIL_SETTINGS) + .acceptMedia(VCloudDirectorMediaType.ORG_EMAIL_SETTINGS) + .httpRequestBuilder().build(), + new VcloudHttpResponsePrimer() + .xmlFilePayload("/org/admin/updateEmailSettings.xml", + VCloudDirectorMediaType.ORG_EMAIL_SETTINGS) + .httpResponseBuilder().build()); + + OrgEmailSettings expected = updateEmailSettings(); + + assertEquals(client.getOrgClient().updateEmailSettings(orgRef.getHref(), expected), expected); + } + + @Test(enabled = false) + public void testGetGeneralSettings() { + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, + new VcloudHttpRequestPrimer() + .apiCommand("GET", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/general") + .acceptAnyMedia() + .httpRequestBuilder().build(), + new VcloudHttpResponsePrimer() + .xmlFilePayload("/org/admin/generalSettings.xml", + VCloudDirectorMediaType.ORG_GENERAL_SETTINGS) + .httpResponseBuilder().build()); + + OrgGeneralSettings expected = generalSettings(); + + assertEquals(client.getOrgClient().getGeneralSettings(orgRef.getHref()), expected); + } + + public static final OrgGeneralSettings generalSettings() { + return OrgGeneralSettings.builder() + .type("application/vnd.vmware.admin.organizationGeneralSettings+xml") + .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/general")) + .link(Link.builder() + .rel("edit") + .type("application/vnd.vmware.admin.organizationGeneralSettings+xml") + .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/general")) + .build()) + .canPublishCatalogs(false) + .deployedVMQuota(0) + .storedVmQuota(0) + .useServerBootSequence(false) + .delayAfterPowerOnSeconds(0) + .build(); + } + + @Test(enabled = false) + public void testUpdateGeneralSettings() { + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, + new VcloudHttpRequestPrimer() + .apiCommand("PUT", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/general") + .xmlFilePayload("/org/admin/updateGeneralSettingsSource.xml", + VCloudDirectorMediaType.ORG_GENERAL_SETTINGS) + .acceptMedia(VCloudDirectorMediaType.ORG_GENERAL_SETTINGS) + .httpRequestBuilder().build(), + new VcloudHttpResponsePrimer() + .xmlFilePayload("/org/admin/updateGeneralSettings.xml", + VCloudDirectorMediaType.ORG_GENERAL_SETTINGS) + .httpResponseBuilder().build()); + + OrgGeneralSettings expected = updateGeneralSettings(); + + assertEquals(client.getOrgClient().updateGeneralSettings(orgRef.getHref(), expected), expected); + } + + public static final OrgGeneralSettings updateGeneralSettings() { + return generalSettings().toBuilder() + + .build(); + } + + @Test + public void testGetLdapSettings() { + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, + new VcloudHttpRequestPrimer() + .apiCommand("GET", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/ldap") + .acceptAnyMedia() + .httpRequestBuilder().build(), + new VcloudHttpResponsePrimer() + .xmlFilePayload("/org/admin/ldapSettings.xml", + VCloudDirectorMediaType.ORG_LDAP_SETTINGS) + .httpResponseBuilder().build()); + + OrgLdapSettings expected = ldapSettings(); + + assertEquals(client.getOrgClient().getLdapSettings(orgRef.getHref()), expected); + } + + public static final OrgLdapSettings ldapSettings() { + return OrgLdapSettings.builder() + .type("application/vnd.vmware.admin.organizationLdapSettings+xml") + .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/ldap")) + .ldapMode("NONE") + .build(); + } + + @Test + public void testGetPasswordPolicy() { + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, + new VcloudHttpRequestPrimer() + .apiCommand("GET", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/passwordPolicy") + .acceptAnyMedia() + .httpRequestBuilder().build(), + new VcloudHttpResponsePrimer() + .xmlFilePayload("/org/admin/passwordPolicy.xml", + VCloudDirectorMediaType.ORG_PASSWORD_POLICY_SETTINGS) + .httpResponseBuilder().build()); + + OrgPasswordPolicySettings expected = passwordPolicy(); + + assertEquals(client.getOrgClient().getPasswordPolicy(orgRef.getHref()), expected); + } + + public static final OrgPasswordPolicySettings passwordPolicy() { + return OrgPasswordPolicySettings.builder() + .type("application/vnd.vmware.admin.organizationPasswordPolicySettings+xml") + .link(Link.builder() + .rel("edit") + .type("application/vnd.vmware.admin.organizationPasswordPolicySettings+xml") + .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/passwordPolicy")) + .build()) + .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/passwordPolicy")) + .accountLockoutEnabled(false) + .invalidLoginsBeforeLockout(5) + .accountLockoutIntervalMinutes(10) + .build(); + } + + @Test + public void testUpdatePasswordPolicy() { + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, + new VcloudHttpRequestPrimer() + .apiCommand("PUT", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/passwordPolicy") + .xmlFilePayload("/org/admin/updatePasswordPolicySource.xml", + VCloudDirectorMediaType.ORG_PASSWORD_POLICY_SETTINGS) + .acceptMedia(VCloudDirectorMediaType.ORG_PASSWORD_POLICY_SETTINGS) + .httpRequestBuilder().build(), + new VcloudHttpResponsePrimer() + .xmlFilePayload("/org/admin/updatePasswordPolicy.xml", + VCloudDirectorMediaType.ORG_PASSWORD_POLICY_SETTINGS) + .httpResponseBuilder().build()); + + OrgPasswordPolicySettings expected = updateOrgPasswordPolicy(); + + assertEquals(client.getOrgClient().updatePasswordPolicy(orgRef.getHref(), expected), expected); + } + + public static final OrgPasswordPolicySettings updateOrgPasswordPolicy() { + return passwordPolicy().toBuilder() + .accountLockoutEnabled(true) + .invalidLoginsBeforeLockout(6) + .accountLockoutIntervalMinutes(11) + .build(); + } + + @Test(enabled = false) + public void testGetVAppLeaseSettings() { + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, + new VcloudHttpRequestPrimer() + .apiCommand("GET", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppLeaseSettings") + .acceptAnyMedia() + .httpRequestBuilder().build(), + new VcloudHttpResponsePrimer() + .xmlFilePayload("/org/admin/vAppLeaseSettings.xml", + VCloudDirectorMediaType.ORG_LEASE_SETTINGS) + .httpResponseBuilder().build()); + + OrgLeaseSettings expected = vAppLeaseSettings(); + + assertEquals(client.getOrgClient().getVAppLeaseSettings(orgRef.getHref()), expected); + } + + public static final OrgLeaseSettings vAppLeaseSettings() { + return OrgLeaseSettings.builder() + .type("application/vnd.vmware.admin.vAppLeaseSettings+xml") + .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppLeaseSettings")) + .link(Link.builder() + .rel("edit") + .type("application/vnd.vmware.admin.vAppLeaseSettings+xml") + .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppLeaseSettings")) + .build()) + .deleteOnStorageLeaseExpiration(false) + .deploymentLeaseSeconds(0) + .storageLeaseSeconds(0) + .build(); + } + + @Test(enabled = false) + public void testUpdateOrgVAppLeaseSettings() { + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, + new VcloudHttpRequestPrimer() + .apiCommand("PUT", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppLeaseSettings") + .xmlFilePayload("/org/admin/updateVAppLeaseSettingsSource.xml", + VCloudDirectorMediaType.ORG_LEASE_SETTINGS) + .acceptMedia(VCloudDirectorMediaType.ORG_LEASE_SETTINGS) + .httpRequestBuilder().build(), + new VcloudHttpResponsePrimer() + .xmlFilePayload("/org/admin/updateVAppLeaseSettings.xml", + VCloudDirectorMediaType.ORG_LEASE_SETTINGS) + .httpResponseBuilder().build()); + + OrgLeaseSettings expected = updateVAppLeaseSettings(); + + assertEquals(client.getOrgClient().updateVAppLeaseSettings(orgRef.getHref(), expected), expected); + } + + public static final OrgLeaseSettings updateVAppLeaseSettings() { + return vAppLeaseSettings().toBuilder() + + .build(); + } + + @Test(enabled = false) + public void testGetVAppTemplateLeaseSettings() { + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, + new VcloudHttpRequestPrimer() + .apiCommand("GET", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppTemplateLeaseSettings") + .acceptAnyMedia() + .httpRequestBuilder().build(), + new VcloudHttpResponsePrimer() + .xmlFilePayload("/org/admin/vAppTemplateLeaseSettings.xml", + VCloudDirectorMediaType.ORG_VAPP_TEMPLATE_LEASE_SETTINGS) + .httpResponseBuilder().build()); + + OrgVAppTemplateLeaseSettings expected = vAppTemplateLeaseSettings(); + + assertEquals(client.getOrgClient().getVAppTemplateLeaseSettings(orgRef.getHref()), expected); + } + + public static final OrgVAppTemplateLeaseSettings vAppTemplateLeaseSettings() { + return OrgVAppTemplateLeaseSettings.builder() + .type("application/vnd.vmware.admin.vAppTemplateLeaseSettings+xml") + .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppTemplateLeaseSettings")) + .link(Link.builder() + .rel("edit") + .type("application/vnd.vmware.admin.vAppTemplateLeaseSettings+xml") + .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppTemplateLeaseSettings")) + .build()) + .deleteOnStorageLeaseExpiration(false) + .storageLeaseSeconds(0) + .build(); + } + + @Test(enabled = false) + public void testUpdateOrgVAppTemplateLeaseSettings() { + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, + new VcloudHttpRequestPrimer() + .apiCommand("PUT", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppTemplateLeaseSettings") + .xmlFilePayload("/org/admin/updateVAppLeaseSettingsSource.xml", + VCloudDirectorMediaType.ORG_VAPP_TEMPLATE_LEASE_SETTINGS) + .acceptMedia(VCloudDirectorMediaType.ORG_VAPP_TEMPLATE_LEASE_SETTINGS) + .httpRequestBuilder().build(), + new VcloudHttpResponsePrimer() + .xmlFilePayload("/org/admin/updateVAppLeaseSettings.xml", + VCloudDirectorMediaType.ORG_VAPP_TEMPLATE_LEASE_SETTINGS) + .httpResponseBuilder().build()); + + OrgVAppTemplateLeaseSettings expected = updateVAppTemplateLeaseSettings(); + + assertEquals(client.getOrgClient().updateVAppTemplateLeaseSettings(orgRef.getHref(), expected), expected); + } + + public static final OrgVAppTemplateLeaseSettings updateVAppTemplateLeaseSettings() { + return vAppTemplateLeaseSettings().toBuilder() + + .build(); } public static final AdminOrg adminOrg() { @@ -199,23 +528,6 @@ public class AdminOrgClientExpectTest extends BaseVCloudDirectorRestClientExpect .build(); } - @Test(enabled = false) - public void testGetSettings() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, - new VcloudHttpRequestPrimer() - .apiCommand("GET", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/") - .acceptAnyMedia() - .httpRequestBuilder().build(), - new VcloudHttpResponsePrimer() - .xmlFilePayload("/org/admin/settings.xml", - VCloudDirectorMediaType.ORG_SETTINGS) - .httpResponseBuilder().build()); - - OrgSettings expected = settings(); - - assertEquals(client.getAdminOrgClient().getSettings(orgRef.getHref()), expected); - } - public static final OrgSettings settings() { return OrgSettings.builder() .type("application/vnd.vmware.admin.orgSettings+xml") @@ -264,47 +576,11 @@ public class AdminOrgClientExpectTest extends BaseVCloudDirectorRestClientExpect .build(); } - @Test(enabled = false) - public void testUpdateSettings() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, - new VcloudHttpRequestPrimer() - .apiCommand("PUT", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/") - .xmlFilePayload("/org/admin/updateSettingsSource.xml", - VCloudDirectorMediaType.ORG_SETTINGS) - .acceptMedia(VCloudDirectorMediaType.ORG_SETTINGS) - .httpRequestBuilder().build(), - new VcloudHttpResponsePrimer() - .xmlFilePayload("/org/admin/updateSettings.xml", - VCloudDirectorMediaType.ORG_SETTINGS) - .httpResponseBuilder().build()); - - OrgSettings expected = updateSettings(); - - assertEquals(client.getAdminOrgClient().updateSettings(orgRef.getHref(), expected), expected); - } - @Test public static final OrgSettings updateSettings() { return settings().toBuilder() .build(); } - - @Test - public void testGetEmailSettings() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, - new VcloudHttpRequestPrimer() - .apiCommand("GET", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/email") - .acceptAnyMedia() - .httpRequestBuilder().build(), - new VcloudHttpResponsePrimer() - .xmlFilePayload("/org/admin/emailSettings.xml", - VCloudDirectorMediaType.ORG_GENERAL_SETTINGS) - .httpResponseBuilder().build()); - - OrgEmailSettings expected = emailSettings(); - - assertEquals(client.getAdminOrgClient().getEmailSettings(orgRef.getHref()), expected); - } public static final OrgEmailSettings emailSettings() { return OrgEmailSettings.builder() @@ -329,25 +605,6 @@ public class AdminOrgClientExpectTest extends BaseVCloudDirectorRestClientExpect .build(); } - @Test - public void testUpdateEmailSettings() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, - new VcloudHttpRequestPrimer() - .apiCommand("PUT", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/email") - .xmlFilePayload("/org/admin/updateEmailSettingsSource.xml", - VCloudDirectorMediaType.ORG_EMAIL_SETTINGS) - .acceptMedia(VCloudDirectorMediaType.ORG_EMAIL_SETTINGS) - .httpRequestBuilder().build(), - new VcloudHttpResponsePrimer() - .xmlFilePayload("/org/admin/updateEmailSettings.xml", - VCloudDirectorMediaType.ORG_EMAIL_SETTINGS) - .httpResponseBuilder().build()); - - OrgEmailSettings expected = updateEmailSettings(); - - assertEquals(client.getAdminOrgClient().updateEmailSettings(orgRef.getHref(), expected), expected); - } - @Test public static final OrgEmailSettings updateEmailSettings() { return emailSettings().toBuilder() @@ -364,259 +621,4 @@ public class AdminOrgClientExpectTest extends BaseVCloudDirectorRestClientExpect .build(); } - @Test(enabled = false) - public void testGetGeneralSettings() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, - new VcloudHttpRequestPrimer() - .apiCommand("GET", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/general") - .acceptAnyMedia() - .httpRequestBuilder().build(), - new VcloudHttpResponsePrimer() - .xmlFilePayload("/org/admin/generalSettings.xml", - VCloudDirectorMediaType.ORG_GENERAL_SETTINGS) - .httpResponseBuilder().build()); - - OrgGeneralSettings expected = generalSettings(); - - assertEquals(client.getAdminOrgClient().getGeneralSettings(orgRef.getHref()), expected); - } - - public static final OrgGeneralSettings generalSettings() { - return OrgGeneralSettings.builder() - .type("application/vnd.vmware.admin.organizationGeneralSettings+xml") - .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/general")) - .link(Link.builder() - .rel("edit") - .type("application/vnd.vmware.admin.organizationGeneralSettings+xml") - .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/general")) - .build()) - .canPublishCatalogs(false) - .deployedVMQuota(0) - .storedVmQuota(0) - .useServerBootSequence(false) - .delayAfterPowerOnSeconds(0) - .build(); - } - - @Test(enabled = false) - public void testUpdateGeneralSettings() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, - new VcloudHttpRequestPrimer() - .apiCommand("PUT", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/general") - .xmlFilePayload("/org/admin/updateGeneralSettingsSource.xml", - VCloudDirectorMediaType.ORG_GENERAL_SETTINGS) - .acceptMedia(VCloudDirectorMediaType.ORG_GENERAL_SETTINGS) - .httpRequestBuilder().build(), - new VcloudHttpResponsePrimer() - .xmlFilePayload("/org/admin/updateGeneralSettings.xml", - VCloudDirectorMediaType.ORG_GENERAL_SETTINGS) - .httpResponseBuilder().build()); - - OrgGeneralSettings expected = updateGeneralSettings(); - - assertEquals(client.getAdminOrgClient().updateGeneralSettings(orgRef.getHref(), expected), expected); - } - - public static final OrgGeneralSettings updateGeneralSettings() { - return generalSettings().toBuilder() - - .build(); - } - - @Test - public void testGetLdapSettings() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, - new VcloudHttpRequestPrimer() - .apiCommand("GET", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/ldap") - .acceptAnyMedia() - .httpRequestBuilder().build(), - new VcloudHttpResponsePrimer() - .xmlFilePayload("/org/admin/ldapSettings.xml", - VCloudDirectorMediaType.ORG_LDAP_SETTINGS) - .httpResponseBuilder().build()); - - OrgLdapSettings expected = ldapSettings(); - - assertEquals(client.getAdminOrgClient().getLdapSettings(orgRef.getHref()), expected); - } - - public static final OrgLdapSettings ldapSettings() { - return OrgLdapSettings.builder() - .type("application/vnd.vmware.admin.organizationLdapSettings+xml") - .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/ldap")) - .ldapMode("NONE") - .build(); - } - - @Test - public void testGetPasswordPolicy() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, - new VcloudHttpRequestPrimer() - .apiCommand("GET", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/passwordPolicy") - .acceptAnyMedia() - .httpRequestBuilder().build(), - new VcloudHttpResponsePrimer() - .xmlFilePayload("/org/admin/passwordPolicy.xml", - VCloudDirectorMediaType.ORG_PASSWORD_POLICY_SETTINGS) - .httpResponseBuilder().build()); - - OrgPasswordPolicySettings expected = passwordPolicy(); - - assertEquals(client.getAdminOrgClient().getPasswordPolicy(orgRef.getHref()), expected); - } - - public static final OrgPasswordPolicySettings passwordPolicy() { - return OrgPasswordPolicySettings.builder() - .type("application/vnd.vmware.admin.organizationPasswordPolicySettings+xml") - .link(Link.builder() - .rel("edit") - .type("application/vnd.vmware.admin.organizationPasswordPolicySettings+xml") - .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/passwordPolicy")) - .build()) - .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/passwordPolicy")) - .accountLockoutEnabled(false) - .invalidLoginsBeforeLockout(5) - .accountLockoutIntervalMinutes(10) - .build(); - } - - @Test - public void testUpdatePasswordPolicy() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, - new VcloudHttpRequestPrimer() - .apiCommand("PUT", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/passwordPolicy") - .xmlFilePayload("/org/admin/updatePasswordPolicySource.xml", - VCloudDirectorMediaType.ORG_PASSWORD_POLICY_SETTINGS) - .acceptMedia(VCloudDirectorMediaType.ORG_PASSWORD_POLICY_SETTINGS) - .httpRequestBuilder().build(), - new VcloudHttpResponsePrimer() - .xmlFilePayload("/org/admin/updatePasswordPolicy.xml", - VCloudDirectorMediaType.ORG_PASSWORD_POLICY_SETTINGS) - .httpResponseBuilder().build()); - - OrgPasswordPolicySettings expected = updateOrgPasswordPolicy(); - - assertEquals(client.getAdminOrgClient().updatePasswordPolicy(orgRef.getHref(), expected), expected); - } - - public static final OrgPasswordPolicySettings updateOrgPasswordPolicy() { - return passwordPolicy().toBuilder() - .accountLockoutEnabled(true) - .invalidLoginsBeforeLockout(6) - .accountLockoutIntervalMinutes(11) - .build(); - } - - @Test(enabled = false) - public void testGetVAppLeaseSettings() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, - new VcloudHttpRequestPrimer() - .apiCommand("GET", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppLeaseSettings") - .acceptAnyMedia() - .httpRequestBuilder().build(), - new VcloudHttpResponsePrimer() - .xmlFilePayload("/org/admin/vAppLeaseSettings.xml", - VCloudDirectorMediaType.ORG_LEASE_SETTINGS) - .httpResponseBuilder().build()); - - OrgLeaseSettings expected = vAppLeaseSettings(); - - assertEquals(client.getAdminOrgClient().getVAppLeaseSettings(orgRef.getHref()), expected); - } - - public static final OrgLeaseSettings vAppLeaseSettings() { - return OrgLeaseSettings.builder() - .type("application/vnd.vmware.admin.vAppLeaseSettings+xml") - .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppLeaseSettings")) - .link(Link.builder() - .rel("edit") - .type("application/vnd.vmware.admin.vAppLeaseSettings+xml") - .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppLeaseSettings")) - .build()) - .deleteOnStorageLeaseExpiration(false) - .deploymentLeaseSeconds(0) - .storageLeaseSeconds(0) - .build(); - } - - @Test(enabled = false) - public void testUpdateOrgVAppLeaseSettings() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, - new VcloudHttpRequestPrimer() - .apiCommand("PUT", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppLeaseSettings") - .xmlFilePayload("/org/admin/updateVAppLeaseSettingsSource.xml", - VCloudDirectorMediaType.ORG_LEASE_SETTINGS) - .acceptMedia(VCloudDirectorMediaType.ORG_LEASE_SETTINGS) - .httpRequestBuilder().build(), - new VcloudHttpResponsePrimer() - .xmlFilePayload("/org/admin/updateVAppLeaseSettings.xml", - VCloudDirectorMediaType.ORG_LEASE_SETTINGS) - .httpResponseBuilder().build()); - - OrgLeaseSettings expected = updateVAppLeaseSettings(); - - assertEquals(client.getAdminOrgClient().updateVAppLeaseSettings(orgRef.getHref(), expected), expected); - } - - public static final OrgLeaseSettings updateVAppLeaseSettings() { - return vAppLeaseSettings().toBuilder() - - .build(); - } - - @Test(enabled = false) - public void testGetVAppTemplateLeaseSettings() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, - new VcloudHttpRequestPrimer() - .apiCommand("GET", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppTemplateLeaseSettings") - .acceptAnyMedia() - .httpRequestBuilder().build(), - new VcloudHttpResponsePrimer() - .xmlFilePayload("/org/admin/vAppTemplateLeaseSettings.xml", - VCloudDirectorMediaType.ORG_VAPP_TEMPLATE_LEASE_SETTINGS) - .httpResponseBuilder().build()); - - OrgVAppTemplateLeaseSettings expected = vAppTemplateLeaseSettings(); - - assertEquals(client.getAdminOrgClient().getVAppTemplateLeaseSettings(orgRef.getHref()), expected); - } - - public static final OrgVAppTemplateLeaseSettings vAppTemplateLeaseSettings() { - return OrgVAppTemplateLeaseSettings.builder() - .type("application/vnd.vmware.admin.vAppTemplateLeaseSettings+xml") - .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppTemplateLeaseSettings")) - .link(Link.builder() - .rel("edit") - .type("application/vnd.vmware.admin.vAppTemplateLeaseSettings+xml") - .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppTemplateLeaseSettings")) - .build()) - .deleteOnStorageLeaseExpiration(false) - .storageLeaseSeconds(0) - .build(); - } - - @Test(enabled = false) - public void testUpdateOrgVAppTemplateLeaseSettings() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, - new VcloudHttpRequestPrimer() - .apiCommand("PUT", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppTemplateLeaseSettings") - .xmlFilePayload("/org/admin/updateVAppLeaseSettingsSource.xml", - VCloudDirectorMediaType.ORG_VAPP_TEMPLATE_LEASE_SETTINGS) - .acceptMedia(VCloudDirectorMediaType.ORG_VAPP_TEMPLATE_LEASE_SETTINGS) - .httpRequestBuilder().build(), - new VcloudHttpResponsePrimer() - .xmlFilePayload("/org/admin/updateVAppLeaseSettings.xml", - VCloudDirectorMediaType.ORG_VAPP_TEMPLATE_LEASE_SETTINGS) - .httpResponseBuilder().build()); - - OrgVAppTemplateLeaseSettings expected = updateVAppTemplateLeaseSettings(); - - assertEquals(client.getAdminOrgClient().updateVAppTemplateLeaseSettings(orgRef.getHref(), expected), expected); - } - - public static final OrgVAppTemplateLeaseSettings updateVAppTemplateLeaseSettings() { - return vAppTemplateLeaseSettings().toBuilder() - - .build(); - } } diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClientLiveTest.java index def0438b7f..df4964adce 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClientLiveTest.java @@ -35,6 +35,7 @@ import org.jclouds.vcloud.director.v1_5.domain.OrgSettings; import org.jclouds.vcloud.director.v1_5.domain.OrgVAppTemplateLeaseSettings; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.SmtpServerSettings; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminOrgClient; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -72,7 +73,7 @@ public class AdminOrgClientLiveTest extends BaseVCloudDirectorClientLiveTest { @Override @BeforeClass(alwaysRun = true) public void setupRequiredClients() { - orgClient = context.getApi().getAdminOrgClient(); + orgClient = adminContext.getApi().getOrgClient(); orgRef = Iterables.getFirst(orgClient.getOrgList().getOrgs(), null).toAdminReference(endpoint); assertNotNull(orgRef, String.format(REF_REQ_LIVE, "admin org")); } diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClientExpectTest.java index 89c007bf35..d9f5b1331e 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClientExpectTest.java @@ -24,12 +24,12 @@ import java.net.URI; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorClient; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; +import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient; import org.jclouds.vcloud.director.v1_5.domain.Link; -import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecordType; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRoleRecord; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryClient; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; import org.testng.annotations.Test; @@ -41,7 +41,7 @@ import com.google.common.collect.ImmutableMultimap; * @author Aled Sage */ @Test(groups = { "unit", "admin", "query" }, singleThreaded = true, testName = "AdminQueryClientExpectTest") -public class AdminQueryClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class AdminQueryClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { // TODO Write expect tests for all other admin-query operations @@ -64,7 +64,7 @@ public class AdminQueryClientExpectTest extends BaseVCloudDirectorRestClientExpe .payload(payloadFromResourceWithContentType("/query/admin/allGroups.xml", VCloudDirectorMediaType.QUERY_RESULT_RECORDS + ";version=1.5")) .build(); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, queryRequest, queryResponse); + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, queryRequest, queryResponse); QueryResultRecords expected = QueryResultRecords.builder() .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/groups/query?page=1&pageSize=25&format=records")) @@ -85,7 +85,7 @@ public class AdminQueryClientExpectTest extends BaseVCloudDirectorRestClientExpe .build()) .build(); - assertEquals(client.getAdminQueryClient().groupsQueryAll(), expected); + assertEquals(client.getQueryClient().groupsQueryAll(), expected); } // @@ -112,7 +112,7 @@ public class AdminQueryClientExpectTest extends BaseVCloudDirectorRestClientExpe .payload(payloadFromResourceWithContentType("/query/admin/allRoles.xml", VCloudDirectorMediaType.QUERY_RESULT_RECORDS + ";version=1.5")) .build(); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, queryRequest, queryResponse); + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, queryRequest, queryResponse); QueryResultRecords expected = QueryResultRecords.builder() .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/roles/query?page=1&pageSize=25&format=records")) @@ -138,7 +138,7 @@ public class AdminQueryClientExpectTest extends BaseVCloudDirectorRestClientExpe .build()) .build(); - assertEquals(client.getAdminQueryClient().rolesQueryAll(), expected); + assertEquals(client.getQueryClient().rolesQueryAll(), expected); } } diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClientLiveTest.java index cf49f5ede7..94dd70cc5e 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClientLiveTest.java @@ -30,6 +30,7 @@ import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRightRecord; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRoleRecord; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultStrandedUserRecord; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryClient; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -51,7 +52,7 @@ public class AdminQueryClientLiveTest extends BaseVCloudDirectorClientLiveTest { @Override @BeforeClass(alwaysRun = true) public void setupRequiredClients() { - queryClient = context.getApi().getAdminQueryClient(); + queryClient = adminContext.getApi().getQueryClient(); } @Test(testName = "GET /admin/groups/query") diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminVdcClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminVdcClientExpectTest.java index 2977902615..7a57aa7da5 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminVdcClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminVdcClientExpectTest.java @@ -22,8 +22,8 @@ import static org.testng.Assert.assertEquals; import java.net.URI; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorClient; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; +import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient; import org.jclouds.vcloud.director.v1_5.domain.AdminVdc; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; @@ -35,7 +35,7 @@ import org.testng.annotations.Test; * @author danikov */ @Test(groups = { "unit", "admin", "vdc" }, singleThreaded = true, testName = "AdminVdcClientExpectTest") -public class AdminVdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class AdminVdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { private Reference vdcRef = Reference.builder() .href(URI.create(endpoint + "???")) @@ -43,7 +43,7 @@ public class AdminVdcClientExpectTest extends BaseVCloudDirectorRestClientExpect @Test( enabled = false ) public void testGetVdc() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/admin/vdc/???") .acceptAnyMedia() @@ -55,7 +55,7 @@ public class AdminVdcClientExpectTest extends BaseVCloudDirectorRestClientExpect AdminVdc expected = adminVdc(); - assertEquals(client.getAdminVdcClient().getVdc(vdcRef.getHref()), expected); + assertEquals(client.getVdcClient().getVdc(vdcRef.getHref()), expected); } public static final AdminVdc adminVdc() { diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminVdcClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminVdcClientLiveTest.java index 7eb335c44c..5b86e24142 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminVdcClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminVdcClientLiveTest.java @@ -33,6 +33,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Metadata; import org.jclouds.vcloud.director.v1_5.domain.MetadataEntry; import org.jclouds.vcloud.director.v1_5.domain.MetadataValue; import org.jclouds.vcloud.director.v1_5.domain.Task; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminVdcClient; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; @@ -62,7 +63,7 @@ public class AdminVdcClientLiveTest extends BaseVCloudDirectorClientLiveTest { @Override @BeforeClass(alwaysRun = true) public void setupRequiredClients() { - vdcClient = context.getApi().getAdminVdcClient(); + vdcClient = adminContext.getApi().getVdcClient(); metadataClient = vdcClient.getMetadataClient(); assertNotNull(vdcURI, String.format(REF_REQ_LIVE, VDC)); adminVdcUri = toAdminUri(vdcURI); diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientExpectTest.java index 2d202cdc6a..1488b8254c 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientExpectTest.java @@ -24,8 +24,8 @@ import java.net.URI; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorClient; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; +import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient; import org.jclouds.vcloud.director.v1_5.domain.CatalogItem; import org.jclouds.vcloud.director.v1_5.domain.CatalogItems; import org.jclouds.vcloud.director.v1_5.domain.CatalogType; @@ -47,7 +47,7 @@ import com.google.common.collect.ImmutableSet; * @author grkvlt@apache.org */ @Test(groups = { "unit", "user", "catalog" }, singleThreaded = true, testName = "CatalogClientExpectTest") -public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { @Test public void testGetCatalog() { @@ -65,7 +65,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .payload(payloadFromResourceWithContentType("/catalog/catalog.xml", VCloudDirectorMediaType.CATALOG + ";version=1.5")) .build(); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogRequest, catalogResponse); + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogRequest, catalogResponse); CatalogType expected = catalog(); @@ -90,7 +90,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .payload(payloadFromResourceWithContentType("/catalog/createdCatalogItem.xml", VCloudDirectorMediaType.CATALOG_ITEM + ";version=1.5")) .build(); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); URI catalogURI = URI.create(endpoint + "/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"); @@ -121,7 +121,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .payload(payloadFromResourceWithContentType("/catalog/catalogMetadata.xml", VCloudDirectorMediaType.METADATA)) .build(); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogRequest, catalogResponse); + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogRequest, catalogResponse); URI catalogURI = URI.create(endpoint + "/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"); @@ -155,7 +155,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .payload(payloadFromResourceWithContentType("/catalog/catalogMetadataValue.xml", VCloudDirectorMediaType.METADATA_VALUE)) .build(); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogRequest, catalogResponse); + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogRequest, catalogResponse); URI catalogURI = URI.create(endpoint + "/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"); @@ -180,13 +180,13 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .payload(payloadFromResourceWithContentType("/catalog/catalogItem.xml", VCloudDirectorMediaType.CATALOG_ITEM)) .build(); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); - URI catalogItemURI = URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"); - - CatalogItem expected = catalogItem(); - - assertEquals(client.getCatalogClient().getCatalogItem(catalogItemURI), expected); + URI catalogItemURI = URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"); + + CatalogItem expected = catalogItem(); + + assertEquals(client.getCatalogClient().getCatalogItem(catalogItemURI), expected); } @Test @@ -206,7 +206,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .payload(payloadFromResourceWithContentType("/catalog/updateCatalogItem.xml", VCloudDirectorMediaType.CATALOG_ITEM + ";version=1.5")) .build(); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); URI catalogItemURI = URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"); CatalogItem expected = catalogItem(); @@ -229,7 +229,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .statusCode(200) .build(); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); URI catalogItemURI = URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"); @@ -252,7 +252,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .payload(payloadFromResourceWithContentType("/catalog/catalogItemMetadata.xml", VCloudDirectorMediaType.METADATA)) .build(); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); URI catalogItemURI = URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"); @@ -287,7 +287,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .payload(payloadFromResourceWithContentType("/catalog/mergeMetadataTask.xml", VCloudDirectorMediaType.TASK + ";version=1.5")) .build(); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); URI catalogItemURI = URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"); @@ -314,7 +314,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .payload(payloadFromResourceWithContentType("/catalog/catalogItemMetadataValue.xml", VCloudDirectorMediaType.METADATA_VALUE + ";version=1.5")) .build(); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); URI catalogItemURI = URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"); @@ -340,7 +340,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .payload(payloadFromResourceWithContentType("/catalog/setMetadataValueTask.xml", VCloudDirectorMediaType.TASK + ";version=1.5")) .build(); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); URI catalogItemURI = URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"); @@ -367,7 +367,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .payload(payloadFromResourceWithContentType("/catalog/deleteMetadataEntryTask.xml", VCloudDirectorMediaType.TASK)) .build(); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); URI catalogItemURI = URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"); @@ -376,43 +376,42 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT assertEquals(client.getCatalogClient().getCatalogItemMetadataClient().deleteMetadataEntry(catalogItemURI, "KEY"), expected); } - @SuppressWarnings("unchecked") public static final CatalogType catalog() { return CatalogType.builder() - .name("QunyingTestCatalog") - .type("application/vnd.vmware.vcloud.catalog+xml") - .id("urn:vcloud:catalog:7212e451-76e1-4631-b2de-ba1dfd8080e4") - .href(URI.create("https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4")) - .link(Link.builder() - .rel("up") - .type("application/vnd.vmware.vcloud.org+xml") - .href(URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0")) - .build()) - .link(Link.builder() - .rel("add") - .type("application/vnd.vmware.vcloud.catalogItem+xml") - .href(URI.create("https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/catalogItems")) - .build()) - .link(Link.builder() - .rel("down") - .type("application/vnd.vmware.vcloud.metadata+xml") - .href(URI.create("https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/metadata")) - .build()) - .catalogItems(CatalogItems.builder() - .item(Reference.builder() - .type("application/vnd.vmware.vcloud.catalogItem+xml") - .name("ubuntu10") - .href(URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df")) - .build()) - .item(Reference.builder() - .type("application/vnd.vmware.vcloud.catalogItem+xml") - .name("imageTesting") - .href(URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a9e0afdb-a42b-4688-8409-2ac68cf22939")) - .build()) - .build()) - .description("Testing") - .isPublished(false) - .build(); + .name("QunyingTestCatalog") + .type("application/vnd.vmware.vcloud.catalog+xml") + .id("urn:vcloud:catalog:7212e451-76e1-4631-b2de-ba1dfd8080e4") + .href(URI.create("https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4")) + .link(Link.builder() + .rel("up") + .type("application/vnd.vmware.vcloud.org+xml") + .href(URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0")) + .build()) + .link(Link.builder() + .rel("add") + .type("application/vnd.vmware.vcloud.catalogItem+xml") + .href(URI.create("https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/catalogItems")) + .build()) + .link(Link.builder() + .rel("down") + .type("application/vnd.vmware.vcloud.metadata+xml") + .href(URI.create("https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/metadata")) + .build()) + .catalogItems(CatalogItems.builder() + .item(Reference.builder() + .type("application/vnd.vmware.vcloud.catalogItem+xml") + .name("ubuntu10") + .href(URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df")) + .build()) + .item(Reference.builder() + .type("application/vnd.vmware.vcloud.catalogItem+xml") + .name("imageTesting") + .href(URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a9e0afdb-a42b-4688-8409-2ac68cf22939")) + .build()) + .build()) + .description("Testing") + .isPublished(false) + .build(); } public static CatalogItem createdCatalogItem() { @@ -447,10 +446,10 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT public static Reference ubuntuVappTemplateReference() { return Reference.builder() - .type("application/vnd.vmware.vcloud.vAppTemplate+xml") - .name("ubuntu10") - .href(URI.create("https://vcloudbeta.bluelock.com/api/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9")) - .build(); + .type("application/vnd.vmware.vcloud.vAppTemplate+xml") + .name("ubuntu10") + .href(URI.create("https://vcloudbeta.bluelock.com/api/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9")) + .build(); } public static MetadataEntry metadataEntry() { @@ -630,4 +629,4 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .build(); } } - + diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientLiveTest.java index c07b6627e8..6c69ef4088 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientLiveTest.java @@ -24,7 +24,11 @@ import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.C import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_REQ_LIVE; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.REF_REQ_LIVE; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.TASK_COMPLETE_TIMELY; -import static org.jclouds.vcloud.director.v1_5.domain.Checks.*; +import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkCatalogItem; +import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkError; +import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkMetadata; +import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkMetadataValue; +import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkTask; import static org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates.relEquals; import static org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates.typeEquals; import static org.testng.Assert.assertEquals; @@ -34,8 +38,20 @@ import static org.testng.Assert.fail; import org.jclouds.vcloud.director.v1_5.VCloudDirectorException; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; -import org.jclouds.vcloud.director.v1_5.domain.*; +import org.jclouds.vcloud.director.v1_5.domain.AdminCatalog; +import org.jclouds.vcloud.director.v1_5.domain.CatalogItem; +import org.jclouds.vcloud.director.v1_5.domain.CatalogType; +import org.jclouds.vcloud.director.v1_5.domain.Checks; import org.jclouds.vcloud.director.v1_5.domain.Error; +import org.jclouds.vcloud.director.v1_5.domain.Link; +import org.jclouds.vcloud.director.v1_5.domain.Media; +import org.jclouds.vcloud.director.v1_5.domain.Metadata; +import org.jclouds.vcloud.director.v1_5.domain.MetadataEntry; +import org.jclouds.vcloud.director.v1_5.domain.MetadataValue; +import org.jclouds.vcloud.director.v1_5.domain.Reference; +import org.jclouds.vcloud.director.v1_5.domain.Task; +import org.jclouds.vcloud.director.v1_5.domain.Vdc; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogClient; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; @@ -77,7 +93,7 @@ public class CatalogClientLiveTest extends BaseVCloudDirectorClientLiveTest { .description("created by CatalogClientLiveTest") .build(); - AdminCatalogClient adminCatalogClient = context.getApi().getAdminCatalogClient(); + AdminCatalogClient adminCatalogClient = adminContext.getApi().getCatalogClient(); adminCatalog = adminCatalogClient.createCatalog(orgRef.getHref(), newCatalog); catalogRef = find(adminCatalog.getLinks(), and(relEquals("alternate"), typeEquals(VCloudDirectorMediaType.CATALOG))); @@ -99,7 +115,7 @@ public class CatalogClientLiveTest extends BaseVCloudDirectorClientLiveTest { context.getApi().getMediaClient().deleteMedia(media.getHref()); if (adminCatalog != null) { - context.getApi().getAdminCatalogClient().deleteCatalog(adminCatalog.getHref()); + adminContext.getApi().getCatalogClient().deleteCatalog(adminCatalog.getHref()); try { catalogClient.getCatalog(catalogRef.getHref()); fail("The Catalog should have been deleted"); diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/GroupClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/GroupClientExpectTest.java index 3db50f235d..8b1957c28e 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/GroupClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/GroupClientExpectTest.java @@ -22,10 +22,11 @@ import static org.testng.Assert.assertEquals; import java.net.URI; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorClient; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; +import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient; import org.jclouds.vcloud.director.v1_5.domain.Group; import org.jclouds.vcloud.director.v1_5.domain.Reference; +import org.jclouds.vcloud.director.v1_5.features.admin.GroupClient; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; import org.testng.annotations.Test; @@ -35,7 +36,7 @@ import org.testng.annotations.Test; * @author danikov */ @Test(groups = { "unit", "admin", "group"}, singleThreaded = true, testName = "GroupClientExpectTest") -public class GroupClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class GroupClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { private Reference groupRef = Reference.builder() .type("application/vnd.vmware.admin.group+xml") @@ -45,7 +46,7 @@ public class GroupClientExpectTest extends BaseVCloudDirectorRestClientExpectTes @Test(enabled = false) public void testGetGroup() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/admin/group/???") .acceptAnyMedia() @@ -67,7 +68,7 @@ public class GroupClientExpectTest extends BaseVCloudDirectorRestClientExpectTes @Test(enabled = false) public void testUpdateGroup() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", "/admin/group/???") .xmlFilePayload("/group/updateGroupSource.xml", VCloudDirectorMediaType.GROUP) @@ -88,7 +89,7 @@ public class GroupClientExpectTest extends BaseVCloudDirectorRestClientExpectTes @Test public void testDeleteGroup() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("DELETE", "/admin/group/???") .acceptAnyMedia() @@ -96,6 +97,6 @@ public class GroupClientExpectTest extends BaseVCloudDirectorRestClientExpectTes new VcloudHttpResponsePrimer() .httpResponseBuilder().statusCode(204).build()); - client.getAdminCatalogClient().deleteCatalog(groupRef.getHref()); + client.getCatalogClient().deleteCatalog(groupRef.getHref()); } } diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/GroupClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/GroupClientLiveTest.java index f0aa95b01e..262f8012c6 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/GroupClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/GroupClientLiveTest.java @@ -28,6 +28,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Checks; import org.jclouds.vcloud.director.v1_5.domain.Group; import org.jclouds.vcloud.director.v1_5.domain.OrgLdapSettings; import org.jclouds.vcloud.director.v1_5.domain.Reference; +import org.jclouds.vcloud.director.v1_5.features.admin.GroupClient; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -45,7 +46,6 @@ public class GroupClientLiveTest extends BaseVCloudDirectorClientLiveTest { /* * Convenience references to API clients. */ - private GroupClient groupClient; /* @@ -58,11 +58,11 @@ public class GroupClientLiveTest extends BaseVCloudDirectorClientLiveTest { @Override @BeforeClass(alwaysRun = true) public void setupRequiredClients() { - groupClient = context.getApi().getGroupClient(); + groupClient = adminContext.getApi().getGroupClient(); Reference orgRef = null; // TODO: requisite LDAP settings -// oldLdapSettings = context.getApi().getAdminOrgClient().getLdapSettings(orgRef.getHref()); +// oldLdapSettings = adminContext.getApi().getAdminOrgClient().getLdapSettings(orgRef.getHref()); // OrgLdapSettings newLdapSettings = oldLdapSettings.toBuilder() // .ldapMode(OrgLdapSettings.LdapMode.SYSTEM) // .build(); diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientExpectTest.java index c9f1324876..5d9050dcc0 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientExpectTest.java @@ -23,7 +23,6 @@ import static org.testng.Assert.fail; import java.net.URI; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorClient; import org.jclouds.vcloud.director.v1_5.VCloudDirectorException; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.CloneMediaParams; @@ -38,6 +37,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Owner; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.Task; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; @@ -48,13 +48,13 @@ import com.google.common.collect.ImmutableSet; * @author danikov */ @Test(groups = { "unit", "user", "media" }, singleThreaded = true, testName = "MediaClientExpectTest") -public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { @Test public void testCreateMedia() { URI uploadLink = URI.create(endpoint + "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/media"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/media") .acceptMedia(VCloudDirectorMediaType.MEDIA) @@ -80,7 +80,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testCloneMedia() { URI cloneUri = URI.create(endpoint + "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/cloneMedia"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/cloneMedia") .acceptMedia(VCloudDirectorMediaType.MEDIA) @@ -110,7 +110,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testGetMedia() { URI mediaUri = URI.create(endpoint + "/media/794eb334-754e-4917-b5a0-5df85cbd61d1"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1") .acceptAnyMedia() @@ -127,7 +127,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testResponse400ForInvalidMedia() { URI mediaUri = URI.create(endpoint + "/media/NOTAUUID"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/media/NOTAUUID") .acceptAnyMedia() @@ -156,7 +156,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testResponse403ForCatalogIdUsedAsMediaId() { URI mediaUri = URI.create(endpoint + "/media/e9cd3387-ac57-4d27-a481-9bee75e0690f"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/media/e9cd3387-ac57-4d27-a481-9bee75e0690f") .acceptAnyMedia() @@ -185,7 +185,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testResponse403ForFakeMediaId() { URI mediaUri = URI.create(endpoint + "/media/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/media/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee") .acceptAnyMedia() @@ -214,7 +214,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testUpdateMedia() { URI mediaUri = URI.create(endpoint + "/media/794eb334-754e-4917-b5a0-5df85cbd61d1"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1") .xmlFilePayload("/media/updateMedia.xml", VCloudDirectorMediaType.MEDIA) @@ -234,7 +234,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testDeleteMedia() { URI mediaUri = URI.create(endpoint + "/media/794eb334-754e-4917-b5a0-5df85cbd61d1"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("DELETE", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1") .acceptMedia(VCloudDirectorMediaType.TASK) @@ -252,7 +252,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testGetMetadata() { URI mediaUri = URI.create("https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1/metadata") .acceptAnyMedia() @@ -271,7 +271,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testMergeMetadata() { URI mediaUri = URI.create("https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1/metadata") .xmlFilePayload("/media/mergeMetadata.xml", VCloudDirectorMediaType.METADATA) @@ -290,7 +290,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testGetMetadataValue() { URI mediaUri = URI.create("https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1/metadata/key") .acceptAnyMedia() @@ -309,7 +309,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testSetMetadataValue() { URI mediaUri = URI.create("https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1/metadata/key") .xmlFilePayload("/media/setMetadataValue.xml", VCloudDirectorMediaType.METADATA_VALUE) @@ -330,7 +330,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testDeleteMetadataValue() { URI mediaUri = URI.create("https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("DELETE", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1/metadata/key") .acceptMedia(VCloudDirectorMediaType.TASK) @@ -348,7 +348,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testGetOwner() { URI mediaUri = URI.create(endpoint + "/media/794eb334-754e-4917-b5a0-5df85cbd61d1"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1/owner") .acceptAnyMedia() diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientExpectTest.java index b0f7056439..b1319787e5 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientExpectTest.java @@ -23,7 +23,6 @@ import static org.testng.Assert.fail; import java.net.URI; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorClient; import org.jclouds.vcloud.director.v1_5.VCloudDirectorException; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.DhcpService; @@ -42,6 +41,7 @@ import org.jclouds.vcloud.director.v1_5.domain.NetworkFeatures; import org.jclouds.vcloud.director.v1_5.domain.OrgNetwork; import org.jclouds.vcloud.director.v1_5.domain.SyslogServerSettings; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; @@ -52,13 +52,13 @@ import com.google.common.collect.ImmutableSet; * @author danikov */ @Test(groups = { "unit", "user", "network" }, singleThreaded = true, testName = "NetworkClientExpectTest") -public class NetworkClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class NetworkClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { @Test public void testGetNetwork() { URI networkUri = URI.create(endpoint + "/network/f3ba8256-6f48-4512-aad6-600e85b4dc38"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/network/f3ba8256-6f48-4512-aad6-600e85b4dc38") .acceptAnyMedia() @@ -75,7 +75,7 @@ public class NetworkClientExpectTest extends BaseVCloudDirectorRestClientExpectT public void testGetNetworkWithInvalidId() { URI networkUri = URI.create(endpoint + "/network/NOTAUUID"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/network/NOTAUUID") .acceptAnyMedia() @@ -104,7 +104,7 @@ public class NetworkClientExpectTest extends BaseVCloudDirectorRestClientExpectT public void testGetNetworkWithCatalogId() { URI networkUri = URI.create(endpoint + "/network/9e08c2f6-077a-42ce-bece-d5332e2ebb5c"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/network/9e08c2f6-077a-42ce-bece-d5332e2ebb5c") .acceptAnyMedia() @@ -133,7 +133,7 @@ public class NetworkClientExpectTest extends BaseVCloudDirectorRestClientExpectT public void testGetNetworkWithFakeId() { URI networkUri = URI.create(endpoint + "/network/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/network/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee") .acceptAnyMedia() @@ -162,7 +162,7 @@ public class NetworkClientExpectTest extends BaseVCloudDirectorRestClientExpectT public void testGetMetadata() { URI networkUri = URI.create(endpoint + "/network/55a677cf-ab3f-48ae-b880-fab90421980c"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/network/55a677cf-ab3f-48ae-b880-fab90421980c/metadata") .acceptAnyMedia() @@ -189,7 +189,7 @@ public class NetworkClientExpectTest extends BaseVCloudDirectorRestClientExpectT public void testGetMetadataValue() { URI networkUri = URI.create("https://vcloudbeta.bluelock.com/api/network/55a677cf-ab3f-48ae-b880-fab90421980c"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/network/55a677cf-ab3f-48ae-b880-fab90421980c/metadata/KEY") .acceptAnyMedia() diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientLiveTest.java index 21100a6410..8456ffed8f 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientLiveTest.java @@ -62,13 +62,13 @@ public class NetworkClientLiveTest extends BaseVCloudDirectorClientLiveTest { @BeforeClass(alwaysRun = true) public void setupRequiredClients() { networkClient = context.getApi().getNetworkClient(); - context.getApi().getAdminNetworkClient().getMetadataClient().setMetadata(toAdminUri(networkURI), + adminContext.getApi().getNetworkClient().getMetadataClient().setMetadata(toAdminUri(networkURI), "key", MetadataValue.builder().value("value").build()); } @AfterClass(groups = { "live" }) public void cleanUp() throws Exception { - context.getApi().getAdminNetworkClient().getMetadataClient() + adminContext.getApi().getNetworkClient().getMetadataClient() .deleteMetadataEntry(toAdminUri(networkURI), "key"); } diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientExpectTest.java index 4dfa409e9b..53ba73acda 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientExpectTest.java @@ -23,7 +23,6 @@ import static org.testng.Assert.fail; import java.net.URI; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorClient; import org.jclouds.vcloud.director.v1_5.VCloudDirectorException; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.Error; @@ -35,6 +34,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Org; import org.jclouds.vcloud.director.v1_5.domain.OrgList; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; @@ -46,11 +46,11 @@ import com.google.common.collect.Iterables; * @author Adrian Cole */ @Test(groups = { "unit", "user", "org" }, singleThreaded = true, testName = "OrgClientExpectTest") -public class OrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class OrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { @Test public void testGetOrgList() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, getStandardRequest("GET", "/org/"), getStandardPayloadResponse("/org/orglist.xml", VCloudDirectorMediaType.ORG_LIST)); @@ -67,7 +67,7 @@ public class OrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test public void testGetOrgFromOrgListReference() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, getStandardRequest("GET", "/org/"), getStandardPayloadResponse("/org/orglist.xml", VCloudDirectorMediaType.ORG_LIST)); @@ -86,7 +86,7 @@ public class OrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest public void testGetOrg() { URI orgUri = URI.create(endpoint + "/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, getStandardRequest("GET", "/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"), getStandardPayloadResponse("/org/org.xml", VCloudDirectorMediaType.ORG)); @@ -99,7 +99,7 @@ public class OrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest public void testGetOrgFailOnInvalidOrgId() { URI orgUri = URI.create(endpoint + "/org/NOTAUUID"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, getStandardRequest("GET", "/org/NOTAUUID"), getStandardPayloadResponse(400, "/org/error400.xml", VCloudDirectorMediaType.ERROR)); @@ -123,7 +123,7 @@ public class OrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest public void testGetOrgFailOnWrongOrgId() { URI orgUri = URI.create(endpoint + "/org/9e08c2f6-077a-42ce-bece-d5332e2ebb5c"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, getStandardRequest("GET", "/org/9e08c2f6-077a-42ce-bece-d5332e2ebb5c"), getStandardPayloadResponse(403, "/org/error403-catalog.xml", VCloudDirectorMediaType.ERROR)); @@ -147,7 +147,7 @@ public class OrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest public void testGetOrgFailOnFakeOrgId() { URI orgUri = URI.create(endpoint + "/org/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, getStandardRequest("GET", "/org/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"), getStandardPayloadResponse(403, "/org/error403-fake.xml", VCloudDirectorMediaType.ERROR)); @@ -171,7 +171,7 @@ public class OrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest public void testGetOrgMetadata() { URI orgUri = URI.create(endpoint + "/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/metadata") .acceptAnyMedia() @@ -198,7 +198,7 @@ public class OrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest public void testGetOrgMetadataValue() { URI orgUri = URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/metadata/KEY") .acceptAnyMedia() diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientLiveTest.java index b53b9e71db..d84f71ca15 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientLiveTest.java @@ -21,11 +21,11 @@ package org.jclouds.vcloud.director.v1_5.features; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.CONDITION_FMT; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.CORRECT_VALUE_OBJECT_FMT; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.NOT_EMPTY_OBJECT_FMT; +import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkControlAccessParams; import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkMetadata; import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkMetadataValue; import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkOrg; import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkReferenceType; -import static org.jclouds.vcloud.director.v1_5.domain.Checks.*; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; @@ -69,7 +69,7 @@ public class OrgClientLiveTest extends BaseVCloudDirectorClientLiveTest { @AfterClass(groups = { "live" }) public void cleanUp() throws Exception { if (metadataSet) { - context.getApi().getAdminOrgClient().getMetadataClient() + adminContext.getApi().getOrgClient().getMetadataClient() .deleteMetadataEntry(toAdminUri(orgURI), "key"); } } @@ -114,7 +114,7 @@ public class OrgClientLiveTest extends BaseVCloudDirectorClientLiveTest { @Test(testName = "orgClient admin metadata setup", dependsOnMethods = { "testGetOrg" }) public void testSetupMetadata() { - context.getApi().getAdminOrgClient().getMetadataClient().setMetadata(toAdminUri(orgURI), + adminContext.getApi().getOrgClient().getMetadataClient().setMetadata(toAdminUri(orgURI), "KEY", MetadataValue.builder().value("VALUE").build()); metadataSet = true; } diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryClientExpectTest.java index 9bbbb4d5a2..7c0915ee8f 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryClientExpectTest.java @@ -24,7 +24,6 @@ import java.net.URI; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorClient; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.CatalogReference; import org.jclouds.vcloud.director.v1_5.domain.Link; @@ -33,6 +32,7 @@ import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultCatalogRecord; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecordType; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; import org.testng.annotations.Test; import com.google.common.collect.ImmutableMultimap; @@ -43,7 +43,7 @@ import com.google.common.collect.ImmutableMultimap; * @author grkvlt@apache.org */ @Test(groups = { "unit", "user", "query" }, singleThreaded = true, testName = "QueryClientExpectTest") -public class QueryClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class QueryClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { @Test public void testQueryAllCatalogs() { @@ -61,7 +61,7 @@ public class QueryClientExpectTest extends BaseVCloudDirectorRestClientExpectTes .payload(payloadFromResourceWithContentType("/query/allCatalogs.xml", VCloudDirectorMediaType.QUERY_RESULT_RECORDS + ";version=1.5")) .build(); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, queryRequest, queryResponse); + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, queryRequest, queryResponse); QueryResultRecords expected = QueryResultRecords.builder() .href(URI.create("https://vcloudbeta.bluelock.com/api/catalogs/query?page=1&pageSize=25&format=records")) @@ -137,7 +137,7 @@ public class QueryClientExpectTest extends BaseVCloudDirectorRestClientExpectTes .payload(payloadFromResourceWithContentType("/query/allCatalogReferences.xml", VCloudDirectorMediaType.QUERY_RESULT_RECORDS + ";version=1.5")) .build(); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, queryRequest, queryResponse); + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, queryRequest, queryResponse); CatalogReferences expected = CatalogReferences.builder() .href(URI.create("https://vcloudbeta.bluelock.com/api/catalogs/query?page=1&pageSize=25&format=references")) diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskClientExpectTest.java index 327d588f39..eee7fd33ac 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskClientExpectTest.java @@ -25,7 +25,6 @@ import java.net.URI; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorClient; import org.jclouds.vcloud.director.v1_5.VCloudDirectorException; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.Error; @@ -33,6 +32,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.Task; import org.jclouds.vcloud.director.v1_5.domain.TasksList; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; import org.testng.annotations.Test; import com.google.common.collect.ImmutableMultimap; @@ -43,7 +43,7 @@ import com.google.common.collect.ImmutableMultimap; * @author grkvlt@apache.org */ @Test(groups = { "unit", "user", "task" }, singleThreaded = true, testName = "TaskClientExpectTest") -public class TaskClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class TaskClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { @Test public void testTaskListForValidOrg() { @@ -75,7 +75,7 @@ public class TaskClientExpectTest extends BaseVCloudDirectorRestClientExpectTest .payload(payloadFromResourceWithContentType("/org/org.xml", VCloudDirectorMediaType.TASKS_LIST + ";version=1.5")) .build(); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, taskRequest, taskResponse, orgRequest, orgResponse); + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, taskRequest, taskResponse, orgRequest, orgResponse); TasksList expected = TasksList.builder() .name("Tasks Lists") @@ -115,7 +115,7 @@ public class TaskClientExpectTest extends BaseVCloudDirectorRestClientExpectTest .payload(payloadFromResourceWithContentType("/org/error400.xml", VCloudDirectorMediaType.ERROR + ";version=1.5")) .build(); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, taskRequest, taskResponse, orgRequest, orgResponse); + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, taskRequest, taskResponse, orgRequest, orgResponse); Error expected = Error.builder() .message("validation error on field 'id': String value has invalid format or length") @@ -160,7 +160,7 @@ public class TaskClientExpectTest extends BaseVCloudDirectorRestClientExpectTest .payload(payloadFromResourceWithContentType("/org/error403-fake.xml", VCloudDirectorMediaType.ERROR + ";version=1.5")) .build(); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, taskRequest, taskResponse, orgRequest, orgResponse); + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, taskRequest, taskResponse, orgRequest, orgResponse); Error expected = Error.builder() .message("No access to entity \"com.vmware.vcloud.entity.org:aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\".") @@ -194,7 +194,7 @@ public class TaskClientExpectTest extends BaseVCloudDirectorRestClientExpectTest .payload(payloadFromResourceWithContentType("/task/task.xml", VCloudDirectorMediaType.TASK + ";version=1.5")) .build(); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, taskRequest, taskResponse); + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, taskRequest, taskResponse); URI taskUri = URI.create(endpoint + "/task/5fcd2af3-d0ec-45ce-9451-8c585a2c766b"); @@ -219,7 +219,7 @@ public class TaskClientExpectTest extends BaseVCloudDirectorRestClientExpectTest .statusCode(200) .build(); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, taskRequest, taskResponse); + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, taskRequest, taskResponse); URI taskUri = URI.create(endpoint + "/task/5fcd2af3-d0ec-45ce-9451-8c585a2c766b"); diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UserClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UserClientExpectTest.java index e42c064c4d..2f908b5786 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UserClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UserClientExpectTest.java @@ -23,22 +23,23 @@ import static org.testng.Assert.assertEquals; import java.net.URI; import java.util.Collections; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorClient; import org.jclouds.vcloud.director.v1_5.VCloudDirectorException; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; +import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient; import org.jclouds.vcloud.director.v1_5.domain.Link; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.User; +import org.jclouds.vcloud.director.v1_5.features.admin.UserClient; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; import org.testng.annotations.Test; /** - * Test the {@link GroupClient} by observing its side effects. + * Test the {@link UserClient} by observing its side effects. * * @author danikov */ @Test(groups = { "unit", "admin", "adminUser"}, singleThreaded = true, testName = "UserClientExpectTest") -public class UserClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class UserClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { private Reference orgRef = Reference.builder() .href(URI.create(endpoint + "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0")) @@ -50,7 +51,7 @@ public class UserClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test public void testCreateUser() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/catalogs") .xmlFilePayload("/user/createUserSource.xml", VCloudDirectorMediaType.USER) @@ -113,7 +114,7 @@ public class UserClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test public void testGetUser() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/admin/user/b37223f3-8792-477a-820f-334998f61cd6") .acceptAnyMedia() @@ -135,7 +136,7 @@ public class UserClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test public void testUpdateUser() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", "/admin/user/b37223f3-8792-477a-820f-334998f61cd6") .xmlFilePayload("/user/updateUserSource.xml", VCloudDirectorMediaType.USER) @@ -175,7 +176,7 @@ public class UserClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test public void testDeleteUser() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("DELETE", "/admin/user/b37223f3-8792-477a-820f-334998f61cd6") .acceptAnyMedia() @@ -188,7 +189,7 @@ public class UserClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test public void testUnlockUser() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/admin/user/b37223f3-8792-477a-820f-334998f61cd6/action/unlock") .acceptAnyMedia() @@ -201,7 +202,7 @@ public class UserClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(expectedExceptions = VCloudDirectorException.class) public void testUnlockUserFailNotFound() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/admin/user/b37223f3-8792-477a-820f-334998f61cd6/action/unlock") .acceptAnyMedia() diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UserClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UserClientLiveTest.java index 442c9b8167..635faa8199 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UserClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UserClientLiveTest.java @@ -27,20 +27,18 @@ import static org.testng.Assert.fail; import static org.testng.AssertJUnit.assertFalse; import java.net.URI; -import java.util.Random; import org.jclouds.rest.AuthorizationException; -import org.jclouds.rest.RestContext; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorAsyncClient; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorClient; import org.jclouds.vcloud.director.v1_5.VCloudDirectorException; import org.jclouds.vcloud.director.v1_5.domain.Checks; import org.jclouds.vcloud.director.v1_5.domain.Error; import org.jclouds.vcloud.director.v1_5.domain.OrgPasswordPolicySettings; import org.jclouds.vcloud.director.v1_5.domain.Reference; -import org.jclouds.vcloud.director.v1_5.domain.RoleReferences; +import org.jclouds.vcloud.director.v1_5.domain.Role.DefaultRoles; import org.jclouds.vcloud.director.v1_5.domain.SessionWithToken; import org.jclouds.vcloud.director.v1_5.domain.User; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminOrgClient; +import org.jclouds.vcloud.director.v1_5.features.admin.UserClient; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; import org.jclouds.vcloud.director.v1_5.login.SessionClient; import org.testng.annotations.AfterClass; @@ -69,12 +67,11 @@ public class UserClientLiveTest extends BaseVCloudDirectorClientLiveTest { */ private Reference orgRef; private User user; - private static Random random = new Random(); @Override @BeforeClass(alwaysRun = true) public void setupRequiredClients() { - userClient = context.getApi().getUserClient(); + userClient = adminContext.getApi().getUserClient(); orgRef = Iterables.getFirst(context.getApi().getOrgClient().getOrgList().getOrgs(), null).toAdminReference(endpoint); } @@ -91,7 +88,7 @@ public class UserClientLiveTest extends BaseVCloudDirectorClientLiveTest { @Test(testName = "POST /admin/org/{id}/users") public void testCreateUser() { - User newUser = randomTestUser("testCreateUser", context); + User newUser = randomTestUser("testCreateUser"); user = userClient.createUser(orgRef.getHref(), newUser); Checks.checkUser(newUser); } @@ -122,7 +119,7 @@ public class UserClientLiveTest extends BaseVCloudDirectorClientLiveTest { .password("newPassword") // TODO test setting other fields? // .name("new"+oldUser.getName()) - .role(nonVAppUserRole(context)) + .role(getRoleReferenceFor(DefaultRoles.AUTHOR)) .build(); userClient.updateUser(user.getHref(), newUser); @@ -165,7 +162,7 @@ public class UserClientLiveTest extends BaseVCloudDirectorClientLiveTest { @Test(testName = "POST /admin/user/{id}/action/unlock", dependsOnMethods = { "testUpdateUser" }) public void testUnlockUser() { // Need to know how many times to fail login to lock account - AdminOrgClient adminOrgClient = context.getApi().getAdminOrgClient(); + AdminOrgClient adminOrgClient = adminContext.getApi().getOrgClient(); OrgPasswordPolicySettings settingsToRevertTo = null; // session client isn't typically exposed to the user, as it is implicit @@ -249,48 +246,4 @@ public class UserClientLiveTest extends BaseVCloudDirectorClientLiveTest { assertEquals(vde.getError(), expected); } } - - public static Reference vAppUserRole(RestContext context) { - RoleReferences roles = context.getApi().getAdminQueryClient().roleReferencesQueryAll(); - for (Reference role : roles.getReferences()) { - if (equal(role.getName(), "vApp User")) { - return Reference.builder().fromReference(role).build(); - } - } - - return null; - } - - public static Reference nonVAppUserRole(RestContext context) { - RoleReferences roles = context.getApi().getAdminQueryClient().roleReferencesQueryAll(); - for (Reference role : roles.getReferences()) { - if (!equal(role.getName(), "vApp User")) { - return Reference.builder().fromReference(role).build(); - } - } - - return null; - } - - public static User randomTestUser(String prefix, RestContext context) { - return randomTestUser(prefix, vAppUserRole(context)); - } - - public static User randomTestUser(String prefix, Reference role) { - return User.builder() - .name(name(prefix)+random.nextInt(999999)) - .fullName("testFullName") - .emailAddress("test@test.com") - .telephone("555-1234") - .isEnabled(false) - .im("testIM") - .isAlertEnabled(false) - .alertEmailPrefix("testPrefix") - .alertEmail("testAlert@test.com") - .isExternal(false) - .isGroupRole(false) - .role(role) - .password("password") - .build(); - } } diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientExpectTest.java index 612f913b0e..676efb7f7e 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientExpectTest.java @@ -22,7 +22,6 @@ import static org.testng.Assert.assertEquals; import java.net.URI; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorClient; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.ControlAccessParams; import org.jclouds.vcloud.director.v1_5.domain.DeployVAppParams; @@ -52,6 +51,7 @@ import org.jclouds.vcloud.director.v1_5.domain.ovf.OperatingSystemSection; import org.jclouds.vcloud.director.v1_5.domain.ovf.StartupSection; import org.jclouds.vcloud.director.v1_5.domain.ovf.VirtualHardwareSection; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.testng.internal.annotations.Sets; @@ -65,7 +65,7 @@ import com.google.common.collect.Multimaps; * @author grkvlt@apache.org */ @Test(groups = { "unit", "user", "vapp" }, singleThreaded = true, testName = "VAppClientExpectTest") -public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { private String vAppId = "vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be"; private URI vAppURI = URI.create(endpoint + vAppId); @@ -76,7 +76,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false)//TODO public void testGetVapp() { - VCloudDirectorClient client = orderedRequestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = orderedRequestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId) .acceptMedia(VCloudDirectorMediaType.VAPP) @@ -92,7 +92,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyVApp() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId) .xmlFilePayload("/vApp/modifyVApp.xml", VCloudDirectorMediaType.VAPP) @@ -113,7 +113,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testDeleteVApp() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("DELETE", vAppId) .acceptAnyMedia() @@ -129,7 +129,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testConsolidateVApp() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/action/consolidate") .acceptAnyMedia() @@ -145,7 +145,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testControlAccess() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/action/controlAccess") .xmlFilePayload("/vApp/controlAccessParams.xml", VCloudDirectorMediaType.CONTROL_ACCESS) @@ -164,7 +164,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testDeploy() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/action/deploy") .xmlFilePayload("/vApp/deployParams.xml", VCloudDirectorMediaType.DEPLOY_VAPP_PARAMS) @@ -184,7 +184,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testDiscardSuspendedState() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/action/discardSuspendedState") .acceptAnyMedia() @@ -200,7 +200,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testEnterMaintenanceMode() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/action/enterMaintenanceMode") .acceptAnyMedia() @@ -214,7 +214,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testExitMaintenanceMode() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/action/exitMaintenanceMode") .acceptAnyMedia() @@ -228,7 +228,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testInstallVMwareTools() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/action/installVMwareTools") .acceptAnyMedia() @@ -244,7 +244,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testRecomposeVApp() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/action/recomposeVApp") .xmlFilePayload("/vApp/recomposeVAppParams.xml", VCloudDirectorMediaType.RECOMPOSE_VAPP_PARAMS) @@ -264,7 +264,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testRelocate() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/action/relocate") .xmlFilePayload("/vApp/relocateParams.xml", VCloudDirectorMediaType.RELOCATE_VM_PARAMS) @@ -284,7 +284,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testUndeploy() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/action/undeploy") .xmlFilePayload("/vApp/undeployParams.xml", VCloudDirectorMediaType.UNDEPLOY_VAPP_PARAMS) @@ -304,7 +304,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testUpgradeHardwareVersion() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/action/upgradeHardwareVersion") .acceptAnyMedia() @@ -320,7 +320,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testPowerOff() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/power/action/powerOff") .acceptAnyMedia() @@ -336,7 +336,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testPowerOn() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/power/action/powerOn") .acceptAnyMedia() @@ -352,7 +352,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testReboot() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/power/action/reboot") .acceptAnyMedia() @@ -368,7 +368,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testReset() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/power/action/reset") .acceptAnyMedia() @@ -384,7 +384,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testShutdown() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/power/action/shutdown") .acceptAnyMedia() @@ -400,7 +400,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testSuspend() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/power/action/suspend") .acceptAnyMedia() @@ -416,7 +416,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetControlAccesss() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/controlAccess") .acceptAnyMedia() @@ -432,7 +432,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetGuestCustomizationSection() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/guestCustomizationSection") .acceptAnyMedia() @@ -448,7 +448,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyGuestCustomizationSection() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/guestCustomizationSection") .xmlFilePayload("/vApp/modifyGuestCustomizationSection.xml", VCloudDirectorMediaType.GUEST_CUSTOMIZATION_SECTION) @@ -468,7 +468,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetLeaseSettingsSection() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/leaseSettingsSection") .acceptAnyMedia() @@ -484,7 +484,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyLeaseSettingsSection() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/leaseSettingsSection") .xmlFilePayload("/vApp/modifyLeaseSettingsSection.xml", VCloudDirectorMediaType.LEASE_SETTINGS_SECTION) @@ -504,7 +504,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testEjectMedia() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/media/action/ejectMedia") .xmlFilePayload("/vApp/ejectMediaParams.xml", VCloudDirectorMediaType.MEDIA_PARAMS) @@ -524,7 +524,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testInsertMedia() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/media/action/insertMedia") .xmlFilePayload("/vApp/insertMediaParams.xml", VCloudDirectorMediaType.MEDIA_PARAMS) @@ -544,7 +544,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetNetworkConfigSection() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/networkConfigSection") .acceptAnyMedia() @@ -560,7 +560,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyNetworkConfigSection() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/networkConfigSection") .xmlFilePayload("/vApp/modifyNetworkConfigSection.xml", VCloudDirectorMediaType.NETWORK_CONFIG_SECTION) @@ -580,7 +580,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetNetworkConnectionSection() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/networkConnectionSection") .acceptAnyMedia() @@ -596,7 +596,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyNetworkConnectionSection() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/networkConnectionSection") .xmlFilePayload("/vApp/modifyNetworkConnectionSection.xml", VCloudDirectorMediaType.NETWORK_CONNECTION_SECTION) @@ -616,7 +616,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetNetworkSection() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/networkSection") .acceptAnyMedia() @@ -632,7 +632,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetOperatingSystemSection() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/operatingSystemSection") .acceptAnyMedia() @@ -648,7 +648,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyOperatingSystemSection() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/operatingSystemSection") .xmlFilePayload("/vApp/modifyOperatingSystemSection.xml", VCloudDirectorMediaType.OPERATING_SYSTEM_SECTION) @@ -668,7 +668,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetOwner() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/owner") .acceptAnyMedia() @@ -684,7 +684,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyOwner() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/owner") .xmlFilePayload("/vApp/modifyOwner.xml", VCloudDirectorMediaType.OWNER) @@ -701,7 +701,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetProductSections() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/productSections") .acceptAnyMedia() @@ -717,7 +717,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyProductSections() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/productSections") .xmlFilePayload("/vApp/modifyProductSections.xml", VCloudDirectorMediaType.PRODUCT_SECTION_LIST) @@ -734,7 +734,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetPendingQuestion() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/question") .acceptAnyMedia() @@ -750,7 +750,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testAnswerQuestion() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/question/action/answer") .xmlFilePayload("/vApp/answerQuestion.xml", VCloudDirectorMediaType.VM_PENDING_ANSWER) @@ -767,7 +767,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetRuntimeInfoSection() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/runtimeInfoSection") .acceptAnyMedia() @@ -783,7 +783,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetScreenImage() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/screen") .acceptMedia(VCloudDirectorMediaType.ANY_IMAGE) @@ -801,7 +801,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetScreenTicket() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/screen/action/acquireTicket") .acceptAnyMedia() @@ -817,7 +817,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetStartupSection() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/startupSection") .acceptAnyMedia() @@ -833,7 +833,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyStartupSection() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/startupSection") .xmlFilePayload("/vApp/modifyStartupSection.xml", VCloudDirectorMediaType.STARTUP_SECTION) @@ -853,7 +853,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetVirtualHardwareSection() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/virtualHardwareSection") .acceptAnyMedia() @@ -869,7 +869,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyVirtualHardwareSection() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/virtualHardwareSection") .xmlFilePayload("/vApp/modifyVirtualHardwareSection.xml", VCloudDirectorMediaType.VIRTUAL_HARDWARE_SECTION) @@ -889,7 +889,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetVirtualHardwareSectionCpu() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/virtualHardwareSection/cpu") .acceptAnyMedia() @@ -905,7 +905,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyVirtualHardwareSectionCpu() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("", vAppId + "/virtualHardwareSection/cpu") .xmlFilePayload("/vApp/modifyVirtualHardwareSectionCpu.xml", VCloudDirectorMediaType.OVF_RASD_ITEM) @@ -925,7 +925,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetVirtualHardwareSectionDisks() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/virtualHardwareSection/disks") .acceptAnyMedia() @@ -941,7 +941,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyVirtualHardwareSectionDisks() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/virtualHardwareSection/disks") .xmlFilePayload("/vApp/modifyVirtualHardwareSectionDisks.xml", VCloudDirectorMediaType.OVF_RASD_ITEMS_LIST) @@ -961,7 +961,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetVirtualHardwareSectionMedia() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/virtualHardwareSection/media") .acceptAnyMedia() @@ -977,7 +977,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetVirtualHardwareSectionMemory() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/virtualHardwareSection/memory") .acceptAnyMedia() @@ -993,7 +993,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyVirtualHardwareSectionMemory() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/virtualHardwareSection/memory") .xmlFilePayload("/vApp/modifyVirtualHardwareSectionMemory.xml", VCloudDirectorMediaType.VAPP) @@ -1013,7 +1013,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetVirtualHardwareSectionNetworkCards() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/virtualHardwareSection/networkCards") .acceptAnyMedia() @@ -1029,7 +1029,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyVirtualHardwareSectionNetworkCards() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/virtualHardwareSection/networkCards") .xmlFilePayload("/vApp/modifyVirtualHardwareSectionNetworkCards.xml", VCloudDirectorMediaType.OVF_RASD_ITEMS_LIST) @@ -1049,7 +1049,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetVirtualHardwareSectionSerialPorts() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/virtualHardwareSection/serialPorts") .acceptAnyMedia() @@ -1065,7 +1065,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyVirtualHardwareSectionSerialPorts() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/virtualHardwareSection/serialPorts") .xmlFilePayload("/vApp/modifyVirtualHardwareSectionSerialPorts.xml", VCloudDirectorMediaType.OVF_RASD_ITEMS_LIST) diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java index 8c826f18a1..3e75e92b5d 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java @@ -65,6 +65,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Task; import org.jclouds.vcloud.director.v1_5.domain.VAppNetworkConfiguration; import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; @@ -75,7 +76,7 @@ import com.google.common.collect.ImmutableSet; * @author Adam Lowe */ @Test(groups = { "unit", "user", "vapptemplate" }, testName = "VAppTemplateClientExpectTest") -public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { public VAppTemplateClientExpectTest() { TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles")); diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientExpectTest.java index 90240a667f..f52d1ce5ae 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientExpectTest.java @@ -23,7 +23,6 @@ import static org.testng.Assert.fail; import java.net.URI; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorClient; import org.jclouds.vcloud.director.v1_5.VCloudDirectorException; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.Capabilities; @@ -46,6 +45,7 @@ import org.jclouds.vcloud.director.v1_5.domain.VApp; import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; import org.jclouds.vcloud.director.v1_5.domain.Vdc; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -55,7 +55,7 @@ import org.testng.annotations.Test; * @author danikov */ @Test(groups = { "unit", "user", "vdc" }, singleThreaded = true, testName = "VdcClientExpectTest") -public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { private URI vdcURI; @@ -67,7 +67,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test public void testGetVdc() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f") .acceptAnyMedia() @@ -84,7 +84,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test public void testResponse400ForInvalidVdcId() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/vdc/NOTAUUID") .acceptAnyMedia() @@ -110,7 +110,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test public void testResponse403ForFakeVdcId() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/vdc/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee") .acceptAnyMedia() @@ -135,7 +135,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testCaptureVApp() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/captureVApp") .xmlFilePayload("/vdc/params/captureVApp.xml", VCloudDirectorMediaType.CAPTURE_VAPP_PARAMS) @@ -157,7 +157,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testResponse4xxForCaptureVAppNoParams() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/captureVApp") .xmlFilePayload("/vdc/params/captureVApp.xml", VCloudDirectorMediaType.CAPTURE_VAPP_PARAMS) @@ -183,7 +183,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testCloneVApp() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/cloneVAppTemplate") .xmlFilePayload("/vdc/params/cloneVApp.xml", VCloudDirectorMediaType.CLONE_VAPP_PARAMS) @@ -205,7 +205,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testCloneVAppTemplate() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/cloneVAppTemplate") .xmlFilePayload("/vdc/params/cloneVAppTemplate.xml", VCloudDirectorMediaType.CLONE_VAPP_TEMPLATE_PARAMS) @@ -227,7 +227,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testComposeVApp() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/composeVApp") .xmlFilePayload("/vdc/params/composeVApp.xml", VCloudDirectorMediaType.COMPOSE_VAPP_PARAMS) @@ -249,7 +249,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testInstantiateVAppTemplate() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/instantiateVAppTemplate") .xmlFilePayload("/vdc/params/instantiateVAppTemplate.xml", VCloudDirectorMediaType.CAPTURE_VAPP_PARAMS) @@ -271,7 +271,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testUploadVAppTemplate() { - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/uploadVAppTemplate") .xmlFilePayload("/vdc/params/uploadVAppTemplate.xml", VCloudDirectorMediaType.UPLOAD_VAPP_TEMPLATE_PARAMS) @@ -295,7 +295,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest public void testCreateMedia() { URI vdcUri = URI.create(endpoint + "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/media") .acceptMedia(VCloudDirectorMediaType.MEDIA) @@ -321,7 +321,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest public void testCloneMedia() { URI vdcUri = URI.create(endpoint + "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/cloneMedia") .acceptMedia(VCloudDirectorMediaType.MEDIA) @@ -351,7 +351,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest public void testGetMetadata() { URI vdcUri = URI.create(endpoint + "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/metadata") .acceptAnyMedia() @@ -369,7 +369,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest public void testGetMetadataValue() { URI vdcUri = URI.create("https://vcloudbeta.bluelock.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"); - VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/metadata/key") .acceptAnyMedia() diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientLiveTest.java index 4214aae07e..01bbad6d4b 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientLiveTest.java @@ -105,7 +105,7 @@ public class VdcClientLiveTest extends BaseVCloudDirectorClientLiveTest { cleanUpVApp(composedVApp); } - context.getApi().getAdminVdcClient().getMetadataClient() + adminContext.getApi().getVdcClient().getMetadataClient() .deleteMetadataEntry(toAdminUri(vdcURI), "key"); } @@ -309,7 +309,7 @@ public class VdcClientLiveTest extends BaseVCloudDirectorClientLiveTest { @Test(testName = "vdcClient admin metadata configuration", dependsOnMethods = { "testGetVdc" } ) public void testSetupMetadata() { - context.getApi().getAdminVdcClient().getMetadataClient().setMetadata(toAdminUri(vdcURI), + adminContext.getApi().getVdcClient().getMetadataClient().setMetadata(toAdminUri(vdcURI), "key", MetadataValue.builder().value("value").build()); } diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorRestClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorRestClientExpectTest.java index cd3b01f8e4..cf9601e2a3 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorRestClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorRestClientExpectTest.java @@ -29,9 +29,9 @@ import org.jclouds.date.DateService; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.rest.BaseRestClientExpectTest; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorClient; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.Reference; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; import org.testng.annotations.BeforeGroups; import com.google.common.collect.ImmutableMultimap; @@ -44,7 +44,8 @@ import com.google.inject.Guice; * * @author Adrian Cole */ -public class BaseVCloudDirectorRestClientExpectTest extends BaseRestClientExpectTest { +public abstract class BaseVCloudDirectorRestClientExpectTest + extends BaseRestClientExpectTest { public static final String user = "adrian@jclouds.org"; public static final String org = "JClouds"; From 17e90c22b14ec116e8876f938eed5bd4d2f03f8a Mon Sep 17 00:00:00 2001 From: danikov Date: Wed, 28 Mar 2012 09:50:38 +0100 Subject: [PATCH 02/11] build users ahead of tests using admin credentials (WIP) --- .../BaseVCloudDirectorClientLiveTest.java | 95 +++++++++++++++++-- 1 file changed, 89 insertions(+), 6 deletions(-) diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorClientLiveTest.java index 71aed1de7e..814c576f77 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorClientLiveTest.java @@ -19,14 +19,17 @@ package org.jclouds.vcloud.director.v1_5.internal; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.ENTITY_NON_NULL; +import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.REF_REQ_LIVE; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.TASK_COMPLETE_TIMELY; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; import java.net.URI; +import java.text.SimpleDateFormat; import java.util.Collection; import java.util.Collections; +import java.util.Date; import java.util.Properties; import java.util.Random; import java.util.Set; @@ -43,10 +46,11 @@ import org.jclouds.rest.RestContext; import org.jclouds.rest.RestContextFactory; import org.jclouds.sshj.config.SshjSshClientModule; import org.jclouds.vcloud.director.testng.FormatApiResultsListener; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorAsyncClient; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorClient; +import org.jclouds.vcloud.director.v1_5.VCloudDirectorContext; import org.jclouds.vcloud.director.v1_5.VCloudDirectorException; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; +import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminAsyncClient; +import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient; import org.jclouds.vcloud.director.v1_5.domain.InstantiateVAppTemplateParams; import org.jclouds.vcloud.director.v1_5.domain.InstantiationParams; import org.jclouds.vcloud.director.v1_5.domain.Link; @@ -56,9 +60,12 @@ import org.jclouds.vcloud.director.v1_5.domain.NetworkConfiguration; import org.jclouds.vcloud.director.v1_5.domain.Org; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status; +import org.jclouds.vcloud.director.v1_5.domain.Role.DefaultRoles; +import org.jclouds.vcloud.director.v1_5.domain.RoleReferences; import org.jclouds.vcloud.director.v1_5.domain.Session; import org.jclouds.vcloud.director.v1_5.domain.Task; import org.jclouds.vcloud.director.v1_5.domain.UndeployVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.User; import org.jclouds.vcloud.director.v1_5.domain.VApp; import org.jclouds.vcloud.director.v1_5.domain.VAppNetworkConfiguration; import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; @@ -70,6 +77,9 @@ import org.jclouds.vcloud.director.v1_5.features.VdcClient; import org.jclouds.vcloud.director.v1_5.predicates.ReferencePredicates; import org.jclouds.vcloud.director.v1_5.predicates.TaskStatusEquals; import org.jclouds.vcloud.director.v1_5.predicates.TaskSuccess; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserAsyncClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; +import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Listeners; import org.testng.annotations.Test; @@ -87,7 +97,7 @@ import com.google.inject.Guice; import com.google.inject.Module; /** - * Tests behavior of {@link VCloudDirectorClient} and acts as parent for other client live tests. + * Tests behavior of {@link VCloudDirectorUserClient} and acts as parent for other client live tests. * * @author Adrian Cole * @author grkvlt@apache.org @@ -105,11 +115,15 @@ public abstract class BaseVCloudDirectorClientLiveTest extends BaseVersionedServ public static final String VAPP = "vApp"; public static final String VAPP_TEMPLATE = "vAppTemplate"; public static final String VDC = "vdc"; + public static final int REQUIRED_ADMIN_VM_QUOTA = 0; + public static final int REQUIRED_USER_VM_QUOTA = 0; public Predicate retryTaskSuccess; public Predicate retryTaskSuccessLong; - protected RestContext context; + protected RestContext adminContext; + protected RestContext context; // FIXME: rename to userContext? + protected Session adminSession; protected Session session; protected String catalogId; @@ -151,14 +165,80 @@ public abstract class BaseVCloudDirectorClientLiveTest extends BaseVersionedServ protected void setupContext() throws Exception { setupCredentials(); Properties overrides = setupProperties(); - - context = new RestContextFactory().createContext(provider, identity, credential, ImmutableSet. of( + + RestContext rootContext = + new RestContextFactory().createContext(provider, identity, credential, ImmutableSet. of( + new Log4JLoggingModule(), new SshjSshClientModule()), overrides); + + rootContext.utils().injector().injectMembers(this); + Reference orgRef = Iterables.getFirst(rootContext.getApi().getOrgClient().getOrgList().getOrgs(), null) + .toAdminReference(endpoint); + assertNotNull(orgRef, String.format(REF_REQ_LIVE, "admin org")); + + String adminIdentity = "testAdmin"+new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); + String adminCredential = "testAdminPassword"; + rootContext.getApi().getUserClient().createUser(orgRef.getHref(), User.builder() + .name(adminIdentity) + .password(adminCredential) + .description("test user with user-level privileges") //TODO desc + .role(getRoleReferenceFor(DefaultRoles.ORG_ADMIN)) + .deployedVmQuota(REQUIRED_ADMIN_VM_QUOTA) + .isEnabled(true) + .build()); + + rootContext.close(); rootContext = null; + + adminContext = VCloudDirectorContext.class.cast(new RestContextFactory().createContext(provider, adminIdentity, adminCredential, ImmutableSet. of( + new Log4JLoggingModule(), new SshjSshClientModule()), overrides)).getAdminContext(); + adminSession = adminContext.getApi().getCurrentSession(); + adminContext.utils().injector().injectMembers(this); + String userIdentity = "test"+new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); + String userCredential = "testPassword"; + + adminContext.getApi().getUserClient().createUser(orgRef.getHref(), User.builder() + .name(userIdentity) + .password(userCredential) + .description("test user with user-level privileges") + .role(getRoleReferenceFor(DefaultRoles.USER)) + .deployedVmQuota(REQUIRED_USER_VM_QUOTA) + .isEnabled(true) + .build()); + + context = new RestContextFactory().createContext(provider, userIdentity, userCredential, ImmutableSet. of( new Log4JLoggingModule(), new SshjSshClientModule()), overrides); session = context.getApi().getCurrentSession(); context.utils().injector().injectMembers(this); + initTestParametersFromPropertiesOrLazyDiscover(); setupRequiredClients(); } + + public Reference getRoleReferenceFor(String name) { + RoleReferences roles = adminContext.getApi().getQueryClient().roleReferencesQueryAll(); + return Iterables.find(roles.getReferences(), ReferencePredicates.nameEquals(name)); + } + + public User randomTestUser(String prefix) { + return randomTestUser(prefix, getRoleReferenceFor(DefaultRoles.USER)); + } + + public User randomTestUser(String prefix, Reference role) { + return User.builder() + .name(name(prefix)+random.nextInt(999999)) + .fullName("testFullName") + .emailAddress("test@test.com") + .telephone("555-1234") + .isEnabled(false) + .im("testIM") + .isAlertEnabled(false) + .alertEmailPrefix("testPrefix") + .alertEmail("testAlert@test.com") + .isExternal(false) + .isGroupRole(false) + .role(role) + .password("password") + .build(); + } // TODO change properties to URI, not id protected void initTestParametersFromPropertiesOrLazyDiscover() { @@ -206,9 +286,12 @@ public abstract class BaseVCloudDirectorClientLiveTest extends BaseVersionedServ } } + @AfterClass(alwaysRun = true) protected void tearDown() { if (context != null) context.close(); + if (adminContext != null) + adminContext.close(); } public URI toAdminUri(Reference ref) { From 708b06545410b2835f82625d12ed2fa614a5e75d Mon Sep 17 00:00:00 2001 From: Andrew Donald Kennedy Date: Tue, 27 Mar 2012 17:49:22 +0100 Subject: [PATCH 03/11] Issue 830: Method name tidying --- .../v1_5/features/VAppAsyncClient.java | 23 +- .../director/v1_5/features/VAppClient.java | 32 +-- .../features/VAppTemplateAsyncClient.java | 90 +++---- .../v1_5/features/VAppTemplateClient.java | 222 +++++++++--------- .../director/v1_5/features/VdcClient.java | 104 ++++---- .../v1_5/features/VAppClientExpectTest.java | 8 +- .../v1_5/features/VAppClientLiveTest.java | 10 +- .../VAppTemplateClientExpectTest.java | 52 ++-- .../features/VAppTemplateClientLiveTest.java | 64 ++--- 9 files changed, 304 insertions(+), 301 deletions(-) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppAsyncClient.java index 24686545cf..208a10e034 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppAsyncClient.java @@ -123,24 +123,25 @@ public interface VAppAsyncClient { ListenableFuture deleteVApp(@EndpointParam URI vAppURI); /** - * @see VAppClient#consolidateVApp(URI) + * @see VAppClient#consolidateVm(URI) */ @POST @Path("/action/consolidate") @Consumes(TASK) @JAXBResponseParser - ListenableFuture consolidateVApp(@EndpointParam URI vAppURI); + ListenableFuture consolidateVm(@EndpointParam URI vAppURI); /** - * @see VAppClient#controlAccess(URI, ControlAccessParams) + * @see VAppClient#modifyControlAccess(URI, ControlAccessParams) */ @POST @Path("/action/controlAccess") @Produces(CONTROL_ACCESS) @Consumes(CONTROL_ACCESS) @JAXBResponseParser - ListenableFuture controlAccess(@EndpointParam URI vAppURI, - @BinderParam(BindToXMLPayload.class) ControlAccessParams params); + @ExceptionParser(ThrowVCloudErrorOn4xx.class) + ListenableFuture modifyControlAccess(@EndpointParam URI vAppURI, + @BinderParam(BindToXMLPayload.class) ControlAccessParams params); /** * @see VAppClient#deploy(URI, DeployVAppParams) @@ -190,26 +191,26 @@ public interface VAppAsyncClient { ListenableFuture installVMwareTools(@EndpointParam URI vAppURI); /** - * @see VAppClient#recomposeVApp(URI, RecomposeVAppParams) + * @see VAppClient#recompose(URI, RecomposeVAppParams) */ @POST @Path("/action/recomposeVApp") @Produces(RECOMPOSE_VAPP_PARAMS) @Consumes(TASK) @JAXBResponseParser - ListenableFuture recomposeVApp(@EndpointParam URI vAppURI, - @BinderParam(BindToXMLPayload.class) RecomposeVAppParams params); + ListenableFuture recompose(@EndpointParam URI vAppURI, + @BinderParam(BindToXMLPayload.class) RecomposeVAppParams params); /** - * @see VAppClient#relocate(URI, RelocateParams) + * @see VAppClient#relocateVm(URI, RelocateParams) */ @POST @Path("/action/relocate") @Produces(RELOCATE_VM_PARAMS) @Consumes(TASK) @JAXBResponseParser - ListenableFuture relocate(@EndpointParam URI vAppURI, - @BinderParam(BindToXMLPayload.class) RelocateParams params); + ListenableFuture relocateVm(@EndpointParam URI vAppURI, + @BinderParam(BindToXMLPayload.class) RelocateParams params); /** * @see VAppClient#undeploy(URI, UndeployVAppParams) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppClient.java index 2509e2f5df..eec10c496e 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppClient.java @@ -63,32 +63,32 @@ public interface VAppClient { * * The vApp/VM could be in one of these statuses: *

* @@ -131,7 +131,7 @@ public interface VAppClient { * * @since 1.5 */ - Task consolidateVApp(URI vAppURI); + Task consolidateVm(URI vAppURI); /** * Modifies the control access of a vApp. @@ -142,7 +142,7 @@ public interface VAppClient { * * @since 0.9 */ - ControlAccessParams controlAccess(URI vAppURI, ControlAccessParams params); + ControlAccessParams modifyControlAccess(URI vAppURI, ControlAccessParams params); /** * Deploys a vApp/VM. @@ -231,7 +231,7 @@ public interface VAppClient { * * @since 1.0 */ - Task recomposeVApp(URI vAppURI, RecomposeVAppParams params); + Task recompose(URI vAppURI, RecomposeVAppParams params); /** * Relocates a vm. @@ -242,7 +242,7 @@ public interface VAppClient { * * @since 1.5 */ - Task relocate(URI vAppURI, RelocateParams params); + Task relocateVm(URI vAppURI, RelocateParams params); /** * Undeploy a vApp/VM. diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateAsyncClient.java index 25e45683c8..213bfff88c 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateAsyncClient.java @@ -73,7 +73,7 @@ import com.google.common.util.concurrent.ListenableFuture; public interface VAppTemplateAsyncClient { /** - * @see org.jclouds.vcloud.director.v1_5.features.VAppTemplateClient#getVAppTemplate(URI) + * @see VAppTemplateClient#getVAppTemplate(URI) */ @GET @Consumes(VAPP_TEMPLATE) @@ -83,14 +83,14 @@ public interface VAppTemplateAsyncClient { /** - * @see org.jclouds.vcloud.director.v1_5.features.VAppTemplateClient#editVAppTemplate(URI, org.jclouds.vcloud.director.v1_5.domain.VAppTemplate) + * @see VAppTemplateClient#modifyVAppTemplate(URI, VAppTemplate) */ @PUT @Produces(VAPP_TEMPLATE) @Consumes(TASK) @JAXBResponseParser - ListenableFuture editVAppTemplate(@EndpointParam URI templateURI, - @BinderParam(BindToXMLPayload.class) VAppTemplate template); + ListenableFuture modifyVAppTemplate(@EndpointParam URI templateURI, + @BinderParam(BindToXMLPayload.class) VAppTemplate template); /** * @see VAppTemplateClient#deleteVappTemplate(URI) @@ -101,21 +101,21 @@ public interface VAppTemplateAsyncClient { ListenableFuture deleteVappTemplate(@EndpointParam URI templateUri); /** - * @see VAppTemplateClient#consolidateVappTemplate(URI) + * @see VAppTemplateClient#consolidateVm(URI) */ @POST @Consumes(TASK) @Path("/action/consolidate") @JAXBResponseParser - ListenableFuture consolidateVappTemplate(@EndpointParam URI templateURI); + ListenableFuture consolidateVm(@EndpointParam URI templateURI); /** - * @see VAppTemplateClient#disableDownloadVappTemplate(URI) + * @see VAppTemplateClient#disableDownload(URI) */ @POST @Path("/action/disableDownload") @JAXBResponseParser - ListenableFuture disableDownloadVappTemplate(@EndpointParam URI templateURI); + ListenableFuture disableDownload(@EndpointParam URI templateURI); /** * @see VAppTemplateClient#enableDownloadVappTemplate(URI) @@ -124,105 +124,105 @@ public interface VAppTemplateAsyncClient { @Consumes(TASK) @Path("/action/enableDownload") @JAXBResponseParser - ListenableFuture enableDownloadVappTemplate(@EndpointParam URI templateURI); + ListenableFuture enableDownload(@EndpointParam URI templateURI); /** - * @see VAppTemplateClient#relocateVappTemplate(URI, org.jclouds.vcloud.director.v1_5.domain.RelocateParams) + * @see VAppTemplateClient#relocateVm(URI, RelocateParams) */ @POST @Produces(RELOCATE_TEMPLATE) @Consumes(TASK) @Path("/action/relocate") @JAXBResponseParser - ListenableFuture relocateVappTemplate(@EndpointParam URI templateURI, - @BinderParam(BindToXMLPayload.class) RelocateParams params); + ListenableFuture relocateVm(@EndpointParam URI templateURI, + @BinderParam(BindToXMLPayload.class) RelocateParams params); /** - * @see VAppTemplateClient#getVAppTemplateCustomizationSection(URI) + * @see VAppTemplateClient#getCustomizationSection(URI) */ @GET @Consumes(CUSTOMIZATION_SECTION) @Path("/customizationSection") @JAXBResponseParser @ExceptionParser(ReturnNullOnNotFoundOr404.class) - ListenableFuture getVAppTemplateCustomizationSection(@EndpointParam URI templateURI); + ListenableFuture getCustomizationSection(@EndpointParam URI templateURI); /** - * @see VAppTemplateClient#editVAppTemplateCustomizationSection(URI, org.jclouds.vcloud.director.v1_5.domain.CustomizationSection) + * @see VAppTemplateClient#modifyCustomizationSection(URI, CustomizationSection) */ @PUT @Produces(CUSTOMIZATION_SECTION) @Consumes(TASK) @Path("/customizationSection") @JAXBResponseParser - ListenableFuture editVAppTemplateCustomizationSection(@EndpointParam URI templateURI, - @BinderParam(BindToXMLPayload.class) CustomizationSection sectionType); + ListenableFuture modifyCustomizationSection(@EndpointParam URI templateURI, + @BinderParam(BindToXMLPayload.class) CustomizationSection sectionType); /** - * @see VAppTemplateClient#getVAppTemplateGuestCustomizationSection(URI) + * @see VAppTemplateClient#getGuestCustomizationSection(URI) */ @GET @Consumes(GUEST_CUSTOMIZATION_SECTION) @Path("/guestCustomizationSection") @JAXBResponseParser @ExceptionParser(ReturnNullOnNotFoundOr404.class) - ListenableFuture getVAppTemplateGuestCustomizationSection(@EndpointParam URI templateURI); + ListenableFuture getGuestCustomizationSection(@EndpointParam URI templateURI); /** - * @see VAppTemplateClient#editVAppTemplateGuestCustomizationSection(URI, org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection) + * @see VAppTemplateClient#modifyGuestCustomizationSection(URI, org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection) */ @PUT @Produces(GUEST_CUSTOMIZATION_SECTION) @Consumes(TASK) @Path("/guestCustomizationSection") @JAXBResponseParser - ListenableFuture editVAppTemplateGuestCustomizationSection(@EndpointParam URI templateURI, - @BinderParam(BindToXMLPayload.class) GuestCustomizationSection section); + ListenableFuture modifyGuestCustomizationSection(@EndpointParam URI templateURI, + @BinderParam(BindToXMLPayload.class) GuestCustomizationSection section); /** - * @see VAppTemplateClient#getVappTemplateLeaseSettingsSection(URI) + * @see VAppTemplateClient#getLeaseSettingsSection(URI) */ @GET @Consumes(LEASE_SETTINGS_SECTION) @Path("/leaseSettingsSection") @JAXBResponseParser @ExceptionParser(ReturnNullOnNotFoundOr404.class) - ListenableFuture getVappTemplateLeaseSettingsSection(@EndpointParam URI templateURI); + ListenableFuture getLeaseSettingsSection(@EndpointParam URI templateURI); /** - * @see VAppTemplateClient#editVappTemplateLeaseSettingsSection(URI, org.jclouds.vcloud.director.v1_5.domain.LeaseSettingsSection) + * @see VAppTemplateClient#modifyLeaseSettingsSection(URI, LeaseSettingsSection) */ @PUT @Produces(LEASE_SETTINGS_SECTION) @Consumes(TASK) @Path("/leaseSettingsSection") @JAXBResponseParser - ListenableFuture editVappTemplateLeaseSettingsSection(@EndpointParam URI templateURI, - @BinderParam(BindToXMLPayload.class) LeaseSettingsSection settingsSection); + ListenableFuture modifyLeaseSettingsSection(@EndpointParam URI templateURI, + @BinderParam(BindToXMLPayload.class) LeaseSettingsSection settingsSection); /** - * @see VAppTemplateClient#getVAppTemplateNetworkConfigSection(URI) + * @see VAppTemplateClient#getNetworkConfigSection(URI) */ @GET @Consumes(NETWORK_CONFIG_SECTION) @Path("/networkConfigSection") @JAXBResponseParser @ExceptionParser(ReturnNullOnNotFoundOr404.class) - ListenableFuture getVAppTemplateNetworkConfigSection(@EndpointParam URI templateURI); + ListenableFuture getNetworkConfigSection(@EndpointParam URI templateURI); /** - * @see VAppTemplateClient#editVAppTemplateNetworkConfigSection(URI, org.jclouds.vcloud.director.v1_5.domain.NetworkConfigSection) + * @see VAppTemplateClient#modifyNetworkConfigSection(URI, NetworkConfigSection) */ @PUT @Produces(NETWORK_CONFIG_SECTION) @Consumes(TASK) @Path("/networkConfigSection") @JAXBResponseParser - ListenableFuture editVAppTemplateNetworkConfigSection(@EndpointParam URI templateURI, - @BinderParam(BindToXMLPayload.class) NetworkConfigSection section); + ListenableFuture modifyNetworkConfigSection(@EndpointParam URI templateURI, + @BinderParam(BindToXMLPayload.class) NetworkConfigSection section); /** - * @see VAppTemplateClient#getVAppTemplateNetworkConnectionSection(URI) + * @see VAppTemplateClient#getNetworkConnectionSection(URI) */ @GET @Consumes(NETWORK_CONNECTION_SECTION) @@ -232,35 +232,35 @@ public interface VAppTemplateAsyncClient { ListenableFuture getVAppTemplateNetworkConnectionSection(@EndpointParam URI templateURI); /** - * @see VAppTemplateClient#editVAppTemplateNetworkConnectionSection(URI, org.jclouds.vcloud.director.v1_5.domain.NetworkConnectionSection) + * @see VAppTemplateClient#modifyNetworkConnectionSection(URI, NetworkConnectionSection) */ @PUT @Produces(NETWORK_CONNECTION_SECTION) @Consumes(TASK) @Path("/networkConnectionSection") @JAXBResponseParser - ListenableFuture editVAppTemplateNetworkConnectionSection(@EndpointParam URI templateURI, - @BinderParam(BindToXMLPayload.class) NetworkConnectionSection section); + ListenableFuture modifyNetworkConnectionSection(@EndpointParam URI templateURI, + @BinderParam(BindToXMLPayload.class) NetworkConnectionSection section); /** - * @see VAppTemplateClient#getVAppTemplateNetworkSection(URI) + * @see VAppTemplateClient#getNetworkSection(URI) */ @GET @Consumes(NETWORK_SECTION) @Path("/networkSection") @JAXBResponseParser @ExceptionParser(ReturnNullOnNotFoundOr404.class) - ListenableFuture getVAppTemplateNetworkSection(@EndpointParam URI templateURI); + ListenableFuture getNetworkSection(@EndpointParam URI templateURI); /** - * @see VAppTemplateClient#getVAppTemplateOvf(URI) + * @see VAppTemplateClient#getOvf(URI) */ @GET @Consumes @Path("/ovf") @JAXBResponseParser @ExceptionParser(ReturnNullOnNotFoundOr404.class) - ListenableFuture getVAppTemplateOvf(@EndpointParam URI templateURI); + ListenableFuture getOvf(@EndpointParam URI templateURI); /** * @see VAppTemplateClient#getOwnerOfVAppTemplate(URI) @@ -270,7 +270,7 @@ public interface VAppTemplateAsyncClient { @Path("/owner") @JAXBResponseParser @ExceptionParser(ReturnNullOnNotFoundOr404.class) - ListenableFuture getOwnerOfVAppTemplate(@EndpointParam URI templateURI); + ListenableFuture getOwner(@EndpointParam URI templateURI); /** * @see VAppTemplateClient#getProductSectionsForVAppTemplate(URI) @@ -280,18 +280,18 @@ public interface VAppTemplateAsyncClient { @Path("/productSections") @JAXBResponseParser @ExceptionParser(ReturnNullOnNotFoundOr404.class) - ListenableFuture getProductSectionsForVAppTemplate(@EndpointParam URI templateURI); + ListenableFuture getProductSections(@EndpointParam URI templateURI); /** - * @see VAppTemplateClient#editProductSectionsForVAppTemplate(URI, org.jclouds.vcloud.director.v1_5.domain.ProductSectionList) + * @see VAppTemplateClient#modifyProductSections(URI, ProductSectionList) */ @PUT @Produces(PRODUCT_SECTION_LIST) @Consumes(TASK) @Path("/productSections") @JAXBResponseParser - ListenableFuture editProductSectionsForVAppTemplate(@EndpointParam URI templateURI, - @BinderParam(BindToXMLPayload.class) ProductSectionList sections); + ListenableFuture modifyProductSections(@EndpointParam URI templateURI, + @BinderParam(BindToXMLPayload.class) ProductSectionList sections); /** * @see VAppTemplateClient#getShadowVms(URI) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClient.java index 7e6d72949d..bdc154750a 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClient.java @@ -39,7 +39,7 @@ import org.jclouds.vcloud.director.v1_5.domain.ovf.NetworkSection; /** * Provides synchronous access to {@link VAppTemplate} objects. - * + * * @author Adam Lowe * @see org.jclouds.vcloud.director.v1_5.features.VAppTemplateAsyncClient */ @@ -51,25 +51,25 @@ public interface VAppTemplateClient { * * The vApp could be in one of these statues: *
    - *
  • {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#FAILED_CREATION} - - * Transient entity state, e.g., model object is created but the corresponding VC backing - * does not exist yet. This is further sub-categorized in the respective entities. - *
  • {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNRESOLVED} - - * Entity is whole, e.g., VM creation is complete and all the required model objects and VC backings are created. - *
  • {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#RESOLVED} - - * Entity is resolved. - *
  • {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNKNOWN} - - * Entity state could not be retrieved from the inventory, e.g., VM power state is null. - *
  • {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#POWERED_OFF} - - * All VMs of the vApp template - * are powered off. - *
  • {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#MIXED} - - * vApp template status is set to MIXED when the VMs in the vApp are in different power states. + *
  • {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#FAILED_CREATION FAILED_CREATION(-1)} - + * Transient entity state, e.g., model object is created but the corresponding VC backing does not exist yet. This + * is further sub-categorized in the respective entities. + *
  • {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNRESOLVED UNRESOLVED(0)} - + * Entity is whole, e.g., VM creation is complete and all the required model objects and VC backings are created. + *
  • {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#RESOLVED RESOLVED(1)} - + * Entity is resolved. + *
  • {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNKNOWN UNKNOWN(6)} - + * Entity state could not be retrieved from the inventory, e.g., VM power state is null. + *
  • {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#POWERED_OFF POWERED_OFF(8)} - + * All VMs of the vApp template are powered off. + *
  • {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#MIXED MIXED(10)} - + * vApp template status is set to {@code MIXED} when the VMs in the vApp are in different power states. *
+ * * 
     * GET /vAppTemplate/{id}
     *
- * + * * @param templateUri the URI of the template * @return the requested template */ @@ -77,159 +77,159 @@ public interface VAppTemplateClient { /** * Modifies only the name/description of a vApp template. - * + * * 
     * PUT /vAppTemplate/{id}
     *
* * @param templateUri the URI of the template - * @param template the template containing the new name and/or description - * @return the task performing the action. This operation is asynchronous and the user - * should monitor the returned task status in order to check when it is completed. + * @param template the template containing the new name and/or description + * @return the task performing the action. This operation is asynchronous and the user should monitor the returned + * task status in order to check when it is completed. */ - Task editVAppTemplate(URI templateUri, VAppTemplate template); + Task modifyVAppTemplate(URI templateUri, VAppTemplate template); /** * Deletes a vApp template. - * + * * 
     * DELETE /vAppTemplate/{id}
     *
- * + * * @param templateUri the URI of the template - * @return the task performing the action. This operation is asynchronous and the user - * should monitor the returned task status in order to check when it is completed. + * @return the task performing the action. This operation is asynchronous and the user should monitor the returned + * task status in order to check when it is completed. */ Task deleteVappTemplate(URI templateUri); /** * Consolidates a VM - * + * * 
     * POST /vAppTemplate/{id}/action/consolidate
     *
- * + * * @param templateUri the URI of the template - * @return the task performing the action. This operation is asynchronous and the user - * should monitor the returned task status in order to check when it is completed. + * @return the task performing the action. This operation is asynchronous and the user should monitor the returned + * task status in order to check when it is completed. */ - Task consolidateVappTemplate(URI templateUri); + Task consolidateVm(URI templateUri); /** * Disables the download link to the ovf of a vApp template. - * + * * 
     * POST /vAppTemplate/{id}/action/disableDownload
     *
- * + * * @param templateUri the URI of the template */ - void disableDownloadVappTemplate(URI templateUri); + void disableDownload(URI templateUri); /** * Enables downloading of the ovf of a vApp template. - * + * * 
     * POST /vAppTemplate/{id}/action/enableDownload
     *
- * + * * @param templateUri the URI of the template - * @return the task performing the action. This operation is asynchronous and the user - * should monitor the returned task status in order to check when it is completed. + * @return the task performing the action. This operation is asynchronous and the user should monitor the returned + * task status in order to check when it is completed. */ - Task enableDownloadVappTemplate(URI templateUri); + Task enableDownload(URI templateUri); /** * Relocates a virtual machine in a vApp template to a different datastore. - * + * * 
     * POST /vAppTemplate/{id}/action/relocate
     *
- * + * * @param templateUri the URI of the template - * @param params contains the reference to the new datastore - * @return the task performing the action. This operation is asynchronous and the user - * should monitor the returned task status in order to check when it is completed. + * @param params contains the reference to the new datastore + * @return the task performing the action. This operation is asynchronous and the user should monitor the returned + * task status in order to check when it is completed. */ - Task relocateVappTemplate(URI templateUri, RelocateParams params); + Task relocateVm(URI templateUri, RelocateParams params); /** * Retrieves the customization section of a vApp template. - * + * * 
     * GET /vAppTemplate/{id}/customizationSection
     *
- * + * * @param templateUri the URI of the template * @return the customization section */ - CustomizationSection getVAppTemplateCustomizationSection(URI templateUri); + CustomizationSection getCustomizationSection(URI templateUri); /** * Modifies the vApp template customization information. - * + * * 
     * PUT /vAppTemplate/{id}/customizationSection
     *
- * + * * @param templateUri the URI of the template - * @param section the new configuration to apply - * @return the task performing the action. This operation is asynchronous and the user - * should monitor the returned task status in order to check when it is completed. + * @param section the new configuration to apply + * @return the task performing the action. This operation is asynchronous and the user should monitor the returned + * task status in order to check when it is completed. */ - Task editVAppTemplateCustomizationSection(URI templateUri, CustomizationSection section); + Task modifyCustomizationSection(URI templateUri, CustomizationSection section); /** * Retrieves the Guest Customization Section of a VM - * + * * 
     * GET /vAppTemplate/{id}/guestCustomizationSection
     *
- * + * * @param templateUri the URI of the template * @return the guest customization section */ - GuestCustomizationSection getVAppTemplateGuestCustomizationSection(URI templateUri); + GuestCustomizationSection getGuestCustomizationSection(URI templateUri); /** * Modifies the guest customization options of a VM. - * + * * 
     * PUT /vAppTemplate/{id}/guestCustomizationSection
     *
- * + * * @param templateUri the URI of the template - * @param section the new configuration to apply - * @return the task performing the action. This operation is asynchronous and the user - * should monitor the returned task status in order to check when it is completed. + * @param section the new configuration to apply + * @return the task performing the action. This operation is asynchronous and the user should monitor the returned + * task status in order to check when it is completed. */ - Task editVAppTemplateGuestCustomizationSection(URI templateUri, GuestCustomizationSection section); + Task modifyGuestCustomizationSection(URI templateUri, GuestCustomizationSection section); /** * Retrieves the lease settings section of a vApp or vApp template - * + * * 
     * GET /vAppTemplate/{id}/leaseSettingsSection
     *
- * + * * @param templateUri the URI of the template * @return the lease settings */ - LeaseSettingsSection getVappTemplateLeaseSettingsSection(URI templateUri); + LeaseSettingsSection getLeaseSettingsSection(URI templateUri); /** * Modifies the lease settings section of a vApp or vApp template. - * + * * 
     * PUT /vAppTemplate/{id}/leaseSettingsSection
     *
- * + * * @param templateUri the URI of the template - * @param section the new configuration to apply - * @return the task performing the action. This operation is asynchronous and the user - * should monitor the returned task status in order to check when it is completed. + * @param section the new configuration to apply + * @return the task performing the action. This operation is asynchronous and the user should monitor the returned + * task status in order to check when it is completed. */ - Task editVappTemplateLeaseSettingsSection(URI templateUri, LeaseSettingsSection section); + Task modifyLeaseSettingsSection(URI templateUri, LeaseSettingsSection section); /** * Retrieves the network config section of a vApp or vApp template. @@ -237,122 +237,122 @@ public interface VAppTemplateClient { * 
     * GET /vAppTemplate/{id}/networkConfigSection
     *
- * + * * @param templateUri the URI of the template * @return the network config section requested */ - NetworkConfigSection getVAppTemplateNetworkConfigSection(URI templateUri); + NetworkConfigSection getNetworkConfigSection(URI templateUri); /** * Modifies the network config section of a vApp. - * + * * 
     * PUT /vAppTemplate/{id}/networkConfigSection
     *
- * + * * @param templateUri the URI of the template - * @param section the new configuration to apply - * @return the task performing the action. This operation is asynchronous and the user - * should monitor the returned task status in order to check when it is completed. + * @param section the new configuration to apply + * @return the task performing the action. This operation is asynchronous and the user should monitor the returned + * task status in order to check when it is completed. */ - Task editVAppTemplateNetworkConfigSection(URI templateUri, NetworkConfigSection section); + Task modifyNetworkConfigSection(URI templateUri, NetworkConfigSection section); /** * Retrieves the network connection section of a VM - * + * * 
     * GET /vAppTemplate/{id}/networkConnectionSection
     *
- * + * * @param templateUri the URI of the template * @return the network connection section requested */ - NetworkConnectionSection getVAppTemplateNetworkConnectionSection(URI templateUri); + NetworkConnectionSection getNetworkConnectionSection(URI templateUri); /** * Modifies the network connection section of a VM. - * + * * 
     * PUT /vAppTemplate/{id}/networkConnectionSection
     *
- * + * * @param templateUri the URI of the template - * @param section the new configuration to apply - * @return the task performing the action. This operation is asynchronous and the user - * should monitor the returned task status in order to check when it is completed. + * @param section the new configuration to apply + * @return the task performing the action. This operation is asynchronous and the user should monitor the returned + * task status in order to check when it is completed. */ - Task editVAppTemplateNetworkConnectionSection(URI templateUri, NetworkConnectionSection section); + Task modifyNetworkConnectionSection(URI templateUri, NetworkConnectionSection section); /** * Retrieves the network section of a vApp or vApp template. - * + * * 
     * GET /vAppTemplate/{id}/networkSection
     *
- * + * * @param templateUri the URI of the template * @return the network section requested */ - NetworkSection getVAppTemplateNetworkSection(URI templateUri); + NetworkSection getNetworkSection(URI templateUri); /** - * Retrieves an OVF descriptor of a vApp template. This OVF represents the vApp - * template as it is, with all vCloud specific information (like mac address, - * parent networks, etc). The OVF which could be downloaded by enabling for - * download will not contain this information. There no specific states bound - * to this entity. + * Retrieves an OVF descriptor of a vApp template. * + * This OVF represents the vApp template as it is, with all vCloud specific information (like mac address, parent + * networks, etc). The OVF which could be downloaded by enabling for download will not contain this information. + * There are no specific states bound to this entity. + * * 
     * GET /vAppTemplate/{id}/ovf
     *
- * + * * @param templateUri the URI of the template * @return the ovf envelope */ - Envelope getVAppTemplateOvf(URI templateUri); + Envelope getOvf(URI templateUri); /** * Retrieves vApp template owner. - * + * * 
     * GET /vAppTemplate/{id}/owner
     *
- * + * * @param templateUri the URI of the template * @return the owner of the vApp template */ - Owner getOwnerOfVAppTemplate(URI templateUri); + Owner getOwner(URI templateUri); /** * Retrieves VAppTemplate/VM product sections - * + * * 
     * GET /vAppTemplate/{id}/productSections
     *
- * + * * @param templateUri the URI of the template * @return the product sections */ - ProductSectionList getProductSectionsForVAppTemplate(URI templateUri); + ProductSectionList getProductSections(URI templateUri); /** * Modifies the product sections of a vApp or vApp template. - * + * * 
     * PUT /vAppTemplate/{id}/productSections
     *
- * + * * @param templateUri the URI of the template - * @return the task performing the action. This operation is asynchronous and the user - * should monitor the returned task status in order to check when it is completed. + * @return the task performing the action. This operation is asynchronous and the user should monitor the returned + * task status in order to check when it is completed. */ - Task editProductSectionsForVAppTemplate(URI templateUri, ProductSectionList sections); - + Task modifyProductSections(URI templateUri, ProductSectionList sections); + /** * 
     * GET /vAppTemplate/{id}/shadowVms
     *
- * + * * @param templateUri the URI of the template * @return shadowVM references */ diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcClient.java index 8ea71aec0c..236eb3072a 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcClient.java @@ -56,30 +56,34 @@ public interface VdcClient { * Captures a vApp into vApp template. * * The status of vApp template will be in - * {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNRESOLVED UNRESOLVED(0)} - * until the capture task is finished. + * {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNRESOLVED UNRESOLVED(0)} until the + * capture task is finished. * - * @return a VApp resource which will contain a task. - * The user should should wait for this task to finish to be able to use the vApp. + * @return a VApp resource which will contain a task. The user should should wait for this task to finish to be able + * to use the vApp. */ VAppTemplate captureVApp(URI vdcUri, CaptureVAppParams params); /** - * Clones a media into new one. + * Clones a media into new one. + * * The status of the returned media is - * {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNRESOLVED UNRESOLVED(0)} - * until the task for cloning finish. + * {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNRESOLVED UNRESOLVED(0)} until the task + * for cloning finish. * - * @return a Media resource which will contain a task. - * The user should monitor the contained task status in order to check when it is completed. + * @return a Media resource which will contain a task. The user should monitor the contained task status in order to + * check when it is completed. */ Media cloneMedia(URI vdcUri, CloneMediaParams params); /** - * Clones a vApp into new one. The status of vApp will be in UNRESOLVED(0) until the clone task is finished. + * Clones a vApp into new one. + * + * The status of vApp will be in {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNRESOLVED + * UNRESOLVED(0)} until the clone task is finished. * - * @return a VApp resource which will contain a task. - * The user should should wait for this task to finish to be able to use the vApp. + * @return a VApp resource which will contain a task. The user should should wait for this task to finish to be able + * to use the vApp. */ VApp cloneVApp(URI vdcUri, CloneVAppParams params); @@ -87,11 +91,11 @@ public interface VdcClient { * Clones a vApp template into new one. * * The status of vApp template will be in - * {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNRESOLVED UNRESOLVED(0)} - * until the clone task is finished. + * {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNRESOLVED UNRESOLVED(0)} until the clone + * task is finished. * - * @return a VAppTemplate resource which will contain a task. - * The user should should wait for this task to finish to be able to use the VAppTemplate. + * @return a VAppTemplate resource which will contain a task. The user should should wait for this task to finish to + * be able to use the VAppTemplate. */ VAppTemplate cloneVAppTemplate(URI vdcUri, CloneVAppTemplateParams params); @@ -102,45 +106,43 @@ public interface VdcClient { * or virtual machines. When you compose a vApp, all children of each composition source * become peers in the Children collection of the composed vApp. To compose a vApp, a client * makes a compose vApp request whose body is a ComposeVAppParams element, includes the - * following information: + * following information: *
    - *
  • An InstantiationParams element that applies to the composed vApp itself and any vApp - * templates referenced in Item elements. - *
  • A SourcedItem element for each virtual machine, vApp, or vAppTemplate to include in - * the composition. Each SourcedItem can contain the following elements: + *
  • An InstantiationParams element that applies to the composed vApp itself and any vApp templates referenced in + * Item elements. + *
  • A SourcedItem element for each virtual machine, vApp, or vAppTemplate to include in the composition. Each + * SourcedItem can contain the following elements: *
      - *
    • A required Source element whose href attribute value is a reference - * to a vApp template, vApp, or VM to include in the composition. If the Source element - * references a VM, the Item must also include an InstantiationParams element specific to - * that VM. - *
    • An optional NetworkAssignment element that specifies how the network connections - * of child VM elements are mapped to vApp networks in the parent. + *
    • A required Source element whose href attribute value is a reference to a vApp template, vApp, or VM to include + * in the composition. If the Source element references a VM, the Item must also include an InstantiationParams + * element specific to that VM. + *
    • An optional NetworkAssignment element that specifies how the network connections of child VM elements are + * mapped to vApp networks in the parent. *
    - *
  • If any of the composition items is subject to a EULA, the ComposeVAppParams element - * must include an AllEULAsAccepted element that has a value of true, indicating that you - * accept the EULA. Otherwise, composition fails. The composed vApp must be deployed and - * powered on before it can be used. The status of vApp will be - * {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNRESOLVED UNRESOLVED(0)} - * until the compose task is finished. + *
+ * If any of the composition items is subject to a EULA, the ComposeVAppParams element must include an + * AllEULAsAccepted element that has a value of true, indicating that you accept the EULA. Otherwise, composition + * fails. The composed vApp must be deployed and powered on before it can be used. The status of vApp will be + * {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNRESOLVED UNRESOLVED(0)} until the + * compose task is finished. * - * @return a VApp resource which will contain a task. - * The user should should wait for this task to finish to be able to use the vApp. + * @return a VApp resource which will contain a task. The user should should wait for this task to finish to be able + * to use the vApp. */ VApp composeVApp(URI vdcUri, ComposeVAppParams params); /** - * Instantiate a vApp template into a new vApp. - * - * The status of vApp will be in - * {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNRESOLVED UNRESOLVED(0)} - * until the instantiate task is finished. + * Instantiate a vApp template into a new vApp. * + * The status of vApp will be in {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNRESOLVED + * UNRESOLVED(0)} until the instantiate task is finished. + * * 
     * POST /vdc/{id}/action/instantiateVAppTemplate
     *
* - * @return a VApp resource which will contain a task. - * The user should should wait for this task to finish to be able to use the vApp. + * @return a VApp resource which will contain a task. The user should should wait for this task to finish to be able + * to use the vApp. */ VApp instantiateVApp(URI vdcUri, InstantiateVAppParamsType params); @@ -149,19 +151,19 @@ public interface VdcClient { * * The operation is separate on several steps: *
    - *
  1. creating empty vApp template entity - *
  2. uploading an OVF of vApp template - *
  3. uploading disks described from the OVF + *
  4. creating empty vApp template entity + *
  5. uploading an OVF of vApp template + *
  6. uploading disks described from the OVF *
  7. finishing task for uploading *
- * The status of vApp template will be {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#NOT_READY NOT_READY(0)} - * until the ovf and all disks are uploaded to the transfer site. After this a task will run on the vApp template uploading. - * - * Note that the empty vApp template's getFiles() returns a file of size -1 after step one above, + * The status of vApp template will be + * {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#NOT_READY NOT_READY(0)} until the ovf and + * all disks are uploaded to the transfer site. After this a task will run on the vApp template uploading. + * Note that the empty vApp template's getFiles() returns a file of size -1 after step one above, * because the descriptor.ovf does not yet exist. * - * @return a VAppTemplate resource which will contain a task. - * The user should should wait for this task to finish to be able to use the VAppTemplate. + * @return a VAppTemplate resource which will contain a task. The user should should wait for this task to finish to + * be able to use the VAppTemplate. */ VAppTemplate uploadVAppTemplate(URI vdcUri, UploadVAppTemplateParams params); diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientExpectTest.java index 612f913b0e..27125baf03 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientExpectTest.java @@ -140,7 +140,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest Task expected = consolidateVAppTask(); - assertEquals(client.getVAppClient().consolidateVApp(vAppURI), expected); + assertEquals(client.getVAppClient().consolidateVm(vAppURI), expected); } @Test(enabled = false) @@ -159,7 +159,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest ControlAccessParams expected = controlAccessParams(); - assertEquals(client.getVAppClient().controlAccess(vAppURI, params), expected); + assertEquals(client.getVAppClient().modifyControlAccess(vAppURI, params), expected); } @Test(enabled = false) @@ -259,7 +259,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest Task expected = recomposeVAppTask(); - assertEquals(client.getVAppClient().recomposeVApp(vAppURI, params), expected); + assertEquals(client.getVAppClient().recompose(vAppURI, params), expected); } @Test(enabled = false) @@ -279,7 +279,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest Task expected = relocateTask(); - assertEquals(client.getVAppClient().relocate(vAppURI, params), expected); + assertEquals(client.getVAppClient().relocateVm(vAppURI, params), expected); } @Test(enabled = false) diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientLiveTest.java index dd8406b2b6..c2bb9bed70 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientLiveTest.java @@ -316,7 +316,7 @@ public class VAppClientLiveTest extends AbstractVAppClientLiveTest { vApp = powerOn(vApp); // The method under test - Task consolidateVApp = vAppClient.consolidateVApp(vApp.getHref()); + Task consolidateVApp = vAppClient.consolidateVm(vApp.getHref()); assertTrue(retryTaskSuccess.apply(consolidateVApp), String.format(TASK_COMPLETE_TIMELY, "consolidateVApp")); } @@ -331,7 +331,7 @@ public class VAppClientLiveTest extends AbstractVAppClientLiveTest { .build(); // The method under test - ControlAccessParams modified = vAppClient.controlAccess(vApp.getHref(), params); + ControlAccessParams modified = vAppClient.modifyControlAccess(vApp.getHref(), params); // Check the retrieved object is well formed checkControlAccessParams(modified); @@ -347,7 +347,7 @@ public class VAppClientLiveTest extends AbstractVAppClientLiveTest { .build(); // The method under test - ControlAccessParams modified = vAppClient.controlAccess(vApp.getHref(), params); + ControlAccessParams modified = vAppClient.modifyControlAccess(vApp.getHref(), params); // Check the retrieved object is well formed checkControlAccessParams(modified); @@ -436,7 +436,7 @@ public class VAppClientLiveTest extends AbstractVAppClientLiveTest { RecomposeVAppParams params = RecomposeVAppParams.builder().build(); // The method under test - Task recomposeVApp = vAppClient.recomposeVApp(vApp.getHref(), params); + Task recomposeVApp = vAppClient.recompose(vApp.getHref(), params); assertTrue(retryTaskSuccess.apply(recomposeVApp), String.format(TASK_COMPLETE_TIMELY, "recomposeVApp")); } @@ -449,7 +449,7 @@ public class VAppClientLiveTest extends AbstractVAppClientLiveTest { RelocateParams params = RelocateParams.builder().datastore(Reference.builder().href(datastore.getHref()).build()).build(); // The method under test - Task relocate = vAppClient.relocate(vApp.getHref(), params); + Task relocate = vAppClient.relocateVm(vApp.getHref(), params); assertTrue(retryTaskSuccess.apply(relocate), String.format(TASK_COMPLETE_TIMELY, "relocate")); } diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java index 5719ce6d8c..41d2d08f78 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java @@ -102,7 +102,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx assertEquals(template, exampleTemplate()); - Task task = client.editVAppTemplate(uri, exampleTemplate()); + Task task = client.modifyVAppTemplate(uri, exampleTemplate()); assertNotNull(task); task = client.deleteVappTemplate(uri); @@ -130,7 +130,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx new VcloudHttpRequestPrimer().apiCommand("PUT", templateId).xmlFilePayload("/vapptemplate/vAppTemplate.xml", VAPP_TEMPLATE).acceptMedia(TASK).httpRequestBuilder().build(), new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error403.xml", ERROR).httpResponseBuilder().statusCode(403).build()).getVAppTemplateClient(); - client.editVAppTemplate(uri, exampleTemplate()); + client.modifyVAppTemplate(uri, exampleTemplate()); } @Test(expectedExceptions = VCloudDirectorException.class) @@ -155,7 +155,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx ).getVAppTemplateClient(); assertNotNull(client); - Task task = client.consolidateVappTemplate(uri); + Task task = client.consolidateVm(uri); assertNotNull(task); } @@ -168,7 +168,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx new VcloudHttpRequestPrimer().apiCommand("POST", templateId + "/action/consolidate").acceptMedia(TASK).httpRequestBuilder().build(), new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error403.xml", ERROR).httpResponseBuilder().statusCode(403).build()).getVAppTemplateClient(); - client.consolidateVappTemplate(uri); + client.consolidateVm(uri); } public void testDisableDownloadVAppTemplate() { @@ -181,7 +181,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx ).getVAppTemplateClient(); assertNotNull(client); - client.disableDownloadVappTemplate(uri); + client.disableDownload(uri); } @Test(expectedExceptions = VCloudDirectorException.class) @@ -193,7 +193,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx new VcloudHttpRequestPrimer().apiCommand("POST", templateId + "/action/disableDownload").httpRequestBuilder().build(), new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error400.xml", ERROR).httpResponseBuilder().statusCode(400).build()).getVAppTemplateClient(); - client.disableDownloadVappTemplate(uri); + client.disableDownload(uri); } public void testEnableDownloadVAppTemplate() { @@ -206,7 +206,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx ).getVAppTemplateClient(); assertNotNull(client); - Task task = client.enableDownloadVappTemplate(uri); + Task task = client.enableDownload(uri); assertNotNull(task); } @@ -219,7 +219,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx new VcloudHttpRequestPrimer().apiCommand("POST", templateId + "/action/enableDownload").acceptMedia(TASK).httpRequestBuilder().build(), new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error403.xml", ERROR).httpResponseBuilder().statusCode(403).build()).getVAppTemplateClient(); - client.enableDownloadVappTemplate(uri); + client.enableDownload(uri); } public void testRelocateVAppTemplate() { @@ -236,7 +236,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx Reference datastore = Reference.builder().href(URI.create("https://vcloud.example.com/api/admin/extension/datastore/607")).build(); RelocateParams params = RelocateParams.builder().datastore(datastore).build(); - Task task = client.relocateVappTemplate(uri, params); + Task task = client.relocateVm(uri, params); assertNotNull(task); } @@ -252,7 +252,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx Reference datastore = Reference.builder().href(URI.create("https://vcloud.example.com/api/admin/extension/datastore/607")).build(); RelocateParams params = RelocateParams.builder().datastore(datastore).build(); - client.relocateVappTemplate(uri, params); + client.relocateVm(uri, params); } @Test @@ -268,11 +268,11 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx ).getVAppTemplateClient(); assertNotNull(client); - CustomizationSection section = client.getVAppTemplateCustomizationSection(uri); + CustomizationSection section = client.getCustomizationSection(uri); assertEquals(section, exampleCustomizationSection()); - Task task = client.editVAppTemplateCustomizationSection(uri, exampleCustomizationSection()); + Task task = client.modifyCustomizationSection(uri, exampleCustomizationSection()); assertNotNull(task); } @@ -284,7 +284,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx new VcloudHttpRequestPrimer().apiCommand("GET", templateId + "/customizationSection").acceptMedia(CUSTOMIZATION_SECTION).httpRequestBuilder().build(), new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error403.xml", ERROR).httpResponseBuilder().statusCode(403).build()).getVAppTemplateClient(); - assertNull(client.getVAppTemplateCustomizationSection(uri)); + assertNull(client.getCustomizationSection(uri)); } @Test(expectedExceptions = ResourceNotFoundException.class) @@ -296,7 +296,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx new VcloudHttpRequestPrimer().apiCommand("PUT", templateId + "/customizationSection").xmlFilePayload("/vapptemplate/customizationSection.xml", CUSTOMIZATION_SECTION).acceptMedia(TASK).httpRequestBuilder().build(), new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error403.xml", ERROR).httpResponseBuilder().statusCode(403).build()).getVAppTemplateClient(); - client.editVAppTemplateCustomizationSection(uri, exampleCustomizationSection()); + client.modifyCustomizationSection(uri, exampleCustomizationSection()); } public void testGuestCustomizationSection() { @@ -311,11 +311,11 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx ).getVAppTemplateClient(); assertNotNull(client); - GuestCustomizationSection section = client.getVAppTemplateGuestCustomizationSection(uri); + GuestCustomizationSection section = client.getGuestCustomizationSection(uri); assertEquals(section, exampleGuestCustomizationSection()); - Task task = client.editVAppTemplateGuestCustomizationSection(uri, exampleGuestCustomizationSection()); + Task task = client.modifyGuestCustomizationSection(uri, exampleGuestCustomizationSection()); assertNotNull(task); } @@ -328,7 +328,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx new VcloudHttpRequestPrimer().apiCommand("GET", templateId + "/guestCustomizationSection").acceptMedia(GUEST_CUSTOMIZATION_SECTION).httpRequestBuilder().build(), new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error400.xml", ERROR).httpResponseBuilder().statusCode(400).build()).getVAppTemplateClient(); - client.getVAppTemplateGuestCustomizationSection(uri); + client.getGuestCustomizationSection(uri); } @Test(expectedExceptions = VCloudDirectorException.class) @@ -340,7 +340,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx new VcloudHttpRequestPrimer().apiCommand("PUT", templateId + "/guestCustomizationSection").xmlFilePayload("/vapptemplate/guestCustomizationSection.xml", GUEST_CUSTOMIZATION_SECTION).acceptMedia(TASK).httpRequestBuilder().build(), new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error400.xml", ERROR).httpResponseBuilder().statusCode(400).build()).getVAppTemplateClient(); - client.editVAppTemplateGuestCustomizationSection(uri, exampleGuestCustomizationSection()); + client.modifyGuestCustomizationSection(uri, exampleGuestCustomizationSection()); } public void testLeaseSettingsSection() throws ParseException { @@ -355,11 +355,11 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx ).getVAppTemplateClient(); assertNotNull(client); - LeaseSettingsSection section = client.getVappTemplateLeaseSettingsSection(uri); + LeaseSettingsSection section = client.getLeaseSettingsSection(uri); assertEquals(section, exampleLeaseSettingsSection()); - Task task = client.editVappTemplateLeaseSettingsSection(uri, exampleLeaseSettingsSection()); + Task task = client.modifyLeaseSettingsSection(uri, exampleLeaseSettingsSection()); assertNotNull(task); } @@ -371,7 +371,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx new VcloudHttpRequestPrimer().apiCommand("GET", templateId + "/leaseSettingsSection").acceptMedia(LEASE_SETTINGS_SECTION).httpRequestBuilder().build(), new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error403.xml", ERROR).httpResponseBuilder().statusCode(403).build()).getVAppTemplateClient(); - assertNull(client.getVappTemplateLeaseSettingsSection(uri)); + assertNull(client.getLeaseSettingsSection(uri)); } @Test(expectedExceptions = ResourceNotFoundException.class) @@ -383,7 +383,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx new VcloudHttpRequestPrimer().apiCommand("PUT", templateId + "/leaseSettingsSection").xmlFilePayload("/vapptemplate/leaseSettingsSection.xml", LEASE_SETTINGS_SECTION).acceptMedia(TASK).httpRequestBuilder().build(), new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error403.xml", ERROR).httpResponseBuilder().statusCode(403).build()).getVAppTemplateClient(); - client.editVappTemplateLeaseSettingsSection(uri, exampleLeaseSettingsSection()); + client.modifyLeaseSettingsSection(uri, exampleLeaseSettingsSection()); } public void testVappTemplateMetadata() { @@ -503,11 +503,11 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx assertNotNull(client); - NetworkConfigSection section = client.getVAppTemplateNetworkConfigSection(uri); + NetworkConfigSection section = client.getNetworkConfigSection(uri); assertEquals(section, exampleNetworkConfigSection()); - Task task = client.editVAppTemplateNetworkConfigSection(uri, exampleNetworkConfigSection()); + Task task = client.modifyNetworkConfigSection(uri, exampleNetworkConfigSection()); assertNotNull(task); } @@ -520,7 +520,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx new VcloudHttpRequestPrimer().apiCommand("GET", templateId + "/networkConfigSection").acceptMedia(NETWORK_CONFIG_SECTION).httpRequestBuilder().build(), new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error400.xml", ERROR).httpResponseBuilder().statusCode(400).build()).getVAppTemplateClient(); - client.getVAppTemplateNetworkConfigSection(uri); + client.getNetworkConfigSection(uri); } @Test(expectedExceptions = VCloudDirectorException.class) @@ -532,7 +532,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx new VcloudHttpRequestPrimer().apiCommand("PUT", templateId + "/networkConfigSection").xmlFilePayload("/vapptemplate/networkConfigSection.xml", NETWORK_CONFIG_SECTION).acceptMedia(TASK).httpRequestBuilder().build(), new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error400.xml", ERROR).httpResponseBuilder().statusCode(400).build()).getVAppTemplateClient(); - client.editVAppTemplateNetworkConfigSection(uri, exampleNetworkConfigSection()); + client.modifyNetworkConfigSection(uri, exampleNetworkConfigSection()); } private VAppTemplate exampleTemplate() { diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientLiveTest.java index a6bd4ffe15..1630dd3c5d 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientLiveTest.java @@ -106,7 +106,7 @@ public class VAppTemplateClientLiveTest extends AbstractVAppClientLiveTest { @Test(description = "GET /vAppTemplate/{id}/owner") public void testGetVAppTemplateOwner() { - Owner owner = vAppTemplateClient.getOwnerOfVAppTemplate(vAppTemplateURI); + Owner owner = vAppTemplateClient.getOwner(vAppTemplateURI); checkOwner(owner); assertEquals(owner.getUser(), vAppTemplateClient.getVAppTemplate(vAppTemplateURI).getOwner().getUser()); @@ -114,14 +114,14 @@ public class VAppTemplateClientLiveTest extends AbstractVAppClientLiveTest { @Test(description = "GET /vAppTemplate/{id}/customizationSection") public void testGetCustomizationSection() { - CustomizationSection customizationSection = vAppTemplateClient.getVAppTemplateCustomizationSection(vAppTemplateURI); + CustomizationSection customizationSection = vAppTemplateClient.getCustomizationSection(vAppTemplateURI); checkCustomizationSection(customizationSection); } @Test(description = "GET /vAppTemplate/{id}/productSections") public void testGetProductSections() { - ProductSectionList productSectionList = vAppTemplateClient.getProductSectionsForVAppTemplate(vAppTemplateURI); + ProductSectionList productSectionList = vAppTemplateClient.getProductSections(vAppTemplateURI); checkProductSectionList(productSectionList); } @@ -130,13 +130,13 @@ public class VAppTemplateClientLiveTest extends AbstractVAppClientLiveTest { public void testEditProductSections() { // TODO make a real modification - ProductSectionList origSections = vAppTemplateClient.getProductSectionsForVAppTemplate(vApp.getHref()); + ProductSectionList origSections = vAppTemplateClient.getProductSections(vApp.getHref()); ProductSectionList newSections = origSections.toBuilder().build(); - Task task = vAppTemplateClient.editProductSectionsForVAppTemplate(vApp.getHref(), newSections); + Task task = vAppTemplateClient.modifyProductSections(vApp.getHref(), newSections); assertTaskSucceeds(task); - ProductSectionList modified = vAppTemplateClient.getProductSectionsForVAppTemplate(vApp.getHref()); + ProductSectionList modified = vAppTemplateClient.getProductSections(vApp.getHref()); checkProductSectionList(modified); } @@ -145,7 +145,7 @@ public class VAppTemplateClientLiveTest extends AbstractVAppClientLiveTest { getGuestCustomizationSection(new Function() { @Override public GuestCustomizationSection apply(URI uri) { - return vAppTemplateClient.getVAppTemplateGuestCustomizationSection(uri); + return vAppTemplateClient.getGuestCustomizationSection(uri); } }); } @@ -153,7 +153,7 @@ public class VAppTemplateClientLiveTest extends AbstractVAppClientLiveTest { @Test(description = "GET /vAppTemplate/{id}/leaseSettingsSection") public void testGetLeaseSettingsSection() { // FIXME Wrong case for Vapp - LeaseSettingsSection leaseSettingsSection = vAppTemplateClient.getVappTemplateLeaseSettingsSection(vAppTemplateURI); + LeaseSettingsSection leaseSettingsSection = vAppTemplateClient.getLeaseSettingsSection(vAppTemplateURI); checkLeaseSettingsSection(leaseSettingsSection); } @@ -179,7 +179,7 @@ public class VAppTemplateClientLiveTest extends AbstractVAppClientLiveTest { @Test(description = "GET /vAppTemplate/{id}/networkConfigSection") public void testGetVAppTemplateNetworkConfigSection() { - NetworkConfigSection networkConfigSection = vAppTemplateClient.getVAppTemplateNetworkConfigSection(vAppTemplateURI); + NetworkConfigSection networkConfigSection = vAppTemplateClient.getNetworkConfigSection(vAppTemplateURI); checkNetworkConfigSection(networkConfigSection); } @@ -189,21 +189,21 @@ public class VAppTemplateClientLiveTest extends AbstractVAppClientLiveTest { getNetworkConnectionSection(new Function() { @Override public NetworkConnectionSection apply(URI uri) { - return vAppTemplateClient.getVAppTemplateNetworkConnectionSection(uri); + return vAppTemplateClient.getNetworkConnectionSection(uri); } }); } @Test(description = "GET /vAppTemplate/{id}/networkSection") public void testGetVAppTemplateNetworkSection() { - NetworkSection networkSection = vAppTemplateClient.getVAppTemplateNetworkSection(vAppTemplateURI); + NetworkSection networkSection = vAppTemplateClient.getNetworkSection(vAppTemplateURI); checkOvfNetworkSection(networkSection); } @Test(description = "GET /vAppTemplate/{id}/ovf") public void testGetVAppTemplateOvf() { - Envelope envelope = vAppTemplateClient.getVAppTemplateOvf(vAppTemplateURI); + Envelope envelope = vAppTemplateClient.getOvf(vAppTemplateURI); checkOvfEnvelope(envelope); } @@ -217,7 +217,7 @@ public class VAppTemplateClientLiveTest extends AbstractVAppClientLiveTest { .description(description) .build(); - final Task task = vAppTemplateClient.editVAppTemplate(vAppTemplateURI, template); + final Task task = vAppTemplateClient.modifyVAppTemplate(vAppTemplateURI, template); retryTaskSuccess.apply(task); VAppTemplate newTemplate = vAppTemplateClient.getVAppTemplate(vAppTemplateURI); @@ -288,10 +288,10 @@ public class VAppTemplateClientLiveTest extends AbstractVAppClientLiveTest { .computerName(computerName) .build(); - final Task task = vAppTemplateClient.editVAppTemplateGuestCustomizationSection(vm.getHref(), newSection); + final Task task = vAppTemplateClient.modifyGuestCustomizationSection(vm.getHref(), newSection); assertTaskSucceeds(task); - GuestCustomizationSection modified = vAppTemplateClient.getVAppTemplateGuestCustomizationSection(vm.getHref()); + GuestCustomizationSection modified = vAppTemplateClient.getGuestCustomizationSection(vm.getHref()); checkGuestCustomizationSection(modified); assertEquals(modified.getComputerName(), computerName); @@ -299,7 +299,7 @@ public class VAppTemplateClientLiveTest extends AbstractVAppClientLiveTest { @Test(description = "PUT /vAppTemplate/{id}/customizationSection") public void testEditCustomizationSection() { - boolean oldVal = vAppTemplateClient.getVAppTemplateCustomizationSection(vAppTemplateURI).isCustomizeOnInstantiate(); + boolean oldVal = vAppTemplateClient.getCustomizationSection(vAppTemplateURI).isCustomizeOnInstantiate(); boolean newVal = !oldVal; CustomizationSection customizationSection = CustomizationSection.builder() @@ -307,10 +307,10 @@ public class VAppTemplateClientLiveTest extends AbstractVAppClientLiveTest { .customizeOnInstantiate(newVal) .build(); - final Task task = vAppTemplateClient.editVAppTemplateCustomizationSection(vAppTemplateURI, customizationSection); + final Task task = vAppTemplateClient.modifyCustomizationSection(vAppTemplateURI, customizationSection); retryTaskSuccess.apply(task); - CustomizationSection newCustomizationSection = vAppTemplateClient.getVAppTemplateCustomizationSection(vAppTemplateURI); + CustomizationSection newCustomizationSection = vAppTemplateClient.getCustomizationSection(vAppTemplateURI); assertEquals(newCustomizationSection.isCustomizeOnInstantiate(), newVal); } @@ -327,10 +327,10 @@ public class VAppTemplateClientLiveTest extends AbstractVAppClientLiveTest { .deploymentLeaseInSeconds(deploymentLeaseInSeconds) .build(); - final Task task = vAppTemplateClient.editVappTemplateLeaseSettingsSection(vAppTemplateURI, leaseSettingSection); + final Task task = vAppTemplateClient.modifyLeaseSettingsSection(vAppTemplateURI, leaseSettingSection); retryTaskSuccess.apply(task); - LeaseSettingsSection newLeaseSettingsSection = vAppTemplateClient.getVappTemplateLeaseSettingsSection(vAppTemplateURI); + LeaseSettingsSection newLeaseSettingsSection = vAppTemplateClient.getLeaseSettingsSection(vAppTemplateURI); assertEquals(newLeaseSettingsSection.getStorageLeaseInSeconds(), (Integer) storageLeaseInSeconds); assertEquals(newLeaseSettingsSection.getDeploymentLeaseInSeconds(), (Integer) deploymentLeaseInSeconds); } @@ -339,7 +339,7 @@ public class VAppTemplateClientLiveTest extends AbstractVAppClientLiveTest { public void testEditNetworkConfigSection() { // TODO What to modify? - NetworkConfigSection oldSection = vAppTemplateClient.getVAppTemplateNetworkConfigSection(vApp.getHref()); + NetworkConfigSection oldSection = vAppTemplateClient.getNetworkConfigSection(vApp.getHref()); NetworkConfigSection newSection = oldSection.toBuilder().build(); // String networkName = ""+random.nextInt(); @@ -356,10 +356,10 @@ public class VAppTemplateClientLiveTest extends AbstractVAppClientLiveTest { // .networkConfigs(vappNetworkConfigurations) // .build(); - final Task task = vAppTemplateClient.editVAppTemplateNetworkConfigSection(vApp.getHref(), newSection); + final Task task = vAppTemplateClient.modifyNetworkConfigSection(vApp.getHref(), newSection); assertTaskSucceeds(task); - NetworkConfigSection modified = vAppTemplateClient.getVAppTemplateNetworkConfigSection(vAppTemplateURI); + NetworkConfigSection modified = vAppTemplateClient.getNetworkConfigSection(vAppTemplateURI); checkNetworkConfigSection(modified); // assertEquals(modified§.getNetworkConfigs().size(), 1); @@ -383,10 +383,10 @@ public class VAppTemplateClientLiveTest extends AbstractVAppClientLiveTest { .build()) .build(); - Task task = vAppTemplateClient.editVAppTemplateNetworkConnectionSection(vm.getHref(), newSection); + Task task = vAppTemplateClient.modifyNetworkConnectionSection(vm.getHref(), newSection); assertTaskSucceeds(task); - NetworkConnectionSection modified = vAppTemplateClient.getVAppTemplateNetworkConnectionSection(vm.getHref()); + NetworkConnectionSection modified = vAppTemplateClient.getNetworkConnectionSection(vm.getHref()); checkNetworkConnectionSection(modified); } @@ -413,7 +413,7 @@ public class VAppTemplateClientLiveTest extends AbstractVAppClientLiveTest { @Test(description = "POST /vAppTemplate/{id}/action/disableDownload") public void testDisableVAppTemplateDownload() throws Exception { - vAppTemplateClient.disableDownloadVappTemplate(vAppTemplateURI); + vAppTemplateClient.disableDownload(vAppTemplateURI); // TODO Check that it really is disabled. The only thing I can see for determining this // is the undocumented "download" link in the VAppTemplate. But that is brittle and we @@ -428,8 +428,8 @@ public class VAppTemplateClientLiveTest extends AbstractVAppClientLiveTest { @Test(description = "POST /vAppTemplate/{id}/action/enableDownload") public void testEnableVAppTemplateDownload() throws Exception { // First disable so that enable really has some work to do... - vAppTemplateClient.disableDownloadVappTemplate(vAppTemplateURI); - final Task task = vAppTemplateClient.enableDownloadVappTemplate(vAppTemplateURI); + vAppTemplateClient.disableDownload(vAppTemplateURI); + final Task task = vAppTemplateClient.enableDownload(vAppTemplateURI); retryTaskSuccess.apply(task); // TODO Check that it really is enabled. The only thing I can see for determining this @@ -454,7 +454,7 @@ public class VAppTemplateClientLiveTest extends AbstractVAppClientLiveTest { @Test(description = "POST /vAppTemplate/{id}/action/consolidate") public void testConsolidateVAppTemplate() throws Exception { - final Task task = vAppTemplateClient.consolidateVappTemplate(vm.getHref()); + final Task task = vAppTemplateClient.consolidateVm(vm.getHref()); assertTaskSucceedsLong(task); // TODO Need assertion that command had effect @@ -468,7 +468,7 @@ public class VAppTemplateClientLiveTest extends AbstractVAppClientLiveTest { .datastore(dataStore) .build(); - final Task task = vAppTemplateClient.relocateVappTemplate(vAppTemplateURI, relocateParams); + final Task task = vAppTemplateClient.relocateVm(vAppTemplateURI, relocateParams); assertTaskSucceedsLong(task); } @@ -484,8 +484,8 @@ public class VAppTemplateClientLiveTest extends AbstractVAppClientLiveTest { @Test(description = "test completed task not included in vAppTemplate") public void testCompletedTaskNotIncludedInVAppTemplate() throws Exception { // Kick off a task, and wait for it to complete - vAppTemplateClient.disableDownloadVappTemplate(vAppTemplateURI); - final Task task = vAppTemplateClient.enableDownloadVappTemplate(vAppTemplateURI); + vAppTemplateClient.disableDownload(vAppTemplateURI); + final Task task = vAppTemplateClient.enableDownload(vAppTemplateURI); assertTaskDoneEventually(task); // Ask the VAppTemplate for its tasks, and the status of the matching task if it exists From 557cf5e9b36eb6d2f6a167cb4aea8480b6ebf4f0 Mon Sep 17 00:00:00 2001 From: danikov Date: Wed, 28 Mar 2012 09:51:14 +0100 Subject: [PATCH 04/11] trying to fix guice to have both user/admin modules --- .../director/v1_5/VCloudDirectorContext.java | 37 ++++ .../v1_5/VCloudDirectorContextBuilder.java | 10 +- .../admin/VCloudDirectorAdminAsyncClient.java | 4 +- .../v1_5/admin/VCloudDirectorAdminClient.java | 8 +- .../VCloudDirectorRestClientModule.java | 163 +++++++++++------- .../internal/VCloudDirectorContextImpl.java | 72 ++++++++ ...nt.java => VCloudDirectorAsyncClient.java} | 4 +- ...rClient.java => VCloudDirectorClient.java} | 2 +- .../v1_5/VCloudDirectorClientExpectTest.java | 6 +- .../v1_5/features/MediaClientExpectTest.java | 32 ++-- .../features/NetworkClientExpectTest.java | 16 +- .../v1_5/features/OrgClientExpectTest.java | 20 +-- .../v1_5/features/QueryClientExpectTest.java | 8 +- .../v1_5/features/TaskClientExpectTest.java | 14 +- .../v1_5/features/VAppClientExpectTest.java | 120 ++++++------- .../VAppTemplateClientExpectTest.java | 4 +- .../v1_5/features/VdcClientExpectTest.java | 32 ++-- .../BaseVCloudDirectorClientLiveTest.java | 14 +- ...aseVCloudDirectorRestClientExpectTest.java | 4 +- 19 files changed, 359 insertions(+), 211 deletions(-) create mode 100644 labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorContext.java create mode 100644 labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/internal/VCloudDirectorContextImpl.java rename labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/{VCloudDirectorUserAsyncClient.java => VCloudDirectorAsyncClient.java} (97%) rename labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/{VCloudDirectorUserClient.java => VCloudDirectorClient.java} (98%) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorContext.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorContext.java new file mode 100644 index 0000000000..0a1a89247c --- /dev/null +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorContext.java @@ -0,0 +1,37 @@ +/** + * 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.vcloud.director.v1_5; + +import org.jclouds.rest.RestContext; +import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminAsyncClient; +import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient; +import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorContextImpl; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; + +import com.google.inject.ImplementedBy; + +/** + * @author danikov + */ +@ImplementedBy(VCloudDirectorContextImpl.class) +public interface VCloudDirectorContext extends RestContext { + + RestContext getAdminContext(); +} \ No newline at end of file diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorContextBuilder.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorContextBuilder.java index 77e81e3ba3..dc0bd84bdd 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorContextBuilder.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorContextBuilder.java @@ -23,6 +23,9 @@ import java.util.Properties; import org.jclouds.rest.RestContextBuilder; import org.jclouds.vcloud.director.v1_5.config.VCloudDirectorRestClientModule; +import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorContextImpl; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import com.google.inject.Module; @@ -39,5 +42,10 @@ public class VCloudDirectorContextBuilder extends RestContextBuilder modules) { modules.add(new VCloudDirectorRestClientModule()); } - + + @SuppressWarnings("unchecked") + @Override + public VCloudDirectorContext buildContext() { + return buildInjector().getInstance(VCloudDirectorContextImpl.class); + } } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminAsyncClient.java index e9331ea1fc..97837c7ca7 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminAsyncClient.java @@ -32,7 +32,7 @@ import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryAsyncClient; import org.jclouds.vcloud.director.v1_5.features.admin.AdminVdcAsyncClient; import org.jclouds.vcloud.director.v1_5.features.admin.GroupAsyncClient; import org.jclouds.vcloud.director.v1_5.features.admin.UserAsyncClient; -import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserAsyncClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncClient; /** * Provides asynchronous access to VCloudDirector Admin via their REST API. @@ -40,7 +40,7 @@ import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserAsyncClient; * @see VCloudDirectorAdminClient * @author danikov */ -public interface VCloudDirectorAdminAsyncClient extends VCloudDirectorUserAsyncClient { +public interface VCloudDirectorAdminAsyncClient extends VCloudDirectorAsyncClient { /** * @return asynchronous access to admin query features */ diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminClient.java index de3e43beed..fe257065dd 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminClient.java @@ -35,17 +35,17 @@ import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryClient; import org.jclouds.vcloud.director.v1_5.features.admin.AdminVdcClient; import org.jclouds.vcloud.director.v1_5.features.admin.GroupClient; import org.jclouds.vcloud.director.v1_5.features.admin.UserClient; -import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserAsyncClient; -import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; /** * Provides synchronous access to VCloudDirector Admin. * - * @see VCloudDirectorUserAsyncClient + * @see VCloudDirectorAsyncClient * @author Adrian Cole */ @Timeout(duration = 60, timeUnit = TimeUnit.SECONDS) -public interface VCloudDirectorAdminClient extends VCloudDirectorUserClient { +public interface VCloudDirectorAdminClient extends VCloudDirectorClient { /** * @return asynchronous access to admin query features */ diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/config/VCloudDirectorRestClientModule.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/config/VCloudDirectorRestClientModule.java index c41dbfdfe6..0e1b0dc750 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/config/VCloudDirectorRestClientModule.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/config/VCloudDirectorRestClientModule.java @@ -1,4 +1,5 @@ /** + * 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 @@ -36,26 +37,17 @@ import org.jclouds.http.annotation.Redirection; import org.jclouds.http.annotation.ServerError; import org.jclouds.location.Provider; import org.jclouds.rest.ConfiguresRestClient; +import org.jclouds.rest.RestContext; +import org.jclouds.rest.config.BinderUtils; import org.jclouds.rest.config.RestClientModule; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorAsyncClient; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorClient; +import org.jclouds.rest.internal.RestContextImpl; +import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminAsyncClient; +import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient; import org.jclouds.vcloud.director.v1_5.annotations.Login; import org.jclouds.vcloud.director.v1_5.domain.Session; import org.jclouds.vcloud.director.v1_5.domain.SessionWithToken; -import org.jclouds.vcloud.director.v1_5.features.AdminCatalogAsyncClient; -import org.jclouds.vcloud.director.v1_5.features.AdminCatalogClient; -import org.jclouds.vcloud.director.v1_5.features.AdminNetworkAsyncClient; -import org.jclouds.vcloud.director.v1_5.features.AdminNetworkClient; -import org.jclouds.vcloud.director.v1_5.features.AdminOrgAsyncClient; -import org.jclouds.vcloud.director.v1_5.features.AdminOrgClient; -import org.jclouds.vcloud.director.v1_5.features.AdminQueryAsyncClient; -import org.jclouds.vcloud.director.v1_5.features.AdminQueryClient; -import org.jclouds.vcloud.director.v1_5.features.AdminVdcAsyncClient; -import org.jclouds.vcloud.director.v1_5.features.AdminVdcClient; import org.jclouds.vcloud.director.v1_5.features.CatalogAsyncClient; import org.jclouds.vcloud.director.v1_5.features.CatalogClient; -import org.jclouds.vcloud.director.v1_5.features.GroupAsyncClient; -import org.jclouds.vcloud.director.v1_5.features.GroupClient; import org.jclouds.vcloud.director.v1_5.features.MediaAsyncClient; import org.jclouds.vcloud.director.v1_5.features.MediaClient; import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncClient; @@ -70,19 +62,33 @@ import org.jclouds.vcloud.director.v1_5.features.TaskAsyncClient; import org.jclouds.vcloud.director.v1_5.features.TaskClient; import org.jclouds.vcloud.director.v1_5.features.UploadAsyncClient; import org.jclouds.vcloud.director.v1_5.features.UploadClient; -import org.jclouds.vcloud.director.v1_5.features.UserAsyncClient; -import org.jclouds.vcloud.director.v1_5.features.UserClient; import org.jclouds.vcloud.director.v1_5.features.VAppAsyncClient; import org.jclouds.vcloud.director.v1_5.features.VAppClient; import org.jclouds.vcloud.director.v1_5.features.VAppTemplateAsyncClient; import org.jclouds.vcloud.director.v1_5.features.VAppTemplateClient; import org.jclouds.vcloud.director.v1_5.features.VdcAsyncClient; import org.jclouds.vcloud.director.v1_5.features.VdcClient; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogAsyncClient; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogClient; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminNetworkAsyncClient; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminNetworkClient; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminOrgAsyncClient; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminOrgClient; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryAsyncClient; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryClient; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminVdcAsyncClient; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminVdcClient; +import org.jclouds.vcloud.director.v1_5.features.admin.GroupAsyncClient; +import org.jclouds.vcloud.director.v1_5.features.admin.GroupClient; +import org.jclouds.vcloud.director.v1_5.features.admin.UserAsyncClient; +import org.jclouds.vcloud.director.v1_5.features.admin.UserClient; import org.jclouds.vcloud.director.v1_5.functions.LoginUserInOrgWithPassword; import org.jclouds.vcloud.director.v1_5.handlers.InvalidateSessionAndRetryOn401AndLogoutOnClose; import org.jclouds.vcloud.director.v1_5.handlers.VCloudDirectorErrorHandler; import org.jclouds.vcloud.director.v1_5.login.SessionAsyncClient; import org.jclouds.vcloud.director.v1_5.login.SessionClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import com.google.common.base.Function; import com.google.common.base.Supplier; @@ -93,128 +99,153 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableMap; import com.google.inject.Provides; import com.google.inject.Singleton; +import com.google.inject.TypeLiteral; import com.google.inject.name.Named; /** - * Configures the VCloudDirector connection. + * Configures the cloudstack connection. * * @author Adrian Cole */ @RequiresHttp @ConfiguresRestClient public class VCloudDirectorRestClientModule extends RestClientModule { - - public static final Map, Class> DELEGATE_MAP = ImmutableMap., Class>builder() - .put(AdminCatalogClient.class, AdminCatalogAsyncClient.class) - .put(AdminOrgClient.class, AdminOrgAsyncClient.class) - .put(AdminVdcClient.class, AdminVdcAsyncClient.class) - .put(CatalogClient.class, CatalogAsyncClient.class) - .put(NetworkClient.class, NetworkAsyncClient.class) - .put(OrgClient.class, OrgAsyncClient.class) - .put(QueryClient.class, QueryAsyncClient.class) - .put(AdminQueryClient.class, AdminQueryAsyncClient.class) - .put(MediaClient.class, MediaAsyncClient.class) - .put(TaskClient.class, TaskAsyncClient.class) - .put(VdcClient.class, VdcAsyncClient.class) - .put(VAppClient.class, VAppAsyncClient.class) - .put(VAppTemplateClient.class, VAppTemplateAsyncClient.class) - .put(UploadClient.class, UploadAsyncClient.class) - .put(MetadataClient.Readable.class, MetadataAsyncClient.Readable.class) - .put(MetadataClient.Writeable.class, MetadataAsyncClient.Writeable.class) - .put(GroupClient.class, GroupAsyncClient.class) - .put(UserClient.class, UserAsyncClient.class) - .put(AdminNetworkClient.class, AdminNetworkAsyncClient.class) - .build(); - - public VCloudDirectorRestClientModule() { - super(VCloudDirectorClient.class, VCloudDirectorAsyncClient.class, DELEGATE_MAP); + + public static final Map, Class> USER_DELEGATE_MAP = ImmutableMap., Class>builder() + .put(CatalogClient.class, CatalogAsyncClient.class) + .put(MediaClient.class, MediaAsyncClient.class) + .put(MetadataClient.Readable.class, MetadataAsyncClient.Readable.class) + .put(MetadataClient.Writeable.class, MetadataAsyncClient.Writeable.class) + .put(NetworkClient.class, NetworkAsyncClient.class) + .put(OrgClient.class, OrgAsyncClient.class) + .put(QueryClient.class, QueryAsyncClient.class) + .put(TaskClient.class, TaskAsyncClient.class) + .put(UploadClient.class, UploadAsyncClient.class) + .put(VAppClient.class, VAppAsyncClient.class) + .put(VAppTemplateClient.class, VAppTemplateAsyncClient.class) + .put(VdcClient.class, VdcAsyncClient.class) + .build(); + + public static final Map, Class> ADMIN_DELEGATE_MAP = ImmutableMap., Class>builder() + .putAll(USER_DELEGATE_MAP) + .put(AdminCatalogClient.class, AdminCatalogAsyncClient.class) + .put(AdminNetworkClient.class, AdminNetworkAsyncClient.class) + .put(AdminOrgClient.class, AdminOrgAsyncClient.class) + .put(AdminQueryClient.class, AdminQueryAsyncClient.class) + .put(AdminVdcClient.class, AdminVdcAsyncClient.class) + .put(GroupClient.class, GroupAsyncClient.class) + .put(UserClient.class, UserAsyncClient.class) + .build(); + + @Override + protected void bindAsyncClient() { + // bind the user client (default) + super.bindAsyncClient(); + // bind the admin client + BinderUtils.bindAsyncClient(binder(), VCloudDirectorAdminAsyncClient.class); } - + + @Override + protected void bindClient() { + // bind the user client (default) + super.bindClient(); + // bind the admin client + BinderUtils.bindClient(binder(), VCloudDirectorAdminClient.class, VCloudDirectorAdminAsyncClient.class, ADMIN_DELEGATE_MAP); + } + + public VCloudDirectorRestClientModule() { + super(VCloudDirectorClient.class, VCloudDirectorAsyncClient.class, ADMIN_DELEGATE_MAP); + } + @Override protected void configure() { + bind(new TypeLiteral>() { + }).to(new TypeLiteral>() { + }); + // Bind clients that are used directly in Functions, Predicates and other circumstances - bindClientAndAsyncClient(binder(), SessionClient.class, SessionAsyncClient.class); bindClientAndAsyncClient(binder(), OrgClient.class, OrgAsyncClient.class); + bindClientAndAsyncClient(binder(), SessionClient.class, SessionAsyncClient.class); bindClientAndAsyncClient(binder(), TaskClient.class, TaskAsyncClient.class); bindClientAndAsyncClient(binder(), VAppClient.class, VAppAsyncClient.class); - + bind(HttpRetryHandler.class).annotatedWith(ClientError.class).to(InvalidateSessionAndRetryOn401AndLogoutOnClose.class); - + super.configure(); } - + @Override protected void bindErrorHandlers() { bind(HttpErrorHandler.class).annotatedWith(Redirection.class).to(VCloudDirectorErrorHandler.class); bind(HttpErrorHandler.class).annotatedWith(ClientError.class).to(VCloudDirectorErrorHandler.class); bind(HttpErrorHandler.class).annotatedWith(ServerError.class).to(VCloudDirectorErrorHandler.class); } - + @Provides @Login protected Supplier loginUrl(@Provider Supplier provider) { // TODO: technically, we should implement version client, but this will work return Suppliers.compose(new Function() { - + @Override public URI apply(URI arg0) { return URI.create(arg0.toASCIIString() + "/sessions"); } - + }, provider); } - + @Provides protected Supplier currentSession(Supplier in) { return Suppliers.compose(new Function() { - + @Override public Session apply(SessionWithToken arg0) { return arg0.getSession(); } - + }, in); - + } - + @Provides @Singleton @org.jclouds.vcloud.director.v1_5.annotations.Session protected Supplier sessionToken(Supplier in) { return Suppliers.compose(new Function() { - + @Override public String apply(SessionWithToken arg0) { return arg0.getToken(); } - + }, in); - + } - + @Provides @Singleton protected Function makeSureFilterRetriesOnTimeout( - LoginUserInOrgWithPassword loginWithPasswordCredentials) { + LoginUserInOrgWithPassword loginWithPasswordCredentials) { // we should retry on timeout exception logging in. return new RetryOnTimeOutExceptionFunction(loginWithPasswordCredentials); } - + @Provides @Singleton public LoadingCache provideSessionWithTokenCache( - Function getSessionWithToken, - @Named(Constants.PROPERTY_SESSION_INTERVAL) int seconds) { + Function getSessionWithToken, + @Named(Constants.PROPERTY_SESSION_INTERVAL) int seconds) { return CacheBuilder.newBuilder().expireAfterWrite(seconds, TimeUnit.SECONDS).build( - CacheLoader.from(getSessionWithToken)); + CacheLoader.from(getSessionWithToken)); } - + // Temporary conversion of a cache to a supplier until there is a single-element cache // http://code.google.com/p/guava-libraries/issues/detail?id=872 @Provides @Singleton protected Supplier provideSessionWithTokenSupplier( - final LoadingCache cache, @Provider final Credentials creds) { + final LoadingCache cache, @Provider final Credentials creds) { return new Supplier() { @Override public SessionWithToken get() { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/internal/VCloudDirectorContextImpl.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/internal/VCloudDirectorContextImpl.java new file mode 100644 index 0000000000..456c65bf1e --- /dev/null +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/internal/VCloudDirectorContextImpl.java @@ -0,0 +1,72 @@ +/** + * 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.vcloud.director.v1_5.internal; + +import java.net.URI; +import java.util.Map; +import java.util.Set; + +import javax.inject.Inject; +import javax.inject.Singleton; + +import org.jclouds.domain.Credentials; +import org.jclouds.lifecycle.Closer; +import org.jclouds.location.Iso3166; +import org.jclouds.location.Provider; +import org.jclouds.rest.RestContext; +import org.jclouds.rest.Utils; +import org.jclouds.rest.annotations.ApiVersion; +import org.jclouds.rest.annotations.BuildVersion; +import org.jclouds.rest.annotations.Identity; +import org.jclouds.rest.internal.RestContextImpl; +import org.jclouds.vcloud.director.v1_5.VCloudDirectorContext; +import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminAsyncClient; +import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; + +import com.google.common.base.Supplier; +import com.google.inject.Injector; +import com.google.inject.TypeLiteral; + +/** + * @author danikov + */ +@Singleton +public class VCloudDirectorContextImpl extends RestContextImpl implements + VCloudDirectorContext { + private final RestContext adminContext; + + @Inject + VCloudDirectorContextImpl(Closer closer, Map credentialStore, Utils utils, Injector injector, + TypeLiteral syncApi, TypeLiteral asyncApi, + @Provider Supplier endpoint, @Provider String provider, + @Identity String identity, @ApiVersion String apiVersion, @BuildVersion String buildVersion, + @Iso3166 Set iso3166Codes, + RestContext adminContext) { + super(closer, credentialStore, utils, injector, syncApi, asyncApi, endpoint, provider, + identity, apiVersion, buildVersion, iso3166Codes); + this.adminContext = adminContext; + } + + @Override + public RestContext getAdminContext() { + return adminContext; + } +} diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorUserAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorAsyncClient.java similarity index 97% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorUserAsyncClient.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorAsyncClient.java index 429cd82d3d..9488ba7fda 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorUserAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorAsyncClient.java @@ -43,10 +43,10 @@ import com.google.inject.Provides; /** * Provides asynchronous access to VCloudDirector via their REST API. * - * @see VCloudDirectorUserClient + * @see VCloudDirectorClient * @author Adrian Cole */ -public interface VCloudDirectorUserAsyncClient { +public interface VCloudDirectorAsyncClient { /** * * @return the current login session diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorUserClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorClient.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorUserClient.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorClient.java index 4431be8626..f0a3f02574 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorUserClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorClient.java @@ -52,7 +52,7 @@ import com.google.inject.Provides; * @author danikov */ @Timeout(duration = 60, timeUnit = TimeUnit.SECONDS) -public interface VCloudDirectorUserClient { +public interface VCloudDirectorClient { /** * @return the current login session */ diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorClientExpectTest.java index 10c58bb354..191d450b66 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorClientExpectTest.java @@ -22,18 +22,18 @@ import static org.testng.Assert.assertEquals; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; import org.jclouds.vcloud.director.v1_5.login.SessionClientExpectTest; -import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.Test; /** * @author Adrian Cole */ @Test(groups = "unit", testName = "VCloudDirectorClient") -public class VCloudDirectorClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class VCloudDirectorClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { public void testRestClientModuleWorksProperly() throws Exception { - VCloudDirectorUserClient clientWhenSessionsExist = requestSendsResponse(loginRequest, sessionResponse); + VCloudDirectorClient clientWhenSessionsExist = requestSendsResponse(loginRequest, sessionResponse); assertEquals(clientWhenSessionsExist.getCurrentSession(), SessionClientExpectTest.SESSION); } diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientExpectTest.java index 5d9050dcc0..081228d4a4 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientExpectTest.java @@ -37,7 +37,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Owner; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.Task; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; -import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; @@ -48,13 +48,13 @@ import com.google.common.collect.ImmutableSet; * @author danikov */ @Test(groups = { "unit", "user", "media" }, singleThreaded = true, testName = "MediaClientExpectTest") -public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { @Test public void testCreateMedia() { URI uploadLink = URI.create(endpoint + "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/media"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/media") .acceptMedia(VCloudDirectorMediaType.MEDIA) @@ -80,7 +80,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testCloneMedia() { URI cloneUri = URI.create(endpoint + "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/cloneMedia"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/cloneMedia") .acceptMedia(VCloudDirectorMediaType.MEDIA) @@ -110,7 +110,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testGetMedia() { URI mediaUri = URI.create(endpoint + "/media/794eb334-754e-4917-b5a0-5df85cbd61d1"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1") .acceptAnyMedia() @@ -127,7 +127,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testResponse400ForInvalidMedia() { URI mediaUri = URI.create(endpoint + "/media/NOTAUUID"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/media/NOTAUUID") .acceptAnyMedia() @@ -156,7 +156,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testResponse403ForCatalogIdUsedAsMediaId() { URI mediaUri = URI.create(endpoint + "/media/e9cd3387-ac57-4d27-a481-9bee75e0690f"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/media/e9cd3387-ac57-4d27-a481-9bee75e0690f") .acceptAnyMedia() @@ -185,7 +185,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testResponse403ForFakeMediaId() { URI mediaUri = URI.create(endpoint + "/media/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/media/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee") .acceptAnyMedia() @@ -214,7 +214,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testUpdateMedia() { URI mediaUri = URI.create(endpoint + "/media/794eb334-754e-4917-b5a0-5df85cbd61d1"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1") .xmlFilePayload("/media/updateMedia.xml", VCloudDirectorMediaType.MEDIA) @@ -234,7 +234,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testDeleteMedia() { URI mediaUri = URI.create(endpoint + "/media/794eb334-754e-4917-b5a0-5df85cbd61d1"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("DELETE", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1") .acceptMedia(VCloudDirectorMediaType.TASK) @@ -252,7 +252,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testGetMetadata() { URI mediaUri = URI.create("https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1/metadata") .acceptAnyMedia() @@ -271,7 +271,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testMergeMetadata() { URI mediaUri = URI.create("https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1/metadata") .xmlFilePayload("/media/mergeMetadata.xml", VCloudDirectorMediaType.METADATA) @@ -290,7 +290,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testGetMetadataValue() { URI mediaUri = URI.create("https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1/metadata/key") .acceptAnyMedia() @@ -309,7 +309,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testSetMetadataValue() { URI mediaUri = URI.create("https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1/metadata/key") .xmlFilePayload("/media/setMetadataValue.xml", VCloudDirectorMediaType.METADATA_VALUE) @@ -330,7 +330,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testDeleteMetadataValue() { URI mediaUri = URI.create("https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("DELETE", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1/metadata/key") .acceptMedia(VCloudDirectorMediaType.TASK) @@ -348,7 +348,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes public void testGetOwner() { URI mediaUri = URI.create(endpoint + "/media/794eb334-754e-4917-b5a0-5df85cbd61d1"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1/owner") .acceptAnyMedia() diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientExpectTest.java index b1319787e5..e2b8e05cbf 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientExpectTest.java @@ -41,7 +41,7 @@ import org.jclouds.vcloud.director.v1_5.domain.NetworkFeatures; import org.jclouds.vcloud.director.v1_5.domain.OrgNetwork; import org.jclouds.vcloud.director.v1_5.domain.SyslogServerSettings; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; -import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; @@ -52,13 +52,13 @@ import com.google.common.collect.ImmutableSet; * @author danikov */ @Test(groups = { "unit", "user", "network" }, singleThreaded = true, testName = "NetworkClientExpectTest") -public class NetworkClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class NetworkClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { @Test public void testGetNetwork() { URI networkUri = URI.create(endpoint + "/network/f3ba8256-6f48-4512-aad6-600e85b4dc38"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/network/f3ba8256-6f48-4512-aad6-600e85b4dc38") .acceptAnyMedia() @@ -75,7 +75,7 @@ public class NetworkClientExpectTest extends BaseVCloudDirectorRestClientExpectT public void testGetNetworkWithInvalidId() { URI networkUri = URI.create(endpoint + "/network/NOTAUUID"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/network/NOTAUUID") .acceptAnyMedia() @@ -104,7 +104,7 @@ public class NetworkClientExpectTest extends BaseVCloudDirectorRestClientExpectT public void testGetNetworkWithCatalogId() { URI networkUri = URI.create(endpoint + "/network/9e08c2f6-077a-42ce-bece-d5332e2ebb5c"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/network/9e08c2f6-077a-42ce-bece-d5332e2ebb5c") .acceptAnyMedia() @@ -133,7 +133,7 @@ public class NetworkClientExpectTest extends BaseVCloudDirectorRestClientExpectT public void testGetNetworkWithFakeId() { URI networkUri = URI.create(endpoint + "/network/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/network/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee") .acceptAnyMedia() @@ -162,7 +162,7 @@ public class NetworkClientExpectTest extends BaseVCloudDirectorRestClientExpectT public void testGetMetadata() { URI networkUri = URI.create(endpoint + "/network/55a677cf-ab3f-48ae-b880-fab90421980c"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/network/55a677cf-ab3f-48ae-b880-fab90421980c/metadata") .acceptAnyMedia() @@ -189,7 +189,7 @@ public class NetworkClientExpectTest extends BaseVCloudDirectorRestClientExpectT public void testGetMetadataValue() { URI networkUri = URI.create("https://vcloudbeta.bluelock.com/api/network/55a677cf-ab3f-48ae-b880-fab90421980c"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/network/55a677cf-ab3f-48ae-b880-fab90421980c/metadata/KEY") .acceptAnyMedia() diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientExpectTest.java index 53ba73acda..28e91f5eb0 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientExpectTest.java @@ -34,7 +34,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Org; import org.jclouds.vcloud.director.v1_5.domain.OrgList; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; -import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; @@ -46,11 +46,11 @@ import com.google.common.collect.Iterables; * @author Adrian Cole */ @Test(groups = { "unit", "user", "org" }, singleThreaded = true, testName = "OrgClientExpectTest") -public class OrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class OrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { @Test public void testGetOrgList() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, getStandardRequest("GET", "/org/"), getStandardPayloadResponse("/org/orglist.xml", VCloudDirectorMediaType.ORG_LIST)); @@ -67,7 +67,7 @@ public class OrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest< @Test public void testGetOrgFromOrgListReference() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, getStandardRequest("GET", "/org/"), getStandardPayloadResponse("/org/orglist.xml", VCloudDirectorMediaType.ORG_LIST)); @@ -86,7 +86,7 @@ public class OrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest< public void testGetOrg() { URI orgUri = URI.create(endpoint + "/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, getStandardRequest("GET", "/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"), getStandardPayloadResponse("/org/org.xml", VCloudDirectorMediaType.ORG)); @@ -99,7 +99,7 @@ public class OrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest< public void testGetOrgFailOnInvalidOrgId() { URI orgUri = URI.create(endpoint + "/org/NOTAUUID"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, getStandardRequest("GET", "/org/NOTAUUID"), getStandardPayloadResponse(400, "/org/error400.xml", VCloudDirectorMediaType.ERROR)); @@ -123,7 +123,7 @@ public class OrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest< public void testGetOrgFailOnWrongOrgId() { URI orgUri = URI.create(endpoint + "/org/9e08c2f6-077a-42ce-bece-d5332e2ebb5c"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, getStandardRequest("GET", "/org/9e08c2f6-077a-42ce-bece-d5332e2ebb5c"), getStandardPayloadResponse(403, "/org/error403-catalog.xml", VCloudDirectorMediaType.ERROR)); @@ -147,7 +147,7 @@ public class OrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest< public void testGetOrgFailOnFakeOrgId() { URI orgUri = URI.create(endpoint + "/org/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, getStandardRequest("GET", "/org/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"), getStandardPayloadResponse(403, "/org/error403-fake.xml", VCloudDirectorMediaType.ERROR)); @@ -171,7 +171,7 @@ public class OrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest< public void testGetOrgMetadata() { URI orgUri = URI.create(endpoint + "/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/metadata") .acceptAnyMedia() @@ -198,7 +198,7 @@ public class OrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest< public void testGetOrgMetadataValue() { URI orgUri = URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/metadata/KEY") .acceptAnyMedia() diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryClientExpectTest.java index 7c0915ee8f..f9b9ef3b1f 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryClientExpectTest.java @@ -32,7 +32,7 @@ import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultCatalogRecord; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecordType; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; -import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.Test; import com.google.common.collect.ImmutableMultimap; @@ -43,7 +43,7 @@ import com.google.common.collect.ImmutableMultimap; * @author grkvlt@apache.org */ @Test(groups = { "unit", "user", "query" }, singleThreaded = true, testName = "QueryClientExpectTest") -public class QueryClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class QueryClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { @Test public void testQueryAllCatalogs() { @@ -61,7 +61,7 @@ public class QueryClientExpectTest extends BaseVCloudDirectorRestClientExpectTes .payload(payloadFromResourceWithContentType("/query/allCatalogs.xml", VCloudDirectorMediaType.QUERY_RESULT_RECORDS + ";version=1.5")) .build(); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, queryRequest, queryResponse); + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, queryRequest, queryResponse); QueryResultRecords expected = QueryResultRecords.builder() .href(URI.create("https://vcloudbeta.bluelock.com/api/catalogs/query?page=1&pageSize=25&format=records")) @@ -137,7 +137,7 @@ public class QueryClientExpectTest extends BaseVCloudDirectorRestClientExpectTes .payload(payloadFromResourceWithContentType("/query/allCatalogReferences.xml", VCloudDirectorMediaType.QUERY_RESULT_RECORDS + ";version=1.5")) .build(); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, queryRequest, queryResponse); + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, queryRequest, queryResponse); CatalogReferences expected = CatalogReferences.builder() .href(URI.create("https://vcloudbeta.bluelock.com/api/catalogs/query?page=1&pageSize=25&format=references")) diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskClientExpectTest.java index eee7fd33ac..61c2a6d78c 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskClientExpectTest.java @@ -32,7 +32,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.Task; import org.jclouds.vcloud.director.v1_5.domain.TasksList; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; -import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.Test; import com.google.common.collect.ImmutableMultimap; @@ -43,7 +43,7 @@ import com.google.common.collect.ImmutableMultimap; * @author grkvlt@apache.org */ @Test(groups = { "unit", "user", "task" }, singleThreaded = true, testName = "TaskClientExpectTest") -public class TaskClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class TaskClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { @Test public void testTaskListForValidOrg() { @@ -75,7 +75,7 @@ public class TaskClientExpectTest extends BaseVCloudDirectorRestClientExpectTest .payload(payloadFromResourceWithContentType("/org/org.xml", VCloudDirectorMediaType.TASKS_LIST + ";version=1.5")) .build(); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, taskRequest, taskResponse, orgRequest, orgResponse); + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, taskRequest, taskResponse, orgRequest, orgResponse); TasksList expected = TasksList.builder() .name("Tasks Lists") @@ -115,7 +115,7 @@ public class TaskClientExpectTest extends BaseVCloudDirectorRestClientExpectTest .payload(payloadFromResourceWithContentType("/org/error400.xml", VCloudDirectorMediaType.ERROR + ";version=1.5")) .build(); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, taskRequest, taskResponse, orgRequest, orgResponse); + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, taskRequest, taskResponse, orgRequest, orgResponse); Error expected = Error.builder() .message("validation error on field 'id': String value has invalid format or length") @@ -160,7 +160,7 @@ public class TaskClientExpectTest extends BaseVCloudDirectorRestClientExpectTest .payload(payloadFromResourceWithContentType("/org/error403-fake.xml", VCloudDirectorMediaType.ERROR + ";version=1.5")) .build(); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, taskRequest, taskResponse, orgRequest, orgResponse); + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, taskRequest, taskResponse, orgRequest, orgResponse); Error expected = Error.builder() .message("No access to entity \"com.vmware.vcloud.entity.org:aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\".") @@ -194,7 +194,7 @@ public class TaskClientExpectTest extends BaseVCloudDirectorRestClientExpectTest .payload(payloadFromResourceWithContentType("/task/task.xml", VCloudDirectorMediaType.TASK + ";version=1.5")) .build(); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, taskRequest, taskResponse); + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, taskRequest, taskResponse); URI taskUri = URI.create(endpoint + "/task/5fcd2af3-d0ec-45ce-9451-8c585a2c766b"); @@ -219,7 +219,7 @@ public class TaskClientExpectTest extends BaseVCloudDirectorRestClientExpectTest .statusCode(200) .build(); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, taskRequest, taskResponse); + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, taskRequest, taskResponse); URI taskUri = URI.create(endpoint + "/task/5fcd2af3-d0ec-45ce-9451-8c585a2c766b"); diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientExpectTest.java index 676efb7f7e..24e8422b66 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientExpectTest.java @@ -51,7 +51,7 @@ import org.jclouds.vcloud.director.v1_5.domain.ovf.OperatingSystemSection; import org.jclouds.vcloud.director.v1_5.domain.ovf.StartupSection; import org.jclouds.vcloud.director.v1_5.domain.ovf.VirtualHardwareSection; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; -import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.testng.internal.annotations.Sets; @@ -65,7 +65,7 @@ import com.google.common.collect.Multimaps; * @author grkvlt@apache.org */ @Test(groups = { "unit", "user", "vapp" }, singleThreaded = true, testName = "VAppClientExpectTest") -public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { private String vAppId = "vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be"; private URI vAppURI = URI.create(endpoint + vAppId); @@ -76,7 +76,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false)//TODO public void testGetVapp() { - VCloudDirectorUserClient client = orderedRequestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = orderedRequestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId) .acceptMedia(VCloudDirectorMediaType.VAPP) @@ -92,7 +92,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyVApp() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId) .xmlFilePayload("/vApp/modifyVApp.xml", VCloudDirectorMediaType.VAPP) @@ -113,7 +113,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testDeleteVApp() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("DELETE", vAppId) .acceptAnyMedia() @@ -129,7 +129,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testConsolidateVApp() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/action/consolidate") .acceptAnyMedia() @@ -145,7 +145,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testControlAccess() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/action/controlAccess") .xmlFilePayload("/vApp/controlAccessParams.xml", VCloudDirectorMediaType.CONTROL_ACCESS) @@ -164,7 +164,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testDeploy() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/action/deploy") .xmlFilePayload("/vApp/deployParams.xml", VCloudDirectorMediaType.DEPLOY_VAPP_PARAMS) @@ -184,7 +184,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testDiscardSuspendedState() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/action/discardSuspendedState") .acceptAnyMedia() @@ -200,7 +200,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testEnterMaintenanceMode() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/action/enterMaintenanceMode") .acceptAnyMedia() @@ -214,7 +214,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testExitMaintenanceMode() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/action/exitMaintenanceMode") .acceptAnyMedia() @@ -228,7 +228,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testInstallVMwareTools() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/action/installVMwareTools") .acceptAnyMedia() @@ -244,7 +244,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testRecomposeVApp() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/action/recomposeVApp") .xmlFilePayload("/vApp/recomposeVAppParams.xml", VCloudDirectorMediaType.RECOMPOSE_VAPP_PARAMS) @@ -264,7 +264,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testRelocate() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/action/relocate") .xmlFilePayload("/vApp/relocateParams.xml", VCloudDirectorMediaType.RELOCATE_VM_PARAMS) @@ -284,7 +284,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testUndeploy() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/action/undeploy") .xmlFilePayload("/vApp/undeployParams.xml", VCloudDirectorMediaType.UNDEPLOY_VAPP_PARAMS) @@ -304,7 +304,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testUpgradeHardwareVersion() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/action/upgradeHardwareVersion") .acceptAnyMedia() @@ -320,7 +320,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testPowerOff() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/power/action/powerOff") .acceptAnyMedia() @@ -336,7 +336,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testPowerOn() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/power/action/powerOn") .acceptAnyMedia() @@ -352,7 +352,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testReboot() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/power/action/reboot") .acceptAnyMedia() @@ -368,7 +368,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testReset() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/power/action/reset") .acceptAnyMedia() @@ -384,7 +384,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testShutdown() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/power/action/shutdown") .acceptAnyMedia() @@ -400,7 +400,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testSuspend() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/power/action/suspend") .acceptAnyMedia() @@ -416,7 +416,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetControlAccesss() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/controlAccess") .acceptAnyMedia() @@ -432,7 +432,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetGuestCustomizationSection() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/guestCustomizationSection") .acceptAnyMedia() @@ -448,7 +448,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyGuestCustomizationSection() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/guestCustomizationSection") .xmlFilePayload("/vApp/modifyGuestCustomizationSection.xml", VCloudDirectorMediaType.GUEST_CUSTOMIZATION_SECTION) @@ -468,7 +468,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetLeaseSettingsSection() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/leaseSettingsSection") .acceptAnyMedia() @@ -484,7 +484,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyLeaseSettingsSection() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/leaseSettingsSection") .xmlFilePayload("/vApp/modifyLeaseSettingsSection.xml", VCloudDirectorMediaType.LEASE_SETTINGS_SECTION) @@ -504,7 +504,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testEjectMedia() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/media/action/ejectMedia") .xmlFilePayload("/vApp/ejectMediaParams.xml", VCloudDirectorMediaType.MEDIA_PARAMS) @@ -524,7 +524,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testInsertMedia() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/media/action/insertMedia") .xmlFilePayload("/vApp/insertMediaParams.xml", VCloudDirectorMediaType.MEDIA_PARAMS) @@ -544,7 +544,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetNetworkConfigSection() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/networkConfigSection") .acceptAnyMedia() @@ -560,7 +560,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyNetworkConfigSection() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/networkConfigSection") .xmlFilePayload("/vApp/modifyNetworkConfigSection.xml", VCloudDirectorMediaType.NETWORK_CONFIG_SECTION) @@ -580,7 +580,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetNetworkConnectionSection() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/networkConnectionSection") .acceptAnyMedia() @@ -596,7 +596,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyNetworkConnectionSection() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/networkConnectionSection") .xmlFilePayload("/vApp/modifyNetworkConnectionSection.xml", VCloudDirectorMediaType.NETWORK_CONNECTION_SECTION) @@ -616,7 +616,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetNetworkSection() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/networkSection") .acceptAnyMedia() @@ -632,7 +632,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetOperatingSystemSection() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/operatingSystemSection") .acceptAnyMedia() @@ -648,7 +648,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyOperatingSystemSection() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/operatingSystemSection") .xmlFilePayload("/vApp/modifyOperatingSystemSection.xml", VCloudDirectorMediaType.OPERATING_SYSTEM_SECTION) @@ -668,7 +668,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetOwner() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/owner") .acceptAnyMedia() @@ -684,7 +684,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyOwner() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/owner") .xmlFilePayload("/vApp/modifyOwner.xml", VCloudDirectorMediaType.OWNER) @@ -701,7 +701,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetProductSections() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/productSections") .acceptAnyMedia() @@ -717,7 +717,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyProductSections() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/productSections") .xmlFilePayload("/vApp/modifyProductSections.xml", VCloudDirectorMediaType.PRODUCT_SECTION_LIST) @@ -734,7 +734,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetPendingQuestion() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/question") .acceptAnyMedia() @@ -750,7 +750,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testAnswerQuestion() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/question/action/answer") .xmlFilePayload("/vApp/answerQuestion.xml", VCloudDirectorMediaType.VM_PENDING_ANSWER) @@ -767,7 +767,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetRuntimeInfoSection() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/runtimeInfoSection") .acceptAnyMedia() @@ -783,7 +783,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetScreenImage() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/screen") .acceptMedia(VCloudDirectorMediaType.ANY_IMAGE) @@ -801,7 +801,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetScreenTicket() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", vAppId + "/screen/action/acquireTicket") .acceptAnyMedia() @@ -817,7 +817,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetStartupSection() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/startupSection") .acceptAnyMedia() @@ -833,7 +833,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyStartupSection() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/startupSection") .xmlFilePayload("/vApp/modifyStartupSection.xml", VCloudDirectorMediaType.STARTUP_SECTION) @@ -853,7 +853,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetVirtualHardwareSection() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/virtualHardwareSection") .acceptAnyMedia() @@ -869,7 +869,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyVirtualHardwareSection() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/virtualHardwareSection") .xmlFilePayload("/vApp/modifyVirtualHardwareSection.xml", VCloudDirectorMediaType.VIRTUAL_HARDWARE_SECTION) @@ -889,7 +889,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetVirtualHardwareSectionCpu() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/virtualHardwareSection/cpu") .acceptAnyMedia() @@ -905,7 +905,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyVirtualHardwareSectionCpu() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("", vAppId + "/virtualHardwareSection/cpu") .xmlFilePayload("/vApp/modifyVirtualHardwareSectionCpu.xml", VCloudDirectorMediaType.OVF_RASD_ITEM) @@ -925,7 +925,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetVirtualHardwareSectionDisks() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/virtualHardwareSection/disks") .acceptAnyMedia() @@ -941,7 +941,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyVirtualHardwareSectionDisks() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/virtualHardwareSection/disks") .xmlFilePayload("/vApp/modifyVirtualHardwareSectionDisks.xml", VCloudDirectorMediaType.OVF_RASD_ITEMS_LIST) @@ -961,7 +961,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetVirtualHardwareSectionMedia() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/virtualHardwareSection/media") .acceptAnyMedia() @@ -977,7 +977,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetVirtualHardwareSectionMemory() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/virtualHardwareSection/memory") .acceptAnyMedia() @@ -993,7 +993,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyVirtualHardwareSectionMemory() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/virtualHardwareSection/memory") .xmlFilePayload("/vApp/modifyVirtualHardwareSectionMemory.xml", VCloudDirectorMediaType.VAPP) @@ -1013,7 +1013,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetVirtualHardwareSectionNetworkCards() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/virtualHardwareSection/networkCards") .acceptAnyMedia() @@ -1029,7 +1029,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyVirtualHardwareSectionNetworkCards() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/virtualHardwareSection/networkCards") .xmlFilePayload("/vApp/modifyVirtualHardwareSectionNetworkCards.xml", VCloudDirectorMediaType.OVF_RASD_ITEMS_LIST) @@ -1049,7 +1049,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testGetVirtualHardwareSectionSerialPorts() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", vAppId + "/virtualHardwareSection/serialPorts") .acceptAnyMedia() @@ -1065,7 +1065,7 @@ public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest @Test(enabled = false) public void testModifyVirtualHardwareSectionSerialPorts() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("PUT", vAppId + "/virtualHardwareSection/serialPorts") .xmlFilePayload("/vApp/modifyVirtualHardwareSectionSerialPorts.xml", VCloudDirectorMediaType.OVF_RASD_ITEMS_LIST) diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java index 3e75e92b5d..8174869164 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java @@ -65,7 +65,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Task; import org.jclouds.vcloud.director.v1_5.domain.VAppNetworkConfiguration; import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; -import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; @@ -76,7 +76,7 @@ import com.google.common.collect.ImmutableSet; * @author Adam Lowe */ @Test(groups = { "unit", "user", "vapptemplate" }, testName = "VAppTemplateClientExpectTest") -public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { public VAppTemplateClientExpectTest() { TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles")); diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientExpectTest.java index f52d1ce5ae..9a96b1b324 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientExpectTest.java @@ -45,7 +45,7 @@ import org.jclouds.vcloud.director.v1_5.domain.VApp; import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; import org.jclouds.vcloud.director.v1_5.domain.Vdc; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; -import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -55,7 +55,7 @@ import org.testng.annotations.Test; * @author danikov */ @Test(groups = { "unit", "user", "vdc" }, singleThreaded = true, testName = "VdcClientExpectTest") -public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { private URI vdcURI; @@ -67,7 +67,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest< @Test public void testGetVdc() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f") .acceptAnyMedia() @@ -84,7 +84,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest< @Test public void testResponse400ForInvalidVdcId() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/vdc/NOTAUUID") .acceptAnyMedia() @@ -110,7 +110,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest< @Test public void testResponse403ForFakeVdcId() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/vdc/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee") .acceptAnyMedia() @@ -135,7 +135,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest< @Test(enabled = false) public void testCaptureVApp() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/captureVApp") .xmlFilePayload("/vdc/params/captureVApp.xml", VCloudDirectorMediaType.CAPTURE_VAPP_PARAMS) @@ -157,7 +157,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest< @Test(enabled = false) public void testResponse4xxForCaptureVAppNoParams() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/captureVApp") .xmlFilePayload("/vdc/params/captureVApp.xml", VCloudDirectorMediaType.CAPTURE_VAPP_PARAMS) @@ -183,7 +183,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest< @Test(enabled = false) public void testCloneVApp() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/cloneVAppTemplate") .xmlFilePayload("/vdc/params/cloneVApp.xml", VCloudDirectorMediaType.CLONE_VAPP_PARAMS) @@ -205,7 +205,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest< @Test(enabled = false) public void testCloneVAppTemplate() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/cloneVAppTemplate") .xmlFilePayload("/vdc/params/cloneVAppTemplate.xml", VCloudDirectorMediaType.CLONE_VAPP_TEMPLATE_PARAMS) @@ -227,7 +227,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest< @Test(enabled = false) public void testComposeVApp() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/composeVApp") .xmlFilePayload("/vdc/params/composeVApp.xml", VCloudDirectorMediaType.COMPOSE_VAPP_PARAMS) @@ -249,7 +249,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest< @Test(enabled = false) public void testInstantiateVAppTemplate() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/instantiateVAppTemplate") .xmlFilePayload("/vdc/params/instantiateVAppTemplate.xml", VCloudDirectorMediaType.CAPTURE_VAPP_PARAMS) @@ -271,7 +271,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest< @Test(enabled = false) public void testUploadVAppTemplate() { - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/uploadVAppTemplate") .xmlFilePayload("/vdc/params/uploadVAppTemplate.xml", VCloudDirectorMediaType.UPLOAD_VAPP_TEMPLATE_PARAMS) @@ -295,7 +295,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest< public void testCreateMedia() { URI vdcUri = URI.create(endpoint + "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/media") .acceptMedia(VCloudDirectorMediaType.MEDIA) @@ -321,7 +321,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest< public void testCloneMedia() { URI vdcUri = URI.create(endpoint + "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/cloneMedia") .acceptMedia(VCloudDirectorMediaType.MEDIA) @@ -351,7 +351,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest< public void testGetMetadata() { URI vdcUri = URI.create(endpoint + "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/metadata") .acceptAnyMedia() @@ -369,7 +369,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest< public void testGetMetadataValue() { URI vdcUri = URI.create("https://vcloudbeta.bluelock.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"); - VCloudDirectorUserClient client = requestsSendResponses(loginRequest, sessionResponse, + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer() .apiCommand("GET", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/metadata/key") .acceptAnyMedia() diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorClientLiveTest.java index 814c576f77..4148cbb6eb 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorClientLiveTest.java @@ -77,8 +77,8 @@ import org.jclouds.vcloud.director.v1_5.features.VdcClient; import org.jclouds.vcloud.director.v1_5.predicates.ReferencePredicates; import org.jclouds.vcloud.director.v1_5.predicates.TaskStatusEquals; import org.jclouds.vcloud.director.v1_5.predicates.TaskSuccess; -import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserAsyncClient; -import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Listeners; @@ -97,7 +97,7 @@ import com.google.inject.Guice; import com.google.inject.Module; /** - * Tests behavior of {@link VCloudDirectorUserClient} and acts as parent for other client live tests. + * Tests behavior of {@link VCloudDirectorClient} and acts as parent for other client live tests. * * @author Adrian Cole * @author grkvlt@apache.org @@ -122,7 +122,7 @@ public abstract class BaseVCloudDirectorClientLiveTest extends BaseVersionedServ public Predicate retryTaskSuccessLong; protected RestContext adminContext; - protected RestContext context; // FIXME: rename to userContext? + protected RestContext context; // FIXME: rename to userContext? protected Session adminSession; protected Session session; @@ -166,9 +166,9 @@ public abstract class BaseVCloudDirectorClientLiveTest extends BaseVersionedServ setupCredentials(); Properties overrides = setupProperties(); - RestContext rootContext = + VCloudDirectorContext rootContext = VCloudDirectorContext.class.cast( new RestContextFactory().createContext(provider, identity, credential, ImmutableSet. of( - new Log4JLoggingModule(), new SshjSshClientModule()), overrides); + new Log4JLoggingModule(), new SshjSshClientModule()), overrides)); rootContext.utils().injector().injectMembers(this); Reference orgRef = Iterables.getFirst(rootContext.getApi().getOrgClient().getOrgList().getOrgs(), null) @@ -177,7 +177,7 @@ public abstract class BaseVCloudDirectorClientLiveTest extends BaseVersionedServ String adminIdentity = "testAdmin"+new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); String adminCredential = "testAdminPassword"; - rootContext.getApi().getUserClient().createUser(orgRef.getHref(), User.builder() + rootContext.getAdminContext().getApi().getUserClient().createUser(orgRef.getHref(), User.builder() .name(adminIdentity) .password(adminCredential) .description("test user with user-level privileges") //TODO desc diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorRestClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorRestClientExpectTest.java index cf9601e2a3..d637902415 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorRestClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorRestClientExpectTest.java @@ -31,7 +31,7 @@ import org.jclouds.http.HttpResponse; import org.jclouds.rest.BaseRestClientExpectTest; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.Reference; -import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorUserClient; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.BeforeGroups; import com.google.common.collect.ImmutableMultimap; @@ -44,7 +44,7 @@ import com.google.inject.Guice; * * @author Adrian Cole */ -public abstract class BaseVCloudDirectorRestClientExpectTest +public abstract class BaseVCloudDirectorRestClientExpectTest extends BaseRestClientExpectTest { public static final String user = "adrian@jclouds.org"; From ab4d8da22b4cc16d2cbf834a9212d62fac3cc3ef Mon Sep 17 00:00:00 2001 From: Andrew Donald Kennedy Date: Fri, 30 Mar 2012 17:21:38 +0100 Subject: [PATCH 05/11] Issue 830: Add some Javadoc for UndeployVAppParams --- .../director/v1_5/domain/UndeployVAppParams.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/UndeployVAppParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/UndeployVAppParams.java index 781b5cfed6..65fb5f9147 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/UndeployVAppParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/UndeployVAppParams.java @@ -79,7 +79,21 @@ public class UndeployVAppParams { protected String undeployPowerAction; /** - * Gets the value of the undeployPowerAction property. + * The specified action is applied to all VMs in the vApp. + * + * All values other than {@code default} ignore actions, order, and delay specified in the StartupSection. One of: + *
    + *
  • {@code powerOff} (Power off the VMs. This is the default action if this attribute is missing or empty) + *
  • {@code suspend} (Suspend the VMs) + *
  • {@code shutdown} (Shut down the VMs) + *
  • {@code force} (Attempt to power off the VMs. + *
+ * Failures in undeploying the VM or associated networks are ignored. All references to the vApp and its VMs are + * removed from the database), default (Use the actions, order, and delay specified in the StartupSection). + * + * TODO add an enumeration for these values + * + * @since 1.5 */ public String getUndeployPowerAction() { return undeployPowerAction; From 40e38a3ad6fbfde8a1326a943904cfbcad8b923e Mon Sep 17 00:00:00 2001 From: Andrew Donald Kennedy Date: Fri, 30 Mar 2012 17:22:31 +0100 Subject: [PATCH 06/11] Issue 830: Remove wrong exception parser --- .../jclouds/vcloud/director/v1_5/features/VAppAsyncClient.java | 1 - 1 file changed, 1 deletion(-) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppAsyncClient.java index 208a10e034..a9281a2dbe 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppAsyncClient.java @@ -139,7 +139,6 @@ public interface VAppAsyncClient { @Produces(CONTROL_ACCESS) @Consumes(CONTROL_ACCESS) @JAXBResponseParser - @ExceptionParser(ThrowVCloudErrorOn4xx.class) ListenableFuture modifyControlAccess(@EndpointParam URI vAppURI, @BinderParam(BindToXMLPayload.class) ControlAccessParams params); From b5ae8073dafe6f1c258df14bf2d0fa675a8361ba Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Fri, 30 Mar 2012 09:48:08 -0700 Subject: [PATCH 07/11] expect test structure for new admin client --- .../features/VAppTemplateAsyncClient.java | 10 + .../v1_5/VCloudDirectorClientExpectTest.java | 4 +- .../AdminCatalogClientExpectTest.java | 5 +- .../AdminNetworkClientExpectTest.java | 6 +- .../features/AdminOrgClientExpectTest.java | 4 +- .../features/AdminQueryClientExpectTest.java | 4 +- .../features/AdminVdcClientExpectTest.java | 5 +- .../features/CatalogClientExpectTest.java | 30 +- .../v1_5/features/GroupClientExpectTest.java | 4 +- .../v1_5/features/MediaClientExpectTest.java | 4 +- .../features/NetworkClientExpectTest.java | 4 +- .../v1_5/features/OrgClientExpectTest.java | 4 +- .../v1_5/features/QueryClientExpectTest.java | 4 +- .../v1_5/features/TaskClientExpectTest.java | 4 +- .../v1_5/features/UserClientExpectTest.java | 4 +- .../v1_5/features/VAppClientExpectTest.java | 4 +- .../VAppTemplateClientExpectTest.java | 5 +- .../v1_5/features/VdcClientExpectTest.java | 4 +- .../BaseVCloudDirectorExpectTest.java | 261 ++++++++++++++++++ ...aseVCloudDirectorRestClientExpectTest.java | 226 +-------------- .../VCloudDirectorAdminClientExpectTest.java | 57 ++++ 21 files changed, 379 insertions(+), 274 deletions(-) create mode 100644 labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorExpectTest.java create mode 100644 labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/VCloudDirectorAdminClientExpectTest.java diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateAsyncClient.java index 213bfff88c..7219a37fc4 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateAsyncClient.java @@ -200,6 +200,16 @@ public interface VAppTemplateAsyncClient { ListenableFuture modifyLeaseSettingsSection(@EndpointParam URI templateURI, @BinderParam(BindToXMLPayload.class) LeaseSettingsSection settingsSection); + /** + * @see VAppTemplateClient#getNetworkConnectionSection(URI) + */ + @GET + @Consumes(NETWORK_CONFIG_SECTION) + @Path("/networkConnectionSection") + @JAXBResponseParser + @ExceptionParser(ReturnNullOnNotFoundOr404.class) + ListenableFuture getNetworkConnectionSection(@EndpointParam URI templateURI); + /** * @see VAppTemplateClient#getNetworkConfigSection(URI) */ diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorClientExpectTest.java index 191d450b66..3692a6501b 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorClientExpectTest.java @@ -20,7 +20,7 @@ package org.jclouds.vcloud.director.v1_5; import static org.testng.Assert.assertEquals; -import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.jclouds.vcloud.director.v1_5.login.SessionClientExpectTest; import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.Test; @@ -29,7 +29,7 @@ import org.testng.annotations.Test; * @author Adrian Cole */ @Test(groups = "unit", testName = "VCloudDirectorClient") -public class VCloudDirectorClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class VCloudDirectorClientExpectTest extends VCloudDirectorAdminClientExpectTest { public void testRestClientModuleWorksProperly() throws Exception { diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClientExpectTest.java index 6b0459a99e..02750ddb0a 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClientExpectTest.java @@ -30,7 +30,8 @@ import org.jclouds.vcloud.director.v1_5.domain.Owner; import org.jclouds.vcloud.director.v1_5.domain.PublishCatalogParams; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.Task; -import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogClient; +import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; @@ -41,7 +42,7 @@ import com.google.common.collect.ImmutableSet; * @author grkvlt@apache.org */ @Test(groups = { "unit", "admin", "catalog" }, singleThreaded = true, testName = "CatalogClientExpectTest") -public class AdminCatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class AdminCatalogClientExpectTest extends VCloudDirectorAdminClientExpectTest { private Reference catalogRef = Reference.builder() .type("application/vnd.vmware.vcloud.catalog+xml") diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminNetworkClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminNetworkClientExpectTest.java index 5660528e52..3927872382 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminNetworkClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminNetworkClientExpectTest.java @@ -28,8 +28,8 @@ import org.jclouds.vcloud.director.v1_5.domain.Link; import org.jclouds.vcloud.director.v1_5.domain.OrgNetwork; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.Task; -import org.jclouds.vcloud.director.v1_5.features.admin.GroupClient; -import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminNetworkClient; +import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; @@ -40,7 +40,7 @@ import com.google.common.collect.ImmutableSet; * @author danikov */ @Test(groups = { "unit", "admin", "network"}, singleThreaded = true, testName = "AdminNetworkClientExpectTest") -public class AdminNetworkClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class AdminNetworkClientExpectTest extends VCloudDirectorAdminClientExpectTest { Reference networkRef = Reference.builder() .href(URI.create(endpoint+"/admin/network/b466c0c5-8a5c-4335-b703-a2e2e6b5f3e1")) diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClientExpectTest.java index 5b6ae6192d..088515dad6 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClientExpectTest.java @@ -36,7 +36,7 @@ import org.jclouds.vcloud.director.v1_5.domain.OrgVAppTemplateLeaseSettings; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.SmtpServerSettings; import org.jclouds.vcloud.director.v1_5.features.admin.AdminOrgClient; -import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.testng.annotations.Test; /** @@ -45,7 +45,7 @@ import org.testng.annotations.Test; * @author danikov */ @Test(groups = { "unit", "user", "org"}, singleThreaded = true, testName = "AdminOrgClientExpectTest") -public class AdminOrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class AdminOrgClientExpectTest extends VCloudDirectorAdminClientExpectTest { private Reference orgRef = Reference.builder() .href(URI.create(endpoint + "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0")) diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClientExpectTest.java index d9f5b1331e..23840cb589 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClientExpectTest.java @@ -30,7 +30,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Link; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRoleRecord; import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryClient; -import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.testng.annotations.Test; import com.google.common.collect.ImmutableMultimap; @@ -41,7 +41,7 @@ import com.google.common.collect.ImmutableMultimap; * @author Aled Sage */ @Test(groups = { "unit", "admin", "query" }, singleThreaded = true, testName = "AdminQueryClientExpectTest") -public class AdminQueryClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class AdminQueryClientExpectTest extends VCloudDirectorAdminClientExpectTest { // TODO Write expect tests for all other admin-query operations diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminVdcClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminVdcClientExpectTest.java index 22abfc5275..9de490f029 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminVdcClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminVdcClientExpectTest.java @@ -26,7 +26,8 @@ import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient; import org.jclouds.vcloud.director.v1_5.domain.AdminVdc; import org.jclouds.vcloud.director.v1_5.domain.Reference; -import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.features.admin.AdminVdcClient; +import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.testng.annotations.Test; /** @@ -35,7 +36,7 @@ import org.testng.annotations.Test; * @author danikov */ @Test(groups = { "unit", "admin", "vdc" }, singleThreaded = true, testName = "AdminVdcClientExpectTest") -public class AdminVdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class AdminVdcClientExpectTest extends VCloudDirectorAdminClientExpectTest { private Reference vdcRef = Reference.builder() .href(URI.create(endpoint + "???")) diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientExpectTest.java index 72189c2ea9..0c5a194843 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientExpectTest.java @@ -24,8 +24,8 @@ import java.net.URI; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; +import org.jclouds.vcloud.director.v1_5.VCloudDirectorClientExpectTest; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; -import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient; import org.jclouds.vcloud.director.v1_5.domain.CatalogItem; import org.jclouds.vcloud.director.v1_5.domain.CatalogType; import org.jclouds.vcloud.director.v1_5.domain.Link; @@ -34,7 +34,7 @@ import org.jclouds.vcloud.director.v1_5.domain.MetadataEntry; import org.jclouds.vcloud.director.v1_5.domain.MetadataValue; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.Task; -import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.Test; import com.google.common.collect.ImmutableMultimap; @@ -46,7 +46,7 @@ import com.google.common.collect.ImmutableSet; * @author grkvlt@apache.org */ @Test(groups = { "unit", "user", "catalog" }, singleThreaded = true, testName = "CatalogClientExpectTest") -public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class CatalogClientExpectTest extends VCloudDirectorClientExpectTest { @Test public void testGetCatalog() { @@ -64,7 +64,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .payload(payloadFromResourceWithContentType("/catalog/catalog.xml", VCloudDirectorMediaType.CATALOG + ";version=1.5")) .build(); - VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogRequest, catalogResponse); + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogRequest, catalogResponse); CatalogType expected = catalog(); @@ -89,7 +89,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .payload(payloadFromResourceWithContentType("/catalog/createdCatalogItem.xml", VCloudDirectorMediaType.CATALOG_ITEM + ";version=1.5")) .build(); - VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); URI catalogURI = URI.create(endpoint + "/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"); @@ -120,7 +120,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .payload(payloadFromResourceWithContentType("/catalog/catalogMetadata.xml", VCloudDirectorMediaType.METADATA)) .build(); - VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogRequest, catalogResponse); + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogRequest, catalogResponse); URI catalogURI = URI.create(endpoint + "/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"); @@ -154,7 +154,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .payload(payloadFromResourceWithContentType("/catalog/catalogMetadataValue.xml", VCloudDirectorMediaType.METADATA_VALUE)) .build(); - VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogRequest, catalogResponse); + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogRequest, catalogResponse); URI catalogURI = URI.create(endpoint + "/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"); @@ -179,7 +179,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .payload(payloadFromResourceWithContentType("/catalog/catalogItem.xml", VCloudDirectorMediaType.CATALOG_ITEM)) .build(); - VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); URI catalogItemURI = URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"); @@ -205,7 +205,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .payload(payloadFromResourceWithContentType("/catalog/updateCatalogItem.xml", VCloudDirectorMediaType.CATALOG_ITEM + ";version=1.5")) .build(); - VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); URI catalogItemURI = URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"); CatalogItem expected = catalogItem(); @@ -228,7 +228,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .statusCode(200) .build(); - VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); URI catalogItemURI = URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"); @@ -251,7 +251,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .payload(payloadFromResourceWithContentType("/catalog/catalogItemMetadata.xml", VCloudDirectorMediaType.METADATA)) .build(); - VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); URI catalogItemURI = URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"); @@ -286,7 +286,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .payload(payloadFromResourceWithContentType("/catalog/mergeMetadataTask.xml", VCloudDirectorMediaType.TASK + ";version=1.5")) .build(); - VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); URI catalogItemURI = URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"); @@ -313,7 +313,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .payload(payloadFromResourceWithContentType("/catalog/catalogItemMetadataValue.xml", VCloudDirectorMediaType.METADATA_VALUE + ";version=1.5")) .build(); - VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); URI catalogItemURI = URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"); @@ -339,7 +339,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .payload(payloadFromResourceWithContentType("/catalog/setMetadataValueTask.xml", VCloudDirectorMediaType.TASK + ";version=1.5")) .build(); - VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); URI catalogItemURI = URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"); @@ -366,7 +366,7 @@ public class CatalogClientExpectTest extends BaseVCloudDirectorRestClientExpectT .payload(payloadFromResourceWithContentType("/catalog/deleteMetadataEntryTask.xml", VCloudDirectorMediaType.TASK)) .build(); - VCloudDirectorAdminClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); + VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogItemRequest, catalogItemResponse); URI catalogItemURI = URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"); diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/GroupClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/GroupClientExpectTest.java index 8b1957c28e..fa8dc98c79 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/GroupClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/GroupClientExpectTest.java @@ -27,7 +27,7 @@ import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient; import org.jclouds.vcloud.director.v1_5.domain.Group; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.features.admin.GroupClient; -import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.testng.annotations.Test; /** @@ -36,7 +36,7 @@ import org.testng.annotations.Test; * @author danikov */ @Test(groups = { "unit", "admin", "group"}, singleThreaded = true, testName = "GroupClientExpectTest") -public class GroupClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class GroupClientExpectTest extends VCloudDirectorAdminClientExpectTest { private Reference groupRef = Reference.builder() .type("application/vnd.vmware.admin.group+xml") diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientExpectTest.java index 4a80a6c8f6..54f28366df 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientExpectTest.java @@ -37,7 +37,7 @@ import org.jclouds.vcloud.director.v1_5.domain.MetadataValue; import org.jclouds.vcloud.director.v1_5.domain.Owner; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.Task; -import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.Test; @@ -49,7 +49,7 @@ import com.google.common.collect.ImmutableSet; * @author danikov */ @Test(groups = { "unit", "user", "media" }, singleThreaded = true, testName = "MediaClientExpectTest") -public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class MediaClientExpectTest extends VCloudDirectorAdminClientExpectTest { @Test public void testCreateMedia() { diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientExpectTest.java index aeeaad135b..51a2542c21 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientExpectTest.java @@ -41,7 +41,7 @@ import org.jclouds.vcloud.director.v1_5.domain.NetworkConfiguration; import org.jclouds.vcloud.director.v1_5.domain.NetworkFeatures; import org.jclouds.vcloud.director.v1_5.domain.OrgNetwork; import org.jclouds.vcloud.director.v1_5.domain.SyslogServerSettings; -import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.Test; @@ -53,7 +53,7 @@ import com.google.common.collect.ImmutableSet; * @author danikov */ @Test(groups = { "unit", "user", "network" }, singleThreaded = true, testName = "NetworkClientExpectTest") -public class NetworkClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class NetworkClientExpectTest extends VCloudDirectorAdminClientExpectTest { @Test public void testGetNetwork() { diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientExpectTest.java index 91d048459e..2c5ddd9c24 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientExpectTest.java @@ -34,7 +34,7 @@ import org.jclouds.vcloud.director.v1_5.domain.MetadataValue; import org.jclouds.vcloud.director.v1_5.domain.Org; import org.jclouds.vcloud.director.v1_5.domain.OrgList; import org.jclouds.vcloud.director.v1_5.domain.Reference; -import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.Test; @@ -47,7 +47,7 @@ import com.google.common.collect.Iterables; * @author Adrian Cole */ @Test(groups = { "unit", "user", "org" }, singleThreaded = true, testName = "OrgClientExpectTest") -public class OrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class OrgClientExpectTest extends VCloudDirectorAdminClientExpectTest { @Test public void testGetOrgList() { diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryClientExpectTest.java index f7e98b0e08..287598d308 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryClientExpectTest.java @@ -30,7 +30,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Link; import org.jclouds.vcloud.director.v1_5.domain.query.CatalogReferences; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultCatalogRecord; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords; -import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.Test; @@ -42,7 +42,7 @@ import com.google.common.collect.ImmutableMultimap; * @author grkvlt@apache.org */ @Test(groups = { "unit", "user", "query" }, singleThreaded = true, testName = "QueryClientExpectTest") -public class QueryClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class QueryClientExpectTest extends VCloudDirectorAdminClientExpectTest { @Test public void testQueryAllCatalogs() { diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskClientExpectTest.java index 9a9e197d8e..5539424c47 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskClientExpectTest.java @@ -32,7 +32,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Error; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.Task; import org.jclouds.vcloud.director.v1_5.domain.TasksList; -import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.Test; @@ -44,7 +44,7 @@ import com.google.common.collect.ImmutableMultimap; * @author grkvlt@apache.org */ @Test(groups = { "unit", "user", "task" }, singleThreaded = true, testName = "TaskClientExpectTest") -public class TaskClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class TaskClientExpectTest extends VCloudDirectorAdminClientExpectTest { @Test public void testTaskListForValidOrg() { diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UserClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UserClientExpectTest.java index 84fa8b7dfb..b957599973 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UserClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UserClientExpectTest.java @@ -30,7 +30,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Link; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.User; import org.jclouds.vcloud.director.v1_5.features.admin.UserClient; -import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.testng.annotations.Test; /** @@ -39,7 +39,7 @@ import org.testng.annotations.Test; * @author danikov */ @Test(groups = { "unit", "admin", "adminUser"}, singleThreaded = true, testName = "UserClientExpectTest") -public class UserClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class UserClientExpectTest extends VCloudDirectorAdminClientExpectTest { private Reference orgRef = Reference.builder() .href(URI.create(endpoint + "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0")) diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientExpectTest.java index ea539effa1..c8d273b91d 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientExpectTest.java @@ -50,7 +50,7 @@ import org.jclouds.vcloud.director.v1_5.domain.ovf.NetworkSection; import org.jclouds.vcloud.director.v1_5.domain.ovf.OperatingSystemSection; import org.jclouds.vcloud.director.v1_5.domain.ovf.StartupSection; import org.jclouds.vcloud.director.v1_5.domain.ovf.VirtualHardwareSection; -import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -65,7 +65,7 @@ import com.google.common.collect.Multimaps; * @author grkvlt@apache.org */ @Test(groups = { "unit", "user", "vapp" }, singleThreaded = true, testName = "VAppClientExpectTest") -public class VAppClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class VAppClientExpectTest extends VCloudDirectorAdminClientExpectTest { private String vAppId = "vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be"; private URI vAppURI = URI.create(endpoint + vAppId); diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java index f1e46eeb82..25e5863755 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java @@ -66,8 +66,7 @@ import org.jclouds.vcloud.director.v1_5.domain.RelocateParams; import org.jclouds.vcloud.director.v1_5.domain.Task; import org.jclouds.vcloud.director.v1_5.domain.VAppNetworkConfiguration; import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; -import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; -import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; +import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; @@ -78,7 +77,7 @@ import com.google.common.collect.ImmutableSet; * @author Adam Lowe */ @Test(groups = { "unit", "user", "vapptemplate" }, testName = "VAppTemplateClientExpectTest") -public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class VAppTemplateClientExpectTest extends VCloudDirectorAdminClientExpectTest { public VAppTemplateClientExpectTest() { TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles")); diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientExpectTest.java index 62359ff3ff..1fb0d81610 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientExpectTest.java @@ -45,7 +45,7 @@ import org.jclouds.vcloud.director.v1_5.domain.UploadVAppTemplateParams; import org.jclouds.vcloud.director.v1_5.domain.VApp; import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; import org.jclouds.vcloud.director.v1_5.domain.Vdc; -import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; +import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -56,7 +56,7 @@ import org.testng.annotations.Test; * @author danikov */ @Test(groups = { "unit", "user", "vdc" }, singleThreaded = true, testName = "VdcClientExpectTest") -public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest { +public class VdcClientExpectTest extends VCloudDirectorAdminClientExpectTest { private URI vdcURI; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorExpectTest.java new file mode 100644 index 0000000000..75a45c3327 --- /dev/null +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorExpectTest.java @@ -0,0 +1,261 @@ +/** + * 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.vcloud.director.v1_5.internal; + +import static com.google.common.base.Preconditions.checkNotNull; +import static org.jclouds.rest.RestContextFactory.createContext; +import static org.testng.Assert.assertNotNull; + +import java.net.URI; +import java.util.Properties; + +import org.jclouds.Constants; +import org.jclouds.date.DateService; +import org.jclouds.http.HttpRequest; +import org.jclouds.http.HttpResponse; +import org.jclouds.logging.config.NullLoggingModule; +import org.jclouds.rest.BaseRestClientExpectTest; +import org.jclouds.rest.RestContextSpec; +import org.jclouds.rest.BaseRestClientExpectTest.ExpectModule; +import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; +import org.jclouds.vcloud.director.v1_5.domain.Reference; +import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; +import org.testng.annotations.BeforeGroups; + +import com.google.common.base.Function; +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.LinkedListMultimap; +import com.google.common.collect.Multimap; +import com.google.inject.Guice; +import com.google.inject.Module; + +/** + * Base class for writing KeyStone Rest Client Expect tests + * + * @author Adrian Cole + */ +public abstract class BaseVCloudDirectorExpectTest extends BaseRestClientExpectTest { + + public BaseVCloudDirectorExpectTest() { + provider = "vcloud-director"; + identity = String.format("%s@%s", user, org); + credential = password; + } + + public static final String user = "adrian@jclouds.org"; + public static final String org = "JClouds"; + public static final String password = "password"; + public static final String token = "mIaR3/6Lna8DWImd7/JPR5rK8FcUHabt+G/UCJV5pJQ="; + public static final String endpoint = "https://vcloudbeta.bluelock.com/api"; + + protected static DateService dateService; + + @BeforeGroups("unit") + protected static void setupDateService() { + dateService = Guice.createInjector().getInstance(DateService.class); + assertNotNull(dateService); + } + + @Override + public Properties setupProperties() { + Properties props = new Properties(); + props.put(Constants.PROPERTY_MAX_RETRIES, 1); + return props; + } + + @Override + public HttpRequestComparisonType compareHttpRequestAsType(HttpRequest input) { + if (input.getPayload() == null || input.getPayload().getContentMetadata().getContentLength() == 0) { + return HttpRequestComparisonType.DEFAULT; + } + return HttpRequestComparisonType.XML; + } + + protected HttpRequest loginRequest = HttpRequest.builder() + .method("POST") + .endpoint(URI.create(endpoint + "/sessions")) + .headers(ImmutableMultimap.builder() + .put("Accept", "*/*") + .put("Authorization", "Basic YWRyaWFuQGpjbG91ZHMub3JnQEpDbG91ZHM6cGFzc3dvcmQ=") + .build()) + .build(); + + protected HttpResponse sessionResponse = HttpResponse.builder() + .statusCode(200) + .headers(ImmutableMultimap. builder() + .put("x-vcloud-authorization", token) + .put("Set-Cookie", String.format("vcloud-token=%s; Secure; Path=/", token)) + .build()) + .payload(payloadFromResourceWithContentType("/session.xml", VCloudDirectorMediaType.SESSION + ";version=1.5")) + .build(); + + + @Deprecated + protected HttpRequest getStandardRequest(String method, String path) { + return getStandardRequest(method, path, VCloudDirectorMediaType.ANY); + } + + @Deprecated + protected HttpRequest getStandardRequest(String method, URI uri) { + return getStandardRequest(method, uri, VCloudDirectorMediaType.ANY); + } + + @Deprecated + protected HttpRequest getStandardRequest(String method, String path, String mediaType) { + return getStandardRequest(method, URI.create(endpoint + path), VCloudDirectorMediaType.ANY); + } + + @Deprecated + protected HttpRequest getStandardPayloadRequest(String method, String command, String relativeFilePath, + String postMediaType) { + return getStandardPayloadRequest(method, URI.create(endpoint + command), relativeFilePath, postMediaType); + } + + @Deprecated + protected HttpRequest getStandardPayloadRequest(String method, URI uri, String relativeFilePath, + String postMediaType) { + return getStandardRequestWithPayload(method, uri, VCloudDirectorMediaType.ANY, relativeFilePath, postMediaType); + } + + @Deprecated + protected HttpRequest getStandardRequest(String method, URI uri, String mediaType) { + return HttpRequest.builder() + .method(method) + .endpoint(uri) + .headers(ImmutableMultimap. builder() + .put("Accept", mediaType) + .put("x-vcloud-authorization", token) + .build()) + .build(); + } + + @Deprecated + protected HttpRequest getStandardRequestWithPayload(String method, String path, String relativeFilePath, String mediaType) { + return getStandardRequestWithPayload(method, path, VCloudDirectorMediaType.ANY, relativeFilePath, mediaType); + } + + @Deprecated + protected HttpRequest getStandardRequestWithPayload(String method, URI uri, String relativeFilePath, String mediaType) { + return getStandardRequestWithPayload(method, uri, VCloudDirectorMediaType.ANY, relativeFilePath, mediaType); + } + + @Deprecated + protected HttpRequest getStandardRequestWithPayload(String method, String path, String acceptType, String relativeFilePath, String mediaType) { + URI uri = URI.create(endpoint + path); + return getStandardRequestWithPayload(method, uri, acceptType, relativeFilePath, mediaType); + } + + @Deprecated + protected HttpRequest getStandardRequestWithPayload(String method, URI uri, String acceptType, String relativeFilePath, String mediaType) { + return HttpRequest.builder() + .method(method) + .endpoint(uri) + .headers(ImmutableMultimap. builder() + .put("Accept", acceptType) + .put("x-vcloud-authorization", token) + .build()) + .payload(payloadFromResourceWithContentType(relativeFilePath, mediaType)) + .build(); + } + + @Deprecated + protected HttpResponse getStandardPayloadResponse(String relativeFilePath, String mediaType) { + return getStandardPayloadResponse(200, relativeFilePath, mediaType); + } + + @Deprecated + protected HttpResponse getStandardPayloadResponse(int statusCode, String relativeFilePath, String mediaType) { + return HttpResponse.builder() + .statusCode(statusCode) + .payload(payloadFromResourceWithContentType(relativeFilePath, mediaType + ";version=1.5")) + .build(); + } + + /** + * Implicitly adds x-vcloud-authorization header with token. + * Provides convenience methods for priming a HttpRequest.Builder for vCloud testing + * + * @author danikov + */ + public class VcloudHttpRequestPrimer { + private Multimap headers = LinkedListMultimap.create(); + private HttpRequest.Builder builder = HttpRequest.builder(); + + public VcloudHttpRequestPrimer() { + } + + public VcloudHttpRequestPrimer apiCommand(String method, String command) { + builder.method(method).endpoint(URI.create(endpoint + command)); + return this; + } + + public VcloudHttpRequestPrimer xmlFilePayload(String relativeFilePath, String mediaType) { + builder.payload(payloadFromResourceWithContentType(relativeFilePath, mediaType)); + return this; + } + + public VcloudHttpRequestPrimer headers(Multimap headers) { + this.headers.putAll(ImmutableMultimap.copyOf(checkNotNull(headers, "headers"))); + return this; + } + + public VcloudHttpRequestPrimer acceptAnyMedia() { + return acceptMedia(VCloudDirectorMediaType.ANY); + } + + public VcloudHttpRequestPrimer acceptMedia(String media) { + return header("Accept", media); + } + + public VcloudHttpRequestPrimer header(String name, String value) { + headers.put(checkNotNull(name, "header.name"), checkNotNull(value, "header.value")); + return this; + } + + public HttpRequest.Builder httpRequestBuilder() { + header("x-vcloud-authorization", token); + builder.headers(headers); + return builder; + } + } + + protected class VcloudHttpResponsePrimer { + private HttpResponse.Builder builder = HttpResponse.builder(); + + public VcloudHttpResponsePrimer() { + } + + public VcloudHttpResponsePrimer xmlFilePayload(String relativeFilePath, String mediaType) { + builder.payload(payloadFromResourceWithContentType(relativeFilePath, mediaType)); + return this; + } + public HttpResponse.Builder httpResponseBuilder() { + return builder; + } + } + + public URI toAdminUri(Reference ref) { + return toAdminUri(ref.getHref()); + } + + public URI toAdminUri(URI uri) { + return Reference.builder().href(uri).build().toAdminReference(endpoint).getHref(); + } +} diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorRestClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorRestClientExpectTest.java index d637902415..cff0b5c3df 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorRestClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorRestClientExpectTest.java @@ -18,237 +18,13 @@ */ package org.jclouds.vcloud.director.v1_5.internal; -import static com.google.common.base.Preconditions.checkNotNull; -import static org.testng.Assert.assertNotNull; - -import java.net.URI; -import java.util.Properties; - -import org.jclouds.Constants; -import org.jclouds.date.DateService; -import org.jclouds.http.HttpRequest; -import org.jclouds.http.HttpResponse; -import org.jclouds.rest.BaseRestClientExpectTest; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; -import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; -import org.testng.annotations.BeforeGroups; - -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.LinkedListMultimap; -import com.google.common.collect.Multimap; -import com.google.inject.Guice; /** * Base class for writing KeyStone Rest Client Expect tests * * @author Adrian Cole */ -public abstract class BaseVCloudDirectorRestClientExpectTest - extends BaseRestClientExpectTest { +public abstract class BaseVCloudDirectorRestClientExpectTest extends BaseVCloudDirectorExpectTest { - public static final String user = "adrian@jclouds.org"; - public static final String org = "JClouds"; - public static final String password = "password"; - public static final String token = "mIaR3/6Lna8DWImd7/JPR5rK8FcUHabt+G/UCJV5pJQ="; - public static final String endpoint = "https://vcloudbeta.bluelock.com/api"; - - protected static DateService dateService; - - @BeforeGroups("unit") - protected static void setupDateService() { - dateService = Guice.createInjector().getInstance(DateService.class); - assertNotNull(dateService); - } - - @Override - public Properties setupProperties() { - Properties props = new Properties(); - props.put(Constants.PROPERTY_MAX_RETRIES, 1); - return props; - } - - @Override - public HttpRequestComparisonType compareHttpRequestAsType(HttpRequest input) { - if (input.getPayload() == null || input.getPayload().getContentMetadata().getContentLength() == 0) { - return HttpRequestComparisonType.DEFAULT; - } - return HttpRequestComparisonType.XML; - } - - protected HttpRequest loginRequest = HttpRequest.builder() - .method("POST") - .endpoint(URI.create(endpoint + "/sessions")) - .headers(ImmutableMultimap.builder() - .put("Accept", "*/*") - .put("Authorization", "Basic YWRyaWFuQGpjbG91ZHMub3JnQEpDbG91ZHM6cGFzc3dvcmQ=") - .build()) - .build(); - - protected HttpResponse sessionResponse = HttpResponse.builder() - .statusCode(200) - .headers(ImmutableMultimap. builder() - .put("x-vcloud-authorization", token) - .put("Set-Cookie", String.format("vcloud-token=%s; Secure; Path=/", token)) - .build()) - .payload(payloadFromResourceWithContentType("/session.xml", VCloudDirectorMediaType.SESSION + ";version=1.5")) - .build(); - - public BaseVCloudDirectorRestClientExpectTest() { - provider = "vcloud-director"; - identity = String.format("%s@%s", user, org); - credential = password; - } - - @Deprecated - protected HttpRequest getStandardRequest(String method, String path) { - return getStandardRequest(method, path, VCloudDirectorMediaType.ANY); - } - - @Deprecated - protected HttpRequest getStandardRequest(String method, URI uri) { - return getStandardRequest(method, uri, VCloudDirectorMediaType.ANY); - } - - @Deprecated - protected HttpRequest getStandardRequest(String method, String path, String mediaType) { - return getStandardRequest(method, URI.create(endpoint + path), VCloudDirectorMediaType.ANY); - } - - @Deprecated - protected HttpRequest getStandardPayloadRequest(String method, String command, String relativeFilePath, - String postMediaType) { - return getStandardPayloadRequest(method, URI.create(endpoint + command), relativeFilePath, postMediaType); - } - - @Deprecated - protected HttpRequest getStandardPayloadRequest(String method, URI uri, String relativeFilePath, - String postMediaType) { - return getStandardRequestWithPayload(method, uri, VCloudDirectorMediaType.ANY, relativeFilePath, postMediaType); - } - - @Deprecated - protected HttpRequest getStandardRequest(String method, URI uri, String mediaType) { - return HttpRequest.builder() - .method(method) - .endpoint(uri) - .headers(ImmutableMultimap. builder() - .put("Accept", mediaType) - .put("x-vcloud-authorization", token) - .build()) - .build(); - } - - @Deprecated - protected HttpRequest getStandardRequestWithPayload(String method, String path, String relativeFilePath, String mediaType) { - return getStandardRequestWithPayload(method, path, VCloudDirectorMediaType.ANY, relativeFilePath, mediaType); - } - - @Deprecated - protected HttpRequest getStandardRequestWithPayload(String method, URI uri, String relativeFilePath, String mediaType) { - return getStandardRequestWithPayload(method, uri, VCloudDirectorMediaType.ANY, relativeFilePath, mediaType); - } - - @Deprecated - protected HttpRequest getStandardRequestWithPayload(String method, String path, String acceptType, String relativeFilePath, String mediaType) { - URI uri = URI.create(endpoint + path); - return getStandardRequestWithPayload(method, uri, acceptType, relativeFilePath, mediaType); - } - - @Deprecated - protected HttpRequest getStandardRequestWithPayload(String method, URI uri, String acceptType, String relativeFilePath, String mediaType) { - return HttpRequest.builder() - .method(method) - .endpoint(uri) - .headers(ImmutableMultimap. builder() - .put("Accept", acceptType) - .put("x-vcloud-authorization", token) - .build()) - .payload(payloadFromResourceWithContentType(relativeFilePath, mediaType)) - .build(); - } - - @Deprecated - protected HttpResponse getStandardPayloadResponse(String relativeFilePath, String mediaType) { - return getStandardPayloadResponse(200, relativeFilePath, mediaType); - } - - @Deprecated - protected HttpResponse getStandardPayloadResponse(int statusCode, String relativeFilePath, String mediaType) { - return HttpResponse.builder() - .statusCode(statusCode) - .payload(payloadFromResourceWithContentType(relativeFilePath, mediaType + ";version=1.5")) - .build(); - } - - /** - * Implicitly adds x-vcloud-authorization header with token. - * Provides convenience methods for priming a HttpRequest.Builder for vCloud testing - * - * @author danikov - */ - public class VcloudHttpRequestPrimer { - private Multimap headers = LinkedListMultimap.create(); - private HttpRequest.Builder builder = HttpRequest.builder(); - - public VcloudHttpRequestPrimer() { - } - - public VcloudHttpRequestPrimer apiCommand(String method, String command) { - builder.method(method).endpoint(URI.create(endpoint + command)); - return this; - } - - public VcloudHttpRequestPrimer xmlFilePayload(String relativeFilePath, String mediaType) { - builder.payload(payloadFromResourceWithContentType(relativeFilePath, mediaType)); - return this; - } - - public VcloudHttpRequestPrimer headers(Multimap headers) { - this.headers.putAll(ImmutableMultimap.copyOf(checkNotNull(headers, "headers"))); - return this; - } - - public VcloudHttpRequestPrimer acceptAnyMedia() { - return acceptMedia(VCloudDirectorMediaType.ANY); - } - - public VcloudHttpRequestPrimer acceptMedia(String media) { - return header("Accept", media); - } - - public VcloudHttpRequestPrimer header(String name, String value) { - headers.put(checkNotNull(name, "header.name"), checkNotNull(value, "header.value")); - return this; - } - - public HttpRequest.Builder httpRequestBuilder() { - header("x-vcloud-authorization", token); - builder.headers(headers); - return builder; - } - } - - protected class VcloudHttpResponsePrimer { - private HttpResponse.Builder builder = HttpResponse.builder(); - - public VcloudHttpResponsePrimer() { - } - - public VcloudHttpResponsePrimer xmlFilePayload(String relativeFilePath, String mediaType) { - builder.payload(payloadFromResourceWithContentType(relativeFilePath, mediaType)); - return this; - } - public HttpResponse.Builder httpResponseBuilder() { - return builder; - } - } - - public URI toAdminUri(Reference ref) { - return toAdminUri(ref.getHref()); - } - - public URI toAdminUri(URI uri) { - return Reference.builder().href(uri).build().toAdminReference(endpoint).getHref(); - } } diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/VCloudDirectorAdminClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/VCloudDirectorAdminClientExpectTest.java new file mode 100644 index 0000000000..f713b33bf2 --- /dev/null +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/VCloudDirectorAdminClientExpectTest.java @@ -0,0 +1,57 @@ +/** + * 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.vcloud.director.v1_5.internal; + +import java.util.Properties; + +import org.jclouds.http.HttpRequest; +import org.jclouds.http.HttpResponse; +import org.jclouds.logging.config.NullLoggingModule; +import org.jclouds.rest.RestContextFactory; +import org.jclouds.vcloud.director.v1_5.VCloudDirectorContext; +import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient; + +import com.google.common.base.Function; +import com.google.common.collect.ImmutableSet; +import com.google.inject.Module; + +/** + * + * @author Adrian Cole + */ +public abstract class VCloudDirectorAdminClientExpectTest extends + BaseVCloudDirectorExpectTest implements + Function { + + @Override + public VCloudDirectorAdminClient createClient(Function fn, Module module, Properties props) { + return apply(createVCloudDirectorContext(fn, module, props)); + } + + @Override + public VCloudDirectorAdminClient apply(VCloudDirectorContext input) { + return input.getAdminContext().getApi(); + } + + private VCloudDirectorContext createVCloudDirectorContext(Function fn, Module module, + Properties props) { + return VCloudDirectorContext.class.cast(new RestContextFactory(setupRestProperties()).createContext(provider, + identity, credential, ImmutableSet. of(new ExpectModule(fn), new NullLoggingModule(), module), props)); + } +} From fea72442b60a022ecb75f80d0e10d11767e2afe9 Mon Sep 17 00:00:00 2001 From: danikov Date: Fri, 30 Mar 2012 18:23:20 +0100 Subject: [PATCH 08/11] minor vcloud bugfixes --- .../director/v1_5/features/UserClientLiveTest.java | 10 +--------- .../internal/BaseVCloudDirectorClientLiveTest.java | 4 +++- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UserClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UserClientLiveTest.java index 3e736eceb3..41346976ef 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UserClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UserClientLiveTest.java @@ -217,15 +217,7 @@ public class UserClientLiveTest extends BaseVCloudDirectorClientLiveTest { dependsOnMethods = { "testCreateUser" } ) public void testDeleteUser() { // Create a user to be deleted (so we remove dependencies on test ordering) - String name = name("a"); - User newUser = User.builder() - .name(name) - .role(Reference.builder() // FIXME: auto-fetch a role? or inject - .name("vApp User") - .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/role/ff1e0c91-1288-3664-82b7-a6fa303af4d1")) - .build()) - .password("password") - .build(); + User newUser = randomTestUser("testDeleteUser"); User userToBeDeleted = userClient.createUser(orgRef.getHref(), newUser); // Delete the user diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorClientLiveTest.java index 4148cbb6eb..d08911c7d2 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorClientLiveTest.java @@ -169,6 +169,7 @@ public abstract class BaseVCloudDirectorClientLiveTest extends BaseVersionedServ VCloudDirectorContext rootContext = VCloudDirectorContext.class.cast( new RestContextFactory().createContext(provider, identity, credential, ImmutableSet. of( new Log4JLoggingModule(), new SshjSshClientModule()), overrides)); + adminContext = rootContext.getAdminContext(); rootContext.utils().injector().injectMembers(this); Reference orgRef = Iterables.getFirst(rootContext.getApi().getOrgClient().getOrgList().getOrgs(), null) @@ -215,7 +216,8 @@ public abstract class BaseVCloudDirectorClientLiveTest extends BaseVersionedServ public Reference getRoleReferenceFor(String name) { RoleReferences roles = adminContext.getApi().getQueryClient().roleReferencesQueryAll(); - return Iterables.find(roles.getReferences(), ReferencePredicates.nameEquals(name)); + // wrapped in a builder to strip out unwanted xml cruft that the api chokes on + return Reference.builder().fromReference(Iterables.find(roles.getReferences(), ReferencePredicates.nameEquals(name))).build(); } public User randomTestUser(String prefix) { From a6429398fd91f083799afbbcf4415c3c45f2ee43 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Fri, 30 Mar 2012 16:57:31 -0700 Subject: [PATCH 09/11] Issue 891: switch to openjdk; tested on ubuntu --- .../org/jclouds/compute/RunScriptData.java | 2 +- .../compute/BaseComputeServiceLiveTest.java | 6 +- .../test/resources/initscript_with_java.sh | 65 +++++++++---------- .../test/resources/initscript_with_jboss.sh | 65 +++++++++---------- compute/src/test/resources/runscript.sh | 65 +++++++++---------- .../PlacementGroupClientLiveTest.java | 2 +- .../statements/java/InstallJDK.java | 27 +++++++- .../{installJDK.sh => installJDKFromURL.sh} | 5 +- .../resources/functions/installOpenJDK.sh | 35 ++++++++++ .../statements/java/InstallJDKTest.java | 8 +-- .../test_install_jdk_scriptbuilder.sh | 65 +++++++++---------- 11 files changed, 200 insertions(+), 145 deletions(-) rename scriptbuilder/src/main/resources/functions/{installJDK.sh => installJDKFromURL.sh} (87%) create mode 100644 scriptbuilder/src/main/resources/functions/installOpenJDK.sh diff --git a/compute/src/main/java/org/jclouds/compute/RunScriptData.java b/compute/src/main/java/org/jclouds/compute/RunScriptData.java index 16f3601b29..e62fd67348 100644 --- a/compute/src/main/java/org/jclouds/compute/RunScriptData.java +++ b/compute/src/main/java/org/jclouds/compute/RunScriptData.java @@ -61,7 +61,7 @@ public class RunScriptData { public static StatementList installAdminUserJBossAndOpenPorts(OperatingSystem os) throws IOException { return new StatementList(// AdminAccess.builder().adminUsername("web").build(),// - InstallJDK.fromURL(),// + InstallJDK.fromOpenJDK(),// authorizePortsInIpTables(22, 8080),// extractTargzIntoDirectory(JBOSS7_URL, "/usr/local"),// exec("{md} " + JBOSS_HOME), exec("mv /usr/local/jboss-*/* " + JBOSS_HOME),// diff --git a/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java b/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java index b98f16b8fc..7be16f5e0d 100644 --- a/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java +++ b/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java @@ -213,7 +213,7 @@ public abstract class BaseComputeServiceLiveTest extends BaseVersionedServiceLiv @Test(enabled = true, expectedExceptions = NoSuchElementException.class) public void testCorrectExceptionRunningNodesNotFound() throws Exception { - client.runScriptOnNodesMatching(runningInGroup("zebras-are-awesome"), InstallJDK.fromURL()); + client.runScriptOnNodesMatching(runningInGroup("zebras-are-awesome"), InstallJDK.fromOpenJDK()); } // since surefire and eclipse don't otherwise guarantee the order, we are @@ -375,7 +375,7 @@ public abstract class BaseComputeServiceLiveTest extends BaseVersionedServiceLiv protected static Template addRunScriptToTemplate(Template template) { template.getOptions().runScript( - Statements.newStatementList(AdminAccess.standard(), InstallJDK.fromURL())); + Statements.newStatementList(AdminAccess.standard(), InstallJDK.fromOpenJDK())); return template; } @@ -439,7 +439,7 @@ public abstract class BaseComputeServiceLiveTest extends BaseVersionedServiceLiv protected Map runScriptWithCreds(final String group, OperatingSystem os, LoginCredentials creds) throws RunScriptOnNodesException { - return client.runScriptOnNodesMatching(runningInGroup(group), InstallJDK.fromURL(), overrideLoginCredentials(creds) + return client.runScriptOnNodesMatching(runningInGroup(group), InstallJDK.fromOpenJDK(), overrideLoginCredentials(creds) .nameTask("runScriptWithCreds")); } diff --git a/compute/src/test/resources/initscript_with_java.sh b/compute/src/test/resources/initscript_with_java.sh index b085af364d..927da887cf 100644 --- a/compute/src/test/resources/initscript_with_java.sh +++ b/compute/src/test/resources/initscript_with_java.sh @@ -133,41 +133,40 @@ function setupPublicCurl() { ensure_can_resolve_public_dns return 0 } +function setupJavaHomeInProfile() { + test -n \"$SUDO_USER\" && cat >> `getent passwd $SUDO_USER| cut -f6 -d:`/.bashrc <<-'END_OF_JCLOUDS_FILE' + export JAVA_HOME=/usr/local/jdk + export PATH=$JAVA_HOME/bin:$PATH +END_OF_JCLOUDS_FILE + cat >> /etc/bashrc <<-'END_OF_JCLOUDS_FILE' + export JAVA_HOME=/usr/local/jdk + export PATH=$JAVA_HOME/bin:$PATH +END_OF_JCLOUDS_FILE + cat >> $HOME/.bashrc <<-'END_OF_JCLOUDS_FILE' + export JAVA_HOME=/usr/local/jdk + export PATH=$JAVA_HOME/bin:$PATH +END_OF_JCLOUDS_FILE + cat >> /etc/skel/.bashrc <<-'END_OF_JCLOUDS_FILE' + export JAVA_HOME=/usr/local/jdk + export PATH=$JAVA_HOME/bin:$PATH +END_OF_JCLOUDS_FILE +} + function installJDK() { - if hash curl 2>/dev/null; then - if [ `uname -m` == 'x86_64' ]; then - local url=${1:-http://download.oracle.com/otn-pub/java/jdk/7/jdk-7-linux-x64.tar.gz} - else - local url=${1:-http://download.oracle.com/otn-pub/java/jdk/7/jdk-7-linux-i586.tar.gz} - fi - curl -q -s -S -L --connect-timeout 10 --max-time 600 --retry 20 -X GET $url |(mkdir -p /usr/local &&cd /usr/local &&tar -xpzf -) - mv /usr/local/jdk* /usr/local/jdk/ - test -n \"$SUDO_USER\" && cat >> /home/$SUDO_USER/.bashrc <<-'END_OF_JCLOUDS_FILE' - export JAVA_HOME=/usr/local/jdk - export PATH=$JAVA_HOME/bin:$PATH -END_OF_JCLOUDS_FILE - cat >> /etc/bashrc <<-'END_OF_JCLOUDS_FILE' - export JAVA_HOME=/usr/local/jdk - export PATH=$JAVA_HOME/bin:$PATH -END_OF_JCLOUDS_FILE - cat >> $HOME/.bashrc <<-'END_OF_JCLOUDS_FILE' - export JAVA_HOME=/usr/local/jdk - export PATH=$JAVA_HOME/bin:$PATH -END_OF_JCLOUDS_FILE - cat >> /etc/skel/.bashrc <<-'END_OF_JCLOUDS_FILE' - export JAVA_HOME=/usr/local/jdk - export PATH=$JAVA_HOME/bin:$PATH -END_OF_JCLOUDS_FILE - # TODO: eventhough we are setting the above, sometimes images (ex. - # cloudservers ubuntu) kick out of .bashrc (ex. [ -z "$PS1" ] && - # return), for this reason, we should also explicitly link. - # A better way would be to update using alternatives or the like - ln -fs /usr/local/jdk/bin/java /usr/bin/java - /usr/bin/java -version || abort "cannot run /usr/bin/java" + if hash apt-get 2>/dev/null; then + export pkg=openjdk-7-jdk + apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg ) + elif hash yum 2>/dev/null; then + export pkg=java-1.7.0-openjdk + yum --nogpgcheck -y ensure $pkg else - abort "curl not available.. cannot install openjdk" + abort "we only support apt-get and yum right now... please contribute!" + return 1 fi - return 0 + JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common` + ln -Fs $JAVA_HOME /usr/local/jdk + /usr/local/jdk/bin/java -version || abort "cannot run java" + setupJavaHomeInProfile } END_OF_JCLOUDS_SCRIPT @@ -198,7 +197,7 @@ END_OF_JCLOUDS_SCRIPT awk -v user=^${SUDO_USER:=${USER}}: -v password='crypt(randompassword)' 'BEGIN { FS=OFS=":" } $0 ~ user { $2 = password } 1' /etc/shadow >/etc/shadow.${SUDO_USER:=${USER}} test -f /etc/shadow.${SUDO_USER:=${USER}} && mv /etc/shadow.${SUDO_USER:=${USER}} /etc/shadow setupPublicCurl || return 1 - installJDK || return 1 + installOpenJDK || return 1 END_OF_JCLOUDS_SCRIPT diff --git a/compute/src/test/resources/initscript_with_jboss.sh b/compute/src/test/resources/initscript_with_jboss.sh index 1a9052097f..e848b851b0 100644 --- a/compute/src/test/resources/initscript_with_jboss.sh +++ b/compute/src/test/resources/initscript_with_jboss.sh @@ -133,41 +133,40 @@ function setupPublicCurl() { ensure_can_resolve_public_dns return 0 } +function setupJavaHomeInProfile() { + test -n \"$SUDO_USER\" && cat >> `getent passwd $SUDO_USER| cut -f6 -d:`/.bashrc <<-'END_OF_JCLOUDS_FILE' + export JAVA_HOME=/usr/local/jdk + export PATH=$JAVA_HOME/bin:$PATH +END_OF_JCLOUDS_FILE + cat >> /etc/bashrc <<-'END_OF_JCLOUDS_FILE' + export JAVA_HOME=/usr/local/jdk + export PATH=$JAVA_HOME/bin:$PATH +END_OF_JCLOUDS_FILE + cat >> $HOME/.bashrc <<-'END_OF_JCLOUDS_FILE' + export JAVA_HOME=/usr/local/jdk + export PATH=$JAVA_HOME/bin:$PATH +END_OF_JCLOUDS_FILE + cat >> /etc/skel/.bashrc <<-'END_OF_JCLOUDS_FILE' + export JAVA_HOME=/usr/local/jdk + export PATH=$JAVA_HOME/bin:$PATH +END_OF_JCLOUDS_FILE +} + function installJDK() { - if hash curl 2>/dev/null; then - if [ `uname -m` == 'x86_64' ]; then - local url=${1:-http://download.oracle.com/otn-pub/java/jdk/7/jdk-7-linux-x64.tar.gz} - else - local url=${1:-http://download.oracle.com/otn-pub/java/jdk/7/jdk-7-linux-i586.tar.gz} - fi - curl -q -s -S -L --connect-timeout 10 --max-time 600 --retry 20 -X GET $url |(mkdir -p /usr/local &&cd /usr/local &&tar -xpzf -) - mv /usr/local/jdk* /usr/local/jdk/ - test -n \"$SUDO_USER\" && cat >> /home/$SUDO_USER/.bashrc <<-'END_OF_JCLOUDS_FILE' - export JAVA_HOME=/usr/local/jdk - export PATH=$JAVA_HOME/bin:$PATH -END_OF_JCLOUDS_FILE - cat >> /etc/bashrc <<-'END_OF_JCLOUDS_FILE' - export JAVA_HOME=/usr/local/jdk - export PATH=$JAVA_HOME/bin:$PATH -END_OF_JCLOUDS_FILE - cat >> $HOME/.bashrc <<-'END_OF_JCLOUDS_FILE' - export JAVA_HOME=/usr/local/jdk - export PATH=$JAVA_HOME/bin:$PATH -END_OF_JCLOUDS_FILE - cat >> /etc/skel/.bashrc <<-'END_OF_JCLOUDS_FILE' - export JAVA_HOME=/usr/local/jdk - export PATH=$JAVA_HOME/bin:$PATH -END_OF_JCLOUDS_FILE - # TODO: eventhough we are setting the above, sometimes images (ex. - # cloudservers ubuntu) kick out of .bashrc (ex. [ -z "$PS1" ] && - # return), for this reason, we should also explicitly link. - # A better way would be to update using alternatives or the like - ln -fs /usr/local/jdk/bin/java /usr/bin/java - /usr/bin/java -version || abort "cannot run /usr/bin/java" + if hash apt-get 2>/dev/null; then + export pkg=openjdk-7-jdk + apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg ) + elif hash yum 2>/dev/null; then + export pkg=java-1.7.0-openjdk + yum --nogpgcheck -y ensure $pkg else - abort "curl not available.. cannot install openjdk" + abort "we only support apt-get and yum right now... please contribute!" + return 1 fi - return 0 + JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common` + ln -Fs $JAVA_HOME /usr/local/jdk + /usr/local/jdk/bin/java -version || abort "cannot run java" + setupJavaHomeInProfile } END_OF_JCLOUDS_SCRIPT @@ -198,7 +197,7 @@ END_OF_JCLOUDS_SCRIPT awk -v user=^${SUDO_USER:=${USER}}: -v password='crypt(randompassword)' 'BEGIN { FS=OFS=":" } $0 ~ user { $2 = password } 1' /etc/shadow >/etc/shadow.${SUDO_USER:=${USER}} test -f /etc/shadow.${SUDO_USER:=${USER}} && mv /etc/shadow.${SUDO_USER:=${USER}} /etc/shadow setupPublicCurl || return 1 - installJDK || return 1 + installOpenJDK || return 1 iptables -I INPUT 1 -p tcp --dport 22 -j ACCEPT iptables -I INPUT 1 -p tcp --dport 8080 -j ACCEPT iptables-save diff --git a/compute/src/test/resources/runscript.sh b/compute/src/test/resources/runscript.sh index 844ba16f3c..7f8977c047 100644 --- a/compute/src/test/resources/runscript.sh +++ b/compute/src/test/resources/runscript.sh @@ -133,41 +133,40 @@ function setupPublicCurl() { ensure_can_resolve_public_dns return 0 } +function setupJavaHomeInProfile() { + test -n \"$SUDO_USER\" && cat >> `getent passwd $SUDO_USER| cut -f6 -d:`/.bashrc <<-'END_OF_JCLOUDS_FILE' + export JAVA_HOME=/usr/local/jdk + export PATH=$JAVA_HOME/bin:$PATH +END_OF_JCLOUDS_FILE + cat >> /etc/bashrc <<-'END_OF_JCLOUDS_FILE' + export JAVA_HOME=/usr/local/jdk + export PATH=$JAVA_HOME/bin:$PATH +END_OF_JCLOUDS_FILE + cat >> $HOME/.bashrc <<-'END_OF_JCLOUDS_FILE' + export JAVA_HOME=/usr/local/jdk + export PATH=$JAVA_HOME/bin:$PATH +END_OF_JCLOUDS_FILE + cat >> /etc/skel/.bashrc <<-'END_OF_JCLOUDS_FILE' + export JAVA_HOME=/usr/local/jdk + export PATH=$JAVA_HOME/bin:$PATH +END_OF_JCLOUDS_FILE +} + function installJDK() { - if hash curl 2>/dev/null; then - if [ `uname -m` == 'x86_64' ]; then - local url=${1:-http://download.oracle.com/otn-pub/java/jdk/7/jdk-7-linux-x64.tar.gz} - else - local url=${1:-http://download.oracle.com/otn-pub/java/jdk/7/jdk-7-linux-i586.tar.gz} - fi - curl -q -s -S -L --connect-timeout 10 --max-time 600 --retry 20 -X GET $url |(mkdir -p /usr/local &&cd /usr/local &&tar -xpzf -) - mv /usr/local/jdk* /usr/local/jdk/ - test -n \"$SUDO_USER\" && cat >> /home/$SUDO_USER/.bashrc <<-'END_OF_JCLOUDS_FILE' - export JAVA_HOME=/usr/local/jdk - export PATH=$JAVA_HOME/bin:$PATH -END_OF_JCLOUDS_FILE - cat >> /etc/bashrc <<-'END_OF_JCLOUDS_FILE' - export JAVA_HOME=/usr/local/jdk - export PATH=$JAVA_HOME/bin:$PATH -END_OF_JCLOUDS_FILE - cat >> $HOME/.bashrc <<-'END_OF_JCLOUDS_FILE' - export JAVA_HOME=/usr/local/jdk - export PATH=$JAVA_HOME/bin:$PATH -END_OF_JCLOUDS_FILE - cat >> /etc/skel/.bashrc <<-'END_OF_JCLOUDS_FILE' - export JAVA_HOME=/usr/local/jdk - export PATH=$JAVA_HOME/bin:$PATH -END_OF_JCLOUDS_FILE - # TODO: eventhough we are setting the above, sometimes images (ex. - # cloudservers ubuntu) kick out of .bashrc (ex. [ -z "$PS1" ] && - # return), for this reason, we should also explicitly link. - # A better way would be to update using alternatives or the like - ln -fs /usr/local/jdk/bin/java /usr/bin/java - /usr/bin/java -version || abort "cannot run /usr/bin/java" + if hash apt-get 2>/dev/null; then + export pkg=openjdk-7-jdk + apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg ) + elif hash yum 2>/dev/null; then + export pkg=java-1.7.0-openjdk + yum --nogpgcheck -y ensure $pkg else - abort "curl not available.. cannot install openjdk" + abort "we only support apt-get and yum right now... please contribute!" + return 1 fi - return 0 + JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common` + ln -Fs $JAVA_HOME /usr/local/jdk + /usr/local/jdk/bin/java -version || abort "cannot run java" + setupJavaHomeInProfile } END_OF_JCLOUDS_SCRIPT @@ -178,7 +177,7 @@ END_OF_JCLOUDS_SCRIPT rm -f $INSTANCE_HOME/rc trap 'echo $?>$INSTANCE_HOME/rc' 0 1 2 3 15 setupPublicCurl || exit 1 - installJDK || exit 1 + installOpenJDK || exit 1 END_OF_JCLOUDS_SCRIPT diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/PlacementGroupClientLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/PlacementGroupClientLiveTest.java index f5cbb645d1..a39c976178 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/PlacementGroupClientLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/PlacementGroupClientLiveTest.java @@ -149,7 +149,7 @@ public class PlacementGroupClientLiveTest extends BaseVersionedServiceLiveTest { assertEquals(template.getImage().getUserMetadata().get("hypervisor"), "xen"); template.getOptions().runScript( - Statements.newStatementList(AdminAccess.standard(), InstallJDK.fromURL())); + Statements.newStatementList(AdminAccess.standard(), InstallJDK.fromOpenJDK())); String group = PREFIX + "cccluster"; context.getComputeService().destroyNodesMatching(NodePredicates.inGroup(group)); diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/java/InstallJDK.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/java/InstallJDK.java index 5f24f1decf..ad15a5cb59 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/java/InstallJDK.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/java/InstallJDK.java @@ -31,22 +31,43 @@ import org.jclouds.scriptbuilder.domain.StatementList; * @author Adrian Cole */ public class InstallJDK { + // TODO: this doesn't work + public static Statement fromOracle() { + throw new UnsupportedOperationException("Oracle JDK install doesn't currently work due to license agreement"); + } + + public static Statement fromOpenJDK() { + return new FromOpenJDK(); + } + + /** + * @see fromOpenJDK + */ + @Deprecated public static Statement fromURL() { - return new FromURL(); + return fromOpenJDK(); } public static Statement fromURL(URI url) { return new FromURL(url); } + public static class FromOpenJDK extends StatementList { + + public FromOpenJDK() { + super(call("setupPublicCurl"), call("installOpenJDK")); + } + + } + public static class FromURL extends StatementList { public FromURL() { - super(call("setupPublicCurl"), call("installJDK")); + super(call("setupPublicCurl"), call("installJDKFromURL")); } public FromURL(URI jdk7Url) { - super(call("setupPublicCurl"), call("installJDK", jdk7Url.toASCIIString())); + super(call("setupPublicCurl"), call("installJDKFromURL", jdk7Url.toASCIIString())); } } } \ No newline at end of file diff --git a/scriptbuilder/src/main/resources/functions/installJDK.sh b/scriptbuilder/src/main/resources/functions/installJDKFromURL.sh similarity index 87% rename from scriptbuilder/src/main/resources/functions/installJDK.sh rename to scriptbuilder/src/main/resources/functions/installJDKFromURL.sh index a800582483..a42b3a1e61 100644 --- a/scriptbuilder/src/main/resources/functions/installJDK.sh +++ b/scriptbuilder/src/main/resources/functions/installJDKFromURL.sh @@ -1,4 +1,7 @@ -function installJDK() { +# note this does not work until someone addresses user auth +# https://issues.jenkins-ci.org/browse/JENKINS-10556 +# https://forums.oracle.com/forums/thread.jspa?messageID=10236239&tstart=0 +function installJDKFromURL() { if hash curl 2>/dev/null; then if [ `uname -m` == 'x86_64' ]; then local url=${1:-http://download.oracle.com/otn-pub/java/jdk/7/jdk-7-linux-x64.tar.gz} diff --git a/scriptbuilder/src/main/resources/functions/installOpenJDK.sh b/scriptbuilder/src/main/resources/functions/installOpenJDK.sh new file mode 100644 index 0000000000..cf7ef59be2 --- /dev/null +++ b/scriptbuilder/src/main/resources/functions/installOpenJDK.sh @@ -0,0 +1,35 @@ +function setupJavaHomeInProfile() { + test -n \"$SUDO_USER\" && cat >> `getent passwd $SUDO_USER| cut -f6 -d:`/.bashrc <<-'END_OF_JCLOUDS_FILE' + export JAVA_HOME=/usr/local/jdk + export PATH=$JAVA_HOME/bin:$PATH +END_OF_JCLOUDS_FILE + cat >> /etc/bashrc <<-'END_OF_JCLOUDS_FILE' + export JAVA_HOME=/usr/local/jdk + export PATH=$JAVA_HOME/bin:$PATH +END_OF_JCLOUDS_FILE + cat >> $HOME/.bashrc <<-'END_OF_JCLOUDS_FILE' + export JAVA_HOME=/usr/local/jdk + export PATH=$JAVA_HOME/bin:$PATH +END_OF_JCLOUDS_FILE + cat >> /etc/skel/.bashrc <<-'END_OF_JCLOUDS_FILE' + export JAVA_HOME=/usr/local/jdk + export PATH=$JAVA_HOME/bin:$PATH +END_OF_JCLOUDS_FILE +} + +function installJDK() { + if hash apt-get 2>/dev/null; then + export pkg=openjdk-7-jdk + apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg ) + elif hash yum 2>/dev/null; then + export pkg=java-1.7.0-openjdk + yum --nogpgcheck -y ensure $pkg + else + abort "we only support apt-get and yum right now... please contribute!" + return 1 + fi + JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common` + ln -Fs $JAVA_HOME /usr/local/jdk + /usr/local/jdk/bin/java -version || abort "cannot run java" + setupJavaHomeInProfile +} \ No newline at end of file diff --git a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/java/InstallJDKTest.java b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/java/InstallJDKTest.java index dee09e0e3b..8bb7033d4b 100644 --- a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/java/InstallJDKTest.java +++ b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/java/InstallJDKTest.java @@ -39,14 +39,14 @@ import com.google.common.io.Resources; @Test(groups = "unit", testName = "InstallJDKTest") public class InstallJDKTest { - Statement installJDK = InstallJDK.fromURL(); + Statement installJDK = InstallJDK.fromOpenJDK(); public void testInstallJDKUNIX() throws IOException { - assertEquals(InstallJDK.fromURL().render(OsFamily.UNIX), "setupPublicCurl || return 1\ninstallJDK || return 1\n"); + assertEquals(InstallJDK.fromOpenJDK().render(OsFamily.UNIX), "setupPublicCurl || return 1\ninstallOpenJDK || return 1\n"); } public void testInstallJDKUNIXInScriptBuilderSourcesSetupPublicCurl() throws IOException { - assertEquals(InitScript.builder().name("install_jdk").run(InstallJDK.fromURL()).build().render(OsFamily.UNIX), + assertEquals(InitScript.builder().name("install_jdk").run(InstallJDK.fromOpenJDK()).build().render(OsFamily.UNIX), CharStreams.toString(Resources.newReaderSupplier( Resources.getResource("test_install_jdk_scriptbuilder." + ShellToken.SH.to(OsFamily.UNIX)), Charsets.UTF_8))); @@ -54,7 +54,7 @@ public class InstallJDKTest { public void testInstallJDKUNIXWithURL() throws IOException { assertEquals(InstallJDK.fromURL(URI.create("http://foo")).render(OsFamily.UNIX), - "setupPublicCurl || return 1\ninstallJDK http://foo || return 1\n"); + "setupPublicCurl || return 1\ninstallJDKFromURL http://foo || return 1\n"); } } diff --git a/scriptbuilder/src/test/resources/test_install_jdk_scriptbuilder.sh b/scriptbuilder/src/test/resources/test_install_jdk_scriptbuilder.sh index a253c0f725..905599a088 100644 --- a/scriptbuilder/src/test/resources/test_install_jdk_scriptbuilder.sh +++ b/scriptbuilder/src/test/resources/test_install_jdk_scriptbuilder.sh @@ -133,41 +133,40 @@ function setupPublicCurl() { ensure_can_resolve_public_dns return 0 } +function setupJavaHomeInProfile() { + test -n \"$SUDO_USER\" && cat >> `getent passwd $SUDO_USER| cut -f6 -d:`/.bashrc <<-'END_OF_JCLOUDS_FILE' + export JAVA_HOME=/usr/local/jdk + export PATH=$JAVA_HOME/bin:$PATH +END_OF_JCLOUDS_FILE + cat >> /etc/bashrc <<-'END_OF_JCLOUDS_FILE' + export JAVA_HOME=/usr/local/jdk + export PATH=$JAVA_HOME/bin:$PATH +END_OF_JCLOUDS_FILE + cat >> $HOME/.bashrc <<-'END_OF_JCLOUDS_FILE' + export JAVA_HOME=/usr/local/jdk + export PATH=$JAVA_HOME/bin:$PATH +END_OF_JCLOUDS_FILE + cat >> /etc/skel/.bashrc <<-'END_OF_JCLOUDS_FILE' + export JAVA_HOME=/usr/local/jdk + export PATH=$JAVA_HOME/bin:$PATH +END_OF_JCLOUDS_FILE +} + function installJDK() { - if hash curl 2>/dev/null; then - if [ `uname -m` == 'x86_64' ]; then - local url=${1:-http://download.oracle.com/otn-pub/java/jdk/7/jdk-7-linux-x64.tar.gz} - else - local url=${1:-http://download.oracle.com/otn-pub/java/jdk/7/jdk-7-linux-i586.tar.gz} - fi - curl -q -s -S -L --connect-timeout 10 --max-time 600 --retry 20 -X GET $url |(mkdir -p /usr/local &&cd /usr/local &&tar -xpzf -) - mv /usr/local/jdk* /usr/local/jdk/ - test -n \"$SUDO_USER\" && cat >> /home/$SUDO_USER/.bashrc <<-'END_OF_JCLOUDS_FILE' - export JAVA_HOME=/usr/local/jdk - export PATH=$JAVA_HOME/bin:$PATH -END_OF_JCLOUDS_FILE - cat >> /etc/bashrc <<-'END_OF_JCLOUDS_FILE' - export JAVA_HOME=/usr/local/jdk - export PATH=$JAVA_HOME/bin:$PATH -END_OF_JCLOUDS_FILE - cat >> $HOME/.bashrc <<-'END_OF_JCLOUDS_FILE' - export JAVA_HOME=/usr/local/jdk - export PATH=$JAVA_HOME/bin:$PATH -END_OF_JCLOUDS_FILE - cat >> /etc/skel/.bashrc <<-'END_OF_JCLOUDS_FILE' - export JAVA_HOME=/usr/local/jdk - export PATH=$JAVA_HOME/bin:$PATH -END_OF_JCLOUDS_FILE - # TODO: eventhough we are setting the above, sometimes images (ex. - # cloudservers ubuntu) kick out of .bashrc (ex. [ -z "$PS1" ] && - # return), for this reason, we should also explicitly link. - # A better way would be to update using alternatives or the like - ln -fs /usr/local/jdk/bin/java /usr/bin/java - /usr/bin/java -version || abort "cannot run /usr/bin/java" + if hash apt-get 2>/dev/null; then + export pkg=openjdk-7-jdk + apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg ) + elif hash yum 2>/dev/null; then + export pkg=java-1.7.0-openjdk + yum --nogpgcheck -y ensure $pkg else - abort "curl not available.. cannot install openjdk" + abort "we only support apt-get and yum right now... please contribute!" + return 1 fi - return 0 + JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common` + ln -Fs $JAVA_HOME /usr/local/jdk + /usr/local/jdk/bin/java -version || abort "cannot run java" + setupJavaHomeInProfile } END_OF_JCLOUDS_SCRIPT @@ -178,7 +177,7 @@ END_OF_JCLOUDS_SCRIPT rm -f $INSTANCE_HOME/rc trap 'echo $?>$INSTANCE_HOME/rc' 0 1 2 3 15 setupPublicCurl || exit 1 - installJDK || exit 1 + installOpenJDK || exit 1 END_OF_JCLOUDS_SCRIPT From 8ab1d7f26ce330442788fd70c5ef072e66c7d1e3 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Fri, 30 Mar 2012 18:32:16 -0700 Subject: [PATCH 10/11] return false when node is null --- .../java/org/jclouds/compute/predicates/NodePredicates.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compute/src/main/java/org/jclouds/compute/predicates/NodePredicates.java b/compute/src/main/java/org/jclouds/compute/predicates/NodePredicates.java index f1cc800cdc..32cd732d0f 100644 --- a/compute/src/main/java/org/jclouds/compute/predicates/NodePredicates.java +++ b/compute/src/main/java/org/jclouds/compute/predicates/NodePredicates.java @@ -213,7 +213,7 @@ public class NodePredicates { return new Predicate() { @Override public boolean apply(NodeMetadata nodeMetadata) { - return nodeMetadata.getGroup() != null; + return nodeMetadata != null && nodeMetadata.getGroup() != null; } @Override From 7e6b4190687ff4a215fb201e9e0ac871cf95c9a0 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Fri, 30 Mar 2012 18:34:52 -0700 Subject: [PATCH 11/11] Issue 891: ubuntu and centos now work with openjdk --- .../compute/StubComputeServiceIntegrationTest.java | 2 +- compute/src/test/resources/initscript_with_java.sh | 12 +++++++----- compute/src/test/resources/initscript_with_jboss.sh | 12 +++++++----- compute/src/test/resources/runscript.sh | 12 +++++++----- .../src/main/resources/functions/installOpenJDK.sh | 10 ++++++---- .../src/main/resources/functions/setupPublicCurl.sh | 2 +- .../test/resources/test_install_jdk_scriptbuilder.sh | 12 +++++++----- 7 files changed, 36 insertions(+), 26 deletions(-) diff --git a/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java b/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java index 551e37510d..cccd9f735f 100644 --- a/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java +++ b/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java @@ -65,7 +65,7 @@ import com.google.inject.Module; * * @author Adrian Cole */ -@Test(groups = "live") +@Test(groups = "live", testName="StubComputeServiceIntegrationTest") public class StubComputeServiceIntegrationTest extends BaseComputeServiceLiveTest { private static final ExecResponse EXEC_GOOD = new ExecResponse("", "", 0); diff --git a/compute/src/test/resources/initscript_with_java.sh b/compute/src/test/resources/initscript_with_java.sh index 927da887cf..9ad7659941 100644 --- a/compute/src/test/resources/initscript_with_java.sh +++ b/compute/src/test/resources/initscript_with_java.sh @@ -96,7 +96,7 @@ function ensure_cmd_or_install_package_apt(){ function ensure_cmd_or_install_package_yum(){ local cmd=$1 local pkg=$2 - hash $cmd 2>/dev/null || yum --nogpgcheck -y ensure $pkg + hash $cmd 2>/dev/null || yum --nogpgcheck -y install $pkg } function ensure_netutils_apt() { @@ -152,18 +152,20 @@ END_OF_JCLOUDS_FILE END_OF_JCLOUDS_FILE } -function installJDK() { +function installOpenJDK() { if hash apt-get 2>/dev/null; then export pkg=openjdk-7-jdk apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg ) + export JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common` elif hash yum 2>/dev/null; then - export pkg=java-1.7.0-openjdk - yum --nogpgcheck -y ensure $pkg + #TODO: find a jdk7 yum repo + export pkg=java-1.6.0-openjdk-devel + yum --nogpgcheck -y install $pkg + export JAVA_HOME=`ls -d /usr/lib/jvm/java-1.6.0-openjdk-*` else abort "we only support apt-get and yum right now... please contribute!" return 1 fi - JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common` ln -Fs $JAVA_HOME /usr/local/jdk /usr/local/jdk/bin/java -version || abort "cannot run java" setupJavaHomeInProfile diff --git a/compute/src/test/resources/initscript_with_jboss.sh b/compute/src/test/resources/initscript_with_jboss.sh index e848b851b0..b745f96667 100644 --- a/compute/src/test/resources/initscript_with_jboss.sh +++ b/compute/src/test/resources/initscript_with_jboss.sh @@ -96,7 +96,7 @@ function ensure_cmd_or_install_package_apt(){ function ensure_cmd_or_install_package_yum(){ local cmd=$1 local pkg=$2 - hash $cmd 2>/dev/null || yum --nogpgcheck -y ensure $pkg + hash $cmd 2>/dev/null || yum --nogpgcheck -y install $pkg } function ensure_netutils_apt() { @@ -152,18 +152,20 @@ END_OF_JCLOUDS_FILE END_OF_JCLOUDS_FILE } -function installJDK() { +function installOpenJDK() { if hash apt-get 2>/dev/null; then export pkg=openjdk-7-jdk apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg ) + export JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common` elif hash yum 2>/dev/null; then - export pkg=java-1.7.0-openjdk - yum --nogpgcheck -y ensure $pkg + #TODO: find a jdk7 yum repo + export pkg=java-1.6.0-openjdk-devel + yum --nogpgcheck -y install $pkg + export JAVA_HOME=`ls -d /usr/lib/jvm/java-1.6.0-openjdk-*` else abort "we only support apt-get and yum right now... please contribute!" return 1 fi - JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common` ln -Fs $JAVA_HOME /usr/local/jdk /usr/local/jdk/bin/java -version || abort "cannot run java" setupJavaHomeInProfile diff --git a/compute/src/test/resources/runscript.sh b/compute/src/test/resources/runscript.sh index 7f8977c047..ea2874ccd0 100644 --- a/compute/src/test/resources/runscript.sh +++ b/compute/src/test/resources/runscript.sh @@ -96,7 +96,7 @@ function ensure_cmd_or_install_package_apt(){ function ensure_cmd_or_install_package_yum(){ local cmd=$1 local pkg=$2 - hash $cmd 2>/dev/null || yum --nogpgcheck -y ensure $pkg + hash $cmd 2>/dev/null || yum --nogpgcheck -y install $pkg } function ensure_netutils_apt() { @@ -152,18 +152,20 @@ END_OF_JCLOUDS_FILE END_OF_JCLOUDS_FILE } -function installJDK() { +function installOpenJDK() { if hash apt-get 2>/dev/null; then export pkg=openjdk-7-jdk apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg ) + export JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common` elif hash yum 2>/dev/null; then - export pkg=java-1.7.0-openjdk - yum --nogpgcheck -y ensure $pkg + #TODO: find a jdk7 yum repo + export pkg=java-1.6.0-openjdk-devel + yum --nogpgcheck -y install $pkg + export JAVA_HOME=`ls -d /usr/lib/jvm/java-1.6.0-openjdk-*` else abort "we only support apt-get and yum right now... please contribute!" return 1 fi - JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common` ln -Fs $JAVA_HOME /usr/local/jdk /usr/local/jdk/bin/java -version || abort "cannot run java" setupJavaHomeInProfile diff --git a/scriptbuilder/src/main/resources/functions/installOpenJDK.sh b/scriptbuilder/src/main/resources/functions/installOpenJDK.sh index cf7ef59be2..0ac3b2f2ca 100644 --- a/scriptbuilder/src/main/resources/functions/installOpenJDK.sh +++ b/scriptbuilder/src/main/resources/functions/installOpenJDK.sh @@ -17,18 +17,20 @@ END_OF_JCLOUDS_FILE END_OF_JCLOUDS_FILE } -function installJDK() { +function installOpenJDK() { if hash apt-get 2>/dev/null; then export pkg=openjdk-7-jdk apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg ) + export JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common` elif hash yum 2>/dev/null; then - export pkg=java-1.7.0-openjdk - yum --nogpgcheck -y ensure $pkg + #TODO: find a jdk7 yum repo + export pkg=java-1.6.0-openjdk-devel + yum --nogpgcheck -y install $pkg + export JAVA_HOME=`ls -d /usr/lib/jvm/java-1.6.0-openjdk-*` else abort "we only support apt-get and yum right now... please contribute!" return 1 fi - JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common` ln -Fs $JAVA_HOME /usr/local/jdk /usr/local/jdk/bin/java -version || abort "cannot run java" setupJavaHomeInProfile diff --git a/scriptbuilder/src/main/resources/functions/setupPublicCurl.sh b/scriptbuilder/src/main/resources/functions/setupPublicCurl.sh index 005f891c83..ad72ddb838 100644 --- a/scriptbuilder/src/main/resources/functions/setupPublicCurl.sh +++ b/scriptbuilder/src/main/resources/functions/setupPublicCurl.sh @@ -11,7 +11,7 @@ function ensure_cmd_or_install_package_apt(){ function ensure_cmd_or_install_package_yum(){ local cmd=$1 local pkg=$2 - hash $cmd 2>/dev/null || yum --nogpgcheck -y ensure $pkg + hash $cmd 2>/dev/null || yum --nogpgcheck -y install $pkg } function ensure_netutils_apt() { diff --git a/scriptbuilder/src/test/resources/test_install_jdk_scriptbuilder.sh b/scriptbuilder/src/test/resources/test_install_jdk_scriptbuilder.sh index 905599a088..d35c30b1d7 100644 --- a/scriptbuilder/src/test/resources/test_install_jdk_scriptbuilder.sh +++ b/scriptbuilder/src/test/resources/test_install_jdk_scriptbuilder.sh @@ -96,7 +96,7 @@ function ensure_cmd_or_install_package_apt(){ function ensure_cmd_or_install_package_yum(){ local cmd=$1 local pkg=$2 - hash $cmd 2>/dev/null || yum --nogpgcheck -y ensure $pkg + hash $cmd 2>/dev/null || yum --nogpgcheck -y install $pkg } function ensure_netutils_apt() { @@ -152,18 +152,20 @@ END_OF_JCLOUDS_FILE END_OF_JCLOUDS_FILE } -function installJDK() { +function installOpenJDK() { if hash apt-get 2>/dev/null; then export pkg=openjdk-7-jdk apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg ) + export JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common` elif hash yum 2>/dev/null; then - export pkg=java-1.7.0-openjdk - yum --nogpgcheck -y ensure $pkg + #TODO: find a jdk7 yum repo + export pkg=java-1.6.0-openjdk-devel + yum --nogpgcheck -y install $pkg + export JAVA_HOME=`ls -d /usr/lib/jvm/java-1.6.0-openjdk-*` else abort "we only support apt-get and yum right now... please contribute!" return 1 fi - JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common` ln -Fs $JAVA_HOME /usr/local/jdk /usr/local/jdk/bin/java -version || abort "cannot run java" setupJavaHomeInProfile