-
Notifications
You must be signed in to change notification settings - Fork 317
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #973 from PravinRanjan10/master
Fileshare feature: Adding capability to create fileshare from snapshots
- Loading branch information
Showing
9 changed files
with
361 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,196 @@ | ||
| // Copyright 2019 The OpenSDS Authors. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| // WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| // License for the specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package nfs | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "reflect" | ||
| "testing" | ||
|
|
||
| //"github.com/opensds/opensds/contrib/drivers/filesharedrivers/nfs" | ||
| . "github.com/opensds/opensds/contrib/drivers/utils/config" | ||
| "github.com/opensds/opensds/pkg/model" | ||
| pb "github.com/opensds/opensds/pkg/model/proto" | ||
| "github.com/opensds/opensds/pkg/utils/config" | ||
| "github.com/opensds/opensds/pkg/utils/exec" | ||
| ) | ||
|
|
||
| var fp = map[string]PoolProperties{ | ||
| "opensds-files-default": { | ||
| StorageType: "file", | ||
| AvailabilityZone: "default", | ||
| MultiAttach: true, | ||
| Extras: model.StoragePoolExtraSpec{ | ||
| DataStorage: model.DataStorageLoS{ | ||
| ProvisioningPolicy: "Thin", | ||
| IsSpaceEfficient: false, | ||
| StorageAccessCapability: []string{"Read", "Write", "Execute"}, | ||
| }, | ||
| IOConnectivity: model.IOConnectivityLoS{ | ||
| AccessProtocol: "nfs", | ||
| MaxIOPS: 7000000, | ||
| MaxBWS: 600, | ||
| }, | ||
| Advanced: map[string]interface{}{ | ||
| "diskType": "SSD", | ||
| "latency": "5ms", | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| func TestSetup(t *testing.T) { | ||
| var d = &Driver{} | ||
| config.CONF.OsdsDock.Backends.NFS.ConfigPath = "testdata/nfs.yaml" | ||
| var expectedDriver = &Driver{ | ||
| conf: &NFSConfig{ | ||
| Pool: fp, | ||
| TgtBindIp: "11.242.178.20", | ||
| TgtConfDir: "/etc/tgt/conf.d", | ||
| EnableChapAuth: false, | ||
| }, | ||
| } | ||
|
|
||
| if err := d.Setup(); err != nil { | ||
| t.Errorf("Setup nfs driver failed: %+v\n", err) | ||
| } | ||
| if !reflect.DeepEqual(d.conf, expectedDriver.conf) { | ||
| t.Errorf("Expected %+v, got %+v", expectedDriver.conf, d.conf) | ||
| } | ||
| } | ||
|
|
||
| type FakeResp struct { | ||
| out string | ||
| err error | ||
| } | ||
|
|
||
| func NewFakeExecuter(respMap map[string]*FakeResp) exec.Executer { | ||
| return &FakeExecuter{RespMap: respMap} | ||
| } | ||
|
|
||
| type FakeExecuter struct { | ||
| RespMap map[string]*FakeResp | ||
| } | ||
|
|
||
| func (f *FakeExecuter) Run(name string, args ...string) (string, error) { | ||
| var cmd = name | ||
| if name == "env" { | ||
| cmd = args[1] | ||
| } | ||
| v, ok := f.RespMap[cmd] | ||
| if !ok { | ||
| return "", fmt.Errorf("can not find specified op: %s", args[1]) | ||
| } | ||
| return v.out, v.err | ||
| } | ||
|
|
||
| func TestCreateFileShare(t *testing.T) { | ||
| var fd = &Driver{} | ||
| config.CONF.OsdsDock.Backends.NFS.ConfigPath = "testdata/nfs.yaml" | ||
| fd.Setup() | ||
|
|
||
| respMap := map[string]*FakeResp{ | ||
| "mkdir": {"", nil}, | ||
| "mke2fs": {"", nil}, | ||
| "mount": {"", nil}, | ||
| "chmod": {"", nil}, | ||
| "lvconvert": {"", nil}, | ||
| "lvcreate": {"", nil}, | ||
| } | ||
| fd.cli.RootExecuter = NewFakeExecuter(respMap) | ||
| fd.cli.BaseExecuter = NewFakeExecuter(respMap) | ||
|
|
||
| opt := &pb.CreateFileShareOpts{ | ||
| Id: "e1bb066c-5ce7-46eb-9336-25508cee9f71", | ||
| Name: "test001", | ||
| Description: "fileshare for testing", | ||
| Size: int64(1), | ||
| PoolName: "vg001", | ||
| } | ||
| var expected = &model.FileShareSpec{ | ||
| BaseModel: &model.BaseModel{Id: "e1bb066c-5ce7-46eb-9336-25508cee9f71"}, | ||
| Name: "test001", | ||
| Description: "fileshare for testing", | ||
| Size: int64(1), | ||
| Protocols: []string{"nfs"}, | ||
| ExportLocations: []string{"11.242.178.20:/var/test001"}, | ||
| Metadata: map[string]string{ | ||
| "lvPath": "/dev/vg001/test001", | ||
| "nfsFileshareID": "e1bb066c-5ce7-46eb-9336-25508cee9f71", | ||
| "nfsFileshareName": "test001", | ||
| "snapshotName": "", | ||
| }, | ||
| } | ||
| fileshare, err := fd.CreateFileShare(opt) | ||
| if err != nil { | ||
| t.Error("Failed to create fileshare:", err) | ||
| } | ||
| if !reflect.DeepEqual(fileshare, expected) { | ||
| t.Errorf("Expected %+v, got %+v\n", expected, fileshare) | ||
| } | ||
| } | ||
|
|
||
| func TestListPools(t *testing.T) { | ||
| var fd = &Driver{} | ||
| config.CONF.OsdsDock.Backends.NFS.ConfigPath = "testdata/nfs.yaml" | ||
| fd.Setup() | ||
|
|
||
| var vgsResp = `opensds-files-default 20.00 20.00 WSpJ3r-JYVF-DYNq-1rCe-5I6j-Zb3d-8Ub0Hg | ||
| opensds-volumes-default 20.00 20.00 t7mLWW-AeCf-LtuF-7K8p-R4xA-QC5x-61qx3H` | ||
| respMap := map[string]*FakeResp{ | ||
| "vgs": {vgsResp, nil}, | ||
| } | ||
| fd.cli.RootExecuter = NewFakeExecuter(respMap) | ||
| fd.cli.BaseExecuter = NewFakeExecuter(respMap) | ||
|
|
||
| var expected = []*model.StoragePoolSpec{ | ||
| { | ||
| BaseModel: &model.BaseModel{}, | ||
| Name: "opensds-files-default", | ||
| TotalCapacity: int64(20), | ||
| FreeCapacity: int64(20), | ||
| AvailabilityZone: "default", | ||
| StorageType: "file", | ||
| MultiAttach: false, | ||
| Extras: model.StoragePoolExtraSpec{ | ||
| DataStorage: model.DataStorageLoS{ | ||
| ProvisioningPolicy: "Thin", | ||
| IsSpaceEfficient: false, | ||
| StorageAccessCapability: []string{"Read", "Write", "Execute"}, | ||
| }, | ||
| IOConnectivity: model.IOConnectivityLoS{ | ||
| AccessProtocol: "nfs", | ||
| MaxIOPS: 7000000, | ||
| MaxBWS: 600, | ||
| }, | ||
| Advanced: map[string]interface{}{ | ||
| "diskType": "SSD", | ||
| "latency": "5ms", | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| pols, err := fd.ListPools() | ||
| if err != nil { | ||
| t.Error("Failed to list pools:", err) | ||
| } | ||
| for i := range pols { | ||
| pols[i].Id = "" | ||
| } | ||
| if !reflect.DeepEqual(pols, expected) { | ||
| t.Errorf("Expected %+v, got %+v\n", expected[0], pols[0]) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| tgtBindIp: 11.242.178.20 | ||
| tgtConfDir: /etc/tgt/conf.d | ||
| pool: | ||
| opensds-files-default: | ||
| diskType: NL-SAS | ||
| availabilityZone: default | ||
| multiAttach: true | ||
| storageType: file | ||
| extras: | ||
| dataStorage: | ||
| provisioningPolicy: Thin | ||
| isSpaceEfficient: false | ||
| storageAccessCapability: | ||
| - Read | ||
| - Write | ||
| - Execute | ||
| ioConnectivity: | ||
| accessProtocol: nfs | ||
| maxIOPS: 7000000 | ||
| maxBWS: 600 | ||
| advanced: | ||
| diskType: SSD | ||
| latency: 5ms |
Oops, something went wrong.