diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | src/errors.rs | 6 | ||||
| -rw-r--r-- | src/lib.rs | 2 | ||||
| -rw-r--r-- | src/network.rs | 18 |
4 files changed, 23 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c53c86d..1d2877f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * rename `shiplift::rep::Config` to `shiplift::rep::ContainerConfig` [#264](https://github.com/softprops/shiplift/pull/264) * add missing fields ([API version 1.41](https://docs.docker.com/engine/api/v1.41/#operation/ImageInspect)) to `ContainerConfig` [#264](https://github.com/softprops/shiplift/pull/264) * add missing fields ([API version 1.41](https://docs.docker.com/engine/api/v1.41/#operation/ImageHistory)) to `History` [#264](https://github.com/softprops/shiplift/pull/264) +* add missing fields to `NetworkEntry` [#254](https://github.com/softprops/shiplift/pull/254) # 0.7.0 diff --git a/src/errors.rs b/src/errors.rs index a182ff6..a02836a 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -14,10 +14,14 @@ pub enum Error { SerdeJsonError(SerdeError), Hyper(hyper::Error), Http(hyper::http::Error), + #[allow(clippy::upper_case_acronyms)] IO(IoError), Encoding(FromUtf8Error), InvalidResponse(String), - Fault { code: StatusCode, message: String }, + Fault { + code: StatusCode, + message: String, + }, ConnectionNotUpgraded, } @@ -122,7 +122,7 @@ reexport! { SearchResult, ImageInfo as Image, ImageDetails, Config, History, Status, }; network::{ - NetworkSettings, NetworkEntry, NetworkInfo as Network, IPAM, NetworkDetails, + NetworkSettings, NetworkEntry, NetworkInfo as Network, Ipam, NetworkDetails, NetworkContainerDetails, NetworkCreateInfo, }; service::{ diff --git a/src/network.rs b/src/network.rs index 5c5535d..62d8bbe 100644 --- a/src/network.rs +++ b/src/network.rs @@ -349,6 +349,20 @@ pub struct NetworkEntry { #[serde(rename = "GlobalIPv6PrefixLen")] pub global_ipv6_prefix_len: u64, pub mac_address: String, + pub links: Option<Vec<String>>, + pub aliases: Option<Vec<String>>, + #[serde(rename = "IPAMConfig")] + pub ipam_config: Option<EndpointIPAMConfig>, +} + +#[derive(Clone, Debug, Serialize, Deserialize)] +pub struct EndpointIPAMConfig { + #[serde(rename = "IPv4Address")] + pub ipv4_address: String, + #[serde(rename = "IPv6Address")] + pub ipv6_address: String, + #[serde(rename = "LinkLocalIPs")] + pub link_local_ips: Vec<String>, } #[derive(Clone, Debug, Serialize, Deserialize)] @@ -365,7 +379,7 @@ pub struct NetworkInfo { #[derive(Clone, Debug, Serialize, Deserialize)] #[serde(rename_all = "PascalCase")] -pub struct IPAM { +pub struct Ipam { pub driver: String, pub config: Vec<HashMap<String, String>>, pub options: Option<HashMap<String, String>>, @@ -381,7 +395,7 @@ pub struct NetworkDetails { #[serde(rename = "EnableIPv6")] pub enable_ipv6: bool, #[serde(rename = "IPAM")] - pub ipam: IPAM, + pub ipam: Ipam, pub internal: bool, pub attachable: bool, pub containers: HashMap<String, NetworkContainerDetails>, |