Add Extensions to VgpuTypeID

Signed-off-by: Evan Lezar <[email protected]>

Author: elezar

gen/nvml/generateapi.go

@@ -77,6 +77,7 @@ var GeneratableInterfaces = []GeneratableInterfacePoperties{
 	{
 		Type:      "nvmlVgpuTypeId",
 		Interface: "VgpuTypeId",
+		Exclude:   []string{"ID"},
 	},
 }
 

pkg/nvml/api.go

@@ -27,6 +27,11 @@ type ExtendedInterface interface {
 	LookupSymbol(string) error
 }
 
+//go:generate moq -rm -out mock/extendedvgputypeid.go -pkg mock . ExtendedVgpuTypeId:ExtendedVgpuTypeId
+type ExtendedVgpuTypeId interface {
+	ID() uint32
+}
+
 // libraryOptions hold the paramaters than can be set by a LibraryOption
 type libraryOptions struct {
 	path  string

pkg/nvml/cgo_helpers_static.go

@@ -73,7 +73,3 @@ func unpackPCharString(str string) (*C.char, *struct{}) {
 	h := (*stringHeader)(unsafe.Pointer(&str))
 	return (*C.char)(h.Data), cgoAllocsUnknown
 }
-
-func VgpuTypeIdToUint32(typeId VgpuTypeId) uint32 {
-	return uint32(typeId.(nvmlVgpuTypeId))
-}

pkg/nvml/mock/extendedvgputypeid.go

@@ -0,0 +1,27 @@
+// Copyright (c) 2020, NVIDIA CORPORATION.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package nvml
+
+func (vgpuTypeId *nvmlVgpuTypeId) Extensions() ExtendedVgpuTypeId {
+	return vgpuTypeId
+}
+
+// ID returns the numeric representaion of the vgpuTypeId.
+func (vgpuTypeId *nvmlVgpuTypeId) ID() uint32 {
+	if vgpuTypeId == nil {
+		return 0
+	}
+	return uint32(*vgpuTypeId)
+}

pkg/nvml/vgpu_extensions.go

@@ -990,6 +990,7 @@ type VgpuInstance interface {
 //
 //go:generate moq -out mock/vgputypeid.go -pkg mock . VgpuTypeId:VgpuTypeId
 type VgpuTypeId interface {
+	Extensions() ExtendedVgpuTypeId
 	GetCapabilities(VgpuCapability) (bool, Return)
 	GetClass() (string, Return)
 	GetCreatablePlacements(Device) (VgpuPlacementList, Return)