Skip to content

Allow user to check where volume is binded on host #49

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 2 commits into from
Aug 27, 2014
Merged

Allow user to check where volume is binded on host #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99424b6
Container inspect can now return where the volumes are binded
pnuz3n Aug 27, 2014
229e082
Refactored code a little and added test for parsing volume binds JSON
pnuz3n Aug 27, 2014
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: 4 additions & 8 deletions src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,12 @@

import java.util.Map;

import com.github.dockerjava.api.model.*;
import org.apache.commons.lang.builder.ToStringBuilder;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.github.dockerjava.api.model.ContainerConfig;
import com.github.dockerjava.api.model.LxcConf;
import com.github.dockerjava.api.model.Ports;
import com.github.dockerjava.api.model.Volume;
import com.github.dockerjava.api.model.Volumes;

/**
*
Expand Down Expand Up @@ -74,7 +70,7 @@ public class InspectContainerResponse {
private ContainerState state;

@JsonProperty("Volumes")
private Volumes volumes;
private VolumeBinds volumes;

@JsonProperty("VolumesRW")
private Volumes volumesRW;
Expand Down Expand Up @@ -120,8 +116,8 @@ public String getResolvConfPath() {
}

@JsonIgnore
public Volume[] getVolumes() {
return volumes.getVolumes();
public VolumeBind[] getVolumes() {
return volumes.getBinds();
}

@JsonIgnore
Expand Down
19 changes: 19 additions & 0 deletions src/main/java/com/github/dockerjava/api/model/VolumeBind.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.github.dockerjava.api.model;

public class VolumeBind {
private final String hostPath;
private final String containerPath;

public VolumeBind(String hostPath, String containerPath){
this.hostPath = hostPath;
this.containerPath = containerPath;
}

public String getContainerPath() {
return containerPath;
}

public String getHostPath() {
return hostPath;
}
}
53 changes: 53 additions & 0 deletions src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
package com.github.dockerjava.api.model;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.ObjectCodec;
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.node.NullNode;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

// This is not going to be serialized
@JsonDeserialize(using = VolumeBinds.Deserializer.class)
public class VolumeBinds {
private final VolumeBind[] binds;

public VolumeBinds(VolumeBind... binds) {
this.binds = binds;
}

public VolumeBind[] getBinds() {
return binds;
}

public static final class Deserializer extends JsonDeserializer<VolumeBinds> {
@Override
public VolumeBinds deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {

List<VolumeBind> binds = new ArrayList<VolumeBind>();
ObjectCodec oc = jsonParser.getCodec();
JsonNode node = oc.readTree(jsonParser);
for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
Map.Entry<String, JsonNode> field = it.next();
JsonNode value = field.getValue();
if (!value.equals(NullNode.getInstance())) {
if (!value.isTextual()){
throw deserializationContext.mappingException("Expected path for '"+field.getKey()+"'in host but got '"+ value+"'.");
}
VolumeBind bind = new VolumeBind(value.asText(),field.getKey());
binds.add(bind);
}
}
return new VolumeBinds(binds.toArray(new VolumeBind[binds.size()]));
}
}

}
33 changes: 33 additions & 0 deletions src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package com.github.dockerjava.api.model;

import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import jdk.nashorn.internal.parser.JSONParser;
import org.testng.annotations.Test;

import java.io.IOException;

import static org.testng.Assert.*;

public class VolumeBindsTest {
@Test
public void t() throws IOException {
String s = "{\"/data\":\"/some/path\"}";
ObjectMapper objectMapper = new ObjectMapper();
VolumeBinds volumeBinds = objectMapper.readValue(s, VolumeBinds.class);
VolumeBind[] binds = volumeBinds.getBinds();
assertEquals(binds.length,1);
assertEquals(binds[0].getHostPath(),"/some/path");
assertEquals(binds[0].getContainerPath(), "/data");
}

@Test(expectedExceptions = JsonMappingException.class)
public void t1() throws IOException {
String s = "{\"/data\": {} }";
ObjectMapper objectMapper = new ObjectMapper();
VolumeBinds volumeBinds = objectMapper.readValue(s, VolumeBinds.class);
}


}
17 changes: 8 additions & 9 deletions src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,12 @@
import static org.hamcrest.Matchers.startsWith;

import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.*;

import com.github.dockerjava.api.DockerException;
import com.github.dockerjava.api.command.CreateContainerResponse;
import com.github.dockerjava.api.command.InspectContainerResponse;
import com.github.dockerjava.api.model.Bind;
import com.github.dockerjava.api.model.ExposedPort;
import com.github.dockerjava.api.model.Link;
import com.github.dockerjava.api.model.Ports;
import com.github.dockerjava.api.model.Volume;
import com.github.dockerjava.api.model.*;

import org.testng.ITestResult;
import org.testng.annotations.AfterMethod;
Expand Down Expand Up @@ -82,9 +78,12 @@ public void startContainerWithVolumes() throws DockerException {
inspectContainerResponse = dockerClient.inspectContainerCmd(container
.getId()).exec();


assertThat(Arrays.asList(inspectContainerResponse.getVolumes()),
contains(volume1, volume2));
VolumeBind[] volumeBinds = inspectContainerResponse.getVolumes();
List<String> volumes = new ArrayList<String>();
for(VolumeBind bind :volumeBinds){
volumes.add(bind.getContainerPath());
}
assertThat(volumes, contains(volume1.getPath(), volume2.getPath()));

assertThat(Arrays.asList(inspectContainerResponse.getVolumesRW()),
contains(volume1, volume2));
Expand Down