Merge pull request #11 from lengrongfu/main

update ascend uuid define logic

Author: limengxuan

.github/workflows/dev.yml

@@ -0,0 +1,59 @@
+# This workflow will build a golang project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go
+
+name: CI
+
+on:
+  pull_request:
+    branches: [ "main" ]
+
+env:
+  GO_VERSION: "1.22.5"
+
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: ${{ env.GO_VERSION }}
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v6
+        with:
+          version: v1.60
+
+  build:
+    env:
+      IMAGE_NAME: ${{ secrets.IMAGE_NAME || 'projecthami/ascend-device-plugin' }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Get branch names.
+        id: branch-names
+        uses: tj-actions/branch-names@v8
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker Login
+        uses: docker/login-action@v3.1.0
+        with:
+          username: ${{ secrets.DOCKERHUB_TOKEN }}
+          password: ${{ secrets.DOCKERHUB_PASSWD }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          build-args: |
+            BASE_IMAGE=ubuntu:20.04
+            GO_VERSION=${{ env.GO_VERSION }}
+            VERSION=${{ steps.branch-names.outputs.current_branch || steps.branch-names.outputs.tag }}-${{ github.sha }}
+          tags: ${{ env.IMAGE_NAME }}:dev

internal/manager/manager.go

@@ -22,6 +22,7 @@ import (
 
 	"github.com/Project-HAMi/ascend-device-plugin/internal"
 	"huawei.com/npu-exporter/v6/devmanager"
+	"huawei.com/npu-exporter/v6/devmanager/dcmi"
 	"k8s.io/klog/v2"
 )
 
@@ -118,13 +119,18 @@ func (am *AscendManager) UpdateDevice() error {
 			klog.Errorf("failed to get card id from device id: %v", err)
 			return err
 		}
+		uuid, err := am.mgr.GetDieID(ID, dcmi.VDIE)
+		if err != nil {
+			klog.Errorf("failed to get uuid from device id: %v", err)
+			return err
+		}
 		health, err := am.mgr.GetDeviceHealth(ID)
 		if err != nil {
 			klog.Errorf("failed to get device health: %v", err)
 			return err
 		}
 		am.devs = append(am.devs, &Device{
-			UUID:     fmt.Sprintf("%s-%d", am.config.CommonWord, phyID),
+			UUID:     uuid,
 			LogicID:  ID,
 			PhyID:    phyID,
 			CardID:   cardID,

internal/server/server.go

@@ -260,6 +260,9 @@ func (ps *PluginServer) parsePodAnnotation(pod *v1.Pod) ([]int32, []string, erro
 	var IDs []int32
 	var temps []string
 	for _, info := range rtInfo {
+		if info.UUID == "" {
+			continue
+		}
 		d := ps.mgr.GetDeviceByUUID(info.UUID)
 		if d == nil {
 			return nil, nil, fmt.Errorf("unknown uuid: %s", info.UUID)