From 83f4e210a95c701729bfc8488464eaf20bb73013 Mon Sep 17 00:00:00 2001 From: Matt Richerson Date: Mon, 15 Jul 2024 15:39:08 -0500 Subject: [PATCH] Fix Nte's sticky 'A' key Signed-off-by: Matt Richerson --- pkg/manager-nnf/aer.go | 4 ++-- pkg/manager-nnf/allocation_policy.go | 12 ++++++------ pkg/manager-nnf/api.go | 2 +- pkg/manager-nnf/manager.go | 6 +++--- pkg/manager-nnf/servicer.go | 2 +- pkg/manager-nvme/manager.go | 2 +- pkg/manager-remote/manager.go | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkg/manager-nnf/aer.go b/pkg/manager-nnf/aer.go index c78a7aa..bfc8356 100644 --- a/pkg/manager-nnf/aer.go +++ b/pkg/manager-nnf/aer.go @@ -109,8 +109,8 @@ func (aer *AerService) StorageServiceIdStoragePoolIdCapacitySourceIdGet(id0 stri func (aer *AerService) StorageServiceIdStoragePoolIdCapacitySourceIdProvidingVolumesGet(id0 string, id1 string, id2 string, model *sf.VolumeCollectionVolumeCollection) error { return aer.c(aer.s.StorageServiceIdStoragePoolIdCapacitySourceIdProvidingVolumesGet(id0, id1, id2, model)) } -func (aer *AerService) StorageServiceIdStoragePoolIdAlloctedVolumesGet(id0 string, id1 string, model *sf.VolumeCollectionVolumeCollection) error { - return aer.c(aer.s.StorageServiceIdStoragePoolIdAlloctedVolumesGet(id0, id1, model)) +func (aer *AerService) StorageServiceIdStoragePoolIdAllocatedVolumesGet(id0 string, id1 string, model *sf.VolumeCollectionVolumeCollection) error { + return aer.c(aer.s.StorageServiceIdStoragePoolIdAllocatedVolumesGet(id0, id1, model)) } func (aer *AerService) StorageServiceIdStoragePoolIdAllocatedVolumeIdGet(id0 string, id1 string, id2 string, model *sf.VolumeV161Volume) error { return aer.c(aer.s.StorageServiceIdStoragePoolIdAllocatedVolumeIdGet(id0, id1, id2, model)) diff --git a/pkg/manager-nnf/allocation_policy.go b/pkg/manager-nnf/allocation_policy.go index 7f47635..11ce685 100644 --- a/pkg/manager-nnf/allocation_policy.go +++ b/pkg/manager-nnf/allocation_policy.go @@ -57,8 +57,8 @@ const ( // Default AllocationPolicy and AllocationCompliance const ( - DefaultAlloctionPolicy = SpareAllocationPolicyType - DefaultAlloctionCompliance = StrictAllocationComplianceType + DefaultAllocationPolicy = SpareAllocationPolicyType + DefaultAllocationCompliance = StrictAllocationComplianceType ) // AllocationPolicyOem - @@ -78,13 +78,13 @@ type AllocationPolicyOem struct { // is not as desired. func NewAllocationPolicy(config AllocationConfig, oem map[string]interface{}) AllocationPolicy { - policy := DefaultAlloctionPolicy - compliance := DefaultAlloctionCompliance + policy := DefaultAllocationPolicy + compliance := DefaultAllocationCompliance if oem != nil { overrides := AllocationPolicyOem{ - Policy: DefaultAlloctionPolicy, - Compliance: DefaultAlloctionCompliance, + Policy: DefaultAllocationPolicy, + Compliance: DefaultAllocationCompliance, } if err := openapi.UnmarshalOem(oem, &overrides); err == nil { diff --git a/pkg/manager-nnf/api.go b/pkg/manager-nnf/api.go index a642d83..cc1a6d3 100644 --- a/pkg/manager-nnf/api.go +++ b/pkg/manager-nnf/api.go @@ -95,7 +95,7 @@ type StorageServiceApi interface { StorageServiceIdStoragePoolIdCapacitySourcesGet(string, string, *sf.CapacitySourceCollectionCapacitySourceCollection) error StorageServiceIdStoragePoolIdCapacitySourceIdGet(string, string, string, *sf.CapacityCapacitySource) error StorageServiceIdStoragePoolIdCapacitySourceIdProvidingVolumesGet(string, string, string, *sf.VolumeCollectionVolumeCollection) error - StorageServiceIdStoragePoolIdAlloctedVolumesGet(string, string, *sf.VolumeCollectionVolumeCollection) error + StorageServiceIdStoragePoolIdAllocatedVolumesGet(string, string, *sf.VolumeCollectionVolumeCollection) error StorageServiceIdStoragePoolIdAllocatedVolumeIdGet(string, string, string, *sf.VolumeV161Volume) error StorageServiceIdStorageGroupsGet(string, *sf.StorageGroupCollectionStorageGroupCollection) error diff --git a/pkg/manager-nnf/manager.go b/pkg/manager-nnf/manager.go index a665087..776253d 100644 --- a/pkg/manager-nnf/manager.go +++ b/pkg/manager-nnf/manager.go @@ -752,7 +752,7 @@ func (*StorageService) StorageServiceIdStoragePoolIdGet(storageServiceId, storag model.Id = p.id model.OdataId = p.OdataId() - model.AllocatedVolumes = p.OdataIdRef("/AlloctedVolumes") + model.AllocatedVolumes = p.OdataIdRef("/AllocatedVolumes") model.BlockSizeBytes = 4096 // TODO model.Capacity = sf.CapacityV100Capacity{ @@ -901,8 +901,8 @@ func (*StorageService) StorageServiceIdStoragePoolIdCapacitySourceIdProvidingVol return nil } -// StorageServiceIdStoragePoolIdAlloctedVolumesGet - -func (*StorageService) StorageServiceIdStoragePoolIdAlloctedVolumesGet(storageServiceId, storagePoolId string, model *sf.VolumeCollectionVolumeCollection) error { +// StorageServiceIdStoragePoolIdAllocatedVolumesGet - +func (*StorageService) StorageServiceIdStoragePoolIdAllocatedVolumesGet(storageServiceId, storagePoolId string, model *sf.VolumeCollectionVolumeCollection) error { _, p := findStoragePool(storageServiceId, storagePoolId) if p == nil { return ec.NewErrNotFound().WithEvent(msgreg.ResourceNotFoundBase(StoragePoolOdataType, storagePoolId)) diff --git a/pkg/manager-nnf/servicer.go b/pkg/manager-nnf/servicer.go index 4059cf6..3122d62 100644 --- a/pkg/manager-nnf/servicer.go +++ b/pkg/manager-nnf/servicer.go @@ -263,7 +263,7 @@ func (s *DefaultApiService) RedfishV1StorageServicesStorageServiceIdStoragePools Name: "Allocated Volume Collection", } - err := s.ss.StorageServiceIdStoragePoolIdAlloctedVolumesGet(storageServiceId, storagePoolId, &model) + err := s.ss.StorageServiceIdStoragePoolIdAllocatedVolumesGet(storageServiceId, storagePoolId, &model) EncodeResponse(model, err, w) } diff --git a/pkg/manager-nvme/manager.go b/pkg/manager-nvme/manager.go index 0ab72ce..3c91c94 100644 --- a/pkg/manager-nvme/manager.go +++ b/pkg/manager-nvme/manager.go @@ -110,7 +110,7 @@ type Storage struct { // the life of the object. capacityBytes uint64 - // Unallocted capacity in bytes. This value is updated for any namespaces create or + // Unallocated capacity in bytes. This value is updated for any namespaces create or // delete operation that might shrink or grow the byte count as expected. unallocatedBytes uint64 diff --git a/pkg/manager-remote/manager.go b/pkg/manager-remote/manager.go index 4604c6b..1989632 100644 --- a/pkg/manager-remote/manager.go +++ b/pkg/manager-remote/manager.go @@ -337,7 +337,7 @@ func (*ServerStorageService) StorageServiceIdStoragePoolIdCapacitySourceIdProvid return ec.NewErrNotAcceptable() } -func (*ServerStorageService) StorageServiceIdStoragePoolIdAlloctedVolumesGet(storageServiceId, storagePoolId string, model *sf.VolumeCollectionVolumeCollection) error { +func (*ServerStorageService) StorageServiceIdStoragePoolIdAllocatedVolumesGet(storageServiceId, storagePoolId string, model *sf.VolumeCollectionVolumeCollection) error { return nil }