Merge pull request #15051 from zexi/automated-cherry-pick-of-#15050-upstream-master

Automated cherry pick of #15050: feat(region): is_baremetal option for storage list

pkg/apis/compute/storage_const.go

@@ -236,4 +236,7 @@ type StorageListInput struct {
 
 	// filter storages which attached the specified host
 	HostId string `json:"host_id"`
+
+	// filter storages of baremetal host
+	IsBaremetal *bool `json:"is_baremetal"`
 }

pkg/compute/models/storages.go

@@ -1532,6 +1532,14 @@ func (manager *SStorageManager) ListItemFilter(
 		q = q.In("id", sq.SubQuery())
 	}
 
+	if query.IsBaremetal != nil {
+		qf := q.NotEquals
+		if *query.IsBaremetal {
+			qf = q.Equals
+		}
+		q = qf("storage_type", api.STORAGE_BAREMETAL)
+	}
+
 	return q, err
 }
 

pkg/mcclient/options/compute/storage.go

@@ -35,6 +35,7 @@ type StorageListOptions struct {
 
 	HostSchedtagId string `help:"filter storage by host schedtag"`
 	ImageId        string `help:"filter storage by image"`
+	IsBaremetal    *bool  `help:"Baremetal storage list"`
 }
 
 func (opts *StorageListOptions) Params() (jsonutils.JSONObject, error) {