Merge pull request #60 from OpenCHAMI/csm-sync

Merge CSM SMD head to OpenCHAMI

Author: alexlovelltroy

.gitignore

@@ -23,4 +23,4 @@ dist/
 /smd-loader
 /smd-loader-native
 /smd-native
-
+/pprof

Dockerfile.pprof

@@ -0,0 +1,25 @@
+FROM chainguard/wolfi-base:latest
+
+RUN apk add --no-cache tini
+
+# Include curl in the final image.
+RUN set -ex \
+    && apk update \
+    && apk add --no-cache curl tini \
+    && rm -rf /var/cache/apk/*  \
+    && rm -rf /tmp/*
+
+COPY pprof/smd /
+COPY pprof/smd-loader /
+COPY pprof/smd-init /
+RUN mkdir /persistent_migrations
+COPY migrations/* /persistent_migrations/
+
+EXPOSE 27779
+
+# nobody 65534:65534
+USER 65534:65534
+
+CMD [ "/smd" ]
+
+ENTRYPOINT [ "/sbin/tini", "--" ]

Makefile

@@ -1,6 +1,6 @@
 # MIT License
 #
-# (C) Copyright 2021-2022 Hewlett Packard Enterprise Development LP
+# (C) Copyright 2021-2022,2025 Hewlett Packard Enterprise Development LP
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -41,7 +41,7 @@ LDFLAGS    := -ldflags "-X main.GitCommit=$(COMMIT) \
 	-X 'main.GoVersion=$(GO_VERSION)' \
 	-X 'main.BuildUser=$(BUILD_USER)'"
 
-all: image unittest ct snyk ct_image
+all: image image-pprof unittest ct snyk ct_image
 
 .PHONY : all image unittest snyk ct ct_image binaries coverage docker
 
@@ -62,29 +62,41 @@ ct_image:
 
 binaries: smd smd-init smd-loader native
 
-
-
 smd: cmd/smd/*.go
 	GOOS=linux GOARCH=amd64 go build -o smd -v -tags musl $(LDFLAGS) ./cmd/smd
 
 smd-init: cmd/smd-init/*.go
 	GOOS=linux GOARCH=amd64 go build -o smd-init -v -tags musl $(LDFLAGS) ./cmd/smd-init
 
+smd-loader: cmd/smd-loader/*.go
+	GOOS=linux GOARCH=amd64 go build -o smd-loader -v -tags musl $(LDFLAGS) ./cmd/smd-loader
+
+
 native:
 	go build -o smd-init-native -v -tags musl $(LDFLAGS) ./cmd/smd-init
 	go build -o smd-native -v -tags musl $(LDFLAGS) ./cmd/smd
 	go build -o smd-loader-native -v -tags musl $(LDFLAGS) ./cmd/smd-loader
 
+coverage:
+	go test -cover -v -tags musl ./cmd/* ./internal/* ./pkg/*
+
+binaries-pprof: pprof/smd pprof/smd-init pprof/smd-loader
 
+pprof/smd: cmd/smd/*.go
+	GOOS=linux GOARCH=amd64 go build -o pprof/smd -v -tags "musl pprof" $(LDFLAGS) ./cmd/smd
 
-smd-loader: cmd/smd-loader/*.go
-	GOOS=linux GOARCH=amd64 go build -o smd-loader -v -tags musl $(LDFLAGS) ./cmd/smd-loader
+pprof/smd-init: cmd/smd-init/*.go
+	GOOS=linux GOARCH=amd64 go build -o pprof/smd-init -v -tags "musl pprof" $(LDFLAGS) ./cmd/smd-init
 
-coverage:
-	go test -cover -v -tags musl ./cmd/* ./internal/* ./pkg/*
+pprof/smd-loader: cmd/smd-loader/*.go
+	GOOS=linux GOARCH=amd64 go build -o pprof/smd-loader -v -tags "musl pprof" $(LDFLAGS) ./cmd/smd-loader
+
+image-pprof:
+	docker build ${NO_CACHE} --pull ${DOCKER_ARGS} --tag '${NAME}-pprof:${VERSION}' -f Dockerfile.pprof .
 
 clean:
 	rm -f smd smd-init smd-init-native smd-loader smd-loader-native smd-native
+	rm -rf pprof
 	go clean -testcache
 	go clean -cache
 	go clean -modcache

api/swagger_v2.yaml

@@ -1423,6 +1423,7 @@ paths:
             - MgmtHLSwitch
             - CDUMgmtSwitch
             - Node
+            - VirtualNode
             - Processor
             - Drive
             - StorageGroup
@@ -11869,6 +11870,7 @@ definitions:
       - MgmtHLSwitch
       - CDUMgmtSwitch
       - Node
+      - VirtualNode
       - Processor
       - Drive
       - StorageGroup
@@ -12157,6 +12159,7 @@ parameters:
       - MgmtHLSwitch
       - CDUMgmtSwitch
       - Node
+      - VirtualNode
       - Processor
       - Drive
       - StorageGroup
@@ -12272,7 +12275,7 @@ parameters:
       - X86
       - ARM
       - Other
-      - Unknown
+      - UNKNOWN
   compClassParam:
     name: class
     in: query

cmd/smd-loader/main.go

@@ -29,11 +29,11 @@ import (
 	"net/http"
 	"os"
 	"os/signal"
+	"github.com/Cray-HPE/hms-base/v2"
+	hmshttp "github.com/Cray-HPE/hms-go-http-lib"
 	"syscall"
 	"time"
 
-	base "github.com/Cray-HPE/hms-base"
-	hmshttp "github.com/Cray-HPE/hms-go-http-lib"
 	"github.com/hashicorp/go-retryablehttp"
 )