Merge pull request networkservicemesh#601 from glazychev-art/pinggrou…

…prange_move Move pinggrouprange to connectioncontext
Nordix · Jul 14, 2023 · f7a0057 · f7a0057
2 parents 8de98ab + db26ef8
commit f7a0057
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/pkg/kernel/networkservice/connectioncontextkernel/client.go b/pkg/kernel/networkservice/connectioncontextkernel/client.go
@@ -1,6 +1,6 @@
-// Copyright (c) 2020-2022 Cisco and/or its affiliates.
+// Copyright (c) 2020-2023 Cisco and/or its affiliates.
 //
-// Copyright (c) 2021-2022 Nordix Foundation.
+// Copyright (c) 2021-2023 Nordix Foundation.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -33,6 +33,7 @@ import (
 	"github.com/networkservicemesh/sdk-kernel/pkg/kernel/networkservice/connectioncontextkernel/ipcontext/ipaddress"
 	"github.com/networkservicemesh/sdk-kernel/pkg/kernel/networkservice/connectioncontextkernel/ipcontext/ipneighbors"
 	"github.com/networkservicemesh/sdk-kernel/pkg/kernel/networkservice/connectioncontextkernel/ipcontext/routes"
+	"github.com/networkservicemesh/sdk-kernel/pkg/kernel/networkservice/connectioncontextkernel/pinggrouprange"
 )
 
 // NewClient provides a NetworkServiceClient that applies the connectioncontext to a kernel interface
@@ -66,5 +67,6 @@ func NewClient() networkservice.NetworkServiceClient {
 		ipaddress.NewClient(),
 		routelocalnet.NewClient(),
 		iptables4nattemplate.NewClient(),
+		pinggrouprange.NewClient(),
 	)
 }
diff --git a/...l/networkservice/pinggrouprange/client.go → ...ioncontextkernel/pinggrouprange/client.go b/...l/networkservice/pinggrouprange/client.go → ...ioncontextkernel/pinggrouprange/client.go
diff --git a/...l/networkservice/pinggrouprange/common.go → ...ioncontextkernel/pinggrouprange/common.go b/...l/networkservice/pinggrouprange/common.go → ...ioncontextkernel/pinggrouprange/common.go
diff --git a/...rnel/networkservice/pinggrouprange/doc.go → ...ectioncontextkernel/pinggrouprange/doc.go b/...rnel/networkservice/pinggrouprange/doc.go → ...ectioncontextkernel/pinggrouprange/doc.go
diff --git a/...l/networkservice/pinggrouprange/server.go → ...ioncontextkernel/pinggrouprange/server.go b/...l/networkservice/pinggrouprange/server.go → ...ioncontextkernel/pinggrouprange/server.go
diff --git a/pkg/kernel/networkservice/connectioncontextkernel/server.go b/pkg/kernel/networkservice/connectioncontextkernel/server.go
@@ -1,6 +1,6 @@
-// Copyright (c) 2020-2022 Cisco and/or its affiliates.
+// Copyright (c) 2020-2023 Cisco and/or its affiliates.
 //
-// Copyright (c) 2021-2022 Nordix Foundation.
+// Copyright (c) 2021-2023 Nordix Foundation.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -29,6 +29,7 @@ import (
 	"github.com/networkservicemesh/sdk-kernel/pkg/kernel/networkservice/connectioncontextkernel/ipcontext/iprule"
 	"github.com/networkservicemesh/sdk-kernel/pkg/kernel/networkservice/connectioncontextkernel/ipcontext/routes"
 	"github.com/networkservicemesh/sdk-kernel/pkg/kernel/networkservice/connectioncontextkernel/mtu"
+	"github.com/networkservicemesh/sdk-kernel/pkg/kernel/networkservice/connectioncontextkernel/pinggrouprange"
 
 	"github.com/networkservicemesh/sdk/pkg/networkservice/core/chain"
 )
@@ -63,5 +64,6 @@ func NewServer() networkservice.NetworkServiceServer {
 		iprule.NewServer(),
 		routes.NewServer(),
 		ipaddress.NewServer(),
+		pinggrouprange.NewServer(),
 	)
 }