Merge pull request #268 from Nordix/fix-sriov-ci-test

fix for sriov ci test failure
networkservicemesh · Sep 24, 2021 · 868bbc1 · 868bbc1
2 parents 411eece + 42575f3
commit 868bbc1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/networkservice/common/token/server.go b/pkg/networkservice/common/token/server.go
@@ -50,7 +50,7 @@ func NewServer(tokenKey string) networkservice.NetworkServiceServer {
 
 func (s *tokenServer) Request(ctx context.Context, request *networkservice.NetworkServiceRequest) (*networkservice.Connection, error) {
 	var tokenID string
-	if mechanism := kernel.ToMechanism(request.GetConnection().GetMechanism()); mechanism != nil || mechanism.GetDeviceTokenID() == "" {
+	if mechanism := kernel.ToMechanism(request.GetConnection().GetMechanism()); mechanism != nil && mechanism.GetDeviceTokenID() == "" {
 		if tokenID = s.config.assign(s.tokenName, request.GetConnection()); tokenID != "" {
 			mechanism.SetDeviceTokenID(tokenID)
 		}