Skip to content

[CNS] Overlay Expansion Subnet Update Job Bug Fix #4103

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

Open
wants to merge 1 commit into from
+28 −22
Open

[CNS] Overlay Expansion Subnet Update Job Bug Fix #4103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion cns/restserver/internalapi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,9 @@ func (service *HTTPRestService) CreateOrUpdateNetworkContainerInternal(req *cns.
existingReq := existingNCInfo.CreateNetworkContainerRequest
if !reflect.DeepEqual(existingReq.IPConfiguration.IPSubnet, req.IPConfiguration.IPSubnet) {
// check for potential overlay subnet expansion - checking if new subnet is a superset of old subnet
isCIDRSuperset := validateCIDRSuperset(req.IPConfiguration.IPSubnet.IPAddress, existingReq.IPConfiguration.IPSubnet.IPAddress)
isCIDRSuperset := validateCIDRSuperset(
fmt.Sprintf("%s/%d", req.IPConfiguration.IPSubnet.IPAddress, req.IPConfiguration.IPSubnet.PrefixLength),
fmt.Sprintf("%s/%d", existingReq.IPConfiguration.IPSubnet.IPAddress, existingReq.IPConfiguration.IPSubnet.PrefixLength))
if !isCIDRSuperset {
logger.Errorf("[Azure CNS] Error. PrimaryCA is not same, NCId %s, old CA %s/%d, new CA %s/%d", //nolint:staticcheck // Suppress SA1019: logger.Errorf is deprecated
req.NetworkContainerid,
Expand Down
46 changes: 25 additions & 21 deletions cns/restserver/internalapi_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,16 @@ func TestReconcileNCStatePrimaryIPChangeShouldFail(t *testing.T) {
svc.state.ContainerStatus = make(map[string]containerstatus)

testCases := []struct {
existingIPAddress string
requestIPAddress string
reqIPAddress string
reqPrefixLength uint8
existingIPAddress string
existingPrefixLength uint8
}{
{"", "10.240.0.0/16"},
{"10.240.0.0", "2001:db8::/64"},
{"2001:db8::/64", "10.240.0.0/16"},
{"10.0.1.0/22", "10.0.2.0/24"},
{"10.0.1.0/21", "10.0.1.0/23"},
{"10.0.1.0", "10.0.0.0/15"},
{"10.0.1.0/15", "10.0.0.0"},
{"10.240.1.0", 16, "10.240.0.0", 16},
{"10.240.0.0", 64, "2001:db8::", 64},
{"2001:db8::", 64, "10.240.0.0", 16},
{"10.0.1.0", 24, "10.0.2.0", 22},
{"10.0.1.0", 23, "10.0.1.0", 21},
}

// Run test cases
Expand All @@ -92,7 +92,7 @@ func TestReconcileNCStatePrimaryIPChangeShouldFail(t *testing.T) {
IPConfiguration: cns.IPConfiguration{
IPSubnet: cns.IPSubnet{
IPAddress: tc.existingIPAddress,
PrefixLength: 24,
PrefixLength: tc.existingPrefixLength,
},
},
},
Expand All @@ -103,8 +103,8 @@ func TestReconcileNCStatePrimaryIPChangeShouldFail(t *testing.T) {
NetworkContainerid: ncID,
IPConfiguration: cns.IPConfiguration{
IPSubnet: cns.IPSubnet{
IPAddress: tc.requestIPAddress,
PrefixLength: 24,
IPAddress: tc.reqIPAddress,
PrefixLength: tc.reqPrefixLength,
},
},
},
Expand All @@ -127,13 +127,17 @@ func TestReconcileNCStatePrimaryIPChangeShouldNotFail(t *testing.T) {
svc.state.ContainerStatus = make(map[string]containerstatus)

testCases := []struct {
existingIPAddress string
requestIPAddress string
reqIPAddress string
reqPrefixLength uint8
existingIPAddress string
existingPrefixLength uint8
}{
{"10.0.1.0/24", "10.0.2.0/22"},
{"10.0.1.0/20", "10.0.1.0/18"},
{"10.0.1.0/19", "10.0.0.0/15"},
{"10.0.1.0/18", "10.0.1.0/18"},
{"10.240.0.0", 20, "10.240.0.0", 24},

{"10.0.1.0", 22, "10.0.2.0", 24},
{"10.0.1.0", 18, "10.0.1.0", 20},
{"10.0.1.0", 15, "10.0.0.0", 19},
{"10.0.1.0", 18, "10.0.1.0", 18},
}

// Run test cases
Expand All @@ -149,7 +153,7 @@ func TestReconcileNCStatePrimaryIPChangeShouldNotFail(t *testing.T) {
IPConfiguration: cns.IPConfiguration{
IPSubnet: cns.IPSubnet{
IPAddress: tc.existingIPAddress,
PrefixLength: 24,
PrefixLength: tc.existingPrefixLength,
},
},
},
Expand All @@ -160,8 +164,8 @@ func TestReconcileNCStatePrimaryIPChangeShouldNotFail(t *testing.T) {
NetworkContainerid: ncID,
IPConfiguration: cns.IPConfiguration{
IPSubnet: cns.IPSubnet{
IPAddress: tc.requestIPAddress,
PrefixLength: 24,
IPAddress: tc.reqIPAddress,
PrefixLength: tc.reqPrefixLength,
},
},
NetworkContainerType: cns.Kubernetes,
Expand Down
Loading