Merge branch 'main' into update-cira-name

Author: madhavilosetty-intel

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/coreos/go-oidc/v3 v3.17.0
 	github.com/device-management-toolkit/go-wsman-messages/v2 v2.38.0
 	github.com/gin-contrib/cors v1.7.7
-	github.com/gin-contrib/pprof v1.5.3
+	github.com/gin-contrib/pprof v1.5.4
 	github.com/gin-gonic/gin v1.12.0
 	github.com/go-fuego/fuego v0.19.0
 	github.com/go-xmlfmt/xmlfmt v1.1.3

go.sum

@@ -59,8 +59,8 @@ github.com/getkin/kin-openapi v0.133.0 h1:pJdmNohVIJ97r4AUFtEXRXwESr8b0bD721u/Tz
 github.com/getkin/kin-openapi v0.133.0/go.mod h1:boAciF6cXk5FhPqe/NQeBTeenbjqU4LhWBf09ILVvWE=
 github.com/gin-contrib/cors v1.7.7 h1:Oh9joP463x7Mw72vhvJ61YQm8ODh9b04YR7vsOErD0Q=
 github.com/gin-contrib/cors v1.7.7/go.mod h1:K5tW0RkzJtWSiOdikXloy8VEZlgdVNpHNw8FpjUPNrE=
-github.com/gin-contrib/pprof v1.5.3 h1:Bj5SxJ3kQDVez/s/+f9+meedJIqLS+xlkIVDe/lcvgM=
-github.com/gin-contrib/pprof v1.5.3/go.mod h1:0+LQSZ4SLO0B6+2n6JBzaEygpTBxe/nI+YEYpfQQ6xY=
+github.com/gin-contrib/pprof v1.5.4 h1:daxf2UNZw5IEx6WBdcpnEzgeDfkp083KdjUAFuMEkK4=
+github.com/gin-contrib/pprof v1.5.4/go.mod h1:AUxwt9kgpJGWiytj6RorBqRMyFuOQk7dPNfM9nHEY9I=
 github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w=
 github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM=
 github.com/gin-gonic/gin v1.12.0 h1:b3YAbrZtnf8N//yjKeU2+MQsh2mY5htkZidOM7O0wG8=

internal/mocks/wsman_mocks.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/device-management-toolkit/console/internal/entity/dto/v1"
 	dtov2 "github.com/device-management-toolkit/console/internal/entity/dto/v2"
+	wsmanAPI "github.com/device-management-toolkit/console/internal/usecase/devices/wsman"
 )
 
 func (uc *UseCase) GetVersion(c context.Context, guid string) (v1 dto.Version, v2 dtov2.Version, err error) {
@@ -82,29 +83,23 @@ func (uc *UseCase) GetHardwareInfo(c context.Context, guid string) (dto.Hardware
 		return dto.HardwareInfo{}, err
 	}
 
-	result := uc.hardwareInfoToDTO(hwInfo)
-
-	return result, nil
+	return uc.hardwareInfoToDTO(hwInfo), nil
 }
 
