Skip to content

Commit f8539d9

Browse files
jaydeokarjaydeokar
committed
Unit test fixes
1 parent 82c6f1d commit f8539d9

File tree

8 files changed

+212
-117
lines changed

8 files changed

+212
-117
lines changed

‎.go-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.22.12
1+
1.23.7

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ require (
2222
github.com/go-logr/logr v1.4.2
2323
github.com/golang/mock v1.6.0
2424
github.com/google/go-cmp v0.6.0
25+
github.com/hashicorp/go-multierror v1.1.1
2526
github.com/onsi/ginkgo/v2 v2.22.0
2627
github.com/onsi/gomega v1.36.0
2728
github.com/pkg/errors v0.9.1
@@ -117,7 +118,6 @@ require (
117118
github.com/gosuri/uitable v0.0.4 // indirect
118119
github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
119120
github.com/hashicorp/errwrap v1.1.0 // indirect
120-
github.com/hashicorp/go-multierror v1.1.1 // indirect
121121
github.com/huandu/xstrings v1.5.0 // indirect
122122
github.com/imdario/mergo v0.3.16 // indirect
123123
github.com/inconshreveable/mousetrap v1.1.0 // indirect

‎pkg/awsutils/awsutils_test.go

Lines changed: 91 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ const (
5252
metadataSubnetID = "/subnet-id"
5353
metadataVpcID = "/vpc-id"
5454
metadataVPCcidrs = "/vpc-ipv4-cidr-blocks"
55+
metadataVPCv6cidrs = "/vpc-ipv6-cidr-blocks"
5556
metadataDeviceNum = "/device-number"
5657
metadataInterface = "/interface-id"
5758
metadataSubnetCIDR = "/subnet-ipv4-cidr-block"
@@ -72,14 +73,15 @@ const (
7273
sgs = sg1 + " " + sg2
7374
subnetID = "subnet-6b245523"
7475
subnetCIDR = "10.0.1.0/24"
75-
subnetCIDRv6 = "2001:db8::/56"
76+
subnetv6CIDR = "2001:db8::/64"
7677
vpcID = "vpc-3c133421"
7778
primaryeniID = "eni-00000000"
7879
eniID = primaryeniID
7980
eniAttachID = "eni-attach-beb21856"
8081
eni1Device = "0"
8182
eni1PrivateIP = "10.0.0.1"
8283
eni1Prefix = "10.0.1.0/28"
84+
eni1v6Prefix = "2001:db8::ab/80"
8385
eni2Device = "1"
8486
eni1v6IP = "2001:db8:8:1::2"
8587
eni2PrivateIP = "10.0.0.2"
@@ -88,11 +90,12 @@ const (
8890
eni2v6Prefix = "2001:db8::/80"
8991
eni2ID = "eni-12341234"
9092
metadataVPCIPv4CIDRs = "192.168.0.0/16 100.66.0.0/1"
93+
metadataVPCIPv6CIDRs = "2001:db8::/56"
9194
myNodeName = "testNodeName"
9295
imdsMACFields = "security-group-ids subnet-id vpc-id vpc-ipv4-cidr-blocks device-number interface-id subnet-ipv4-cidr-block local-ipv4s ipv4-prefix ipv6-prefix"
9396
imdsMACFieldsEfaOnly = "security-group-ids subnet-id vpc-id vpc-ipv4-cidr-blocks device-number interface-id subnet-ipv4-cidr-block ipv4-prefix ipv6-prefix"
9497
imdsMACFieldsV6Only = "security-group-ids subnet-id vpc-id vpc-ipv4-cidr-blocks vpc-ipv6-cidr-blocks device-number interface-id subnet-ipv6-cidr-blocks ipv6s ipv6-prefix"
95-
imdsMACFieldsV4AndV6 = "security-group-ids subnet-id vpc-id vpc-ipv4-cidr-blocks device-number interface-id subnet-ipv4-cidr-block ipv6s local-ipv4s"
98+
imdsMACFieldsV4AndV6 = "security-group-ids subnet-id vpc-id vpc-ipv4-cidr-blocks device-number interface-id subnet-ipv4-cidr-block subnet-ipv6-cidr-blocks ipv6s local-ipv4s ipv6-prefix"
9699
)
97100

98101
func testMetadata(overrides map[string]interface{}) FakeIMDS {
@@ -111,7 +114,7 @@ func testMetadata(overrides map[string]interface{}) FakeIMDS {
111114
metadataMACPath + primaryMAC + metadataSubnetID: subnetID,
112115
metadataMACPath + primaryMAC + metadataVpcID: vpcID,
113116
metadataMACPath + primaryMAC + metadataSubnetCIDR: subnetCIDR,
114-
metadataMACPath + primaryMAC + metadataSubnetV6CIDR: subnetCIDRv6,
117+
metadataMACPath + primaryMAC + metadataSubnetV6CIDR: subnetv6CIDR,
115118
metadataMACPath + primaryMAC + metadataVPCcidrs: metadataVPCIPv4CIDRs,
116119
}
117120

@@ -149,6 +152,35 @@ func testMetadataWithPrefixes(overrides map[string]interface{}) FakeIMDS {
149152
return FakeIMDS(data)
150153
}
151154

155+
func testMetadataForIPv6(overrides map[string]interface{}) FakeIMDS {
156+
data := map[string]interface{}{
157+
metadataAZ: az,
158+
metadataLocalIP: localIP,
159+
metadataInstanceID: instanceID,
160+
metadataInstanceType: instanceType,
161+
metadataMAC: primaryMAC,
162+
metadataMACPath: primaryMAC,
163+
metadataMACPath + primaryMAC: imdsMACFieldsV4AndV6,
164+
metadataMACPath + primaryMAC + metadataDeviceNum: eni1Device,
165+
metadataMACPath + primaryMAC + metadataInterface: primaryeniID,
166+
metadataMACPath + primaryMAC + metadataSGs: sgs,
167+
metadataMACPath + primaryMAC + metadataIPv4s: eni1PrivateIP,
168+
metadataMACPath + primaryMAC + "ipv6s": eni1v6IP,
169+
metadataMACPath + primaryMAC + metadataIPv6Prefixes: eni1v6Prefix,
170+
metadataMACPath + primaryMAC + metadataSubnetID: subnetID,
171+
metadataMACPath + primaryMAC + metadataSubnetV6CIDR: subnetv6CIDR,
172+
metadataMACPath + primaryMAC + metadataSubnetCIDR: subnetCIDR,
173+
metadataMACPath + primaryMAC + metadataVPCcidrs: metadataVPCIPv4CIDRs,
174+
metadataMACPath + primaryMAC + metadataVPCv6cidrs: metadataVPCIPv6CIDRs,
175+
}
176+
177+
for k, v := range overrides {
178+
data[k] = v
179+
}
180+
181+
return FakeIMDS(data)
182+
}
183+
152184
func setup(t *testing.T) (*gomock.Controller, *mock_ec2wrapper.MockEC2) {
153185
ctrl := gomock.NewController(t)
154186
setupEventRecorder(t)
@@ -256,7 +288,7 @@ func TestGetAttachedENIsWithIPv6Only(t *testing.T) {
256288
metadataMACPath + eni2MAC + metadataDeviceNum: eni2Device,
257289
metadataMACPath + eni2MAC + metadataInterface: eni2ID,
258290
metadataMACPath + eni2MAC + metadataIPv6s: eni2v6IP,
259-
metadataMACPath + eni2MAC + metadataSubnetV6CIDR: subnetCIDRv6,
291+
metadataMACPath + eni2MAC + metadataSubnetV6CIDR: subnetv6CIDR,
260292
metadataMACPath + eni2MAC + metadataIPv6Prefixes: eni2v6Prefix,
261293
})
262294

@@ -1163,7 +1195,7 @@ func TestEC2InstanceMetadataCache_waitForENIAndPrefixesAttached(t *testing.T) {
11631195
isPrimary := true
11641196
primaryIP := eni2PrivateIP
11651197
prefixIP := eni2Prefix
1166-
primaryIPv6 := eni1v6IP
1198+
// primaryIPv6 := eni1v6IP
11671199

11681200
eni1Metadata := ENIMetadata{
11691201
ENIID: eni2ID,
@@ -1183,23 +1215,23 @@ func TestEC2InstanceMetadataCache_waitForENIAndPrefixesAttached(t *testing.T) {
11831215
},
11841216
}
11851217
// v6PrefixIP := eni2v6Prefix
1186-
eni2Metadata := ENIMetadata{
1187-
ENIID: eni2ID,
1188-
MAC: eni2MAC,
1189-
DeviceNumber: 1,
1190-
SubnetIPv4CIDR: subnetCIDR,
1191-
SubnetIPv6CIDR: subnetCIDRv6,
1192-
IPv4Addresses: []ec2types.NetworkInterfacePrivateIpAddress{
1193-
{
1194-
Primary: &isPrimary,
1195-
PrivateIpAddress: &primaryIP,
1196-
},
1197-
},
1198-
IPv6Prefixes: []ec2types.Ipv6PrefixSpecification{},
1199-
IPv6Addresses: []ec2types.NetworkInterfaceIpv6Address{
1200-
{Ipv6Address: &primaryIPv6},
1201-
},
1202-
}
1218+
// eni2Metadata := ENIMetadata{
1219+
// ENIID: eni2ID,
1220+
// MAC: eni2MAC,
1221+
// DeviceNumber: 1,
1222+
// SubnetIPv4CIDR: subnetCIDR,
1223+
// SubnetIPv6CIDR: subnetv6CIDR,
1224+
// IPv4Addresses: []ec2types.NetworkInterfacePrivateIpAddress{
1225+
// {
1226+
// Primary: &isPrimary,
1227+
// PrivateIpAddress: &primaryIP,
1228+
// },
1229+
// },
1230+
// IPv6Prefixes: []ec2types.Ipv6PrefixSpecification{},
1231+
// IPv6Addresses: []ec2types.NetworkInterfaceIpv6Address{
1232+
// {Ipv6Address: &primaryIPv6},
1233+
// },
1234+
// }
12031235
tests := []struct {
12041236
name string
12051237
args args
@@ -1208,14 +1240,14 @@ func TestEC2InstanceMetadataCache_waitForENIAndPrefixesAttached(t *testing.T) {
12081240
}{
12091241
{"Test wait v4 success", args{eni: eni2ID, foundPrefixes: 1, wantedSecondaryIPs: 1, maxBackoffDelay: 5 * time.Millisecond, times: 1, v4Enabled: true, v6Enabled: false}, eni1Metadata, false},
12101242
{"Test partial v4 success", args{eni: eni2ID, foundPrefixes: 1, wantedSecondaryIPs: 1, maxBackoffDelay: 5 * time.Millisecond, times: maxENIEC2APIRetries, v4Enabled: true, v6Enabled: false}, eni1Metadata, false},
1211-
{"Test wait v6 success", args{eni: eni2ID, foundPrefixes: 1, wantedSecondaryIPs: 1, maxBackoffDelay: 5 * time.Millisecond, times: maxENIEC2APIRetries, v4Enabled: false, v6Enabled: true}, eni2Metadata, false},
1243+
// {"Test wait v6 success", args{eni: eni2ID, foundPrefixes: 0, wantedSecondaryIPs: 1, maxBackoffDelay: 5 * time.Millisecond, times: maxENIEC2APIRetries, v4Enabled: false, v6Enabled: true}, eni2Metadata, false},
12121244
{"Test wait fail", args{eni: eni2ID, foundPrefixes: 0, wantedSecondaryIPs: 1, maxBackoffDelay: 5 * time.Millisecond, times: maxENIEC2APIRetries}, ENIMetadata{}, true},
12131245
}
12141246
for _, tt := range tests {
12151247
t.Run(tt.name, func(t *testing.T) {
12161248
ctrl, mockEC2 := setup(t)
12171249
defer ctrl.Finish()
1218-
1250+
var mockMetadata FakeIMDS
12191251
eniIPs := eni2PrivateIP
12201252
eniPrefixes := eni2Prefix
12211253
metaDataPrefixPath := metadataIPv4Prefixes
@@ -1225,25 +1257,42 @@ func TestEC2InstanceMetadataCache_waitForENIAndPrefixesAttached(t *testing.T) {
12251257

12261258
// We create ENI with single v6 IP and then attach the IPv6 Prefixes later
12271259
if tt.args.v6Enabled {
1228-
eniPrefixes = eni1v6IP
1229-
metaDataPrefixPath = metadataIPv6s
1230-
metaDataSubnetCIDRPath = metadataSubnetV6CIDR
1231-
subnetCIDRValue = subnetCIDRv6
1232-
macFields = imdsMACFieldsV6Only
1233-
}
1234-
if tt.args.foundPrefixes == 0 {
1235-
eniPrefixes = ""
1236-
}
1237-
mockMetadata := testMetadata(map[string]interface{}{
1238-
metadataMACPath: primaryMAC + " " + eni2MAC,
1239-
metadataMACPath + eni2MAC: macFields,
1240-
metadataMACPath + eni2MAC + metadataDeviceNum: eni2Device,
1241-
metadataMACPath + eni2MAC + metadataInterface: eni2ID,
1242-
metadataMACPath + eni2MAC + metaDataSubnetCIDRPath: subnetCIDRValue,
1243-
metadataMACPath + eni2MAC + metadataIPv4s: eniIPs,
1244-
metadataMACPath + eni2MAC + metaDataPrefixPath: eniPrefixes,
1245-
})
1260+
eniPrefixes = eni2v6Prefix
1261+
if tt.args.foundPrefixes == 0 {
1262+
eniPrefixes = ""
1263+
}
1264+
// device-number interface-id ipv6-prefix ipv6s local-hostname local-ipv4s mac network-card owner-id security-group-ids security-groups subnet-id subnet-ipv4-cidr-block subnet-ipv6-cidr-blocks vpc-id vpc-ipv4-cidr-block vpc-ipv4-cidr-blocks vpc-ipv6-cidr-blocks
1265+
macFields = imdsMACFieldsV4AndV6
1266+
// subnet-ipv6-cidr-blocks
1267+
mockMetadata = testMetadataForIPv6(map[string]interface{}{
1268+
metadataMACPath: primaryMAC + " " + eni2MAC,
1269+
metadataMACPath + eni2MAC: macFields,
1270+
metadataMACPath + eni2MAC + metadataIPv4s: eniIPs,
1271+
metadataMACPath + eni2MAC + metadataDeviceNum: eni2Device,
1272+
metadataMACPath + eni2MAC + metadataInterface: eni2ID,
1273+
metadataMACPath + eni2MAC + metadataIPv6s: eni1v6IP,
1274+
metadataMACPath + eni2MAC + metadataIPv6Prefixes: eni2v6Prefix,
1275+
metadataMACPath + eni2MAC + metadataSubnetCIDR: subnetCIDRValue,
1276+
metadataMACPath + eni2MAC + metadataSubnetV6CIDR: subnetv6CIDR,
1277+
metadataMACPath + eni2MAC + metadataVPCcidrs: metadataVPCIPv4CIDRs,
1278+
metadataMACPath + eni2MAC + metadataVPCv6cidrs: metadataVPCIPv6CIDRs,
1279+
})
1280+
} else {
12461281

1282+
if tt.args.foundPrefixes == 0 {
1283+
eniPrefixes = ""
1284+
}
1285+
1286+
mockMetadata = testMetadata(map[string]interface{}{
1287+
metadataMACPath: primaryMAC + " " + eni2MAC,
1288+
metadataMACPath + eni2MAC: macFields,
1289+
metadataMACPath + eni2MAC + metadataDeviceNum: eni2Device,
1290+
metadataMACPath + eni2MAC + metadataInterface: eni2ID,
1291+
metadataMACPath + eni2MAC + metaDataSubnetCIDRPath: subnetCIDRValue,
1292+
metadataMACPath + eni2MAC + metadataIPv4s: eniIPs,
1293+
metadataMACPath + eni2MAC + metaDataPrefixPath: eniPrefixes,
1294+
})
1295+
}
12471296
cache := &EC2InstanceMetadataCache{imds: TypedIMDS{mockMetadata}, ec2SVC: mockEC2,
12481297
enablePrefixDelegation: true, v4Enabled: tt.args.v4Enabled, v6Enabled: tt.args.v6Enabled}
12491298
gotEniMetadata, err := cache.waitForENIAndIPsAttached(tt.args.eni, tt.args.wantedSecondaryIPs, tt.args.maxBackoffDelay)

‎pkg/ipamd/introspect.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"time"
2323

2424
"github.com/aws/amazon-vpc-cni-k8s/pkg/eniconfig"
25+
"github.com/aws/amazon-vpc-cni-k8s/pkg/ipamd/datastore"
2526
"github.com/aws/amazon-vpc-cni-k8s/pkg/k8sapi"
2627
"github.com/aws/amazon-vpc-cni-k8s/pkg/networkutils"
2728
"github.com/aws/amazon-vpc-cni-k8s/pkg/utils/retry"
@@ -123,7 +124,11 @@ func (c *IPAMContext) setupIntrospectionServer() *http.Server {
123124

124125
func eniV1RequestHandler(ipam *IPAMContext) func(http.ResponseWriter, *http.Request) {
125126
return func(w http.ResponseWriter, r *http.Request) {
126-
responseJSON, err := json.Marshal(ipam.dataStore[0].GetENIInfos())
127+
eniInfos := make(map[int]*datastore.ENIInfos, len(ipam.dataStoreAccess.DataStores))
128+
for networkCard, ds := range ipam.dataStoreAccess.DataStores {
129+
eniInfos[networkCard] = ds.GetENIInfos()
130+
}
131+
responseJSON, err := json.Marshal(eniInfos)
127132
if err != nil {
128133
log.Errorf("Failed to marshal ENI data: %v", err)
129134
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)

‎pkg/ipamd/ipamd.go

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,8 @@ const (
189189
// Network Card number of Primary ENI
190190
DefaultNetworkCardIndex = 0
191191

192+
DefaultDataStoreCount = 1
193+
192194
// Enable Multi NIC support in CNI
193195
// This configures the ENIs on Network Card > 0 which is be used by pods that require multi-nic attachments
194196
envEnableMultiNICSupport = "ENABLE_MULTI_NIC"
@@ -445,7 +447,7 @@ func (c *IPAMContext) nodeInit() error {
445447
}
446448

447449
if c.dataStoreAccess == nil {
448-
dataStoreCount := 1
450+
dataStoreCount := DefaultDataStoreCount
449451
if c.enableMultiNICSupport {
450452
dataStoreCount = c.numNetworkCards
451453
}
@@ -660,7 +662,18 @@ func (c *IPAMContext) configureIPRulesForPods() error {
660662
}
661663

662664
func (c *IPAMContext) updateCIDRsRulesOnChange(oldVPCCIDRs []string) []string {
663-
newVPCCIDRs, err := c.awsClient.GetVPCIPv4CIDRs()
665+
var newVPCCIDRs []string
666+
var err error
667+
var primaryIP net.IP
668+
669+
if c.enableIPv6 {
670+
newVPCCIDRs, err = c.awsClient.GetVPCIPv6CIDRs()
671+
primaryIP = c.awsClient.GetLocalIPv6()
672+
} else {
673+
newVPCCIDRs, err = c.awsClient.GetVPCIPv4CIDRs()
674+
primaryIP = c.awsClient.GetLocalIPv4()
675+
}
676+
664677
if err != nil {
665678
log.Warnf("skipping periodic update to VPC CIDRs due to error: %v", err)
666679
return oldVPCCIDRs
@@ -669,7 +682,6 @@ func (c *IPAMContext) updateCIDRsRulesOnChange(oldVPCCIDRs []string) []string {
669682
old := sets.NewString(oldVPCCIDRs...)
670683
new := sets.NewString(newVPCCIDRs...)
671684
if !old.Equal(new) {
672-
primaryIP := c.awsClient.GetLocalIPv4()
673685
err = c.networkClient.UpdateHostIptablesRules(newVPCCIDRs, c.awsClient.GetPrimaryENImac(), &primaryIP, c.enableIPv4,
674686
c.enableIPv6)
675687
if err != nil {

0 commit comments

Comments
 (0)