mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-17 20:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

cephfs/volumeptions: modified fields, updated validation

Browse Source
This commit is contained in:
gman 2018-03-20 15:51:27 +01:00
parent 0df8415067
commit aefc258ccd
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/cephfs/volumeoptions.go
View File

@ -19,11 +19,9 @@ package cephfs
import "errors"
type volumeOptions struct {
Monitor string `json:"monitor"`
Pool string `json:"pool"`
ClusterName string `json:"clusterName"`
AdminId string `json:"adminID"`
AdminSecret string `json:"adminSecret"`
Monitors string `json:"monitors"`
RootPath string `json:"rootPath"`
User string `json:"user"`
}
func extractOption(dest *string, optionLabel string, options map[string]string) error {
@ -38,23 +36,15 @@ func extractOption(dest *string, optionLabel string, options map[string]string)
func newVolumeOptions(volOptions map[string]string) (*volumeOptions, error) {
var opts volumeOptions
if err := extractOption(&opts.AdminId, "adminID", volOptions); err != nil {
if err := extractOption(&opts.Monitors, "monitors", volOptions); err != nil {
return nil, err
}
if err := extractOption(&opts.AdminSecret, "adminSecret", volOptions); err != nil {
if err := extractOption(&opts.RootPath, "rootPath", volOptions); err != nil {
return nil, err
}
if err := extractOption(&opts.Monitor, "monitor", volOptions); err != nil {
return nil, err
}
if err := extractOption(&opts.Pool, "pool", volOptions); err != nil {
return nil, err
}
if err := extractOption(&opts.ClusterName, "clusterName", volOptions); err != nil {
if err := extractOption(&opts.User, "user", volOptions); err != nil {
return nil, err
}