-func (uc *UseCase) hardwareInfoToDTO(hw interface{}) dto.HardwareInfo {
-	result := dto.HardwareInfo{}
-
-	hwInfo, ok := hw.(map[string]interface{})
-	if !ok {
-		return result
+func (uc *UseCase) hardwareInfoToDTO(hw wsmanAPI.HWResults) dto.HardwareInfo {
+	memoryItems := make([]any, len(hw.PhysicalMemoryResult.Body.PullResponse.MemoryItems))
+	for i := range hw.PhysicalMemoryResult.Body.PullResponse.MemoryItems {
+		memoryItems[i] = hw.PhysicalMemoryResult.Body.PullResponse.MemoryItems[i]
 	}
 
-	result.CIMComputerSystemPackage = uc.parseCIMResponse(hwInfo["CIM_ComputerSystemPackage"])
-	result.CIMSystemPackaging = uc.parseCIMResponse(hwInfo["CIM_SystemPackaging"])
-	result.CIMChassis = uc.parseCIMResponse(hwInfo["CIM_Chassis"])
-	result.CIMChip = uc.parseCIMResponse(hwInfo["CIM_Chip"])
-	result.CIMCard = uc.parseCIMResponse(hwInfo["CIM_Card"])
-	result.CIMBIOSElement = uc.parseCIMResponse(hwInfo["CIM_BIOSElement"])
-	result.CIMProcessor = uc.parseCIMResponse(hwInfo["CIM_Processor"])
-	result.CIMPhysicalMemory = uc.parseCIMResponse(hwInfo["CIM_PhysicalMemory"])
-
-	return result
+	return dto.HardwareInfo{
+		CIMChassis:        dto.CIMResponse{Response: hw.ChassisResult.Body.PackageResponse},
+		CIMChip:           dto.CIMResponse{Responses: []any{hw.ChipResult.Body.PackageResponse}},
+		CIMCard:           dto.CIMResponse{Response: hw.CardResult.Body.PackageResponse},
+		CIMBIOSElement:    dto.CIMResponse{Response: hw.BiosResult.Body.GetResponse},
+		CIMProcessor:      dto.CIMResponse{Responses: []any{hw.ProcessorResult.Body.PackageResponse}},
+		CIMPhysicalMemory: dto.CIMResponse{Responses: memoryItems},
+	}
 }
 
 func (uc *UseCase) GetDiskInfo(c context.Context, guid string) (dto.DiskInfo, error) {
@@ -127,49 +122,14 @@ func (uc *UseCase) GetDiskInfo(c context.Context, guid string) (dto.DiskInfo, er
 		return dto.DiskInfo{}, err
 	}
 
-	result := uc.discInfoToDTO(diskInfo)
-
-	return result, nil
+	return uc.diskInfoToDTO(diskInfo), nil
 }
 
-func (uc *UseCase) discInfoToDTO(discInfo interface{}) dto.DiskInfo {
-	result := dto.DiskInfo{}
-
-	info, ok := discInfo.(map[string]interface{})
-	if !ok {
-		return result
+func (uc *UseCase) diskInfoToDTO(diskInfo wsmanAPI.DiskResults) dto.DiskInfo {
+	return dto.DiskInfo{
+		CIMMediaAccessDevice: dto.CIMResponse{Responses: []any{diskInfo.MediaAccessPullResult.Body.PullResponse.MediaAccessDevices}},
+		CIMPhysicalPackage:   dto.CIMResponse{Responses: []any{diskInfo.PPPullResult.Body.PullResponse.PhysicalPackage}},
 	}
-
-	result.CIMMediaAccessDevice = uc.parseCIMResponse(info["CIM_MediaAccessDevice"])
-	result.CIMPhysicalPackage = uc.parseCIMResponse(info["CIM_PhysicalPackage"])
-
-	return result
-}
-
-func (uc *UseCase) parseCIMResponse(hwInfo interface{}) dto.CIMResponse {
-	result := dto.CIMResponse{}
-
-	info, ok := hwInfo.(map[string]interface{})
-	if !ok {
-		return result
-	}
-
-	response, ok := info["response"]
-	if ok {
-		result.Response = response
-	}
-
-	responses, ok := info["responses"].([]interface{})
-	if ok {
-		result.Responses = responses
-	}
-
-	status, ok := info["status"].(int)
-	if ok {
-		result.Status = status
-	}
-
-	return result
 }
 
 func (uc *UseCase) GetAuditLog(c context.Context, startIndex int, guid string) (dto.AuditLog, error) {

internal/usecase/devices/info.go

@@ -11,12 +11,20 @@ import (
 	"github.com/device-management-toolkit/go-wsman-messages/v2/pkg/wsman/amt/auditlog"
 	"github.com/device-management-toolkit/go-wsman-messages/v2/pkg/wsman/amt/messagelog"
 	"github.com/device-management-toolkit/go-wsman-messages/v2/pkg/wsman/amt/setupandconfiguration"
+	"github.com/device-management-toolkit/go-wsman-messages/v2/pkg/wsman/cim/bios"
+	"github.com/device-management-toolkit/go-wsman-messages/v2/pkg/wsman/cim/card"
+	"github.com/device-management-toolkit/go-wsman-messages/v2/pkg/wsman/cim/chassis"
+	"github.com/device-management-toolkit/go-wsman-messages/v2/pkg/wsman/cim/chip"
+	"github.com/device-management-toolkit/go-wsman-messages/v2/pkg/wsman/cim/mediaaccess"
+	"github.com/device-management-toolkit/go-wsman-messages/v2/pkg/wsman/cim/physical"
+	"github.com/device-management-toolkit/go-wsman-messages/v2/pkg/wsman/cim/processor"
 	"github.com/device-management-toolkit/go-wsman-messages/v2/pkg/wsman/cim/software"
 
 	"github.com/device-management-toolkit/console/internal/entity"
 	"github.com/device-management-toolkit/console/internal/entity/dto/v1"
 	"github.com/device-management-toolkit/console/internal/mocks"
 	devices "github.com/device-management-toolkit/console/internal/usecase/devices"
+	wsmanAPI "github.com/device-management-toolkit/console/internal/usecase/devices/wsman"
 	"github.com/device-management-toolkit/console/pkg/logger"
 )
 
@@ -272,14 +280,71 @@ func TestGetHardwareInfo(t *testing.T) {
 					Return(man2, nil)
 				man2.EXPECT().
 					GetHardwareInfo().
-					Return(gomock.Any(), nil)
+					Return(wsmanAPI.HWResults{}, nil)
 			},
 			repoMock: func(repo *mocks.MockDeviceManagementRepository) {
 				repo.EXPECT().
 					GetByID(context.Background(), device.GUID, "").
 					Return(device, nil)
 			},
-			res: dto.HardwareInfo{},
+			res: dto.HardwareInfo{
+				CIMChassis:        dto.CIMResponse{Response: chassis.PackageResponse{}},
+				CIMChip:           dto.CIMResponse{Responses: []any{chip.PackageResponse{}}},
+				CIMCard:           dto.CIMResponse{Response: card.PackageResponse{}},
+				CIMBIOSElement:    dto.CIMResponse{Response: bios.BiosElement{}},
+				CIMProcessor:      dto.CIMResponse{Responses: []any{processor.PackageResponse{}}},
+				CIMPhysicalMemory: dto.CIMResponse{Responses: []any{}},
+			},
+			err: nil,
+		},
+		{
+			name:   "success with populated data",
+			action: 0,
+			manMock: func(man *mocks.MockWSMAN, man2 *mocks.MockManagement) {
+				man.EXPECT().
+					SetupWsmanClient(gomock.Any(), false, true).
+					Return(man2, nil)
+				man2.EXPECT().
+					GetHardwareInfo().
+					Return(wsmanAPI.HWResults{
+						PhysicalMemoryResult: physical.Response{
+							Body: physical.Body{
+								PullResponse: physical.PullResponse{
+									MemoryItems: []physical.PhysicalMemory{
+										{
+											ElementName:  "Memory 0",
+											Manufacturer: "Samsung",
+											Capacity:     8388608,
+											Speed:        3200,
+											SerialNumber: "ABC123",
+											BankLabel:    "BANK0",
+										},
+									},
+								},
+							},
+						},
+					}, nil)
+			},
+			repoMock: func(repo *mocks.MockDeviceManagementRepository) {
+				repo.EXPECT().
+					GetByID(context.Background(), device.GUID, "").
+					Return(device, nil)
+			},
+			res: dto.HardwareInfo{
+				CIMChassis:     dto.CIMResponse{Response: chassis.PackageResponse{}},
+				CIMChip:        dto.CIMResponse{Responses: []any{chip.PackageResponse{}}},
+				CIMCard:        dto.CIMResponse{Response: card.PackageResponse{}},
+				CIMBIOSElement: dto.CIMResponse{Response: bios.BiosElement{}},
+				CIMProcessor:   dto.CIMResponse{Responses: []any{processor.PackageResponse{}}},
+				CIMPhysicalMemory: dto.CIMResponse{Responses: []any{physical.PhysicalMemory{
+					ElementName:  "Memory 0",
+					Manufacturer: "Samsung",
+					Capacity:     8388608,
+					Speed:        3200,
+					SerialNumber: "ABC123",
+					BankLabel:    "BANK0",
+				}}},
+			},
 			err: nil,
 		},
 		{
@@ -303,7 +368,7 @@ func TestGetHardwareInfo(t *testing.T) {
 					Return(man2, nil)
 				man2.EXPECT().
 					GetHardwareInfo().
-					Return(nil, ErrGeneral)
+					Return(wsmanAPI.HWResults{}, ErrGeneral)
 			},
 			repoMock: func(repo *mocks.MockDeviceManagementRepository) {
 				repo.EXPECT().
@@ -596,14 +661,84 @@ func TestGetDiskInfo(t *testing.T) {
 					Return(man2, nil)
 				man2.EXPECT().
 					GetDiskInfo().
-					Return(gomock.Any(), nil)
+					Return(wsmanAPI.DiskResults{}, nil)
 			},
 			repoMock: func(repo *mocks.MockDeviceManagementRepository) {
 				repo.EXPECT().
 					GetByID(context.Background(), device.GUID, "").
 					Return(device, nil)
 			},
-			res: dto.DiskInfo{},
+			res: dto.DiskInfo{
+				CIMMediaAccessDevice: dto.CIMResponse{Responses: []any{[]mediaaccess.MediaAccessDevice(nil)}},
+				CIMPhysicalPackage:   dto.CIMResponse{Responses: []any{[]physical.PhysicalPackage(nil)}},
+			},
+			err: nil,
+		},
+		{
+			name:   "success with populated data",
+			action: 0,
+			manMock: func(man *mocks.MockWSMAN, man2 *mocks.MockManagement) {
+				man.EXPECT().
+					SetupWsmanClient(gomock.Any(), false, true).
+					Return(man2, nil)
+				man2.EXPECT().
+					GetDiskInfo().
+					Return(wsmanAPI.DiskResults{
+						MediaAccessPullResult: mediaaccess.Response{
+							Body: mediaaccess.Body{
+								PullResponse: mediaaccess.PullResponse{
+									MediaAccessDevices: []mediaaccess.MediaAccessDevice{
+										{
+											CreationClassName: "CIM_MediaAccessDevice",
+											DeviceID:          "DISK0",
+											ElementName:       "SSD Drive",
+											MaxMediaSize:      512000,
+										},
+									},
+								},
+							},
+						},
+						PPPullResult: physical.Response{
+							Body: physical.Body{
+								PullResponse: physical.PullResponse{
+									PhysicalPackage: []physical.PhysicalPackage{
+										{
+											ElementName:       "Physical Package 0",
+											CreationClassName: "CIM_PhysicalPackage",
+											Manufacturer:      "Samsung",
+											SerialNumber:      "XYZ789",
+											Model:             "970 EVO",
+										},
+									},
+								},
+							},
+						},
+					}, nil)
+			},
+			repoMock: func(repo *mocks.MockDeviceManagementRepository) {
+				repo.EXPECT().
+					GetByID(context.Background(), device.GUID, "").
+					Return(device, nil)
+			},
+			res: dto.DiskInfo{
+				CIMMediaAccessDevice: dto.CIMResponse{Responses: []any{[]mediaaccess.MediaAccessDevice{
+					{
+						CreationClassName: "CIM_MediaAccessDevice",
+						DeviceID:          "DISK0",
+						ElementName:       "SSD Drive",
+						MaxMediaSize:      512000,
+					},
+				}}},
+				CIMPhysicalPackage: dto.CIMResponse{Responses: []any{[]physical.PhysicalPackage{
+					{
+						ElementName:       "Physical Package 0",
+						CreationClassName: "CIM_PhysicalPackage",
+						Manufacturer:      "Samsung",
+						SerialNumber:      "XYZ789",
+						Model:             "970 EVO",
+					},
+				}}},
+			},
 			err: nil,
 		},
 		{
@@ -627,7 +762,7 @@ func TestGetDiskInfo(t *testing.T) {
 					Return(man2, nil)
 				man2.EXPECT().
 					GetDiskInfo().
-					Return(nil, ErrGeneral)
+					Return(wsmanAPI.DiskResults{}, ErrGeneral)
 			},
 			repoMock: func(repo *mocks.MockDeviceManagementRepository) {
 				repo.EXPECT().

internal/usecase/devices/info_test.go

@@ -40,7 +40,7 @@ type Management interface {
 	GetAlarmOccurrences() ([]ipsAlarmClock.AlarmClockOccurrence, error)
 	CreateAlarmOccurrences(name string, startTime time.Time, interval int, deleteOnCompletion bool) (alarmclock.AddAlarmOutput, error)
 	DeleteAlarmOccurrences(instanceID string) error
-	GetHardwareInfo() (interface{}, error)
+	GetHardwareInfo() (HWResults, error)
 	GetPowerState() ([]service.CIM_AssociatedPowerManagementService, error)
 	GetOSPowerSavingState() (ipspower.OSPowerSavingState, error)
 	GetIPSPowerManagementService() (ipspower.PowerManagementService, error)
@@ -63,7 +63,7 @@ type Management interface {
 	GetTLSSettingData() ([]tls.SettingDataResponse, error)
 	GetCredentialRelationships() (credential.Items, error)
 	GetConcreteDependencies() ([]concrete.ConcreteDependency, error)
-	GetDiskInfo() (interface{}, error)
+	GetDiskInfo() (DiskResults, error)
 	GetDeviceCertificate() (*gotls.Certificate, error)
 	GetCIMBootSourceSetting() (cimBoot.Response, error)
 	BootServiceStateChange(requestedState int) (cimBoot.BootService, error)