Skip to content

Commit f14e969

Browse files
author
Hoanganh.Mai
committed
add check for tenant existence
1 parent 0508ece commit f14e969

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

internal/controller/ipaddressclaim_controller_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,9 @@ var _ = Describe("IpAddressClaim Controller", Ordered, func() {
201201
defaultIpAddressClaimCR(), defaultIpAddressCreatedByClaim(false), nil,
202202
nil,
203203
nil,
204-
nil,
204+
[]func(*mock_interfaces.MockTenancyInterface, chan error){
205+
mockTenancyTenancyTenantsList,
206+
},
205207
false, false, netboxv1.IpAddressClaimStatus{}, true),
206208
)
207209
})

pkg/netbox/api/ip_address_claim.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ func (r *NetboxClient) RestoreExistingIpByHash(customFieldName string, hash stri
5757

5858
// GetAvailableIpAddressByClaim searches an available IpAddress in Netbox matching IpAddressClaim requirements
5959
func (r *NetboxClient) GetAvailableIpAddressByClaim(ipAddressClaim *models.IPAddressClaim) (*models.IPAddress, error) {
60+
_, err := r.GetTenantDetails(ipAddressClaim.Metadata.Tenant)
61+
if err != nil {
62+
return nil, err
63+
}
6064

6165
responseParentPrefix, err := r.GetPrefix(&models.Prefix{
6266
Prefix: ipAddressClaim.ParentPrefix,

pkg/netbox/api/prefix_claim.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@ func isRequestingTheEntireParentPrefix(prefixClaim *models.PrefixClaim) (bool, e
6767

6868
// GetAvailablePrefixByClaim searches an available Prefix in Netbox matching PrefixClaim requirements
6969
func (r *NetboxClient) GetAvailablePrefixByClaim(prefixClaim *models.PrefixClaim) (*models.Prefix, error) {
70+
_, err := r.GetTenantDetails(prefixClaim.Metadata.Tenant)
71+
if err != nil {
72+
return nil, err
73+
}
74+
7075
responseParentPrefix, err := r.GetPrefix(&models.Prefix{
7176
Prefix: prefixClaim.ParentPrefix,
7277
Metadata: prefixClaim.Metadata,

0 commit comments

Comments
 (0)