Skip to content

Fix iprangeclaim IpRangeName status field yaml/json name #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 14, 2025
Merged

Fix iprangeclaim IpRangeName status field yaml/json name #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f39050e
Fix ipRangeName json/yaml
jstudler Jul 14, 2025
9963cba
Fix tests
jstudler Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/v1/iprangeclaim_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ type IpRangeClaimStatus struct {
EndAddressDotDecimal string `json:"endAddressDotDecimal,omitempty"`

// The name of the IpRange CR created by the IpRangeClaim Controller
IpRangeName string `json:"ipAddressName,omitempty"`
IpRangeName string `json:"ipRangeName,omitempty"`

// Conditions represent the latest available observations of an object's state
Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
Expand Down
8 changes: 4 additions & 4 deletions config/crd/bases/netbox.dev_iprangeclaims.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,6 @@ spec:
endAddressDotDecimal:
description: The last IP Addresses in Dot Decimal notation
type: string
ipAddressName:
description: The name of the IpRange CR created by the IpRangeClaim
Controller
type: string
ipAddresses:
description: The full list of IP Addresses in CIDR notation
items:
Expand All @@ -218,6 +214,10 @@ spec:
ipRangeDotDecimal:
description: The assigned IP Range in Dot Decimal notation (e.g. 192.168.0.1-192.168.0.123)
type: string
ipRangeName:
description: The name of the IpRange CR created by the IpRangeClaim
Controller
type: string
startAddress:
description: The first IP Addresses in CIDR notation
type: string
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/iprange/ipv4/iprangeclaim-ipv4-apply-update/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
- status: 'True'
endAddress: 3.2.0.30/32
endAddressDotDecimal: 3.2.0.30
ipAddressName: iprangeclaim-ipv4-apply-update
ipRangeName: iprangeclaim-ipv4-apply-update
ipRange: 3.2.0.1/32-3.2.0.30/32
ipRangeDotDecimal: 3.2.0.1-3.2.0.30
startAddress: 3.2.0.1/32
Expand Down Expand Up @@ -89,7 +89,7 @@ spec:
- status: 'True'
endAddress: 3.2.0.30/32
endAddressDotDecimal: 3.2.0.30
ipAddressName: iprangeclaim-ipv4-apply-update
ipRangeName: iprangeclaim-ipv4-apply-update
ipRange: 3.2.0.1/32-3.2.0.30/32
ipRangeDotDecimal: 3.2.0.1-3.2.0.30
startAddress: 3.2.0.1/32
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
- status: 'True'
endAddress: 3.2.1.30/32
endAddressDotDecimal: 3.2.1.30
ipAddressName: iprangeclaim-ipv4-prefixexhausted-1
ipRangeName: iprangeclaim-ipv4-prefixexhausted-1
ipRange: 3.2.1.1/32-3.2.1.30/32
ipRangeDotDecimal: 3.2.1.1-3.2.1.30
startAddress: 3.2.1.1/32
Expand Down Expand Up @@ -80,7 +80,7 @@ spec:
- status: 'True'
endAddress: 3.2.1.60/32
endAddressDotDecimal: 3.2.1.60
ipAddressName: iprangeclaim-ipv4-prefixexhausted-2
ipRangeName: iprangeclaim-ipv4-prefixexhausted-2
ipRange: 3.2.1.31/32-3.2.1.60/32
ipRangeDotDecimal: 3.2.1.31-3.2.1.60
startAddress: 3.2.1.31/32
Expand Down
6 changes: 3 additions & 3 deletions tests/e2e/iprange/ipv4/iprangeclaim-ipv4-restore/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
- status: 'True'
endAddress: 3.2.2.30/32
endAddressDotDecimal: 3.2.2.30
ipAddressName: iprangeclaim-ipv4-restore-1
ipRangeName: iprangeclaim-ipv4-restore-1
ipRange: 3.2.2.1/32-3.2.2.30/32
ipRangeDotDecimal: 3.2.2.1-3.2.2.30
startAddress: 3.2.2.1/32
Expand Down Expand Up @@ -91,7 +91,7 @@ spec:
- status: 'True'
endAddress: 3.2.2.60/32
endAddressDotDecimal: 3.2.2.60
ipAddressName: iprangeclaim-ipv4-restore-2
ipRangeName: iprangeclaim-ipv4-restore-2
ipRange: 3.2.2.31/32-3.2.2.60/32
ipRangeDotDecimal: 3.2.2.31-3.2.2.60
startAddress: 3.2.2.31/32
Expand Down Expand Up @@ -143,7 +143,7 @@ spec:
- status: 'True'
endAddress: 3.2.2.30/32
endAddressDotDecimal: 3.2.2.30
ipAddressName: iprangeclaim-ipv4-restore-1
ipRangeName: iprangeclaim-ipv4-restore-1
ipRange: 3.2.2.1/32-3.2.2.30/32
ipRangeDotDecimal: 3.2.2.1-3.2.2.30
startAddress: 3.2.2.1/32
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/iprange/ipv6/iprangeclaim-ipv6-apply-update/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
- status: 'True'
endAddress: 3:2::1e/128
endAddressDotDecimal: 3:2::1e
ipAddressName: iprangeclaim-ipv6-apply-update
ipRangeName: iprangeclaim-ipv6-apply-update
ipRange: 3:2::1/128-3:2::1e/128
ipRangeDotDecimal: 3:2::1-3:2::1e
startAddress: 3:2::1/128
Expand Down Expand Up @@ -89,7 +89,7 @@ spec:
- status: 'True'
endAddress: 3:2::1e/128
endAddressDotDecimal: 3:2::1e
ipAddressName: iprangeclaim-ipv6-apply-update
ipRangeName: iprangeclaim-ipv6-apply-update
ipRange: 3:2::1/128-3:2::1e/128
ipRangeDotDecimal: 3:2::1-3:2::1e
startAddress: 3:2::1/128
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
- status: 'True'
endAddress: 3:2:1::1e/128
endAddressDotDecimal: 3:2:1::1e
ipAddressName: iprangeclaim-ipv6-prefixexhausted-1
ipRangeName: iprangeclaim-ipv6-prefixexhausted-1
ipRange: 3:2:1::1/128-3:2:1::1e/128
ipRangeDotDecimal: 3:2:1::1-3:2:1::1e
startAddress: 3:2:1::1/128
Expand Down Expand Up @@ -81,7 +81,7 @@ spec:
- status: 'True'
endAddress: 3:2:1::3c/128
endAddressDotDecimal: 3:2:1::3c
ipAddressName: iprangeclaim-ipv6-prefixexhausted-2
ipRangeName: iprangeclaim-ipv6-prefixexhausted-2
ipRange: 3:2:1::1f/128-3:2:1::3c/128
ipRangeDotDecimal: 3:2:1::1f-3:2:1::3c
startAddress: 3:2:1::1f/128
Expand Down
6 changes: 3 additions & 3 deletions tests/e2e/iprange/ipv6/iprangeclaim-ipv6-restore/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
- status: 'True'
endAddress: 3:2:2::1e/128
endAddressDotDecimal: 3:2:2::1e
ipAddressName: iprangeclaim-ipv6-restore-1
ipRangeName: iprangeclaim-ipv6-restore-1
ipRange: 3:2:2::1/128-3:2:2::1e/128
ipRangeDotDecimal: 3:2:2::1-3:2:2::1e
startAddress: 3:2:2::1/128
Expand Down Expand Up @@ -91,7 +91,7 @@ spec:
- status: 'True'
endAddress: 3:2:2::3c/128
endAddressDotDecimal: 3:2:2::3c
ipAddressName: iprangeclaim-ipv6-restore-2
ipRangeName: iprangeclaim-ipv6-restore-2
ipRange: 3:2:2::1f/128-3:2:2::3c/128
ipRangeDotDecimal: 3:2:2::1f-3:2:2::3c
startAddress: 3:2:2::1f/128
Expand Down Expand Up @@ -143,7 +143,7 @@ spec:
- status: 'True'
endAddress: 3:2:2::1e/128
endAddressDotDecimal: 3:2:2::1e
ipAddressName: iprangeclaim-ipv6-restore-1
ipRangeName: iprangeclaim-ipv6-restore-1
ipRange: 3:2:2::1/128-3:2:2::1e/128
ipRangeDotDecimal: 3:2:2::1-3:2:2::1e
startAddress: 3:2:2::1/128
Expand Down