Skip to content

Add ability to configure IPAM config for CreateNetworkCmd #550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcuslinke merged 8 commits into from
May 12, 2016
Merged

Add ability to configure IPAM config for CreateNetworkCmd #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2f88b39
Add setters in order to be able to construct network creation request
vuminhkh Apr 17, 2016
14f6479
Fix NPE for withIpamConfig
vuminhkh Apr 17, 2016
3ed7e7c
Add test for network creation with ipam config
vuminhkh Apr 17, 2016
8933038
Separate tests
vuminhkh Apr 30, 2016
35bec14
Merge branch 'master-docker-java'
vuminhkh Apr 30, 2016
4aad2ea
Merge branch 'master-docker-java'
vuminhkh May 5, 2016
90ff0bd
Fix imports
vuminhkh May 5, 2016
4431df9
Fix test names
vuminhkh May 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/main/java/com/github/dockerjava/api/model/Network.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,18 @@ public String getIpRange() {
public String getGateway() {
return gateway;
}

public void setSubnet(String subnet) {
this.subnet = subnet;
}

public void setIpRange(String ipRange) {
this.ipRange = ipRange;
}

public void setGateway(String gateway) {
this.gateway = gateway;
}
}
}
}
3 changes: 3 additions & 0 deletions src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ public CreateNetworkCmd withDriver(String driver) {

@Override
public CreateNetworkCmd withIpamConfig(Ipam.Config config) {
if (this.ipam == null) {
this.ipam = new Ipam();
}
Copy link
Copy Markdown
Member

@KostyaSha KostyaSha Apr 18, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if it null, why do you need set it? Is this field required for API request?

Copy link
Copy Markdown
Contributor Author

@vuminhkh vuminhkh Apr 30, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's an optional config to create a network
https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#create-a-network
If I don't set it then the next line will raise NPE, for me it's a bug that prevent user to set custom configuration for network creation.

Copy link
Copy Markdown
Member

@KostyaSha KostyaSha May 12, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NPE where? In docker daemon?

this.ipam.getConfig().add(config);
Copy link
Copy Markdown
Contributor

@marcuslinke marcuslinke May 12, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. In this line.

return this;
}
Expand Down
16 changes: 16 additions & 0 deletions src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,20 @@ public void createNetwork() throws DockerException {
assertEquals(network.getName(), networkName);
assertEquals(network.getDriver(), "bridge");
}

@Test
public void createNetworkWithIpamConfig() throws DockerException {

String networkName = "testNetwork";
Network.Ipam.Config config = new Network.Ipam.Config();
config.setSubnet("10.67.79.0/24");
CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).withIpamConfig(config).exec();

assertNotNull(createNetworkResponse.getId());

Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
assertEquals(network.getName(), networkName);
assertEquals(network.getDriver(), "bridge");
assertEquals("10.67.79.0/24", network.getIpam().getConfig().iterator().next().getSubnet());
}
}
16 changes: 16 additions & 0 deletions src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,20 @@ public void createNetwork() throws DockerException {
assertEquals(network.getName(), networkName);
assertEquals(network.getDriver(), "bridge");
}

@Test
public void createNetworkWithIpamConfig() throws DockerException {

String networkName = "testNetwork";
Network.Ipam.Config config = new Network.Ipam.Config();
config.setSubnet("10.67.79.0/24");
CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).withIpamConfig(config).exec();
Copy link
Copy Markdown
Member

@KostyaSha KostyaSha Apr 18, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please create separate test


assertNotNull(createNetworkResponse.getId());

Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
assertEquals(network.getName(), networkName);
assertEquals(network.getDriver(), "bridge");
assertEquals("10.67.79.0/24", network.getIpam().getConfig().iterator().next().getSubnet());
}
}