From 2ea5944bdd097a973c82be8d5dcda78273143c02 Mon Sep 17 00:00:00 2001 From: Denis Tingaikin Date: Sat, 14 May 2022 21:47:44 +0300 Subject: [PATCH 1/2] add clientinfo into cmd-nsc-init Signed-off-by: Denis Tingaikin --- internal/imports/gen.go | 4 +++- main.go | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/internal/imports/gen.go b/internal/imports/gen.go index f87688f..3caf9aa 100644 --- a/internal/imports/gen.go +++ b/internal/imports/gen.go @@ -1,5 +1,7 @@ // Copyright (c) 2021 Doc.ai and/or its affiliates. // +// Copyright (c) 2022 Cisco and/or its affiliates. +// // SPDX-License-Identifier: Apache-2.0 // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,5 +18,5 @@ package imports -//go:generate bash -c "cd $(mktemp -d) && GO111MODULE=on go get github.com/edwarnicke/imports-gen@v1.1.1" +//go:generate bash -c "cd $(mktemp -d) && GO111MODULE=on go install github.com/edwarnicke/imports-gen@v1.1.1" //go:generate bash -c "GOOS=linux ${GOPATH}/bin/imports-gen" diff --git a/main.go b/main.go index 838cc31..0dc68f3 100644 --- a/main.go +++ b/main.go @@ -43,6 +43,7 @@ import ( sriovtoken "github.com/networkservicemesh/sdk-sriov/pkg/networkservice/common/token" "github.com/networkservicemesh/sdk/pkg/networkservice/common/authorize" "github.com/networkservicemesh/sdk/pkg/networkservice/common/begin" + "github.com/networkservicemesh/sdk/pkg/networkservice/common/clientinfo" "github.com/networkservicemesh/sdk/pkg/networkservice/common/excludedprefixes" "github.com/networkservicemesh/sdk/pkg/networkservice/common/mechanisms" "github.com/networkservicemesh/sdk/pkg/networkservice/common/mechanisms/kernel" @@ -162,6 +163,7 @@ func main() { nsmClient := chain.NewNetworkServiceClient( updatepath.NewClient(rootConf.Name), begin.NewClient(), + clientinfo.NewClient(), sriovtoken.NewClient(), mechanisms.NewClient(map[string]networkservice.NetworkServiceClient{ vfiomech.MECHANISM: chain.NewNetworkServiceClient(vfio.NewClient()), From d8d1845cc21cbd95f62c474b496445b7fd3b943d Mon Sep 17 00:00:00 2001 From: Denis Tingaikin Date: Sat, 14 May 2022 21:56:10 +0300 Subject: [PATCH 2/2] go generate ./... Signed-off-by: Denis Tingaikin --- internal/imports/imports_linux.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/imports/imports_linux.go b/internal/imports/imports_linux.go index cf3ed8f..3a241cf 100644 --- a/internal/imports/imports_linux.go +++ b/internal/imports/imports_linux.go @@ -14,6 +14,7 @@ import ( _ "github.com/networkservicemesh/sdk-sriov/pkg/networkservice/common/token" _ "github.com/networkservicemesh/sdk/pkg/networkservice/common/authorize" _ "github.com/networkservicemesh/sdk/pkg/networkservice/common/begin" + _ "github.com/networkservicemesh/sdk/pkg/networkservice/common/clientinfo" _ "github.com/networkservicemesh/sdk/pkg/networkservice/common/excludedprefixes" _ "github.com/networkservicemesh/sdk/pkg/networkservice/common/mechanisms" _ "github.com/networkservicemesh/sdk/pkg/networkservice/common/mechanisms/kernel"