Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Nte's sticky 'A' key #103

Merged
merged 1 commit into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/manager-nnf/aer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
12 changes: 6 additions & 6 deletions pkg/manager-nnf/allocation_policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ const (

// Default AllocationPolicy and AllocationCompliance
const (
DefaultAlloctionPolicy = SpareAllocationPolicyType
DefaultAlloctionCompliance = StrictAllocationComplianceType
DefaultAllocationPolicy = SpareAllocationPolicyType
DefaultAllocationCompliance = StrictAllocationComplianceType
)

// AllocationPolicyOem -
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/manager-nnf/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions pkg/manager-nnf/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion pkg/manager-nnf/servicer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/manager-nvme/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion pkg/manager-remote/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Loading