You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/05/07 12:49:29 UTC
[camel] branch master updated (b753eec -> d7b35fa)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from b753eec CAMEL-13490: Consider API key in query paramete...
new 0f9990b Added endpoints for create, remove and connect to network. Unit Tests
new 4275ed4 Changed NetworkID Header Name
new 3fb9404 Renaming variable and consolidating - We can use ID or Name for networks so can put under one header
new d7b35fa Fixed CS for Camel-Docker
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/component/docker/DockerConstants.java | 7 ++
.../camel/component/docker/DockerOperation.java | 9 ++-
.../component/docker/producer/DockerProducer.java | 78 ++++++++++++++++++++++
...est.java => ConnectToNetworkCmdHeaderTest.java} | 24 ++++---
...erTest.java => CreateNetworkCmdHeaderTest.java} | 22 +++---
...erTest.java => RemoveNetworkCmdHeaderTest.java} | 21 +++---
6 files changed, 128 insertions(+), 33 deletions(-)
copy components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/{StartContainerCmdHeaderTest.java => ConnectToNetworkCmdHeaderTest.java} (62%)
copy components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/{StartContainerCmdHeaderTest.java => CreateNetworkCmdHeaderTest.java} (68%)
copy components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/{StartContainerCmdHeaderTest.java => RemoveNetworkCmdHeaderTest.java} (70%)
[camel] 04/04: Fixed CS for Camel-Docker
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d7b35fa64e8db085f237edca6ac688d2493d4b9d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue May 7 14:47:18 2019 +0200
Fixed CS for Camel-Docker
---
.../camel/component/docker/headers/ConnectToNetworkCmdHeaderTest.java | 4 ++--
.../camel/component/docker/headers/CreateNetworkCmdHeaderTest.java | 4 ++--
.../camel/component/docker/headers/RemoveNetworkCmdHeaderTest.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ConnectToNetworkCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ConnectToNetworkCmdHeaderTest.java
index 10d90cd..a860205 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ConnectToNetworkCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ConnectToNetworkCmdHeaderTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.docker.headers;
+import java.util.Map;
+
import com.github.dockerjava.api.command.ConnectToNetworkCmd;
import com.github.dockerjava.api.model.ExposedPort;
import org.apache.camel.component.docker.DockerConstants;
@@ -24,8 +26,6 @@ import org.junit.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
-import java.util.Map;
-
import static org.mockito.ArgumentMatchers.anyString;
/**
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateNetworkCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateNetworkCmdHeaderTest.java
index 3007194..f7a350f 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateNetworkCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateNetworkCmdHeaderTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.docker.headers;
+import java.util.Map;
+
import com.github.dockerjava.api.command.CreateNetworkCmd;
import com.github.dockerjava.api.model.ExposedPort;
import org.apache.camel.component.docker.DockerConstants;
@@ -24,8 +26,6 @@ import org.junit.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
-import java.util.Map;
-
import static org.mockito.ArgumentMatchers.anyString;
/**
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveNetworkCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveNetworkCmdHeaderTest.java
index cc749d1..58307c7 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveNetworkCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveNetworkCmdHeaderTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.docker.headers;
+import java.util.Map;
+
import com.github.dockerjava.api.command.RemoveNetworkCmd;
import com.github.dockerjava.api.model.ExposedPort;
import org.apache.camel.component.docker.DockerConstants;
@@ -24,8 +26,6 @@ import org.junit.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
-import java.util.Map;
-
import static org.mockito.ArgumentMatchers.anyString;
/**
[camel] 01/04: Added endpoints for create,
remove and connect to network. Unit Tests
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0f9990b92cff7cadf5afebc93324c0fd1ee5b15a
Author: Martin Bramwell <ma...@hotmail.co.uk>
AuthorDate: Sun May 5 14:43:15 2019 +0100
Added endpoints for create, remove and connect to network. Unit Tests
---
.../camel/component/docker/DockerConstants.java | 11 +++
.../camel/component/docker/DockerOperation.java | 9 ++-
.../component/docker/producer/DockerProducer.java | 78 ++++++++++++++++++++++
.../headers/ConnectToNetworkCmdHeaderTest.java | 71 ++++++++++++++++++++
.../docker/headers/CreateNetworkCmdHeaderTest.java | 67 +++++++++++++++++++
.../docker/headers/RemoveNetworkCmdHeaderTest.java | 66 ++++++++++++++++++
6 files changed, 301 insertions(+), 1 deletion(-)
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java
index 2b8a799..ba7b800 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java
@@ -223,6 +223,17 @@ public final class DockerConstants {
public static final String DOCKER_RESTART_POLICY = "CamelDockerRestartPolicy";
/**
+ * Create Network *
+ */
+ public static final String DOCKER_NETWORK_NAME = "CamelDockerNetwork";
+
+ /**
+ * Attach to Network *
+ * Remove Network *
+ */
+ public static final String DOCKER_NETWORK_ID = "CamelDockerNetwork";
+
+ /**
* Exec *
*/
public static final String DOCKER_DETACH = "CamelDockerDetach";
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java
index 454509b..e2a855b 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java
@@ -187,6 +187,13 @@ public enum DockerOperation {
DockerConstants.DOCKER_PS_ARGS, String.class),
UNPAUSE_CONTAINER("containerunpause", false, true, false,
DockerConstants.DOCKER_CONTAINER_ID, String.class),
+ CREATE_NETWORK("networkcreate", false, true, false,
+ DockerConstants.DOCKER_NETWORK_NAME, String.class),
+ REMOVE_NETWORK("networkremove", false, true, false,
+ DockerConstants.DOCKER_NETWORK_ID, String.class),
+ CONNECT_NETWORK("networkconnect", false, true, false,
+ DockerConstants.DOCKER_NETWORK_ID, String.class,
+ DockerConstants.DOCKER_CONTAINER_ID, String.class),
WAIT_CONTAINER("containerwait", false, true, true,
DockerConstants.DOCKER_CONTAINER_ID, String.class),
@@ -268,4 +275,4 @@ public enum DockerOperation {
return null;
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java
index 6be98ef..b0d08ab 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java
@@ -21,10 +21,12 @@ import java.io.InputStream;
import com.github.dockerjava.api.DockerClient;
import com.github.dockerjava.api.command.AuthCmd;
import com.github.dockerjava.api.command.CommitCmd;
+import com.github.dockerjava.api.command.ConnectToNetworkCmd;
import com.github.dockerjava.api.command.ContainerDiffCmd;
import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
import com.github.dockerjava.api.command.CreateContainerCmd;
import com.github.dockerjava.api.command.CreateImageCmd;
+import com.github.dockerjava.api.command.CreateNetworkCmd;
import com.github.dockerjava.api.command.ExecCreateCmd;
import com.github.dockerjava.api.command.InfoCmd;
import com.github.dockerjava.api.command.InspectContainerCmd;
@@ -36,6 +38,7 @@ import com.github.dockerjava.api.command.PauseContainerCmd;
import com.github.dockerjava.api.command.PingCmd;
import com.github.dockerjava.api.command.RemoveContainerCmd;
import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.api.command.RemoveNetworkCmd;
import com.github.dockerjava.api.command.RestartContainerCmd;
import com.github.dockerjava.api.command.SearchImagesCmd;
import com.github.dockerjava.api.command.StartContainerCmd;
@@ -49,6 +52,7 @@ import com.github.dockerjava.api.model.Capability;
import com.github.dockerjava.api.model.ExposedPort;
import com.github.dockerjava.api.model.ExposedPorts;
import com.github.dockerjava.api.model.HostConfig;
+import com.github.dockerjava.api.model.Mount;
import com.github.dockerjava.api.model.Volume;
import com.github.dockerjava.api.model.Volumes;
import com.github.dockerjava.api.model.VolumesFrom;
@@ -167,6 +171,15 @@ public class DockerProducer extends DefaultProducer {
case UNPAUSE_CONTAINER:
result = executeUnpauseContainerRequest(client, message).exec();
break;
+ case CREATE_NETWORK:
+ result = executeCreateNetworkRequest(client, message).exec();
+ break;
+ case REMOVE_NETWORK:
+ result = executeRemoveNetworkRequest(client, message).exec();
+ break;
+ case CONNECT_NETWORK:
+ result = executeConnectToNetworkRequest(client, message).exec();
+ break;
case EXEC_CREATE:
result = executeExecCreateRequest(client, message).exec();
break;
@@ -1086,6 +1099,71 @@ public class DockerProducer extends DefaultProducer {
}
+ /**
+ * Produces a network create request
+ *
+ * @param client
+ * @param message
+ * @return
+ */
+ private CreateNetworkCmd executeCreateNetworkRequest(DockerClient client, Message message) {
+
+ LOGGER.debug("Executing Docker Network Create Request");
+
+ String networkName = DockerHelper.getProperty(DockerConstants.DOCKER_NETWORK_NAME, configuration, message, String.class);
+
+ ObjectHelper.notNull(networkName, "Network Name must be specified");
+
+ CreateNetworkCmd createNetworkCmd = client.createNetworkCmd().withName(networkName);
+
+ return createNetworkCmd;
+
+ }
+
+ /**
+ * Produces a network remove request
+ *
+ * @param client
+ * @param message
+ * @return
+ */
+ private RemoveNetworkCmd executeRemoveNetworkRequest(DockerClient client, Message message) {
+
+ LOGGER.debug("Executing Docker Network Remove Request");
+
+ String networkId = DockerHelper.getProperty(DockerConstants.DOCKER_NETWORK_ID, configuration, message, String.class);
+
+ ObjectHelper.notNull(networkId, "Network ID must be specified");
+
+ RemoveNetworkCmd removeNetworkCmd = client.removeNetworkCmd(networkId);
+
+ return removeNetworkCmd;
+
+ }
+
+ /**
+ * Produces a network connect request
+ *
+ * @param client
+ * @param message
+ * @return
+ */
+ private ConnectToNetworkCmd executeConnectToNetworkRequest(DockerClient client, Message message) {
+
+ LOGGER.debug("Executing Docker Network Connect Request");
+
+ String networkId = DockerHelper.getProperty(DockerConstants.DOCKER_NETWORK_NAME, configuration, message, String.class);
+ String containerId = DockerHelper.getProperty(DockerConstants.DOCKER_CONTAINER_ID, configuration, message, String.class);
+
+ ObjectHelper.notNull(networkId, "Network ID must be specified");
+ ObjectHelper.notNull(containerId, "Container ID must be specified");
+
+ ConnectToNetworkCmd connectToNetworkCmd = client.connectToNetworkCmd().withNetworkId(networkId).withContainerId(containerId);
+
+ return connectToNetworkCmd;
+
+ }
+
/*********************
* Exec Requests
********************/
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ConnectToNetworkCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ConnectToNetworkCmdHeaderTest.java
new file mode 100644
index 0000000..17e75a2
--- /dev/null
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ConnectToNetworkCmdHeaderTest.java
@@ -0,0 +1,71 @@
+/*
+ * 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.apache.camel.component.docker.headers;
+
+import com.github.dockerjava.api.command.ConnectToNetworkCmd;
+import com.github.dockerjava.api.model.ExposedPort;
+import org.apache.camel.component.docker.DockerConstants;
+import org.apache.camel.component.docker.DockerOperation;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+
+import java.util.Map;
+
+import static org.mockito.ArgumentMatchers.anyString;
+
+/**
+ * Validates Connect To Network Request headers are applied properly
+ */
+public class ConnectToNetworkCmdHeaderTest extends BaseDockerHeaderTest<ConnectToNetworkCmd> {
+
+ @Mock
+ ExposedPort exposedPort;
+
+ @Mock
+ private ConnectToNetworkCmd mockObject;
+
+ @Test
+ public void createNetworkHeaderTest() {
+
+ String networkId = "ID1234";
+ String containerId = "CID1234";
+
+ Map<String, Object> headers = getDefaultParameters();
+ headers.put(DockerConstants.DOCKER_NETWORK_ID, networkId);
+ headers.put(DockerConstants.DOCKER_CONTAINER_ID, containerId);
+
+ template.sendBodyAndHeaders("direct:in", "", headers);
+
+ Mockito.verify(dockerClient.connectToNetworkCmd(), Mockito.times(1)).withContainerId(containerId);
+ Mockito.verify(dockerClient.connectToNetworkCmd(), Mockito.times(1)).withNetworkId(networkId);
+
+ }
+
+ @Override
+ protected void setupMocks() {
+ Mockito.when(dockerClient.connectToNetworkCmd()).thenReturn(mockObject);
+ Mockito.when(mockObject.withContainerId(anyString())).thenReturn(mockObject);
+ Mockito.when(mockObject.withNetworkId(anyString())).thenReturn(mockObject);
+ }
+
+ @Override
+ protected DockerOperation getOperation() {
+ return DockerOperation.CONNECT_NETWORK;
+ }
+
+}
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateNetworkCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateNetworkCmdHeaderTest.java
new file mode 100644
index 0000000..5918eb7
--- /dev/null
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateNetworkCmdHeaderTest.java
@@ -0,0 +1,67 @@
+/*
+ * 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.apache.camel.component.docker.headers;
+
+import com.github.dockerjava.api.command.CreateNetworkCmd;
+import com.github.dockerjava.api.model.ExposedPort;
+import org.apache.camel.component.docker.DockerConstants;
+import org.apache.camel.component.docker.DockerOperation;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+
+import java.util.Map;
+
+import static org.mockito.ArgumentMatchers.anyString;
+
+/**
+ * Validates Create Network Request headers are applied properly
+ */
+public class CreateNetworkCmdHeaderTest extends BaseDockerHeaderTest<CreateNetworkCmd> {
+
+ @Mock
+ ExposedPort exposedPort;
+
+ @Mock
+ private CreateNetworkCmd mockObject;
+
+ @Test
+ public void createNetworkHeaderTest() {
+
+ String networkName = "TestNetwork";
+
+ Map<String, Object> headers = getDefaultParameters();
+ headers.put(DockerConstants.DOCKER_NETWORK_NAME, networkName);
+
+ template.sendBodyAndHeaders("direct:in", "", headers);
+
+ Mockito.verify(dockerClient.createNetworkCmd(), Mockito.times(1)).withName(networkName);
+
+ }
+
+ @Override
+ protected void setupMocks() {
+ Mockito.when(dockerClient.createNetworkCmd()).thenReturn(mockObject);
+ Mockito.when(mockObject.withName(anyString())).thenReturn(mockObject);
+ }
+
+ @Override
+ protected DockerOperation getOperation() {
+ return DockerOperation.CREATE_NETWORK;
+ }
+
+}
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveNetworkCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveNetworkCmdHeaderTest.java
new file mode 100644
index 0000000..1bb2253
--- /dev/null
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveNetworkCmdHeaderTest.java
@@ -0,0 +1,66 @@
+/*
+ * 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.apache.camel.component.docker.headers;
+
+import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.model.ExposedPort;
+import org.apache.camel.component.docker.DockerConstants;
+import org.apache.camel.component.docker.DockerOperation;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+
+import java.util.Map;
+
+import static org.mockito.ArgumentMatchers.anyString;
+
+/**
+ * Validates Remove Network Request headers are applied properly
+ */
+public class RemoveNetworkCmdHeaderTest extends BaseDockerHeaderTest<RemoveNetworkCmd> {
+
+ @Mock
+ ExposedPort exposedPort;
+
+ @Mock
+ private RemoveNetworkCmd mockObject;
+
+ @Test
+ public void createNetworkHeaderTest() {
+
+ String networkId = "ID1234";
+
+ Map<String, Object> headers = getDefaultParameters();
+ headers.put(DockerConstants.DOCKER_NETWORK_ID, networkId);
+
+ template.sendBodyAndHeaders("direct:in", "", headers);
+
+ Mockito.verify(dockerClient, Mockito.times(1)).removeNetworkCmd(networkId);
+
+ }
+
+ @Override
+ protected void setupMocks() {
+ Mockito.when(dockerClient.removeNetworkCmd(anyString())).thenReturn(mockObject);
+ }
+
+ @Override
+ protected DockerOperation getOperation() {
+ return DockerOperation.REMOVE_NETWORK;
+ }
+
+}
[camel] 03/04: Renaming variable and consolidating - We can use ID
or Name for networks so can put under one header
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3fb94043e3f363254fc7a1ada5db36039e844e4c
Author: Martin Bramwell <ma...@hotmail.co.uk>
AuthorDate: Sun May 5 17:02:51 2019 +0100
Renaming variable and consolidating - We can use ID or Name for networks so can put under one header
---
.../java/org/apache/camel/component/docker/DockerConstants.java | 6 +-----
.../java/org/apache/camel/component/docker/DockerOperation.java | 6 +++---
.../org/apache/camel/component/docker/producer/DockerProducer.java | 6 +++---
.../component/docker/headers/ConnectToNetworkCmdHeaderTest.java | 2 +-
.../camel/component/docker/headers/CreateNetworkCmdHeaderTest.java | 2 +-
.../camel/component/docker/headers/RemoveNetworkCmdHeaderTest.java | 2 +-
6 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java
index 7023705..dad315b 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java
@@ -224,14 +224,10 @@ public final class DockerConstants {
/**
* Create Network *
- */
- public static final String DOCKER_NETWORK_NAME = "CamelDockerNetwork";
-
- /**
* Attach to Network *
* Remove Network *
*/
- public static final String DOCKER_NETWORK_ID = "CamelDockerNetworkId";
+ public static final String DOCKER_NETWORK = "CamelDockerNetwork";
/**
* Exec *
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java
index e2a855b..4ab0f61 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java
@@ -188,11 +188,11 @@ public enum DockerOperation {
UNPAUSE_CONTAINER("containerunpause", false, true, false,
DockerConstants.DOCKER_CONTAINER_ID, String.class),
CREATE_NETWORK("networkcreate", false, true, false,
- DockerConstants.DOCKER_NETWORK_NAME, String.class),
+ DockerConstants.DOCKER_NETWORK, String.class),
REMOVE_NETWORK("networkremove", false, true, false,
- DockerConstants.DOCKER_NETWORK_ID, String.class),
+ DockerConstants.DOCKER_NETWORK, String.class),
CONNECT_NETWORK("networkconnect", false, true, false,
- DockerConstants.DOCKER_NETWORK_ID, String.class,
+ DockerConstants.DOCKER_NETWORK, String.class,
DockerConstants.DOCKER_CONTAINER_ID, String.class),
WAIT_CONTAINER("containerwait", false, true, true,
DockerConstants.DOCKER_CONTAINER_ID, String.class),
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java
index ade8db6..2ecd662 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java
@@ -1110,7 +1110,7 @@ public class DockerProducer extends DefaultProducer {
LOGGER.debug("Executing Docker Network Create Request");
- String networkName = DockerHelper.getProperty(DockerConstants.DOCKER_NETWORK_NAME, configuration, message, String.class);
+ String networkName = DockerHelper.getProperty(DockerConstants.DOCKER_NETWORK, configuration, message, String.class);
ObjectHelper.notNull(networkName, "Network Name must be specified");
@@ -1131,7 +1131,7 @@ public class DockerProducer extends DefaultProducer {
LOGGER.debug("Executing Docker Network Remove Request");
- String networkId = DockerHelper.getProperty(DockerConstants.DOCKER_NETWORK_ID, configuration, message, String.class);
+ String networkId = DockerHelper.getProperty(DockerConstants.DOCKER_NETWORK, configuration, message, String.class);
ObjectHelper.notNull(networkId, "Network ID must be specified");
@@ -1152,7 +1152,7 @@ public class DockerProducer extends DefaultProducer {
LOGGER.debug("Executing Docker Network Connect Request");
- String networkId = DockerHelper.getProperty(DockerConstants.DOCKER_NETWORK_ID, configuration, message, String.class);
+ String networkId = DockerHelper.getProperty(DockerConstants.DOCKER_NETWORK, configuration, message, String.class);
String containerId = DockerHelper.getProperty(DockerConstants.DOCKER_CONTAINER_ID, configuration, message, String.class);
ObjectHelper.notNull(networkId, "Network ID must be specified");
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ConnectToNetworkCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ConnectToNetworkCmdHeaderTest.java
index 17e75a2..10d90cd 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ConnectToNetworkCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ConnectToNetworkCmdHeaderTest.java
@@ -46,7 +46,7 @@ public class ConnectToNetworkCmdHeaderTest extends BaseDockerHeaderTest<ConnectT
String containerId = "CID1234";
Map<String, Object> headers = getDefaultParameters();
- headers.put(DockerConstants.DOCKER_NETWORK_ID, networkId);
+ headers.put(DockerConstants.DOCKER_NETWORK, networkId);
headers.put(DockerConstants.DOCKER_CONTAINER_ID, containerId);
template.sendBodyAndHeaders("direct:in", "", headers);
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateNetworkCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateNetworkCmdHeaderTest.java
index 5918eb7..3007194 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateNetworkCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateNetworkCmdHeaderTest.java
@@ -45,7 +45,7 @@ public class CreateNetworkCmdHeaderTest extends BaseDockerHeaderTest<CreateNetwo
String networkName = "TestNetwork";
Map<String, Object> headers = getDefaultParameters();
- headers.put(DockerConstants.DOCKER_NETWORK_NAME, networkName);
+ headers.put(DockerConstants.DOCKER_NETWORK, networkName);
template.sendBodyAndHeaders("direct:in", "", headers);
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveNetworkCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveNetworkCmdHeaderTest.java
index 1bb2253..cc749d1 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveNetworkCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveNetworkCmdHeaderTest.java
@@ -45,7 +45,7 @@ public class RemoveNetworkCmdHeaderTest extends BaseDockerHeaderTest<RemoveNetwo
String networkId = "ID1234";
Map<String, Object> headers = getDefaultParameters();
- headers.put(DockerConstants.DOCKER_NETWORK_ID, networkId);
+ headers.put(DockerConstants.DOCKER_NETWORK, networkId);
template.sendBodyAndHeaders("direct:in", "", headers);
[camel] 02/04: Changed NetworkID Header Name
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4275ed472ccd0cbc6b84acae80a73095ee89cc52
Author: Martin Bramwell <ma...@hotmail.co.uk>
AuthorDate: Sun May 5 14:46:59 2019 +0100
Changed NetworkID Header Name
---
.../main/java/org/apache/camel/component/docker/DockerConstants.java | 2 +-
.../java/org/apache/camel/component/docker/producer/DockerProducer.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java
index ba7b800..7023705 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java
@@ -231,7 +231,7 @@ public final class DockerConstants {
* Attach to Network *
* Remove Network *
*/
- public static final String DOCKER_NETWORK_ID = "CamelDockerNetwork";
+ public static final String DOCKER_NETWORK_ID = "CamelDockerNetworkId";
/**
* Exec *
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java
index b0d08ab..ade8db6 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java
@@ -1152,7 +1152,7 @@ public class DockerProducer extends DefaultProducer {
LOGGER.debug("Executing Docker Network Connect Request");
- String networkId = DockerHelper.getProperty(DockerConstants.DOCKER_NETWORK_NAME, configuration, message, String.class);
+ String networkId = DockerHelper.getProperty(DockerConstants.DOCKER_NETWORK_ID, configuration, message, String.class);
String containerId = DockerHelper.getProperty(DockerConstants.DOCKER_CONTAINER_ID, configuration, message, String.class);
ObjectHelper.notNull(networkId, "Network ID must be specified");