-
Notifications
You must be signed in to change notification settings - Fork 8
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 #71 from linkernetworks/hwchiu/VX-105
Support the create/delete for volume(pvc) via restful API Former-commit-id: 83ca49cd0998a60d943dda80108f1b096cfdefcf [formerly 83ca49cd0998a60d943dda80108f1b096cfdefcf [formerly 006a9e8]] Former-commit-id: c1d7c36c6fe6e41c235cff10c435af42dff755b1 Former-commit-id: cac2b2b
- Loading branch information
Showing
6 changed files
with
211 additions
and
49 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
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,56 @@ | ||
| package volume | ||
|
|
||
| import ( | ||
| "github.com/linkernetworks/mongo" | ||
| "github.com/linkernetworks/vortex/src/entity" | ||
| "github.com/linkernetworks/vortex/src/serviceprovider" | ||
| "gopkg.in/mgo.v2/bson" | ||
|
|
||
| "k8s.io/api/core/v1" | ||
| "k8s.io/apimachinery/pkg/api/resource" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| ) | ||
|
|
||
| func getPVCInstance(volume *entity.Volume, storageClassName string) *v1.PersistentVolumeClaim { | ||
| capacity, _ := resource.ParseQuantity(volume.Capacity) | ||
| return &v1.PersistentVolumeClaim{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: volume.MetaName, | ||
| }, | ||
| Spec: v1.PersistentVolumeClaimSpec{ | ||
| AccessModes: []v1.PersistentVolumeAccessMode{volume.AccessMode}, | ||
| Resources: v1.ResourceRequirements{ | ||
| Limits: map[v1.ResourceName]resource.Quantity{ | ||
| "storage": capacity, | ||
| }, | ||
| Requests: map[v1.ResourceName]resource.Quantity{ | ||
| "storage": capacity, | ||
| }, | ||
| }, | ||
| StorageClassName: &storageClassName, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func getStorageClassName(session *mongo.Session, storageName string) (string, error) { | ||
| storage := entity.Storage{} | ||
| err := session.FindOne(entity.StorageCollectionName, bson.M{"name": storageName}, &storage) | ||
| return storage.StorageClassName, err | ||
| } | ||
|
|
||
| func CreateVolume(sp *serviceprovider.Container, volume *entity.Volume) error { | ||
| session := sp.Mongo.NewSession() | ||
| defer session.Close() | ||
| storageName, err := getStorageClassName(session, volume.StorageName) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| //fetch the db to get the storageName | ||
| pvc := getPVCInstance(volume, storageName) | ||
| _, err = sp.KubeCtl.CreatePVC(pvc) | ||
| return err | ||
| } | ||
|
|
||
| func DeleteVolume(sp *serviceprovider.Container, volume *entity.Volume) error { | ||
| return sp.KubeCtl.DeletePVC(volume.MetaName) | ||
| } |
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,112 @@ | ||
| package volume | ||
|
|
||
| import ( | ||
| "math/rand" | ||
| "testing" | ||
| "time" | ||
|
|
||
| //"github.com/linkernetworks/mongo" | ||
| "github.com/linkernetworks/vortex/src/config" | ||
| "github.com/linkernetworks/vortex/src/entity" | ||
| "github.com/linkernetworks/vortex/src/serviceprovider" | ||
| "github.com/moby/moby/pkg/namesgenerator" | ||
| "github.com/stretchr/testify/suite" | ||
| "gopkg.in/mgo.v2/bson" | ||
| ) | ||
|
|
||
| func init() { | ||
| rand.Seed(time.Now().UnixNano()) | ||
| } | ||
|
|
||
| type VolumeTestSuite struct { | ||
| suite.Suite | ||
| sp *serviceprovider.Container | ||
| } | ||
|
|
||
| func (suite *VolumeTestSuite) SetupSuite() { | ||
| cf := config.MustRead("../../config/testing.json") | ||
| suite.sp = serviceprovider.NewForTesting(cf) | ||
| } | ||
|
|
||
| func (suite *VolumeTestSuite) TearDownSuite() { | ||
| } | ||
|
|
||
| func TestVolumeSuite(t *testing.T) { | ||
| suite.Run(t, new(VolumeTestSuite)) | ||
| } | ||
|
|
||
| func (suite *VolumeTestSuite) TestGetPVCInstance() { | ||
| volume := &entity.Volume{ | ||
| ID: bson.NewObjectId(), | ||
| Name: namesgenerator.GetRandomName(0), | ||
| StorageName: namesgenerator.GetRandomName(0), | ||
| MetaName: namesgenerator.GetRandomName(0), | ||
| } | ||
|
|
||
| pvc := getPVCInstance(volume, namesgenerator.GetRandomName(0)) | ||
| suite.NotNil(pvc) | ||
| suite.Equal(pvc.ObjectMeta.Name, volume.MetaName) | ||
| } | ||
|
|
||
| func (suite *VolumeTestSuite) TestGetStorageClassName() { | ||
| session := suite.sp.Mongo.NewSession() | ||
| defer session.Close() | ||
|
|
||
| storage := entity.Storage{ | ||
| ID: bson.NewObjectId(), | ||
| Name: namesgenerator.GetRandomName(0), | ||
| StorageClassName: namesgenerator.GetRandomName(0), | ||
| } | ||
|
|
||
| session.Insert(entity.StorageCollectionName, &storage) | ||
| defer session.Remove(entity.StorageCollectionName, "name", storage.Name) | ||
| name, err := getStorageClassName(session, storage.Name) | ||
| suite.NoError(err) | ||
| suite.Equal(name, storage.StorageClassName) | ||
| } | ||
|
|
||
| func (suite *VolumeTestSuite) TestCreateVolume() { | ||
| session := suite.sp.Mongo.NewSession() | ||
| defer session.Close() | ||
| storage := entity.Storage{ | ||
| ID: bson.NewObjectId(), | ||
| Name: namesgenerator.GetRandomName(0), | ||
| StorageClassName: namesgenerator.GetRandomName(0), | ||
| } | ||
|
|
||
| session.Insert(entity.StorageCollectionName, &storage) | ||
| defer session.Remove(entity.StorageCollectionName, "name", storage.Name) | ||
|
|
||
| volume := &entity.Volume{ | ||
| ID: bson.NewObjectId(), | ||
| Name: namesgenerator.GetRandomName(0), | ||
| StorageName: storage.Name, | ||
| MetaName: namesgenerator.GetRandomName(0), | ||
| } | ||
|
|
||
| err := CreateVolume(suite.sp, volume) | ||
| suite.NoError(err) | ||
|
|
||
| v, err := suite.sp.KubeCtl.GetPVC(volume.MetaName) | ||
| suite.NoError(err) | ||
| suite.NotNil(v) | ||
|
|
||
| err = DeleteVolume(suite.sp, volume) | ||
| suite.NoError(err) | ||
|
|
||
| v, err = suite.sp.KubeCtl.GetPVC(volume.MetaName) | ||
| suite.Error(err) | ||
| suite.Nil(v) | ||
| } | ||
|
|
||
| func (suite *VolumeTestSuite) TestCreateVolumeFail() { | ||
| volume := &entity.Volume{ | ||
| ID: bson.NewObjectId(), | ||
| Name: namesgenerator.GetRandomName(0), | ||
| StorageName: namesgenerator.GetRandomName(0), | ||
| MetaName: namesgenerator.GetRandomName(0), | ||
| } | ||
|
|
||
| err := CreateVolume(suite.sp, volume) | ||
| suite.Error(err) | ||
| } |