Add Ipam.options()

src/main/java/com/spotify/docker/client/messages/Ipam.java

@@ -29,7 +29,10 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Nullable;
 
@@ -44,6 +47,10 @@ public abstract class Ipam {
   @JsonProperty("Config")
   public abstract ImmutableList<IpamConfig> config();
 
+  @Nullable
+  @JsonProperty("Options")
+  public abstract ImmutableMap<String, String> options();
+
   public static Builder builder() {
     return new AutoValue_Ipam.Builder();
   }
@@ -55,6 +62,8 @@ public abstract static class Builder {
 
     public abstract Builder config(List<IpamConfig> config);
 
+    public abstract Builder options(Map<String, String> options);
+
     /**
      * @deprecated  As of release 7.0.0, replaced by {@link #config(List)}.
      */
@@ -66,13 +75,23 @@ public Builder config(final String subnet, final String ipRange, final String ga
     public abstract Ipam build();
   }
 
+  public static Ipam create(final String driver, final List<IpamConfig> config) {
+    return builder()
+        .driver(driver)
+        .config(config)
+        .options(null)
+        .build();
+  }
+
   @JsonCreator
   public static Ipam create(
       @JsonProperty("Driver") final String driver,
-      @JsonProperty("Config") final List<IpamConfig> config) {
+      @JsonProperty("Config") final List<IpamConfig> config,
+      @JsonProperty("Options") final Map<String, String> options) {
     return builder()
         .driver(driver)
         .config(config)
+        .options(options)
         .build();
   }
 }

src/test/java/com/spotify/docker/client/messages/IpamTest.java

@@ -28,6 +28,7 @@
 import static org.hamcrest.Matchers.nullValue;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ImmutableMap;
 import com.spotify.docker.client.ObjectMapperProvider;
 
 import org.junit.Test;
@@ -42,6 +43,7 @@ public void testDeserialize() throws Exception {
         objectMapper.readValue(fixture("fixtures/1.29/ipam.json"), Ipam.class);
     assertThat(ipam.driver(), equalTo("default"));
     assertThat(ipam.config(), contains(IpamConfig.create("172.17.0.0/16", null, null)));
+    assertThat(ipam.options(), equalTo(ImmutableMap.of("foo", "bar")));
   }
 
   @Test

src/test/resources/fixtures/1.29/ipam.json

@@ -4,5 +4,8 @@
     {
       "Subnet": "172.17.0.0/16"
     }
-  ]
+  ],
+  "Options": {
+    "foo": "bar"
+  }
 }