Merge branch 'main' into sanfern-dev-ebpf-progs

Signed-off-by: Santhosh Fernandes <[email protected]>
l3af-project · Oct 31, 2023 · 80aec2e · 80aec2e
2 parents 2ead99d + 1ea1fd4
commit 80aec2e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/kf/bpf.go b/kf/bpf.go
@@ -1429,6 +1429,11 @@ func (b *BPF) AttachBPFProgram(ifaceName, direction string) error {
 
 // PinBpfMaps - Pinning tc and xdp maps
 func (b *BPF) PinBpfMaps(ifaceName string) error {
+	// create map path directory
+	if err := b.CreateMapPinDirectory(ifaceName); err != nil {
+		return err
+	}
+
 	for k, v := range b.ProgMapCollection.Maps {
 		var mapFilename string
 		if b.Program.ProgType == models.TCType {

diff --git a/kf/nfconfig_test.go b/kf/nfconfig_test.go
@@ -396,7 +396,7 @@ func TestNFConfigs_Close(t *testing.T) {
 				HostConfig:     tt.fields.hostConfig,
 				processMon:     tt.fields.processMon,
 			}
-			ctx, cancelfunc := context.WithTimeout(context.Background(), 900*time.Millisecond)
+			ctx, cancelfunc := context.WithTimeout(context.Background(), 2*time.Second)
 			defer cancelfunc()
 			if err := cfg.Close(ctx); (err != nil) != tt.wantErr {
 				t.Errorf("NFConfigs.Close() error = %v, wantErr %v", err, tt.wantErr)