Repository: jclouds-labs
Updated Branches:
  refs/heads/master 247e9fd97 -> 1f2153799


http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/etcd/src/test/java/org/jclouds/etcd/features/MiscellaneousApiMockTest.java
----------------------------------------------------------------------
diff --git 
a/etcd/src/test/java/org/jclouds/etcd/features/MiscellaneousApiMockTest.java 
b/etcd/src/test/java/org/jclouds/etcd/features/MiscellaneousApiMockTest.java
deleted file mode 100644
index ad5d8a1..0000000
--- a/etcd/src/test/java/org/jclouds/etcd/features/MiscellaneousApiMockTest.java
+++ /dev/null
@@ -1,105 +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.etcd.features;
-
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.assertFalse;
-
-import org.jclouds.etcd.EtcdApi;
-import org.jclouds.etcd.domain.miscellaneous.Version;
-import org.jclouds.etcd.internal.BaseEtcdMockTest;
-import org.testng.annotations.Test;
-
-import com.squareup.okhttp.mockwebserver.MockResponse;
-import com.squareup.okhttp.mockwebserver.MockWebServer;
-
-/**
- * Mock tests for the {@link org.jclouds.etcd.features.MiscellaneousApi} class.
- */
-@Test(groups = "unit", testName = "MiscellaneousApiMockTest")
-public class MiscellaneousApiMockTest extends BaseEtcdMockTest {
-
-   private final String versionRegex = "^\\d+\\.\\d+\\.\\d+$";
-
-   public void testGetVersion() throws Exception {
-      MockWebServer server = mockEtcdJavaWebServer();
-
-      server.enqueue(new 
MockResponse().setBody(payloadFromResource("/version.json")).setResponseCode(200));
-      EtcdApi etcdJavaApi = api(server.getUrl("/"));
-      MiscellaneousApi api = etcdJavaApi.miscellaneousApi();
-      try {
-         Version version = api.version();
-         assertNotNull(version);
-         assertTrue(version.etcdServer().matches(versionRegex));
-         assertTrue(version.etcdCluster().matches(versionRegex));
-         assertSent(server, "GET", "/version");
-      } finally {
-         etcdJavaApi.close();
-         server.shutdown();
-      }
-   }
-
-   public void testGetHealth() throws Exception {
-      MockWebServer server = mockEtcdJavaWebServer();
-
-      server.enqueue(new 
MockResponse().setBody(payloadFromResource("/health.json")).setResponseCode(200));
-      EtcdApi etcdJavaApi = api(server.getUrl("/"));
-      MiscellaneousApi api = etcdJavaApi.miscellaneousApi();
-      try {
-         boolean health = api.health();
-         assertTrue(health);
-         assertSent(server, "GET", "/health");
-      } finally {
-         etcdJavaApi.close();
-         server.shutdown();
-      }
-   }
-
-   public void testGetBadHealth() throws Exception {
-      MockWebServer server = mockEtcdJavaWebServer();
-
-      server.enqueue(new 
MockResponse().setBody(payloadFromResource("/health-bad.json")).setResponseCode(503));
-      EtcdApi etcdJavaApi = api(server.getUrl("/"));
-      MiscellaneousApi api = etcdJavaApi.miscellaneousApi();
-      try {
-         boolean health = api.health();
-         assertFalse(health);
-         assertSent(server, "GET", "/health");
-      } finally {
-         etcdJavaApi.close();
-         server.shutdown();
-      }
-   }
-
-   public void testGetMetrics() throws Exception {
-      MockWebServer server = mockEtcdJavaWebServer();
-
-      server.enqueue(new 
MockResponse().setBody(payloadFromResource("/metrics.txt")).setResponseCode(200));
-      EtcdApi etcdJavaApi = api(server.getUrl("/"));
-      MiscellaneousApi api = etcdJavaApi.miscellaneousApi();
-      try {
-         String metrics = api.metrics();
-         assertNotNull(metrics);
-         assertSentAcceptText(server, "GET", "/metrics");
-      } finally {
-         etcdJavaApi.close();
-         server.shutdown();
-      }
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/etcd/src/test/java/org/jclouds/etcd/features/StatisticsApiLiveTest.java
----------------------------------------------------------------------
diff --git 
a/etcd/src/test/java/org/jclouds/etcd/features/StatisticsApiLiveTest.java 
b/etcd/src/test/java/org/jclouds/etcd/features/StatisticsApiLiveTest.java
deleted file mode 100644
index 97cd1ac..0000000
--- a/etcd/src/test/java/org/jclouds/etcd/features/StatisticsApiLiveTest.java
+++ /dev/null
@@ -1,77 +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.etcd.features;
-
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.fail;
-
-import java.util.Properties;
-
-import org.jclouds.Constants;
-import org.jclouds.etcd.BaseEtcdApiLiveTest;
-import org.jclouds.etcd.EtcdApi;
-import org.jclouds.etcd.domain.members.Member;
-import org.jclouds.etcd.domain.statistics.Self;
-import org.testng.annotations.Test;
-
-import com.google.inject.Module;
-
-@Test(groups = "live", testName = "StatisticsApiLiveTest")
-public class StatisticsApiLiveTest extends BaseEtcdApiLiveTest {
-
-   private Self self;
-
-   @Test
-   public void testGetSelf() {
-      self = api().self();
-      assertNotNull(self);
-   }
-
-   @Test(dependsOnMethods = "testGetSelf")
-   public void testGetLeader() {
-
-      /*
-       * It's possible the default end-point is not the cluster leader. If true
-       * we will iterate through all members to find the leader and execute the
-       * 'leader' endpoint against its client URL.
-       */
-      if (self.state().equals("StateLeader")) {
-         assertNotNull(api().leader());
-      } else {
-         for (Member possibleLeader : api.membersApi().list()) {
-            if (possibleLeader.id().equals(self.leaderInfo().leader())) {
-               Properties properties = new Properties();
-               properties.setProperty(Constants.PROPERTY_ENDPOINT, 
possibleLeader.clientURLs().get(0));
-               Iterable<Module> modules = setupModules();
-               EtcdApi etcdApi = super.create(properties, modules);
-               assertNotNull(etcdApi.statisticsApi().leader());
-               return;
-            }
-         }
-         fail("Could not find a leader within cluster");
-      }
-   }
-
-   @Test
-   public void testGetStore() {
-      assertNotNull(api().store());
-   }
-
-   private StatisticsApi api() {
-      return api.statisticsApi();
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/etcd/src/test/java/org/jclouds/etcd/features/StatisticsApiMockTest.java
----------------------------------------------------------------------
diff --git 
a/etcd/src/test/java/org/jclouds/etcd/features/StatisticsApiMockTest.java 
b/etcd/src/test/java/org/jclouds/etcd/features/StatisticsApiMockTest.java
deleted file mode 100644
index fc5bdc7..0000000
--- a/etcd/src/test/java/org/jclouds/etcd/features/StatisticsApiMockTest.java
+++ /dev/null
@@ -1,91 +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.etcd.features;
-
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.assertNotNull;
-
-import org.jclouds.etcd.EtcdApi;
-import org.jclouds.etcd.EtcdApiMetadata;
-import org.jclouds.etcd.domain.statistics.Leader;
-import org.jclouds.etcd.domain.statistics.Self;
-import org.jclouds.etcd.domain.statistics.Store;
-import org.jclouds.etcd.internal.BaseEtcdMockTest;
-
-import org.testng.annotations.Test;
-
-import com.squareup.okhttp.mockwebserver.MockResponse;
-import com.squareup.okhttp.mockwebserver.MockWebServer;
-
-/**
- * Mock tests for the {@link org.jclouds.etcd.features.StatisticsApi} class.
- */
-@Test(groups = "unit", testName = "StatisticsApiMockTest")
-public class StatisticsApiMockTest extends BaseEtcdMockTest {
-
-   public void testGetLeader() throws Exception {
-      MockWebServer server = mockEtcdJavaWebServer();
-
-      server.enqueue(new 
MockResponse().setBody(payloadFromResource("/leader.json")).setResponseCode(200));
-      EtcdApi etcdJavaApi = api(server.getUrl("/"));
-      StatisticsApi api = etcdJavaApi.statisticsApi();
-      try {
-         Leader leader = api.leader();
-         assertNotNull(leader);
-         assertTrue(leader.followers().size() == 2);
-         assertTrue(leader.leader().equals("924e2e83e93f2560"));
-         assertSent(server, "GET", "/" + EtcdApiMetadata.API_VERSION + 
"/stats/leader");
-      } finally {
-         etcdJavaApi.close();
-         server.shutdown();
-      }
-   }
-
-   public void testGetSelf() throws Exception {
-      MockWebServer server = mockEtcdJavaWebServer();
-
-      server.enqueue(new 
MockResponse().setBody(payloadFromResource("/self.json")).setResponseCode(200));
-      EtcdApi etcdJavaApi = api(server.getUrl("/"));
-      StatisticsApi api = etcdJavaApi.statisticsApi();
-      try {
-         Self self = api.self();
-         assertNotNull(self);
-         assertTrue(self.leaderInfo().leader().equals("924e2e83e93f2560"));
-         assertSent(server, "GET", "/" + EtcdApiMetadata.API_VERSION + 
"/stats/self");
-      } finally {
-         etcdJavaApi.close();
-         server.shutdown();
-      }
-   }
-
-   public void testGetStore() throws Exception {
-      MockWebServer server = mockEtcdJavaWebServer();
-
-      server.enqueue(new 
MockResponse().setBody(payloadFromResource("/store.json")).setResponseCode(200));
-      EtcdApi etcdJavaApi = api(server.getUrl("/"));
-      StatisticsApi api = etcdJavaApi.statisticsApi();
-      try {
-         Store store = api.store();
-         assertNotNull(store);
-         assertTrue(store.getsSuccess() == 75);
-         assertSent(server, "GET", "/" + EtcdApiMetadata.API_VERSION + 
"/stats/store");
-      } finally {
-         etcdJavaApi.close();
-         server.shutdown();
-      }
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/etcd/src/test/java/org/jclouds/etcd/internal/BaseEtcdMockTest.java
----------------------------------------------------------------------
diff --git a/etcd/src/test/java/org/jclouds/etcd/internal/BaseEtcdMockTest.java 
b/etcd/src/test/java/org/jclouds/etcd/internal/BaseEtcdMockTest.java
deleted file mode 100644
index 9358d09..0000000
--- a/etcd/src/test/java/org/jclouds/etcd/internal/BaseEtcdMockTest.java
+++ /dev/null
@@ -1,114 +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.etcd.internal;
-
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.jclouds.util.Strings2.toStringAndClose;
-import static org.testng.Assert.assertEquals;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Properties;
-
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Constants;
-import org.jclouds.ContextBuilder;
-import org.jclouds.etcd.EtcdApi;
-
-import com.google.common.base.Charsets;
-import com.google.common.base.Throwables;
-import com.google.gson.JsonParser;
-import com.squareup.okhttp.mockwebserver.MockWebServer;
-import com.squareup.okhttp.mockwebserver.RecordedRequest;
-
-/**
- * Base class for all Etcd mock tests.
- */
-public class BaseEtcdMockTest {
-
-   protected String provider;
-   private final JsonParser parser = new JsonParser();
-
-   public BaseEtcdMockTest() {
-      provider = "etcd";
-   }
-
-   public EtcdApi api(URL url) {
-      return 
ContextBuilder.newBuilder(provider).endpoint(url.toString()).overrides(setupProperties())
-            .buildApi(EtcdApi.class);
-   }
-
-   protected Properties setupProperties() {
-      Properties properties = new Properties();
-      properties.setProperty(Constants.PROPERTY_MAX_RETRIES, "0");
-      return properties;
-   }
-
-   public static MockWebServer mockEtcdJavaWebServer() throws IOException {
-      MockWebServer server = new MockWebServer();
-      server.play();
-      return server;
-   }
-
-   public String payloadFromResource(String resource) {
-      try {
-         return new 
String(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(HttpHeaders.ACCEPT)).isEqualTo(MediaType.APPLICATION_JSON);
-      return request;
-   }
-
-   protected RecordedRequest assertSentWithFormData(MockWebServer server, 
String method, String path, String body)
-         throws InterruptedException {
-      RecordedRequest request = server.takeRequest();
-      assertThat(request.getMethod()).isEqualTo(method);
-      assertThat(request.getPath()).isEqualTo(path);
-      assertThat(request.getUtf8Body()).isEqualTo(body);
-      
assertThat(request.getHeader(HttpHeaders.ACCEPT)).isEqualTo(MediaType.APPLICATION_JSON);
-      
assertThat(request.getHeader(HttpHeaders.CONTENT_TYPE)).isEqualTo(MediaType.APPLICATION_FORM_URLENCODED);
-      return request;
-   }
-
-   protected RecordedRequest assertSentAcceptText(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.TEXT_PLAIN);
-      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(request.getUtf8Body()), parser.parse(json));
-      return request;
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/etcd/src/test/resources/health-bad.json
----------------------------------------------------------------------
diff --git a/etcd/src/test/resources/health-bad.json 
b/etcd/src/test/resources/health-bad.json
deleted file mode 100644
index 6b68ef1..0000000
--- a/etcd/src/test/resources/health-bad.json
+++ /dev/null
@@ -1 +0,0 @@
-{"health": "false"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/etcd/src/test/resources/health.json
----------------------------------------------------------------------
diff --git a/etcd/src/test/resources/health.json 
b/etcd/src/test/resources/health.json
deleted file mode 100644
index fdc9176..0000000
--- a/etcd/src/test/resources/health.json
+++ /dev/null
@@ -1 +0,0 @@
-{"health": "true"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/etcd/src/test/resources/keys-create-ttl.json
----------------------------------------------------------------------
diff --git a/etcd/src/test/resources/keys-create-ttl.json 
b/etcd/src/test/resources/keys-create-ttl.json
deleted file mode 100644
index aa1b94a..0000000
--- a/etcd/src/test/resources/keys-create-ttl.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{  
-   "action":"set",
-   "node":{  
-      "createdIndex":5,
-      "expiration":"2016-02-16T13:33:21.970469165Z",
-      "key":"/hello",
-      "modifiedIndex":5,
-      "ttl":5,
-      "value":"world"
-   }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/etcd/src/test/resources/keys-create.json
----------------------------------------------------------------------
diff --git a/etcd/src/test/resources/keys-create.json 
b/etcd/src/test/resources/keys-create.json
deleted file mode 100644
index 79cb39e..0000000
--- a/etcd/src/test/resources/keys-create.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{  
-   "action":"set",
-   "node":{  
-      "key":"/hello",
-      "value":"world",
-      "modifiedIndex":40,
-      "createdIndex":40
-   }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/etcd/src/test/resources/keys-delete.json
----------------------------------------------------------------------
diff --git a/etcd/src/test/resources/keys-delete.json 
b/etcd/src/test/resources/keys-delete.json
deleted file mode 100644
index 9e8d234..0000000
--- a/etcd/src/test/resources/keys-delete.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{  
-   "action":"delete",
-   "node":{  
-      "key":"/hello",
-      "modifiedIndex":41,
-      "createdIndex":39
-   },
-   "prevNode":{  
-      "key":"/hello",
-      "value":"world",
-      "modifiedIndex":39,
-      "createdIndex":39
-   }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/etcd/src/test/resources/keys-get-delete-nonexistent.json
----------------------------------------------------------------------
diff --git a/etcd/src/test/resources/keys-get-delete-nonexistent.json 
b/etcd/src/test/resources/keys-get-delete-nonexistent.json
deleted file mode 100644
index 3a69156..0000000
--- a/etcd/src/test/resources/keys-get-delete-nonexistent.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{  
-   "errorCode":100,
-   "message":"Key not found",
-   "cause":"/foo",
-   "index":16
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/etcd/src/test/resources/keys-get.json
----------------------------------------------------------------------
diff --git a/etcd/src/test/resources/keys-get.json 
b/etcd/src/test/resources/keys-get.json
deleted file mode 100644
index 19213c4..0000000
--- a/etcd/src/test/resources/keys-get.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{  
-   "action":"get",
-   "node":{  
-      "key":"/hello",
-      "value":"world",
-      "modifiedIndex":39,
-      "createdIndex":39
-   }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/etcd/src/test/resources/leader.json
----------------------------------------------------------------------
diff --git a/etcd/src/test/resources/leader.json 
b/etcd/src/test/resources/leader.json
deleted file mode 100644
index 496f904..0000000
--- a/etcd/src/test/resources/leader.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "followers": {
-        "6e3bd23ae5f1eae0": {
-            "counts": {
-                "fail": 0,
-                "success": 745
-            },
-            "latency": {
-                "average": 0.017039507382550306,
-                "current": 0.000138,
-                "maximum": 1.007649,
-                "minimum": 0,
-                "standardDeviation": 0.05289178277920594
-            }
-        },
-        "a8266ecf031671f3": {
-            "counts": {
-                "fail": 0,
-                "success": 735
-            },
-            "latency": {
-                "average": 0.012124141496598642,
-                "current": 0.000559,
-                "maximum": 0.791547,
-                "minimum": 0,
-                "standardDeviation": 0.04187900156583733
-            }
-        }
-    },
-    "leader": "924e2e83e93f2560"
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/etcd/src/test/resources/members-add-existent.json
----------------------------------------------------------------------
diff --git a/etcd/src/test/resources/members-add-existent.json 
b/etcd/src/test/resources/members-add-existent.json
deleted file mode 100644
index 363618c..0000000
--- a/etcd/src/test/resources/members-add-existent.json
+++ /dev/null
@@ -1 +0,0 @@
-{"message":"etcdserver: ID exists"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/etcd/src/test/resources/members-add-illegal-format.json
----------------------------------------------------------------------
diff --git a/etcd/src/test/resources/members-add-illegal-format.json 
b/etcd/src/test/resources/members-add-illegal-format.json
deleted file mode 100644
index c344f28..0000000
--- a/etcd/src/test/resources/members-add-illegal-format.json
+++ /dev/null
@@ -1 +0,0 @@
-{"message":"URL address does not have the form \"host:port\": 
http://www.google.com"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/etcd/src/test/resources/members-add-malformed-url.json
----------------------------------------------------------------------
diff --git a/etcd/src/test/resources/members-add-malformed-url.json 
b/etcd/src/test/resources/members-add-malformed-url.json
deleted file mode 100644
index ffa9a2e..0000000
--- a/etcd/src/test/resources/members-add-malformed-url.json
+++ /dev/null
@@ -1 +0,0 @@
-{"message":"URL scheme must be http or https: 1234567890"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/etcd/src/test/resources/members-added.json
----------------------------------------------------------------------
diff --git a/etcd/src/test/resources/members-added.json 
b/etcd/src/test/resources/members-added.json
deleted file mode 100644
index 904d739..0000000
--- a/etcd/src/test/resources/members-added.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "id": "3777296169",
-    "peerURLs": [
-        "http://10.0.0.10:2380";
-    ],
-    "clientURLs": [
-        "http://10.0.0.10:2381";
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/etcd/src/test/resources/members-delete-nonexistent.json
----------------------------------------------------------------------
diff --git a/etcd/src/test/resources/members-delete-nonexistent.json 
b/etcd/src/test/resources/members-delete-nonexistent.json
deleted file mode 100644
index 52302e6..0000000
--- a/etcd/src/test/resources/members-delete-nonexistent.json
+++ /dev/null
@@ -1 +0,0 @@
-{"message":"No such member: 1234567890"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/etcd/src/test/resources/members.json
----------------------------------------------------------------------
diff --git a/etcd/src/test/resources/members.json 
b/etcd/src/test/resources/members.json
deleted file mode 100644
index cdfcbb5..0000000
--- a/etcd/src/test/resources/members.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "members": [
-        {
-            "id": "272e204152",
-            "name": "infra1",
-            "peerURLs": [
-                "http://10.0.0.10:2380";
-            ],
-            "clientURLs": [
-                "http://10.0.0.10:2379";
-            ]
-        },
-        {
-            "id": "2225373f43",
-            "name": "infra2",
-            "peerURLs": [
-                "http://10.0.0.11:2380";
-            ],
-            "clientURLs": [
-                "http://10.0.0.11:2379";
-            ]
-        },
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/etcd/src/test/resources/metrics.txt
----------------------------------------------------------------------
diff --git a/etcd/src/test/resources/metrics.txt 
b/etcd/src/test/resources/metrics.txt
deleted file mode 100644
index e59f2d6..0000000
--- a/etcd/src/test/resources/metrics.txt
+++ /dev/null
@@ -1,160 +0,0 @@
-# HELP etcd_rafthttp_message_sent_latency_microseconds message sent latency 
distributions.
-# TYPE etcd_rafthttp_message_sent_latency_microseconds summary
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgApp",remoteID="96d5f4741cf7499e",sendingType="message",quantile="0.5"}
 NaN
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgApp",remoteID="96d5f4741cf7499e",sendingType="message",quantile="0.9"}
 NaN
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgApp",remoteID="96d5f4741cf7499e",sendingType="message",quantile="0.99"}
 NaN
-etcd_rafthttp_message_sent_latency_microseconds_sum{msgType="MsgApp",remoteID="96d5f4741cf7499e",sendingType="message"}
 84
-etcd_rafthttp_message_sent_latency_microseconds_count{msgType="MsgApp",remoteID="96d5f4741cf7499e",sendingType="message"}
 1
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgApp",remoteID="96d5f4741cf7499e",sendingType="msgappv2",quantile="0.5"}
 50
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgApp",remoteID="96d5f4741cf7499e",sendingType="msgappv2",quantile="0.9"}
 78
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgApp",remoteID="96d5f4741cf7499e",sendingType="msgappv2",quantile="0.99"}
 98
-etcd_rafthttp_message_sent_latency_microseconds_sum{msgType="MsgApp",remoteID="96d5f4741cf7499e",sendingType="msgappv2"}
 2.045591e+06
-etcd_rafthttp_message_sent_latency_microseconds_count{msgType="MsgApp",remoteID="96d5f4741cf7499e",sendingType="msgappv2"}
 34607
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgApp",remoteID="f992d9b00b6adf2f",sendingType="message",quantile="0.5"}
 NaN
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgApp",remoteID="f992d9b00b6adf2f",sendingType="message",quantile="0.9"}
 NaN
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgApp",remoteID="f992d9b00b6adf2f",sendingType="message",quantile="0.99"}
 NaN
-etcd_rafthttp_message_sent_latency_microseconds_sum{msgType="MsgApp",remoteID="f992d9b00b6adf2f",sendingType="message"}
 45
-etcd_rafthttp_message_sent_latency_microseconds_count{msgType="MsgApp",remoteID="f992d9b00b6adf2f",sendingType="message"}
 1
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgApp",remoteID="f992d9b00b6adf2f",sendingType="msgappv2",quantile="0.5"}
 35
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgApp",remoteID="f992d9b00b6adf2f",sendingType="msgappv2",quantile="0.9"}
 51
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgApp",remoteID="f992d9b00b6adf2f",sendingType="msgappv2",quantile="0.99"}
 83
-etcd_rafthttp_message_sent_latency_microseconds_sum{msgType="MsgApp",remoteID="f992d9b00b6adf2f",sendingType="msgappv2"}
 1.426621e+06
-etcd_rafthttp_message_sent_latency_microseconds_count{msgType="MsgApp",remoteID="f992d9b00b6adf2f",sendingType="msgappv2"}
 34664
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgHeartbeat",remoteID="96d5f4741cf7499e",sendingType="message",quantile="0.5"}
 60
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgHeartbeat",remoteID="96d5f4741cf7499e",sendingType="message",quantile="0.9"}
 91
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgHeartbeat",remoteID="96d5f4741cf7499e",sendingType="message",quantile="0.99"}
 101
-etcd_rafthttp_message_sent_latency_microseconds_sum{msgType="MsgHeartbeat",remoteID="96d5f4741cf7499e",sendingType="message"}
 548492
-etcd_rafthttp_message_sent_latency_microseconds_count{msgType="MsgHeartbeat",remoteID="96d5f4741cf7499e",sendingType="message"}
 7076
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgHeartbeat",remoteID="f992d9b00b6adf2f",sendingType="message",quantile="0.5"}
 39
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgHeartbeat",remoteID="f992d9b00b6adf2f",sendingType="message",quantile="0.9"}
 58
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgHeartbeat",remoteID="f992d9b00b6adf2f",sendingType="message",quantile="0.99"}
 93
-etcd_rafthttp_message_sent_latency_microseconds_sum{msgType="MsgHeartbeat",remoteID="f992d9b00b6adf2f",sendingType="message"}
 335711
-etcd_rafthttp_message_sent_latency_microseconds_count{msgType="MsgHeartbeat",remoteID="f992d9b00b6adf2f",sendingType="message"}
 7076
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgLinkHeartbeat",remoteID="0",sendingType="message",quantile="0.5"}
 53
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgLinkHeartbeat",remoteID="0",sendingType="message",quantile="0.9"}
 65
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgLinkHeartbeat",remoteID="0",sendingType="message",quantile="0.99"}
 71
-etcd_rafthttp_message_sent_latency_microseconds_sum{msgType="MsgLinkHeartbeat",remoteID="0",sendingType="message"}
 455136
-etcd_rafthttp_message_sent_latency_microseconds_count{msgType="MsgLinkHeartbeat",remoteID="0",sendingType="message"}
 8578
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgLinkHeartbeat",remoteID="0",sendingType="msgappv2",quantile="0.5"}
 54
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgLinkHeartbeat",remoteID="0",sendingType="msgappv2",quantile="0.9"}
 69
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgLinkHeartbeat",remoteID="0",sendingType="msgappv2",quantile="0.99"}
 93
-etcd_rafthttp_message_sent_latency_microseconds_sum{msgType="MsgLinkHeartbeat",remoteID="0",sendingType="msgappv2"}
 482458
-etcd_rafthttp_message_sent_latency_microseconds_count{msgType="MsgLinkHeartbeat",remoteID="0",sendingType="msgappv2"}
 8578
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgVote",remoteID="96d5f4741cf7499e",sendingType="message",quantile="0.5"}
 NaN
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgVote",remoteID="96d5f4741cf7499e",sendingType="message",quantile="0.9"}
 NaN
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgVote",remoteID="96d5f4741cf7499e",sendingType="message",quantile="0.99"}
 NaN
-etcd_rafthttp_message_sent_latency_microseconds_sum{msgType="MsgVote",remoteID="96d5f4741cf7499e",sendingType="message"}
 162
-etcd_rafthttp_message_sent_latency_microseconds_count{msgType="MsgVote",remoteID="96d5f4741cf7499e",sendingType="message"}
 1
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgVote",remoteID="f992d9b00b6adf2f",sendingType="message",quantile="0.5"}
 NaN
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgVote",remoteID="f992d9b00b6adf2f",sendingType="message",quantile="0.9"}
 NaN
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgVote",remoteID="f992d9b00b6adf2f",sendingType="message",quantile="0.99"}
 NaN
-etcd_rafthttp_message_sent_latency_microseconds_sum{msgType="MsgVote",remoteID="f992d9b00b6adf2f",sendingType="message"}
 57
-etcd_rafthttp_message_sent_latency_microseconds_count{msgType="MsgVote",remoteID="f992d9b00b6adf2f",sendingType="message"}
 1
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgVoteResp",remoteID="96d5f4741cf7499e",sendingType="message",quantile="0.5"}
 NaN
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgVoteResp",remoteID="96d5f4741cf7499e",sendingType="message",quantile="0.9"}
 NaN
-etcd_rafthttp_message_sent_latency_microseconds{msgType="MsgVoteResp",remoteID="96d5f4741cf7499e",sendingType="message",quantile="0.99"}
 NaN
-etcd_rafthttp_message_sent_latency_microseconds_sum{msgType="MsgVoteResp",remoteID="96d5f4741cf7499e",sendingType="message"}
 54
-etcd_rafthttp_message_sent_latency_microseconds_count{msgType="MsgVoteResp",remoteID="96d5f4741cf7499e",sendingType="message"}
 1
-# HELP etcd_server_file_descriptors_used_total The total number of file 
descriptors used.
-# TYPE etcd_server_file_descriptors_used_total gauge
-etcd_server_file_descriptors_used_total 18
-# HELP etcd_server_pending_proposal_total The total number of pending 
proposals.
-# TYPE etcd_server_pending_proposal_total gauge
-etcd_server_pending_proposal_total 0
-# HELP etcd_server_proposal_durations_milliseconds The latency distributions 
of committing proposal.
-# TYPE etcd_server_proposal_durations_milliseconds summary
-etcd_server_proposal_durations_milliseconds{quantile="0.5"} NaN
-etcd_server_proposal_durations_milliseconds{quantile="0.9"} NaN
-etcd_server_proposal_durations_milliseconds{quantile="0.99"} NaN
-etcd_server_proposal_durations_milliseconds_sum 3678
-etcd_server_proposal_durations_milliseconds_count 2
-# HELP etcd_server_proposal_failed_total The total number of failed proposals.
-# TYPE etcd_server_proposal_failed_total counter
-etcd_server_proposal_failed_total 1
-# HELP etcd_snapshot_save_total_durations_microseconds The total latency 
distributions of save called by snapshot.
-# TYPE etcd_snapshot_save_total_durations_microseconds summary
-etcd_snapshot_save_total_durations_microseconds{quantile="0.5"} NaN
-etcd_snapshot_save_total_durations_microseconds{quantile="0.9"} NaN
-etcd_snapshot_save_total_durations_microseconds{quantile="0.99"} NaN
-etcd_snapshot_save_total_durations_microseconds_sum 258
-etcd_snapshot_save_total_durations_microseconds_count 1
-# HELP etcd_store_expires_total Total number of expired keys.
-# TYPE etcd_store_expires_total counter
-etcd_store_expires_total 0
-# HELP etcd_store_reads_total Total number of reads action by 
(get/getRecursive), local to this member.
-# TYPE etcd_store_reads_total counter
-etcd_store_reads_total{action="getRecursive"} 5
-# HELP etcd_store_watch_requests_total Total number of incoming watch requests 
(new or reestablished).
-# TYPE etcd_store_watch_requests_total counter
-etcd_store_watch_requests_total 0
-# HELP etcd_store_watchers Count of currently active watchers.
-# TYPE etcd_store_watchers gauge
-etcd_store_watchers 0
-# HELP etcd_store_writes_total Total number of writes (e.g. 
set/compareAndDelete) seen by this member.
-# TYPE etcd_store_writes_total counter
-etcd_store_writes_total{action="create"} 3
-etcd_store_writes_total{action="set"} 4
-# HELP etcd_wal_fsync_durations_microseconds The latency distributions of 
fsync called by wal.
-# TYPE etcd_wal_fsync_durations_microseconds summary
-etcd_wal_fsync_durations_microseconds{quantile="0.5"} 41299
-etcd_wal_fsync_durations_microseconds{quantile="0.9"} 120044
-etcd_wal_fsync_durations_microseconds{quantile="0.99"} 563066
-etcd_wal_fsync_durations_microseconds_sum 1.862452899e+09
-etcd_wal_fsync_durations_microseconds_count 27906
-# HELP etcd_wal_last_index_saved The index of the last entry saved by wal.
-# TYPE etcd_wal_last_index_saved gauge
-etcd_wal_last_index_saved 13970
-# HELP go_gc_duration_seconds A summary of the GC invocation durations.
-# TYPE go_gc_duration_seconds summary
-go_gc_duration_seconds{quantile="0"} 0.000199168
-go_gc_duration_seconds{quantile="0.25"} 0.011117938
-go_gc_duration_seconds{quantile="0.5"} 0.013050367
-go_gc_duration_seconds{quantile="0.75"} 0.015054046000000001
-go_gc_duration_seconds{quantile="1"} 0.020298544
-go_gc_duration_seconds_sum 0.8452645520000001
-go_gc_duration_seconds_count 71
-# HELP go_goroutines Number of goroutines that currently exist.
-# TYPE go_goroutines gauge
-go_goroutines 69
-# HELP http_request_duration_microseconds The HTTP request latencies in 
microseconds.
-# TYPE http_request_duration_microseconds summary
-http_request_duration_microseconds{handler="prometheus",quantile="0.5"} NaN
-http_request_duration_microseconds{handler="prometheus",quantile="0.9"} NaN
-http_request_duration_microseconds{handler="prometheus",quantile="0.99"} NaN
-http_request_duration_microseconds_sum{handler="prometheus"} 11850.234
-http_request_duration_microseconds_count{handler="prometheus"} 2
-# HELP http_request_size_bytes The HTTP request sizes in bytes.
-# TYPE http_request_size_bytes summary
-http_request_size_bytes{handler="prometheus",quantile="0.5"} NaN
-http_request_size_bytes{handler="prometheus",quantile="0.9"} NaN
-http_request_size_bytes{handler="prometheus",quantile="0.99"} NaN
-http_request_size_bytes_sum{handler="prometheus"} 680
-http_request_size_bytes_count{handler="prometheus"} 2
-# HELP http_requests_total Total number of HTTP requests made.
-# TYPE http_requests_total counter
-http_requests_total{code="200",handler="prometheus",method="get"} 2
-# HELP http_response_size_bytes The HTTP response sizes in bytes.
-# TYPE http_response_size_bytes summary
-http_response_size_bytes{handler="prometheus",quantile="0.5"} NaN
-http_response_size_bytes{handler="prometheus",quantile="0.9"} NaN
-http_response_size_bytes{handler="prometheus",quantile="0.99"} NaN
-http_response_size_bytes_sum{handler="prometheus"} 3494
-http_response_size_bytes_count{handler="prometheus"} 2
-# HELP process_cpu_seconds_total Total user and system CPU time spent in 
seconds.
-# TYPE process_cpu_seconds_total counter
-process_cpu_seconds_total 48.72
-# HELP process_max_fds Maximum number of open file descriptors.
-# TYPE process_max_fds gauge
-process_max_fds 1024
-# HELP process_open_fds Number of open file descriptors.
-# TYPE process_open_fds gauge
-process_open_fds 19
-# HELP process_resident_memory_bytes Resident memory size in bytes.
-# TYPE process_resident_memory_bytes gauge
-process_resident_memory_bytes 2.8459008e+07
-# HELP process_start_time_seconds Start time of the process since unix epoch 
in seconds.
-# TYPE process_start_time_seconds gauge
-process_start_time_seconds 1.43810894456e+09
-# HELP process_virtual_memory_bytes Virtual memory size in bytes.
-# TYPE process_virtual_memory_bytes gauge
-process_virtual_memory_bytes 3.749888e+07
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/etcd/src/test/resources/self.json
----------------------------------------------------------------------
diff --git a/etcd/src/test/resources/self.json 
b/etcd/src/test/resources/self.json
deleted file mode 100644
index 72b15d5..0000000
--- a/etcd/src/test/resources/self.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "id": "924e2e83e93f2560",
-    "leaderInfo": {
-        "leader": "924e2e83e93f2560",
-        "startTime": "2015-02-09T11:38:30.177534688-08:00",
-        "uptime": "9m33.891343412s"
-    },
-    "name": "infra3",
-    "recvAppendRequestCnt": 0,
-    "sendAppendRequestCnt": 6535,
-    "sendBandwidthRate": 824.1758351191694,
-    "sendPkgRate": 11.111234716807138,
-    "startTime": "2015-02-09T11:38:28.972034204-08:00",
-    "state": "StateLeader"
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/etcd/src/test/resources/store.json
----------------------------------------------------------------------
diff --git a/etcd/src/test/resources/store.json 
b/etcd/src/test/resources/store.json
deleted file mode 100644
index 03e6e3d..0000000
--- a/etcd/src/test/resources/store.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "compareAndSwapFail": 0,
-    "compareAndSwapSuccess": 0,
-    "createFail": 0,
-    "createSuccess": 2,
-    "deleteFail": 0,
-    "deleteSuccess": 0,
-    "expireCount": 0,
-    "getsFail": 4,
-    "getsSuccess": 75,
-    "setsFail": 2,
-    "setsSuccess": 4,
-    "updateFail": 0,
-    "updateSuccess": 0,
-    "watchers": 0
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/etcd/src/test/resources/version.json
----------------------------------------------------------------------
diff --git a/etcd/src/test/resources/version.json 
b/etcd/src/test/resources/version.json
deleted file mode 100644
index f5c5e12..0000000
--- a/etcd/src/test/resources/version.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-       "etcdserver":"2.1.1",
-       "etcdcluster":"2.1.0"
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f215379/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 03cd02f..cb03655 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,6 @@
   <modules>
     <module>azurecompute-arm</module>
     <module>azurecompute</module>
-    <module>etcd</module>
     <module>docker</module>
     <module>cdmi</module>
     <module>cloudsigma2</module>

Reply via email to