未验证 提交 167dc13d 编写于 作者: H helight 提交者: GitHub

change storageClasses to items (#5713)

* change storageClasses to items

* fix test
上级 bed43d0f
...@@ -28,7 +28,7 @@ import ( ...@@ -28,7 +28,7 @@ import (
// StorageClassList holds a list of Storage Class objects in the cluster. // StorageClassList holds a list of Storage Class objects in the cluster.
type StorageClassList struct { type StorageClassList struct {
ListMeta api.ListMeta `json:"listMeta"` ListMeta api.ListMeta `json:"listMeta"`
StorageClasses []StorageClass `json:"storageClasses"` Items []StorageClass `json:"items"`
// List of non-critical errors, that occurred during resource retrieval. // List of non-critical errors, that occurred during resource retrieval.
Errors []error `json:"errors"` Errors []error `json:"errors"`
...@@ -71,7 +71,7 @@ func toStorageClassList(storageClasses []storage.StorageClass, nonCriticalErrors ...@@ -71,7 +71,7 @@ func toStorageClassList(storageClasses []storage.StorageClass, nonCriticalErrors
dsQuery *dataselect.DataSelectQuery) *StorageClassList { dsQuery *dataselect.DataSelectQuery) *StorageClassList {
storageClassList := &StorageClassList{ storageClassList := &StorageClassList{
StorageClasses: make([]StorageClass, 0), Items: make([]StorageClass, 0),
ListMeta: api.ListMeta{TotalItems: len(storageClasses)}, ListMeta: api.ListMeta{TotalItems: len(storageClasses)},
Errors: nonCriticalErrors, Errors: nonCriticalErrors,
} }
...@@ -81,7 +81,7 @@ func toStorageClassList(storageClasses []storage.StorageClass, nonCriticalErrors ...@@ -81,7 +81,7 @@ func toStorageClassList(storageClasses []storage.StorageClass, nonCriticalErrors
storageClassList.ListMeta = api.ListMeta{TotalItems: filteredTotal} storageClassList.ListMeta = api.ListMeta{TotalItems: filteredTotal}
for _, storageClass := range storageClasses { for _, storageClass := range storageClasses {
storageClassList.StorageClasses = append(storageClassList.StorageClasses, toStorageClass(&storageClass)) storageClassList.Items = append(storageClassList.Items, toStorageClass(&storageClass))
} }
return storageClassList return storageClassList
......
...@@ -44,7 +44,7 @@ func TestGetStorageClassList(t *testing.T) { ...@@ -44,7 +44,7 @@ func TestGetStorageClassList(t *testing.T) {
expectedActions: []string{"list"}, expectedActions: []string{"list"},
expected: &StorageClassList{ expected: &StorageClassList{
ListMeta: api.ListMeta{TotalItems: 1}, ListMeta: api.ListMeta{TotalItems: 1},
StorageClasses: []StorageClass{ Items: []StorageClass{
{ {
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
Name: "storage-1", Name: "storage-1",
......
...@@ -50,7 +50,7 @@ export class StorageClassListComponent extends ResourceListBase<StorageClassList ...@@ -50,7 +50,7 @@ export class StorageClassListComponent extends ResourceListBase<StorageClassList
} }
map(storageClassList: StorageClassList): StorageClass[] { map(storageClassList: StorageClassList): StorageClass[] {
return storageClassList.storageClasses; return storageClassList.items;
} }
getDisplayColumns(): string[] { getDisplayColumns(): string[] {
......
...@@ -207,7 +207,7 @@ export interface StatefulSetList extends ResourceList { ...@@ -207,7 +207,7 @@ export interface StatefulSetList extends ResourceList {
} }
export interface StorageClassList extends ResourceList { export interface StorageClassList extends ResourceList {
storageClasses: StorageClass[]; items: StorageClass[];
} }
// Simple detail types // Simple detail types
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册