diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-05 22:14:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-05 22:14:01 +0100 |
| commit | 6805befec2ca9b9a816b1efda0bf43a67cee09a7 (patch) | |
| tree | d86c50f122cc58c62eeb10f8e908603c6a71d470 | |
| parent | 6c0690dbab9de2f41365cca4cf1ed74514db7f52 (diff) | |
| parent | 02f67181a281a4d6ae6bc9b21970d3cd66718b11 (diff) | |
| download | podman-6805befec2ca9b9a816b1efda0bf43a67cee09a7.tar.gz podman-6805befec2ca9b9a816b1efda0bf43a67cee09a7.tar.bz2 podman-6805befec2ca9b9a816b1efda0bf43a67cee09a7.zip | |
Merge pull request #12187 from Luap99/fix-swagger
[CI:DOCS] Fix swagger definition for the new mac address type
| -rw-r--r-- | libpod/network/types/network.go | 1 | ||||
| -rw-r--r-- | pkg/specgen/podspecgen.go | 1 | ||||
| -rw-r--r-- | pkg/specgen/specgen.go | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/libpod/network/types/network.go b/libpod/network/types/network.go index 5cf523e20..ba5e018fd 100644 --- a/libpod/network/types/network.go +++ b/libpod/network/types/network.go @@ -99,6 +99,7 @@ func (n *IPNet) UnmarshalText(text []byte) error { // that it adds the json marshal/unmarshal methods. // This allows us to read the mac from a json string // and a byte array. +// swagger:model MacAddress type HardwareAddr net.HardwareAddr func (h *HardwareAddr) String() string { diff --git a/pkg/specgen/podspecgen.go b/pkg/specgen/podspecgen.go index 32d5be79a..948fb990c 100644 --- a/pkg/specgen/podspecgen.go +++ b/pkg/specgen/podspecgen.go @@ -99,6 +99,7 @@ type PodNetworkConfig struct { // Only available if NetNS is set to Bridge (the default for root). // As such, conflicts with NoInfra=true by proxy. // Optional. + // swagger:strfmt string StaticMAC *types.HardwareAddr `json:"static_mac,omitempty"` // PortMappings is a set of ports to map into the infra container. // As, by default, containers share their network with the infra diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go index 593d91c64..8a4497130 100644 --- a/pkg/specgen/specgen.go +++ b/pkg/specgen/specgen.go @@ -401,6 +401,7 @@ type ContainerNetworkConfig struct { // StaticMAC is a static MAC address to set in the container. // Only available if NetNS is set to bridge. // Optional. + // swagger:strfmt string StaticMAC *nettypes.HardwareAddr `json:"static_mac,omitempty"` // PortBindings is a set of ports to map into the container. // Only available if NetNS is set to bridge or slirp. |