swarm fixes

michael.freund · michael.freund · commit fc6b71f2a020 · 2016-02-12T11:37:34.000+01:00
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -51,14 +51,14 @@ public class DockerClientConfig implements Serializable {
 
     public static final String REGISTRY_URL = "registry.url";
 
+    public static final String DOCKER_IS_SWARM_ENDPOINT = "isSwarmEndpoint";
+
     private static final String DOCKER_JAVA_PROPERTIES = "docker-java.properties";
 
     private static final String DOCKER_CFG = ".dockercfg";
 
     private static final Set<String> CONFIG_KEYS = new HashSet<String>();
 
-    private static final String DOCKER_IS_SWARM_ENDPOINT = "isSwarmEndpoint";
-
     static {
         CONFIG_KEYS.add(DOCKER_HOST);
         CONFIG_KEYS.add(DOCKER_TLS_VERIFY);
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
@@ -78,7 +78,7 @@ public void environment() throws Exception {
         env.put(DockerClientConfig.DOCKER_CONFIG, "dockerConfig");
         env.put(DockerClientConfig.DOCKER_CERT_PATH, dockerCertPath());
         env.put(DockerClientConfig.DOCKER_TLS_VERIFY, "1");
-        env.put(DockerClientConfig.DOCKER_SWARM, "false");
+        env.put(DockerClientConfig.DOCKER_IS_SWARM_ENDPOINT, "false");
 
 
         // when you build a config
@@ -127,6 +127,7 @@ public void systemProperties() throws Exception {
         systemProperties.put(DockerClientConfig.DOCKER_CONFIG, "dockerConfig");
         systemProperties.put(DockerClientConfig.DOCKER_CERT_PATH, dockerCertPath());
         systemProperties.put(DockerClientConfig.DOCKER_TLS_VERIFY, "1");
+        systemProperties.put(DockerClientConfig.DOCKER_IS_SWARM_ENDPOINT, "false");
 
         // when you build new config
         DockerClientConfig config = buildConfig(Collections.<String, String> emptyMap(), systemProperties);
@@ -147,36 +148,36 @@ public void serializableTest() {
     @Test(expectedExceptions = DockerClientException.class)
     public void testTlsVerifyAndCertPathNull() throws Exception {
         new DockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
-                null, true);
+                null, true, false);
     }
 
     @Test(expectedExceptions = DockerClientException.class)
     public void testTlsVerifyAndCertPathEmpty() throws Exception {
         new DockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
-                "", true);
+                "", true, false);
     }
 
     @Test()
     public void testTlsVerifyAndCertPath() throws Exception {
         new DockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
-                dockerCertPath(), true);
+                dockerCertPath(), true, false);
     }
 
     @Test(expectedExceptions = DockerClientException.class)
     public void testWrongHostScheme() throws Exception {
         new DockerClientConfig(URI.create("http://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
-                null, false);
+                null, false, false);
     }
 
     @Test()
     public void testTcpHostScheme() throws Exception {
         new DockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
-                null, false);
+                null, false, false);
     }
 
     @Test()
     public void testUnixHostScheme() throws Exception {
         new DockerClientConfig(URI.create("unix://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
-                null, false);
+                null, false, false);
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
@@ -12,7 +12,7 @@ public class DockerClientImplTest {
     @Test
     public void configuredInstanceAuthConfig() throws Exception {
         // given a config with null serverAddress
-        DockerClientConfig dockerClientConfig = new DockerClientConfig(URI.create("tcp://foo"), null, null, null, "", "", "", null, false);
+        DockerClientConfig dockerClientConfig = new DockerClientConfig(URI.create("tcp://foo"), null, null, null, "", "", "", null, false, false);
         DockerClientImpl dockerClient = DockerClientImpl.getInstance(dockerClientConfig);
 
         // when we get the auth config
