Adds service predicates and more tests
diff --git a/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/ServiceStatus.java b/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/ServiceStatus.java
index 9d14e72..aecde57 100644
--- a/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/ServiceStatus.java
+++ b/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/ServiceStatus.java
@@ -21,25 +21,25 @@
/**
* Specifies that the service is currently being created and deployed.
*/
- CREATE_IN_PROGRESS("create_in_progress "),
+ CREATE_IN_PROGRESS("create_in_progress"),
/**
* Specifies that the service has been deployed and is ready to use.
*/
- DEPLOYED("deployed "),
+ DEPLOYED("deployed"),
/**
* Specifies that the service is currently being updated.
*/
- UPDATE_IN_PROGRESS("update_in_progress "),
+ UPDATE_IN_PROGRESS("update_in_progress"),
/**
* Specifies that the service is currently being deleted.
*/
- DELETE_IN_PROGRESS("delete_in_progress "),
+ DELETE_IN_PROGRESS("delete_in_progress"),
/**
* Specifies that the previous operation on the service failed to create, deploy, update, or delete.
* Looks for the errors for details.
* @see Service#getErrors()
*/
- FAILED("failed "),
+ FAILED("failed"),
/**
* An unexpected status jclouds could not recognize.
*/
diff --git a/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/predicates/ServicePredicates.java b/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/predicates/ServicePredicates.java
new file mode 100644
index 0000000..8983ac5
--- /dev/null
+++ b/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/predicates/ServicePredicates.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.openstack.poppy.v1.predicates;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.jclouds.util.Predicates2.retry;
+
+import org.jclouds.openstack.poppy.v1.domain.Service;
+import org.jclouds.openstack.poppy.v1.domain.ServiceStatus;
+import org.jclouds.openstack.poppy.v1.features.ServiceApi;
+import com.google.common.base.Predicate;
+
+public class ServicePredicates {
+ public static Predicate<Service> awaitDeployed(ServiceApi serviceApi) {
+ ServiceStatusPredicate statusPredicate = new ServiceStatusPredicate(serviceApi, ServiceStatus.DEPLOYED);
+ return retry(statusPredicate, 1200, 15, 15, SECONDS);
+ }
+
+ private static class ServiceStatusPredicate implements Predicate<Service> {
+ private ServiceApi serviceApi;
+ private ServiceStatus status;
+
+ public ServiceStatusPredicate(ServiceApi instanceApi, ServiceStatus status) {
+ this.serviceApi = checkNotNull(instanceApi, "serviceApi must be defined");
+ this.status = checkNotNull(status, "status must be defined");
+ }
+
+ /**
+ * @return boolean Return true when the service reaches status, false otherwise.
+ */
+ @Override
+ public boolean apply(Service service) {
+ checkNotNull(service, "service must be defined");
+
+ if (status.equals(service.getStatus())) {
+ return true;
+ }
+ else {
+ Service serviceUpdated = serviceApi.get(service.getId());
+ checkNotNull(serviceUpdated, "service %s not found.", service.getId());
+
+ return status.equals(serviceUpdated.getStatus());
+ }
+ }
+ }
+}
diff --git a/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiLiveTest.java b/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiLiveTest.java
index 5746b07..9abf2b3 100644
--- a/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiLiveTest.java
+++ b/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiLiveTest.java
@@ -21,6 +21,8 @@
import static org.testng.Assert.assertTrue;
import java.net.URI;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
import org.jclouds.openstack.poppy.v1.domain.Caching;
import org.jclouds.openstack.poppy.v1.domain.CreateService;
@@ -29,10 +31,14 @@
import org.jclouds.openstack.poppy.v1.domain.Restriction;
import org.jclouds.openstack.poppy.v1.domain.RestrictionRule;
import org.jclouds.openstack.poppy.v1.domain.Service;
+import org.jclouds.openstack.poppy.v1.domain.ServiceStatus;
+import org.jclouds.openstack.poppy.v1.domain.UpdateService;
import org.jclouds.openstack.poppy.v1.internal.BasePoppyApiLiveTest;
+import org.jclouds.openstack.poppy.v1.predicates.ServicePredicates;
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
+import com.google.common.util.concurrent.Uninterruptibles;
/**
* Live tests, as should be executed against devstack or a provider
@@ -50,8 +56,8 @@
.name("jclouds_test_service")
.domains(
ImmutableList.of(
- Domain.builder().domain("www.jclouds123456123456.com").build(),
- Domain.builder().domain("www.example123456123456.com").build()))
+ Domain.builder().domain("www.jclouds" + UUID.randomUUID() + ".com").build(),
+ Domain.builder().domain("www.example" + UUID.randomUUID() + ".com").build()))
.origins(ImmutableList.of(
Origin.builder()
.origin("jclouds123456123456.com")
@@ -80,6 +86,15 @@
assertNotNull(serviceList);
Service serviceGet = api.getServiceApi().get(serviceId);
assertEquals(serviceList, serviceGet);
+
+ ServicePredicates.awaitDeployed(serviceApi).apply(serviceGet);
+ assertEquals(serviceApi.get(serviceId).getStatus(), ServiceStatus.DEPLOYED);
+
+ UpdateService updated = serviceGet.toUpdatableService().name("updated_name").build();
+ serviceApi.update(serviceId, serviceGet, updated);
+ Uninterruptibles.sleepUninterruptibly(30, TimeUnit.SECONDS);
+ assertEquals(serviceApi.get(serviceId).getName(), "updated_name");
+
assertTrue(serviceApi.deleteAsset(serviceId, "image/1.jpg"));
assertTrue(serviceApi.deleteAssets(serviceId));
}
