Add SR-IOV token ID mechanism parameter for kernel, VFIO mechanisms

Signed-off-by: Vladimir Popov <vladimir.popov@xored.com>
networkservicemesh · Jul 30, 2021 · 0cca414 · 0cca414
1 parent 6e4a0f8
commit 0cca414
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 2 deletions.
diff --git a/pkg/api/networkservice/mechanisms/common/constants.go b/pkg/api/networkservice/mechanisms/common/constants.go
@@ -1,5 +1,7 @@
 // Copyright (c) 2020-2021 Cisco Systems, Inc.
 //
+// Copyright (c) 2021 Doc.ai and/or its affiliates.
+//
 // SPDX-License-Identifier: Apache-2.0
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -46,6 +48,9 @@ const (
 	// PCIAddressKey - PCI address of the device for the SR-IOV supported mechanisms
 	PCIAddressKey = "pciAddress"
 
+	// SRIOVTokenIDKey - Client/Endpoint SR-IOV token ID
+	SRIOVTokenIDKey = "sriovTokenID"
+
 	// MTU - Maximum Transmission Unit
 	MTU = "MTU"
 )
diff --git a/pkg/api/networkservice/mechanisms/kernel/constants.go b/pkg/api/networkservice/mechanisms/kernel/constants.go
@@ -1,5 +1,7 @@
 // Copyright (c) 2020-2021 Cisco Systems, Inc.
 //
+// Copyright (c) 2021 Doc.ai and/or its affiliates.
+//
 // SPDX-License-Identifier: Apache-2.0
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,6 +35,9 @@ const (
 	// PCIAddressKey - device PCI address property key
 	PCIAddressKey = common.PCIAddressKey
 
+	// SRIOVTokenIDKey is a SR-IOV token ID property key
+	SRIOVTokenIDKey = common.SRIOVTokenIDKey
+
 	// NetNSInodeKey - netns inode mechanism property key
 	NetNSInodeKey = common.NetNSInodeKey
 

diff --git a/pkg/api/networkservice/mechanisms/kernel/helpers.go b/pkg/api/networkservice/mechanisms/kernel/helpers.go
@@ -1,5 +1,7 @@
 // Copyright (c) 2019-2021 Cisco Systems, Inc and/or its affiliates.
 //
+// Copyright (c) 2021 Doc.ai and/or its affiliates.
+//
 // SPDX-License-Identifier: Apache-2.0
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -84,6 +86,16 @@ func (m *Mechanism) IsPCIDevice() bool {
 	return m.GetPCIAddress() != ""
 }
 
+// GetSRIOVTokenID returns SR-IOV token ID
+func (m *Mechanism) GetSRIOVTokenID() string {
+	return m.Parameters[SRIOVTokenIDKey]
+}
+
+// SetSRIOVTokenID sets SR-IOV token ID
+func (m *Mechanism) SetSRIOVTokenID(tokenID string) {
+	m.Parameters[SRIOVTokenIDKey] = tokenID
+}
+
 // GetInterfaceName returns the Kernel Interface Name
 func (m *Mechanism) GetInterfaceName() string {
 	return m.GetParameters()[InterfaceNameKey]

diff --git a/pkg/api/networkservice/mechanisms/vfio/constants.go b/pkg/api/networkservice/mechanisms/vfio/constants.go
@@ -1,5 +1,6 @@
 // Copyright (c) 2020 Intel Corporation. All Rights Reserved.
-// Copyright (c) 2020 Doc.ai and/or its affiliates.
+//
+// Copyright (c) 2020-2021 Doc.ai and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -35,6 +36,9 @@ const (
 	// PCIAddressKey is a PCI address property key
 	PCIAddressKey = common.PCIAddressKey
 
+	// SRIOVTokenIDKey is a SR-IOV token ID property key
+	SRIOVTokenIDKey = common.SRIOVTokenIDKey
+
 	// VfioMajorKey is a /dev/vfio major number property key
 	VfioMajorKey = "vfioMajor"
 

diff --git a/pkg/api/networkservice/mechanisms/vfio/helpers.go b/pkg/api/networkservice/mechanisms/vfio/helpers.go
@@ -1,5 +1,6 @@
 // Copyright (c) 2020 Intel Corporation. All Rights Reserved.
-// Copyright (c) 2020 Doc.ai and/or its affiliates.
+//
+// Copyright (c) 2020-2021 Doc.ai and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -91,6 +92,16 @@ func (m *Mechanism) SetPCIAddress(pciAddress string) {
 	m.GetParameters()[PCIAddressKey] = pciAddress
 }
 
+// GetSRIOVTokenID returns SR-IOV token ID
+func (m *Mechanism) GetSRIOVTokenID() string {
+	return m.Parameters[SRIOVTokenIDKey]
+}
+
+// SetSRIOVTokenID sets SR-IOV token ID
+func (m *Mechanism) SetSRIOVTokenID(tokenID string) {
+	m.Parameters[SRIOVTokenIDKey] = tokenID
+}
+
 // GetVfioMajor returns /dev/vfio major number
 func (m *Mechanism) GetVfioMajor() uint32 {
 	return atou32(m.GetParameters()[VfioMajorKey])