diff --git a/api/v1/iprangeclaim_types.go b/api/v1/iprangeclaim_types.go index 1fdd6600..5c58f725 100644 --- a/api/v1/iprangeclaim_types.go +++ b/api/v1/iprangeclaim_types.go @@ -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"` diff --git a/config/crd/bases/netbox.dev_iprangeclaims.yaml b/config/crd/bases/netbox.dev_iprangeclaims.yaml index d63843a8..248fa1cb 100644 --- a/config/crd/bases/netbox.dev_iprangeclaims.yaml +++ b/config/crd/bases/netbox.dev_iprangeclaims.yaml @@ -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: @@ -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 diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-apply-update/chainsaw-test.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-apply-update/chainsaw-test.yaml index 624075ea..bb9dd737 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-apply-update/chainsaw-test.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-apply-update/chainsaw-test.yaml @@ -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 @@ -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 diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/chainsaw-test.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/chainsaw-test.yaml index 19f493ba..bb3b0ea4 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/chainsaw-test.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/chainsaw-test.yaml @@ -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 @@ -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 diff --git a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-restore/chainsaw-test.yaml b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-restore/chainsaw-test.yaml index 981d700f..3b1d9341 100644 --- a/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-restore/chainsaw-test.yaml +++ b/tests/e2e/iprange/ipv4/iprangeclaim-ipv4-restore/chainsaw-test.yaml @@ -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 @@ -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 @@ -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 diff --git a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-apply-update/chainsaw-test.yaml b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-apply-update/chainsaw-test.yaml index 1498c518..5e06329b 100644 --- a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-apply-update/chainsaw-test.yaml +++ b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-apply-update/chainsaw-test.yaml @@ -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 @@ -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 diff --git a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/chainsaw-test.yaml b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/chainsaw-test.yaml index a88d98fe..3239dcfc 100644 --- a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/chainsaw-test.yaml +++ b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/chainsaw-test.yaml @@ -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 @@ -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 diff --git a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-restore/chainsaw-test.yaml b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-restore/chainsaw-test.yaml index abe22d39..d76e65f6 100644 --- a/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-restore/chainsaw-test.yaml +++ b/tests/e2e/iprange/ipv6/iprangeclaim-ipv6-restore/chainsaw-test.yaml @@ -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 @@ -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 @@ -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