Repository: jclouds-labs Updated Branches: refs/heads/master 736329073 -> 9c19ee0c8
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/java/org/jclouds/shipyard/features/EnginesApiMockTest.java ---------------------------------------------------------------------- diff --git a/shipyard/src/test/java/org/jclouds/shipyard/features/EnginesApiMockTest.java b/shipyard/src/test/java/org/jclouds/shipyard/features/EnginesApiMockTest.java deleted file mode 100644 index b5a4ad1..0000000 --- a/shipyard/src/test/java/org/jclouds/shipyard/features/EnginesApiMockTest.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.shipyard.features; - -import com.google.common.collect.Lists; -import com.squareup.okhttp.mockwebserver.MockResponse; -import com.squareup.okhttp.mockwebserver.MockWebServer; - -import org.jclouds.http.HttpResponseException; -import org.jclouds.shipyard.ShipyardApi; -import org.jclouds.shipyard.domain.engines.AddEngine; -import org.jclouds.shipyard.domain.engines.EngineSettingsInfo; -import org.jclouds.shipyard.internal.BaseShipyardMockTest; -import org.testng.annotations.Test; - -import static org.testng.Assert.assertEquals; - -/** - * Mock tests for the {@link org.jclouds.shipyard.features.EnginesApi} class. - */ -@Test(groups = "unit", testName = "EnginesApiMockTest") -public class EnginesApiMockTest extends BaseShipyardMockTest { - - public void testGetEngine() throws Exception { - MockWebServer server = mockShipyardWebServer(); - server.enqueue(new MockResponse().setBody(payloadFromResource("/engine.json"))); - ShipyardApi shipyardApi = api(server.getUrl("/")); - EnginesApi api = shipyardApi.enginesApi(); - try { - String specificEngineID = "e2059d20-e9df-44f3-8a9b-1bf2321b4eae"; - assertEquals(api.getEngine(specificEngineID).id(), specificEngineID); - assertSent(server, "GET", "/api/engines/" + specificEngineID); - } finally { - shipyardApi.close(); - server.shutdown(); - } - } - - public void testGetAllEngines() throws Exception { - MockWebServer server = mockShipyardWebServer(); - server.enqueue(new MockResponse().setBody(payloadFromResource("/engines.json"))); - ShipyardApi shipyardApi = api(server.getUrl("/")); - EnginesApi api = shipyardApi.enginesApi(); - try { - assertEquals(api.listEngines().size(), 1); - assertSent(server, "GET", "/api/engines"); - } finally { - shipyardApi.close(); - server.shutdown(); - } - } - - public void testAddEngine() throws Exception { - MockWebServer server = mockShipyardWebServer(); - server.enqueue(new MockResponse().setResponseCode(200)); - ShipyardApi shipyardApi = api(server.getUrl("/")); - EnginesApi api = shipyardApi.enginesApi(); - try { - AddEngine addEngine = AddEngine.create("local", - "", - "", - "", - EngineSettingsInfo.create("1234", - "http://localhost:2375";, - 1, - 1024, - Lists.newArrayList("shipyard-test"))); - - api.addEngine(addEngine); - assertSent(server, "POST", "/api/engines", new String(payloadFromResource("/engine-add.json"))); - } finally { - shipyardApi.close(); - server.shutdown(); - } - } - - @Test (expectedExceptions = HttpResponseException.class) - public void testAddNonExistentEngine() throws Exception { - MockWebServer server = mockShipyardWebServer(); - server.enqueue(new MockResponse().setResponseCode(500)); - ShipyardApi shipyardApi = api(server.getUrl("/")); - EnginesApi api = shipyardApi.enginesApi(); - try { - AddEngine addEngine = AddEngine.create("local", - "", - "", - "", - EngineSettingsInfo.create("9999", - "http://shipyard.failure.com:9999";, - 1, - 1024, - Lists.newArrayList("shipyard-faiure"))); - - api.addEngine(addEngine); - assertSent(server, "POST", "/api/engines", new String(payloadFromResource("/engine-add.json"))); - } finally { - shipyardApi.close(); - server.shutdown(); - } - } - - public void testRemoveEngine() throws Exception { - MockWebServer server = mockShipyardWebServer(); - server.enqueue(new MockResponse().setResponseCode(200)); - ShipyardApi shipyardApi = api(server.getUrl("/")); - EnginesApi api = shipyardApi.enginesApi(); - try { - String specificEngineID = "e2059d20-e9df-44f3-8a9b-1bf2321b4eae"; - api.removeEngine(specificEngineID); - assertSent(server, "DELETE", "/api/engines/" + specificEngineID); - } finally { - shipyardApi.close(); - server.shutdown(); - } - } - - public void testRemoveNonExistentEngine() throws Exception { - //TODO - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/java/org/jclouds/shipyard/features/ImagesApiLiveTest.java ---------------------------------------------------------------------- diff --git a/shipyard/src/test/java/org/jclouds/shipyard/features/ImagesApiLiveTest.java b/shipyard/src/test/java/org/jclouds/shipyard/features/ImagesApiLiveTest.java deleted file mode 100644 index 47af8e1..0000000 --- a/shipyard/src/test/java/org/jclouds/shipyard/features/ImagesApiLiveTest.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.shipyard.features; - -import static org.testng.Assert.assertNotNull; - -import java.net.URI; -import java.util.List; - -import org.jclouds.shipyard.domain.images.ImageInfo; -import org.jclouds.shipyard.internal.BaseShipyardApiLiveTest; -import org.testng.annotations.Test; - -@Test(groups = "live", testName = "ImagesApiLiveTest", singleThreaded = true) -public class ImagesApiLiveTest extends BaseShipyardApiLiveTest { - - public void testGetAllImages() throws Exception { - // we only have to test that this does not fail. It's entirely possible we get 0 images back. - // This is a placeholder test-hack until Shipyard gets a proper images API expected in v2.10 - String dockerEndpoint = System.getProperty("test.shipyard.docker.endpoint"); - List<ImageInfo> images = api().listImages(URI.create(dockerEndpoint)); - assertNotNull(images); - } - - private ImagesApi api() { - return api.imagesApi(); - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/java/org/jclouds/shipyard/features/ImagesApiMockTest.java ---------------------------------------------------------------------- diff --git a/shipyard/src/test/java/org/jclouds/shipyard/features/ImagesApiMockTest.java b/shipyard/src/test/java/org/jclouds/shipyard/features/ImagesApiMockTest.java deleted file mode 100644 index cbc5f1e..0000000 --- a/shipyard/src/test/java/org/jclouds/shipyard/features/ImagesApiMockTest.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.shipyard.features; - -import static org.testng.Assert.assertEquals; - -import java.net.URI; - -import org.jclouds.http.HttpResponseException; -import org.jclouds.shipyard.ShipyardApi; -import org.jclouds.shipyard.internal.BaseShipyardMockTest; -import org.testng.annotations.Test; - -import com.squareup.okhttp.mockwebserver.MockResponse; -import com.squareup.okhttp.mockwebserver.MockWebServer; - -/** - * Mock tests for the {@link org.jclouds.shipyard.features.ImagesApi} class. - */ -@Test(groups = "unit", testName = "ImagesApiMockTest") -public class ImagesApiMockTest extends BaseShipyardMockTest { - - public void testGetAllImages() throws Exception { - MockWebServer server = mockShipyardWebServer(); - server.enqueue(new MockResponse(). - setResponseCode(200). - setBody(payloadFromResource("/images.json"))); - ShipyardApi shipyardApi = api(server.getUrl("/")); - ImagesApi api = shipyardApi.imagesApi(); - try { - assertEquals(api.listImages(URI.create("")).size(), 1); - assertSentIgnoreServiceKey(server, "GET", "/images/json"); - } finally { - shipyardApi.close(); - server.shutdown(); - } - } - - @Test (expectedExceptions = HttpResponseException.class) - public void testGetNonExistentDockerDaemon() throws Exception { - MockWebServer server = mockShipyardWebServer(); - server.enqueue(new MockResponse(). - setResponseCode(404). - setBody(payloadFromResource("/images.json"))); - ShipyardApi shipyardApi = api(server.getUrl("/")); - ImagesApi api = shipyardApi.imagesApi(); - try { - assertEquals(api.listImages(URI.create("http://test-jclouds-ship:9999";)).size(), 0); - assertSentIgnoreServiceKey(server, "GET", "/images/json"); - } finally { - shipyardApi.close(); - server.shutdown(); - } - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/java/org/jclouds/shipyard/features/RolesApiLiveTest.java ---------------------------------------------------------------------- diff --git a/shipyard/src/test/java/org/jclouds/shipyard/features/RolesApiLiveTest.java b/shipyard/src/test/java/org/jclouds/shipyard/features/RolesApiLiveTest.java deleted file mode 100644 index e362bac..0000000 --- a/shipyard/src/test/java/org/jclouds/shipyard/features/RolesApiLiveTest.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.shipyard.features; - -import java.util.List; -import java.util.UUID; - -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertNotNull; - -import org.jclouds.shipyard.domain.roles.RoleInfo; -import org.jclouds.shipyard.internal.BaseShipyardApiLiveTest; -import org.testng.annotations.AfterClass; -import org.testng.annotations.Test; - -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; - -@Test(groups = "live", testName = "RolesApiLiveTest", singleThreaded = true) -public class RolesApiLiveTest extends BaseShipyardApiLiveTest { - - private final String roleName = "jclouds-shipyard-test-" + UUID.randomUUID().toString().replaceAll("-", ""); - - @AfterClass (alwaysRun = true) - protected void tearDown() { - api().deleteRole(roleName); - } - - public void testCreateRole() throws Exception { - api().createRole(roleName); - } - - @Test (dependsOnMethods = "testCreateRole") - public void testGetRole() throws Exception { - RoleInfo role = api().getRole(roleName); - assertNotNull(role, "Role was not set"); - assertTrue(role.name().equals(roleName), "Found Role name does not match expected name: found=" + role.name() + ", expected=" + roleName); - } - - @Test (dependsOnMethods = "testGetRole") - public void testListRoles() throws Exception { - List<RoleInfo> possibleRoles = api().listRoles(); - assertNotNull(possibleRoles, "possibleRoles was not set"); - assertTrue(possibleRoles.size() > 0, "Expected at least 1 Role but list was empty"); - RoleInfo possibleRole = Iterables.find(possibleRoles, new Predicate<RoleInfo>() { - @Override - public boolean apply(RoleInfo arg0) { - return arg0.name().equals(roleName); - } - }, null); - assertNotNull(possibleRole, "Expected but could not find Role amongst " + possibleRoles.size() + " found"); - } - - @Test (dependsOnMethods = "testListRoles") - public void testRemoveRole() throws Exception { - boolean removed = api().deleteRole(UUID.randomUUID().toString().replaceAll("-", "")); - assertTrue(removed); - } - - @Test (dependsOnMethods = "testRemoveRole") - public void testRemoveNonExistentRole() throws Exception { - boolean removed = api().deleteRole(UUID.randomUUID().toString().replaceAll("-", "")); - assertTrue(removed); - } - - @Test (dependsOnMethods = "testRemoveNonExistentRole") - public void testGetNonExistentRole() throws Exception { - RoleInfo role = api().getRole("jclouds-shipyard-test-" + UUID.randomUUID().toString().replaceAll("-", "")); - assertNull(role, "Role was expected to be NULL but was not"); - } - - private RolesApi api() { - return api.rolesApi(); - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/java/org/jclouds/shipyard/features/RolesApiMockTest.java ---------------------------------------------------------------------- diff --git a/shipyard/src/test/java/org/jclouds/shipyard/features/RolesApiMockTest.java b/shipyard/src/test/java/org/jclouds/shipyard/features/RolesApiMockTest.java deleted file mode 100644 index 807442d..0000000 --- a/shipyard/src/test/java/org/jclouds/shipyard/features/RolesApiMockTest.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.shipyard.features; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; - -import org.jclouds.shipyard.ShipyardApi; -import org.jclouds.shipyard.domain.roles.RoleInfo; -import org.jclouds.shipyard.internal.BaseShipyardMockTest; -import org.testng.annotations.Test; - -import com.squareup.okhttp.mockwebserver.MockResponse; -import com.squareup.okhttp.mockwebserver.MockWebServer; - -/** - * Mock tests for the {@link org.jclouds.shipyard.features.RolesApi} class. - */ -@Test(groups = "unit", testName = "RolesApiMockTest") -public class RolesApiMockTest extends BaseShipyardMockTest { - - public void testListRoles() throws Exception { - MockWebServer server = mockShipyardWebServer(); - server.enqueue(new MockResponse().setResponseCode(200).setBody(payloadFromResource("/roles.json"))); - ShipyardApi shipyardApi = api(server.getUrl("/")); - RolesApi api = shipyardApi.rolesApi(); - try { - assertEquals(api.listRoles().size(), 2); - assertSent(server, "GET", "/api/roles"); - } finally { - shipyardApi.close(); - server.shutdown(); - } - } - - public void testGetRole() throws Exception { - MockWebServer server = mockShipyardWebServer(); - server.enqueue(new MockResponse().setResponseCode(200).setBody(payloadFromResource("/role.json"))); - ShipyardApi shipyardApi = api(server.getUrl("/")); - RolesApi api = shipyardApi.rolesApi(); - try { - RoleInfo role = api.getRole("admin"); - assertNotNull(role); - assertEquals(role.name(), "admin"); - assertSent(server, "GET", "/api/roles/admin"); - } finally { - shipyardApi.close(); - server.shutdown(); - } - } - - public void testGetNonExistentRole() throws Exception { - MockWebServer server = mockShipyardWebServer(); - server.enqueue(new MockResponse().setResponseCode(500).setBody("role does not exist")); - ShipyardApi shipyardApi = api(server.getUrl("/")); - RolesApi api = shipyardApi.rolesApi(); - try { - RoleInfo role = api.getRole("NonExistentRole"); - assertNull(role); - } finally { - shipyardApi.close(); - server.shutdown(); - } - } - - public void testCreateRole() throws Exception { - MockWebServer server = mockShipyardWebServer(); - server.enqueue(new MockResponse().setResponseCode(204)); - ShipyardApi shipyardApi = api(server.getUrl("/")); - RolesApi api = shipyardApi.rolesApi(); - try { - api.createRole("admin"); - assertSent(server, "POST", "/api/roles", new String(payloadFromResource("/role-delete-create.json"))); - } finally { - shipyardApi.close(); - server.shutdown(); - } - } - - public void testDeleteRole() throws Exception { - MockWebServer server = mockShipyardWebServer(); - server.enqueue(new MockResponse().setResponseCode(204)); - ShipyardApi shipyardApi = api(server.getUrl("/")); - RolesApi api = shipyardApi.rolesApi(); - try { - boolean removed = api.deleteRole("admin"); - assertTrue(removed); - assertSent(server, "DELETE", "/api/roles", new String(payloadFromResource("/role-delete-create.json"))); - } finally { - shipyardApi.close(); - server.shutdown(); - } - } - - public void testDeleteNonExistentRole() throws Exception { - MockWebServer server = mockShipyardWebServer(); - server.enqueue(new MockResponse().setResponseCode(500).setBody("role does not exist")); - ShipyardApi shipyardApi = api(server.getUrl("/")); - RolesApi api = shipyardApi.rolesApi(); - try { - boolean removed = api.deleteRole("NonExistentRole"); - assertFalse(removed); - } finally { - shipyardApi.close(); - server.shutdown(); - } - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/java/org/jclouds/shipyard/features/ServiceKeysApiLiveTest.java ---------------------------------------------------------------------- diff --git a/shipyard/src/test/java/org/jclouds/shipyard/features/ServiceKeysApiLiveTest.java b/shipyard/src/test/java/org/jclouds/shipyard/features/ServiceKeysApiLiveTest.java deleted file mode 100644 index b55b958..0000000 --- a/shipyard/src/test/java/org/jclouds/shipyard/features/ServiceKeysApiLiveTest.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.shipyard.features; - -import java.util.List; -import java.util.UUID; - -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.assertNotNull; - -import org.jclouds.shipyard.domain.servicekeys.ServiceKey; -import org.jclouds.shipyard.internal.BaseShipyardApiLiveTest; -import org.testng.annotations.AfterClass; -import org.testng.annotations.Test; - -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; - -@Test(groups = "live", testName = "ServiceKeysApiLiveTest", singleThreaded = true) -public class ServiceKeysApiLiveTest extends BaseShipyardApiLiveTest { - - private final String serviceKeyDescription = "ShipyardJCloudsLiveTest"; - private String serviceKey = null; - - @AfterClass (alwaysRun = true) - protected void tearDown() { - api().deleteServiceKey(serviceKey); - } - - public void testCreateServiceKey() throws Exception { - ServiceKey possibleServiceKey = api().createServiceKey(serviceKeyDescription); - assertNotNull(possibleServiceKey, "Did not successfully create ServiceKey"); - assertTrue(possibleServiceKey.description().equals(serviceKeyDescription), "ServiceKey description returned from Shipyard did not match expected value"); - serviceKey = possibleServiceKey.key(); - } - - @Test (dependsOnMethods = "testCreateServiceKey") - public void testListServiceKeys() throws Exception { - List<ServiceKey> possibleServiceKeys = api().listServiceKeys(); - assertNotNull(possibleServiceKeys, "possibleServiceKeys was not set"); - assertTrue(possibleServiceKeys.size() > 0, "Expected at least 1 ServiceKey but list was empty"); - ServiceKey possibleServiceKey = Iterables.find(possibleServiceKeys, new Predicate<ServiceKey>() { - @Override - public boolean apply(ServiceKey arg0) { - return arg0.key().equals(serviceKey); - } - }, null); - assertNotNull(possibleServiceKey, "Expected but could not find ServiceKey amongst " + possibleServiceKeys.size() + " found"); - } - - @Test (dependsOnMethods = "testListServiceKeys") - public void testRemoveServiceKey() throws Exception { - assertNotNull(serviceKey, "Expected serviceKey to be set but was not"); - boolean removed = api().deleteServiceKey(serviceKey); - assertTrue(removed); - } - - public void testRemoveNonExistentServiceKey() throws Exception { - boolean removed = api().deleteServiceKey(UUID.randomUUID().toString().replaceAll("-", "")); - assertFalse(removed); - } - - private ServiceKeysApi api() { - return api.serviceKeysApi(); - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/java/org/jclouds/shipyard/features/ServiceKeysApiMockTest.java ---------------------------------------------------------------------- diff --git a/shipyard/src/test/java/org/jclouds/shipyard/features/ServiceKeysApiMockTest.java b/shipyard/src/test/java/org/jclouds/shipyard/features/ServiceKeysApiMockTest.java deleted file mode 100644 index 23369a1..0000000 --- a/shipyard/src/test/java/org/jclouds/shipyard/features/ServiceKeysApiMockTest.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.shipyard.features; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; - -import org.jclouds.http.HttpResponseException; -import org.jclouds.shipyard.ShipyardApi; -import org.jclouds.shipyard.domain.servicekeys.ServiceKey; -import org.jclouds.shipyard.internal.BaseShipyardMockTest; -import org.testng.annotations.Test; - -import com.squareup.okhttp.mockwebserver.MockResponse; -import com.squareup.okhttp.mockwebserver.MockWebServer; - -/** - * Mock tests for the {@link org.jclouds.shipyard.features.ServiceKeysApi} class. - */ -@Test(groups = "unit", testName = "ServiceKeysApiMockTest") -public class ServiceKeysApiMockTest extends BaseShipyardMockTest { - - public void testListServiceKeys() throws Exception { - MockWebServer server = mockShipyardWebServer(); - server.enqueue(new MockResponse().setResponseCode(200).setBody(payloadFromResource("/servicekeys.json"))); - ShipyardApi shipyardApi = api(server.getUrl("/")); - ServiceKeysApi api = shipyardApi.serviceKeysApi(); - try { - assertEquals(api.listServiceKeys().size(), 2); - assertSent(server, "GET", "/api/servicekeys"); - } finally { - shipyardApi.close(); - server.shutdown(); - } - } - - public void testCreateServiceKey() throws Exception { - MockWebServer server = mockShipyardWebServer(); - server.enqueue(new MockResponse().setResponseCode(200).setBody(payloadFromResource("/servicekey-response.json"))); - ShipyardApi shipyardApi = api(server.getUrl("/")); - ServiceKeysApi api = shipyardApi.serviceKeysApi(); - try { - ServiceKey serviceKey = api.createServiceKey("jclouds-shipyard-testing"); - assertNotNull(serviceKey); - assertEquals(serviceKey.description(), "jclouds-shipyard-testing"); - assertSent(server, "POST", "/api/servicekeys", new String(payloadFromResource("/servicekey-create.json"))); - } finally { - shipyardApi.close(); - server.shutdown(); - } - } - - public void testDeleteServiceKey() throws Exception { - MockWebServer server = mockShipyardWebServer(); - server.enqueue(new MockResponse().setResponseCode(204)); - ShipyardApi shipyardApi = api(server.getUrl("/")); - ServiceKeysApi api = shipyardApi.serviceKeysApi(); - try { - boolean removed = api.deleteServiceKey("1111222233334444"); - assertTrue(removed); - assertSent(server, "DELETE", "/api/servicekeys"); - } finally { - shipyardApi.close(); - server.shutdown(); - } - } - - public void testDeleteNonExistentServiceKey() throws Exception { - MockWebServer server = mockShipyardWebServer(); - server.enqueue(new MockResponse().setResponseCode(500).setBody("service key does not exist")); - ShipyardApi shipyardApi = api(server.getUrl("/")); - ServiceKeysApi api = shipyardApi.serviceKeysApi(); - try { - Boolean removed = api.deleteServiceKey("NonExistentServiceKey"); - assertFalse(removed); - assertSent(server, "DELETE", "/api/servicekeys"); - } finally { - shipyardApi.close(); - server.shutdown(); - } - } - - @Test (expectedExceptions = HttpResponseException.class) - public void testDeleteNonExistentServiceKeyWithErroneousData() throws Exception { - MockWebServer server = mockShipyardWebServer(); - server.enqueue(new MockResponse().setResponseCode(555).setBody("erroneous data")); - ShipyardApi shipyardApi = api(server.getUrl("/")); - ServiceKeysApi api = shipyardApi.serviceKeysApi(); - try { - api.deleteServiceKey("NonExistentServiceKey"); - } finally { - shipyardApi.close(); - server.shutdown(); - } - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/java/org/jclouds/shipyard/internal/BaseShipyardApiLiveTest.java ---------------------------------------------------------------------- diff --git a/shipyard/src/test/java/org/jclouds/shipyard/internal/BaseShipyardApiLiveTest.java b/shipyard/src/test/java/org/jclouds/shipyard/internal/BaseShipyardApiLiveTest.java deleted file mode 100644 index fa29524..0000000 --- a/shipyard/src/test/java/org/jclouds/shipyard/internal/BaseShipyardApiLiveTest.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.shipyard.internal; - -import java.util.Properties; - -import org.jclouds.Constants; -import org.jclouds.apis.BaseApiLiveTest; -import org.jclouds.shipyard.ShipyardApi; -import org.testng.annotations.Test; - -import com.google.common.collect.ImmutableSet; -import com.google.inject.Module; - -@Test(groups = "live") -public class BaseShipyardApiLiveTest extends BaseApiLiveTest<ShipyardApi> { - - public BaseShipyardApiLiveTest() { - provider = "shipyard"; - } - - @Override - protected Iterable<Module> setupModules() { - return ImmutableSet.<Module>of(getLoggingModule()); - } - - @Override - protected Properties setupProperties() { - Properties overrides = super.setupProperties(); - overrides.setProperty(Constants.PROPERTY_MAX_RETRIES, "0"); - return overrides; - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/java/org/jclouds/shipyard/internal/BaseShipyardMockTest.java ---------------------------------------------------------------------- diff --git a/shipyard/src/test/java/org/jclouds/shipyard/internal/BaseShipyardMockTest.java b/shipyard/src/test/java/org/jclouds/shipyard/internal/BaseShipyardMockTest.java deleted file mode 100644 index e2e9405..0000000 --- a/shipyard/src/test/java/org/jclouds/shipyard/internal/BaseShipyardMockTest.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.shipyard.internal; - -import static com.google.common.base.Charsets.UTF_8; -import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; -import static org.assertj.core.api.Assertions.assertThat; -import static org.jclouds.util.Strings2.toStringAndClose; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static org.testng.Assert.assertEquals; - -import java.io.IOException; -import java.net.URL; -import java.util.Properties; -import java.util.Set; - -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; - -import org.jclouds.Constants; -import org.jclouds.ContextBuilder; -import org.jclouds.concurrent.config.ExecutorServiceModule; -import org.jclouds.shipyard.ShipyardApi; - -import com.google.common.base.Charsets; -import com.google.common.base.Throwables; -import com.google.common.collect.ImmutableSet; -import com.google.gson.JsonParser; -import com.google.inject.Module; -import com.squareup.okhttp.mockwebserver.MockWebServer; -import com.squareup.okhttp.mockwebserver.RecordedRequest; - -/** - * Base class for all Shipyard mock tests. - */ -public class BaseShipyardMockTest { - private final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(sameThreadExecutor())); - - protected String provider; - private final JsonParser parser = new JsonParser(); - - public BaseShipyardMockTest() { - provider = "shipyard"; - } - - public ShipyardApi api(URL url) { - return ContextBuilder.newBuilder(provider) - .credentials("shipyard-service-key", "") - .endpoint(url.toString()) - .modules(modules) - .overrides(setupProperties()) - .buildApi(ShipyardApi.class); - } - - protected Properties setupProperties() { - Properties properties = new Properties(); - properties.setProperty(Constants.PROPERTY_MAX_RETRIES, "0"); - return properties; - } - - public static MockWebServer mockShipyardWebServer() throws IOException { - MockWebServer server = new MockWebServer(); - server.play(); - return server; - } - - public byte[] payloadFromResource(String resource) { - try { - return toStringAndClose(getClass().getResourceAsStream(resource)).getBytes(Charsets.UTF_8); - } catch (IOException e) { - throw Throwables.propagate(e); - } - } - - protected RecordedRequest assertSent(MockWebServer server, String method, String path) throws InterruptedException { - RecordedRequest request = server.takeRequest(); - assertThat(request.getMethod()).isEqualTo(method); - assertThat(request.getPath()).isEqualTo(path); - assertThat(request.getHeader("X-Service-Key").equals("shipyard-service-key")); - assertThat(request.getHeader(HttpHeaders.ACCEPT)).isEqualTo(MediaType.APPLICATION_JSON); - return request; - } - - protected RecordedRequest assertSentIgnoreServiceKey(MockWebServer server, String method, String path) throws InterruptedException { - RecordedRequest request = server.takeRequest(); - assertThat(request.getMethod()).isEqualTo(method); - assertThat(request.getPath()).isEqualTo(path); - assertThat(request.getHeader(HttpHeaders.ACCEPT)).isEqualTo(MediaType.APPLICATION_JSON); - return request; - } - - protected RecordedRequest assertSent(MockWebServer server, String method, String path, String json) throws InterruptedException { - RecordedRequest request = assertSent(server, method, path); - assertEquals(request.getHeader("Content-Type"), APPLICATION_JSON); - assertEquals(parser.parse(new String(request.getBody(), UTF_8)), parser.parse(json)); - return request; - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/java/org/jclouds/shipyard/internal/BaseShipyardParseTest.java ---------------------------------------------------------------------- diff --git a/shipyard/src/test/java/org/jclouds/shipyard/internal/BaseShipyardParseTest.java b/shipyard/src/test/java/org/jclouds/shipyard/internal/BaseShipyardParseTest.java deleted file mode 100644 index 8bc9532..0000000 --- a/shipyard/src/test/java/org/jclouds/shipyard/internal/BaseShipyardParseTest.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.shipyard.internal; - -import org.jclouds.json.BaseItemParserTest; -import org.jclouds.json.config.GsonModule; - -import com.google.inject.Guice; -import com.google.inject.Injector; - -public abstract class BaseShipyardParseTest<T> extends BaseItemParserTest<T> { - - @Override - protected Injector injector() { - return Guice.createInjector(new GsonModule()); - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/java/org/jclouds/shipyard/parse/ContainersParseTest.java ---------------------------------------------------------------------- diff --git a/shipyard/src/test/java/org/jclouds/shipyard/parse/ContainersParseTest.java b/shipyard/src/test/java/org/jclouds/shipyard/parse/ContainersParseTest.java deleted file mode 100644 index 0db2407..0000000 --- a/shipyard/src/test/java/org/jclouds/shipyard/parse/ContainersParseTest.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.shipyard.parse; - -import java.util.List; - -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; - -import org.jclouds.shipyard.domain.containers.ContainerImageInfo; -import org.jclouds.shipyard.domain.containers.ContainerInfo; -import org.jclouds.shipyard.domain.engines.EngineSettingsInfo; -import org.jclouds.shipyard.domain.images.ImagePortsInfo; -import org.jclouds.shipyard.internal.BaseShipyardParseTest; -import org.testng.annotations.Test; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; - -@Test(groups = "unit") -public class ContainersParseTest extends BaseShipyardParseTest<List<ContainerInfo>> { - - @Override - public String resource() { - return "/containers.json"; - } - - @Override - @Consumes(MediaType.APPLICATION_JSON) - public List<ContainerInfo> expected() { - - return ImmutableList.of( - ContainerInfo.create("e2f6784b75ed8768e83b7ec46ca8ef784941f6ce4c53231023804277965da1d2", - "/atlassian-stash", - ContainerImageInfo.create("nkatsaros/atlassian-stash:3.5", - ImmutableMap.<String, String>of("STASH_HOME", "/var/atlassian/stash", "STASH_VERSION", "3.5.0"), - ImmutableList.<String>of("/docker-entrypoint.sh"), - "e2f6784b75ed", - ImmutableList.<ImagePortsInfo>of(ImagePortsInfo.create("tcp", "0.0.0.0", 8089, 8080)), - ImmutableList.<String>of("/var/atlassian/stash"), - ImmutableMap.<String, String>of(), - true, - "bridge"), - EngineSettingsInfo.create("sdrelnx150", - "http://sdrelnx150:2375";, - 8, - 8096, - ImmutableList.<String>of("sdrelnx150")), - "stopped", - ImmutableList.<ImagePortsInfo>of(ImagePortsInfo.create("tcp", "0.0.0.0", 8089, 8080))) - ); - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/java/org/jclouds/shipyard/parse/EnginesParseTest.java ---------------------------------------------------------------------- diff --git a/shipyard/src/test/java/org/jclouds/shipyard/parse/EnginesParseTest.java b/shipyard/src/test/java/org/jclouds/shipyard/parse/EnginesParseTest.java deleted file mode 100644 index 9e208fc..0000000 --- a/shipyard/src/test/java/org/jclouds/shipyard/parse/EnginesParseTest.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.shipyard.parse; - -import java.util.List; - -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; - -import org.jclouds.shipyard.domain.engines.EngineInfo; -import org.jclouds.shipyard.domain.engines.EngineSettingsInfo; -import org.jclouds.shipyard.internal.BaseShipyardParseTest; -import org.testng.annotations.Test; - -import com.google.common.collect.ImmutableList; - -@Test(groups = "unit") -public class EnginesParseTest extends BaseShipyardParseTest<List<EngineInfo>> { - - @Override - public String resource() { - return "/engines.json"; - } - - @Override - @Consumes(MediaType.APPLICATION_JSON) - public List<EngineInfo> expected() { - return ImmutableList.of( - EngineInfo.create("e2059d20-e9df-44f3-8a9b-1bf2321b4eae", - EngineSettingsInfo.create("sdrelnx150", - "http://sdrelnx150:2375";, - 8, - 8096, - ImmutableList.<String>of("sdrelnx150"))) - ); - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/java/org/jclouds/shipyard/parse/ImagesParseTest.java ---------------------------------------------------------------------- diff --git a/shipyard/src/test/java/org/jclouds/shipyard/parse/ImagesParseTest.java b/shipyard/src/test/java/org/jclouds/shipyard/parse/ImagesParseTest.java deleted file mode 100644 index 359cf0b..0000000 --- a/shipyard/src/test/java/org/jclouds/shipyard/parse/ImagesParseTest.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.shipyard.parse; - -import java.util.List; - -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; - -import org.jclouds.shipyard.domain.images.ImageInfo; -import org.jclouds.shipyard.internal.BaseShipyardParseTest; -import org.testng.annotations.Test; - -import com.google.common.collect.ImmutableList; - -@Test(groups = "unit") -public class ImagesParseTest extends BaseShipyardParseTest<List<ImageInfo>> { - - @Override - public String resource() { - return "/images.json"; - } - - @Override - @Consumes(MediaType.APPLICATION_JSON) - public List<ImageInfo> expected() { - return ImmutableList.of( - ImageInfo.create(1416370366, - "3f0d936caee4777872d6ad8dfae0077b6857d86f0232a240a95e748fb1c981f1", - "5cd3a141e0cc8523bf5d76b9187124bb9d43b874da2656abf1f417e4d4858643", - ImmutableList.<String>of("nkatsaros/atlassian-stash:3.4"), - 6233, - 480107370, - null) - ); - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/resources/container-deploy-response.json ---------------------------------------------------------------------- diff --git a/shipyard/src/test/resources/container-deploy-response.json b/shipyard/src/test/resources/container-deploy-response.json deleted file mode 100644 index acce569..0000000 --- a/shipyard/src/test/resources/container-deploy-response.json +++ /dev/null @@ -1,49 +0,0 @@ -[ -{ - "id": "e2f6784b75ed8768e83b7ec46ca8ef784941f6ce4c53231023804277965da1d2", - "name": "/atlassian-stash", - "image": { - "name": "nkatsaros/atlassian-stash:3.5", - "entrypoint": [ - "/docker-entrypoint.sh" - ], - "environment": { - "STASH_HOME": "/var/atlassian/stash", - "STASH_VERSION": "3.5.0" - }, - "hostname": "e2f6784b75ed", - "bind_ports": [ - { - "proto": "tcp", - "host_ip": "0.0.0.0", - "port": 8089, - "container_port": 8080 - } - ], - "volumes": [ - "/var/atlassian/stash" - ], - "restart_policy": {}, - "publish": true, - "network_mode": "bridge" - }, - "engine": { - "id": "localhost", - "addr": "http://localhost:2375";, - "cpus": 8, - "memory": 8096, - "labels": [ - "localhost" - ] - }, - "state": "stopped", - "ports": [ - { - "proto": "tcp", - "host_ip": "0.0.0.0", - "port": 8089, - "container_port": 8080 - } - ] -} -] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/resources/container-deploy.json ---------------------------------------------------------------------- diff --git a/shipyard/src/test/resources/container-deploy.json b/shipyard/src/test/resources/container-deploy.json deleted file mode 100644 index 74d391b..0000000 --- a/shipyard/src/test/resources/container-deploy.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "nkatsaros/atlassian-stash:3.5", - "container_name": "atlassian-stash", - "cpus": 8, - "memory": 8096, - "type" : "service", - "labels": [ - "localhost" - ], - "args": [], - "environment": { - "STASH_HOME": "/var/atlassian/stash", - "STASH_VERSION": "3.5.0" - }, - "restart_policy": {}, - "bind_ports": [], - "links": {} -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/resources/container.json ---------------------------------------------------------------------- diff --git a/shipyard/src/test/resources/container.json b/shipyard/src/test/resources/container.json deleted file mode 100644 index 1d60c11..0000000 --- a/shipyard/src/test/resources/container.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "id": "e2f6784b75ed8768e83b7ec46ca8ef784941f6ce4c53231023804277965da1d2", - "name": "/atlassian-stash", - "image": { - "name": "nkatsaros/atlassian-stash:3.5", - "entrypoint": [ - "/docker-entrypoint.sh" - ], - "environment": { - "STASH_HOME": "/var/atlassian/stash", - "STASH_VERSION": "3.5.0" - }, - "hostname": "e2f6784b75ed", - "bind_ports": [ - { - "proto": "tcp", - "host_ip": "0.0.0.0", - "port": 8089, - "container_port": 8080 - } - ], - "volumes": [ - "/var/atlassian/stash" - ], - "restart_policy": {}, - "publish": true, - "network_mode": "bridge" - }, - "engine": { - "id": "localhost", - "addr": "http://localhost:2375";, - "cpus": 8, - "memory": 8096, - "labels": [ - "localhost" - ] - }, - "state": "stopped", - "ports": [ - { - "proto": "tcp", - "host_ip": "0.0.0.0", - "port": 8089, - "container_port": 8080 - } - ] -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/resources/containers.json ---------------------------------------------------------------------- diff --git a/shipyard/src/test/resources/containers.json b/shipyard/src/test/resources/containers.json deleted file mode 100644 index 2b838b2..0000000 --- a/shipyard/src/test/resources/containers.json +++ /dev/null @@ -1,49 +0,0 @@ -[ - { - "id": "e2f6784b75ed8768e83b7ec46ca8ef784941f6ce4c53231023804277965da1d2", - "name": "/atlassian-stash", - "image": { - "name": "nkatsaros/atlassian-stash:3.5", - "entrypoint": [ - "/docker-entrypoint.sh" - ], - "environment": { - "STASH_HOME": "/var/atlassian/stash", - "STASH_VERSION": "3.5.0" - }, - "hostname": "e2f6784b75ed", - "bind_ports": [ - { - "proto": "tcp", - "host_ip": "0.0.0.0", - "port": 8089, - "container_port": 8080 - } - ], - "volumes": [ - "/var/atlassian/stash" - ], - "restart_policy": {}, - "publish": true, - "network_mode": "bridge" - }, - "engine": { - "id": "sdrelnx150", - "addr": "http://sdrelnx150:2375";, - "cpus": 8, - "memory": 8096, - "labels": [ - "sdrelnx150" - ] - }, - "state": "stopped", - "ports": [ - { - "proto": "tcp", - "host_ip": "0.0.0.0", - "port": 8089, - "container_port": 8080 - } - ] - } -] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/resources/engine-add.json ---------------------------------------------------------------------- diff --git a/shipyard/src/test/resources/engine-add.json b/shipyard/src/test/resources/engine-add.json deleted file mode 100644 index 11b0800..0000000 --- a/shipyard/src/test/resources/engine-add.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "local": "local", - "ssl_cert": "", - "ssl_key": "", - "ca_cert": "", - "engine": { - "id": "1234", - "addr": "http://localhost:2375";, - "cpus": 1.0, - "memory": 1024.0, - "labels": [ - "shipyard-test" - ] - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/resources/engine.json ---------------------------------------------------------------------- diff --git a/shipyard/src/test/resources/engine.json b/shipyard/src/test/resources/engine.json deleted file mode 100644 index 11f0099..0000000 --- a/shipyard/src/test/resources/engine.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "id": "e2059d20-e9df-44f3-8a9b-1bf2321b4eae", - "engine": { - "id": "sdrelnx150", - "addr": "http://sdrelnx150:2375";, - "cpus": 8, - "memory": 8096, - "labels": [ - "sdrelnx150" - ] - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/resources/engines.json ---------------------------------------------------------------------- diff --git a/shipyard/src/test/resources/engines.json b/shipyard/src/test/resources/engines.json deleted file mode 100644 index 6cc205a..0000000 --- a/shipyard/src/test/resources/engines.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "id": "e2059d20-e9df-44f3-8a9b-1bf2321b4eae", - "engine": { - "id": "sdrelnx150", - "addr": "http://sdrelnx150:2375";, - "cpus": 8, - "memory": 8096, - "labels": [ - "sdrelnx150" - ] - } - } -] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/resources/image.json ---------------------------------------------------------------------- diff --git a/shipyard/src/test/resources/image.json b/shipyard/src/test/resources/image.json deleted file mode 100644 index 0c27470..0000000 --- a/shipyard/src/test/resources/image.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Created": 1416370366, - "Id": "3f0d936caee4777872d6ad8dfae0077b6857d86f0232a240a95e748fb1c981f1", - "ParentId": "5cd3a141e0cc8523bf5d76b9187124bb9d43b874da2656abf1f417e4d4858643", - "RepoTags": [ - "nkatsaros/atlassian-stash:3.4" - ], - "Size": 6233, - "VirtualSize": 480107370 -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/resources/images.json ---------------------------------------------------------------------- diff --git a/shipyard/src/test/resources/images.json b/shipyard/src/test/resources/images.json deleted file mode 100644 index 8affec4..0000000 --- a/shipyard/src/test/resources/images.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "Created": 1416370366, - "Id": "3f0d936caee4777872d6ad8dfae0077b6857d86f0232a240a95e748fb1c981f1", - "ParentId": "5cd3a141e0cc8523bf5d76b9187124bb9d43b874da2656abf1f417e4d4858643", - "RepoTags": [ - "nkatsaros/atlassian-stash:3.4" - ], - "Size": 6233, - "VirtualSize": 480107370 - } -] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/resources/role-delete-create.json ---------------------------------------------------------------------- diff --git a/shipyard/src/test/resources/role-delete-create.json b/shipyard/src/test/resources/role-delete-create.json deleted file mode 100644 index 6447c85..0000000 --- a/shipyard/src/test/resources/role-delete-create.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "admin" -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/resources/role.json ---------------------------------------------------------------------- diff --git a/shipyard/src/test/resources/role.json b/shipyard/src/test/resources/role.json deleted file mode 100644 index fdda8a1..0000000 --- a/shipyard/src/test/resources/role.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "admin", - "id": "448ebe2d-89d9-412c-aab9-ad774d1ec78f" -} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/resources/roles.json ---------------------------------------------------------------------- diff --git a/shipyard/src/test/resources/roles.json b/shipyard/src/test/resources/roles.json deleted file mode 100644 index 6cb32a1..0000000 --- a/shipyard/src/test/resources/roles.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "name": "admin", - "id": "448ebe2d-89d9-412c-aab9-ad774d1ec78f" - }, - { - "name": "user", - "id": "2243edf5-55f1-43ad-9ebb-c36c5233f007" - } -] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/resources/servicekey-create.json ---------------------------------------------------------------------- diff --git a/shipyard/src/test/resources/servicekey-create.json b/shipyard/src/test/resources/servicekey-create.json deleted file mode 100644 index 8e4be28..0000000 --- a/shipyard/src/test/resources/servicekey-create.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "jclouds-shipyard-testing" -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/resources/servicekey-response.json ---------------------------------------------------------------------- diff --git a/shipyard/src/test/resources/servicekey-response.json b/shipyard/src/test/resources/servicekey-response.json deleted file mode 100644 index a09a907..0000000 --- a/shipyard/src/test/resources/servicekey-response.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "key": "1111222233334444", - "description": "jclouds-shipyard-testing" -} - http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9c19ee0c/shipyard/src/test/resources/servicekeys.json ---------------------------------------------------------------------- diff --git a/shipyard/src/test/resources/servicekeys.json b/shipyard/src/test/resources/servicekeys.json deleted file mode 100644 index b695192..0000000 --- a/shipyard/src/test/resources/servicekeys.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - { - "key": "aaaabbbbccccdddd" - }, - { - "key": "1111222233334444", - "description": "testing service keys" - } -] \ No newline at end of file
