diff --git a/api/models/v1_network_create_request.go b/api/models/v1_network_create_request.go index 91a71be..59a435c 100644 --- a/api/models/v1_network_create_request.go +++ b/api/models/v1_network_create_request.go @@ -21,7 +21,7 @@ type V1NetworkCreateRequest struct { // the addressfamilies in this network, either IPv4 or IPv6 or both // Required: true - Addressfamily map[string]bool `json:"addressfamily" yaml:"addressfamily"` + Addressfamilies map[string]bool `json:"addressfamilies" yaml:"addressfamilies"` // if privatesuper, this defines the bitlen of child prefixes per addressfamily if not nil Defaultchildprefixlength map[string]int64 `json:"defaultchildprefixlength,omitempty" yaml:"defaultchildprefixlength,omitempty"` @@ -82,7 +82,7 @@ type V1NetworkCreateRequest struct { func (m *V1NetworkCreateRequest) Validate(formats strfmt.Registry) error { var res []error - if err := m.validateAddressfamily(formats); err != nil { + if err := m.validateAddressfamilies(formats); err != nil { res = append(res, err) } @@ -116,9 +116,9 @@ func (m *V1NetworkCreateRequest) Validate(formats strfmt.Registry) error { return nil } -func (m *V1NetworkCreateRequest) validateAddressfamily(formats strfmt.Registry) error { +func (m *V1NetworkCreateRequest) validateAddressfamilies(formats strfmt.Registry) error { - if err := validate.Required("addressfamily", "body", m.Addressfamily); err != nil { + if err := validate.Required("addressfamilies", "body", m.Addressfamilies); err != nil { return err } diff --git a/api/models/v1_network_immutable.go b/api/models/v1_network_immutable.go index cd57205..5413375 100644 --- a/api/models/v1_network_immutable.go +++ b/api/models/v1_network_immutable.go @@ -22,7 +22,7 @@ type V1NetworkImmutable struct { // the addressfamilies in this network, either IPv4 or IPv6 or both // Required: true - Addressfamily map[string]bool `json:"addressfamily" yaml:"addressfamily"` + Addressfamilies map[string]bool `json:"addressfamilies" yaml:"addressfamilies"` // if privatesuper, this defines the bitlen of child prefixes per addressfamily if not nil Defaultchildprefixlength map[string]int64 `json:"defaultchildprefixlength,omitempty" yaml:"defaultchildprefixlength,omitempty"` @@ -61,7 +61,7 @@ type V1NetworkImmutable struct { func (m *V1NetworkImmutable) Validate(formats strfmt.Registry) error { var res []error - if err := m.validateAddressfamily(formats); err != nil { + if err := m.validateAddressfamilies(formats); err != nil { res = append(res, err) } @@ -91,9 +91,9 @@ func (m *V1NetworkImmutable) Validate(formats strfmt.Registry) error { return nil } -func (m *V1NetworkImmutable) validateAddressfamily(formats strfmt.Registry) error { +func (m *V1NetworkImmutable) validateAddressfamilies(formats strfmt.Registry) error { - if err := validate.Required("addressfamily", "body", m.Addressfamily); err != nil { + if err := validate.Required("addressfamilies", "body", m.Addressfamilies); err != nil { return err } diff --git a/api/models/v1_network_response.go b/api/models/v1_network_response.go index dede7f3..676faf4 100644 --- a/api/models/v1_network_response.go +++ b/api/models/v1_network_response.go @@ -21,7 +21,7 @@ type V1NetworkResponse struct { // the addressfamilies in this network, either IPv4 or IPv6 or both // Required: true - Addressfamily map[string]bool `json:"addressfamily" yaml:"addressfamily"` + Addressfamilies map[string]bool `json:"addressfamilies" yaml:"addressfamilies"` // the last changed timestamp of this entity // Read Only: true @@ -96,7 +96,7 @@ type V1NetworkResponse struct { func (m *V1NetworkResponse) Validate(formats strfmt.Registry) error { var res []error - if err := m.validateAddressfamily(formats); err != nil { + if err := m.validateAddressfamilies(formats); err != nil { res = append(res, err) } @@ -142,9 +142,9 @@ func (m *V1NetworkResponse) Validate(formats strfmt.Registry) error { return nil } -func (m *V1NetworkResponse) validateAddressfamily(formats strfmt.Registry) error { +func (m *V1NetworkResponse) validateAddressfamilies(formats strfmt.Registry) error { - if err := validate.Required("addressfamily", "body", m.Addressfamily); err != nil { + if err := validate.Required("addressfamilies", "body", m.Addressfamilies); err != nil { return err } diff --git a/api/models/v1_network_usage.go b/api/models/v1_network_usage.go index 982f6e4..c2baae2 100644 --- a/api/models/v1_network_usage.go +++ b/api/models/v1_network_usage.go @@ -21,19 +21,19 @@ type V1NetworkUsage struct { // the total available IPs // Required: true - AvailableIps *int64 `json:"available_ips" yaml:"available_ips"` + AvailableIps map[string]int64 `json:"available_ips" yaml:"available_ips"` // the total available 2 bit Prefixes // Required: true - AvailablePrefixes *int64 `json:"available_prefixes" yaml:"available_prefixes"` + AvailablePrefixes map[string]int64 `json:"available_prefixes" yaml:"available_prefixes"` // the total used IPs // Required: true - UsedIps *int64 `json:"used_ips" yaml:"used_ips"` + UsedIps map[string]int64 `json:"used_ips" yaml:"used_ips"` // the total used Prefixes // Required: true - UsedPrefixes *int64 `json:"used_prefixes" yaml:"used_prefixes"` + UsedPrefixes map[string]int64 `json:"used_prefixes" yaml:"used_prefixes"` } // Validate validates this v1 network usage diff --git a/metal-api.json b/metal-api.json index dce9ac8..f3c3bdd 100644 --- a/metal-api.json +++ b/metal-api.json @@ -3666,7 +3666,7 @@ }, "v1.NetworkCreateRequest": { "properties": { - "addressfamily": { + "addressfamilies": { "additionalProperties": { "type": "boolean" }, @@ -3752,7 +3752,7 @@ } }, "required": [ - "addressfamily", + "addressfamilies", "destinationprefixes", "id", "nat", @@ -3814,7 +3814,7 @@ "v1.NetworkImmutable": { "description": "a network which contains prefixes from which IP addresses can be allocated\nprefixes that are reachable within this network", "properties": { - "addressfamily": { + "addressfamilies": { "additionalProperties": { "type": "boolean" }, @@ -3869,7 +3869,7 @@ } }, "required": [ - "addressfamily", + "addressfamilies", "destinationprefixes", "nat", "prefixes", @@ -3879,7 +3879,7 @@ }, "v1.NetworkResponse": { "properties": { - "addressfamily": { + "addressfamilies": { "additionalProperties": { "type": "boolean" }, @@ -3981,7 +3981,7 @@ } }, "required": [ - "addressfamily", + "addressfamilies", "destinationprefixes", "id", "nat", @@ -4038,24 +4038,32 @@ "v1.NetworkUsage": { "properties": { "available_ips": { + "additionalProperties": { + "type": "integer" + }, "description": "the total available IPs", - "format": "integer", - "type": "integer" + "type": "object" }, "available_prefixes": { + "additionalProperties": { + "type": "integer" + }, "description": "the total available 2 bit Prefixes", - "format": "integer", - "type": "integer" + "type": "object" }, "used_ips": { + "additionalProperties": { + "type": "integer" + }, "description": "the total used IPs", - "format": "integer", - "type": "integer" + "type": "object" }, "used_prefixes": { + "additionalProperties": { + "type": "integer" + }, "description": "the total used Prefixes", - "format": "integer", - "type": "integer" + "type": "object" } }, "required": [