From 631348e4bee5f52a8d7c31b6dff5ea3edd19a2aa Mon Sep 17 00:00:00 2001 From: Alexander Peretyatko Date: Mon, 27 Nov 2023 16:11:13 +0700 Subject: [PATCH 1/2] Task:768 Add interface names into NSM metrics Signed-off-by: Alexander Peretyatko --- main.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main.go b/main.go index 787b21a..7ef73b8 100644 --- a/main.go +++ b/main.go @@ -39,6 +39,7 @@ import ( "github.com/networkservicemesh/sdk-vpp/pkg/networkservice/loopback" "github.com/networkservicemesh/sdk-vpp/pkg/networkservice/mechanisms/memif" + "github.com/networkservicemesh/sdk-vpp/pkg/networkservice/stats" "github.com/networkservicemesh/sdk-vpp/pkg/networkservice/up" "github.com/networkservicemesh/sdk-vpp/pkg/networkservice/vrf" "github.com/networkservicemesh/sdk/pkg/networkservice/chains/client" @@ -554,6 +555,7 @@ func createVl3Endpoint(ctx context.Context, cancel context.CancelFunc, config *C unnumbered.NewServer(vppConn, loopback.Load), vrf.NewServer(vppConn, vrfOpts...), loopback.NewServer(vppConn, loopOpts...), + stats.NewServer(ctx, vppConn, stats.InterfaceOnly(true)), mechanisms.NewServer(map[string]networkservice.NetworkServiceServer{ memif.MECHANISM: chain.NewNetworkServiceServer( sendfd.NewServer(), From e6d06a559312bf7ab5d35970be56fec6f18fdf3d Mon Sep 17 00:00:00 2001 From: Alexander Peretyatko Date: Tue, 28 Nov 2023 15:08:10 +0700 Subject: [PATCH 2/2] Task:768 Fix dependency issues Signed-off-by: Alexander Peretyatko --- go.mod | 1 + go.sum | 1 + internal/imports/imports_linux.go | 1 + 3 files changed, 3 insertions(+) diff --git a/go.mod b/go.mod index b646f82..824629e 100644 --- a/go.mod +++ b/go.mod @@ -29,6 +29,7 @@ require ( github.com/edwarnicke/log v1.0.0 // indirect github.com/edwarnicke/serialize v1.0.7 // indirect github.com/fsnotify/fsnotify v1.5.4 // indirect + github.com/ftrvxmtrx/fd v0.0.0-20150925145434-c6d800382fff // indirect github.com/ghodss/yaml v1.0.0 // indirect github.com/go-logr/logr v1.3.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect diff --git a/go.sum b/go.sum index 1e15116..aad189b 100644 --- a/go.sum +++ b/go.sum @@ -65,6 +65,7 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= +github.com/ftrvxmtrx/fd v0.0.0-20150925145434-c6d800382fff h1:zk1wwii7uXmI0znwU+lqg+wFL9G5+vm5I+9rv2let60= github.com/ftrvxmtrx/fd v0.0.0-20150925145434-c6d800382fff/go.mod h1:yUhRXHewUVJ1k89wHKP68xfzk7kwXUx/DV1nx4EBMbw= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= diff --git a/internal/imports/imports_linux.go b/internal/imports/imports_linux.go index 514c2e4..ce43653 100644 --- a/internal/imports/imports_linux.go +++ b/internal/imports/imports_linux.go @@ -18,6 +18,7 @@ import ( _ "github.com/networkservicemesh/sdk-vpp/pkg/networkservice/connectioncontext/mtu" _ "github.com/networkservicemesh/sdk-vpp/pkg/networkservice/loopback" _ "github.com/networkservicemesh/sdk-vpp/pkg/networkservice/mechanisms/memif" + _ "github.com/networkservicemesh/sdk-vpp/pkg/networkservice/stats" _ "github.com/networkservicemesh/sdk-vpp/pkg/networkservice/tag" _ "github.com/networkservicemesh/sdk-vpp/pkg/networkservice/up" _ "github.com/networkservicemesh/sdk-vpp/pkg/networkservice/vrf"