mirror of
https://github.com/containers/podman.git
synced 2025-08-06 03:19:52 +08:00
Fix swagger definition for the new mac address type
The new mac address type broke the api docs. While we could successfully generate the swagger file it could not be viewed in a browser. The problem is that the swagger generation create two type definitions with the name `HardwareAddr` and this pointed back to itself. Thus the render process was stucked in an endless loop. To fix this manually rename the new type to MacAddress and overwrite the types to string because the json unmarshaller accepts the mac as string. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
@ -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 {
|
||||
|
@ -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
|
||||
|
@ -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.
|
||||
|
Reference in New Issue
Block a user