use new genericsync.Maps (#754)

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>
networkservicemesh · Oct 2, 2023 · f8ca43c · f8ca43c
1 parent 57791c4
commit f8ca43c
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 413 deletions.
diff --git a/pkg/networkservice/acl/acl_indices_map.gen.go b/pkg/networkservice/acl/acl_indices_map.gen.go
diff --git a/pkg/networkservice/acl/gen.go b/pkg/networkservice/acl/gen.go
diff --git a/pkg/networkservice/acl/server.go b/pkg/networkservice/acl/server.go
@@ -22,6 +22,7 @@ package acl
 import (
 	"context"
 
+	"github.com/edwarnicke/genericsync"
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/networkservicemesh/govpp/binapi/acl"
 	"github.com/networkservicemesh/govpp/binapi/acl_types"
@@ -38,7 +39,7 @@ import (
 type aclServer struct {
 	vppConn    api.Connection
 	aclRules   []acl_types.ACLRule
-	aclIndices aclIndicesMap
+	aclIndices genericsync.Map[string, []uint32]
 }
 
 // NewServer creates a NetworkServiceServer chain element to set the ACL on a vpp interface

diff --git a/pkg/networkservice/mechanisms/vlan/mtu/client.go b/pkg/networkservice/mechanisms/vlan/mtu/client.go
@@ -25,6 +25,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/types/known/emptypb"
 
+	"github.com/edwarnicke/genericsync"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/utils/metadata"
 	"github.com/networkservicemesh/sdk/pkg/tools/postpone"
@@ -38,7 +39,7 @@ import (
 
 type mtuClient struct {
 	vppConn     api.Connection
-	mtu         mtuMap
+	mtu         genericsync.Map[string, uint32]
 	deviceNames map[string]string
 }
 

diff --git a/pkg/networkservice/mechanisms/vlan/mtu/gen.go b/pkg/networkservice/mechanisms/vlan/mtu/gen.go
diff --git a/pkg/networkservice/mechanisms/vlan/mtu/mtu_map.gen.go b/pkg/networkservice/mechanisms/vlan/mtu/mtu_map.gen.go
diff --git a/pkg/networkservice/pinhole/client.go b/pkg/networkservice/pinhole/client.go
@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"sync"
 
+	"github.com/edwarnicke/genericsync"
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/pkg/errors"
 	"go.fd.io/govpp/api"
@@ -33,8 +34,8 @@ import (
 )
 
 type pinholeClient struct {
-	vppConn api.Connection
-	ipPortMap
+	vppConn   api.Connection
+	ipPortMap genericsync.Map[IPPort, struct{}]
 
 	// We need to protect ACL rules applying with a mutex.
 	// Because adding new entries is based on a dump and applying modified data.

diff --git a/pkg/networkservice/pinhole/gen.go b/pkg/networkservice/pinhole/gen.go
diff --git a/pkg/networkservice/pinhole/server.go b/pkg/networkservice/pinhole/server.go
@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"sync"
 
+	"github.com/edwarnicke/genericsync"
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/pkg/errors"
 	"go.fd.io/govpp/api"
@@ -32,8 +33,8 @@ import (
 )
 
 type pinholeServer struct {
-	vppConn api.Connection
-	ipPortMap
+	vppConn   api.Connection
+	ipPortMap genericsync.Map[IPPort, struct{}]
 
 	// We need to protect ACL rules applying with a mutex.
 	// Because adding new entries is based on a dump and applying modified data.

diff --git a/pkg/networkservice/pinhole/tunnel_ip_map.gen.go b/pkg/networkservice/pinhole/tunnel_ip_map.gen.go