Add dock and controller for file share #726

Shruthi-1MN · 2019-05-09T13:03:56Z

What this PR does / why we need it:
Implementation of controller and dock for file share feature - only implemented create, delete file share operation. Still driver code implementation is in progress. Integration test has to be done yet with sample driver code.

File share post code workflow is as below:
Controller workflow:
1 gRPC interface(model/fileshareproto, filesharecontroller.go)
2 Fileshare controller client(filesharecontroller/client)
3 selector to select the profiles
4 Filesharecontroller server(filesharecontroller/controller.go)
Dock workflow
1 It checks with fileshareproto to validate the dock creation
2 Client communicates to dock server(filesharedock/client)
3 Server dock.go - which registers to the dock and provision the dock so it contacts dock/discovery to discover and maps to backend drivers

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #

Special notes for your reviewer:

Release note:

Shruthi-1MN · 2019-05-09T13:04:14Z

@xxwjj, @wisererik, @leonwanghui, @xing-yang , @NajmudheenCT, @ kumarashit , @rhsakarpos, @himanshuvar, @skdwriting

coveralls · 2019-05-09T13:12:21Z

Coverage decreased (-1.0%) to 29.275% when pulling 141d347 on Shruthi-1MN:fileshare-patch into 7e706f1 on opensds:development.

wisererik

LGTM

leonwanghui · 2019-05-09T14:31:37Z

contrib/drivers/utils/config/constants.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Huawei Technologies Co., Ltd. All Rights Reserved.
+// Copyright 2019 The OpenSDS Authors


Missing a . here

pkg/api/controllers/fileshare.go

leonwanghui · 2019-05-09T15:18:37Z

pkg/controller/fileshare/filesharecontroller.go

+	"github.com/opensds/opensds/pkg/dock/client"
+	"github.com/opensds/opensds/pkg/model"
+	pb "github.com/opensds/opensds/pkg/model/proto"
+	"golang.org/x/net/context"


Please use context package

leonwanghui · 2019-05-09T15:19:40Z

pkg/controller/volume/volumecontroller_test.go


 	"github.com/opensds/opensds/pkg/dock/client"
 	"github.com/opensds/opensds/pkg/model"
+	"github.com/opensds/opensds/pkg/model/proto"


Please remove this package since it's duplicate.

leonwanghui · 2019-05-09T15:21:58Z

pkg/controller/fileshare/filesharecontroller.go

@@ -0,0 +1,104 @@
+// Copyright 2019 The OpenSDS Authors


Please add . here.

leonwanghui · 2019-05-09T15:22:30Z

pkg/controller/selector/selector.go

+		prf, err = db.C.GetProfile(c.NewAdminContext(), in.ProfileId)
+	}
+	if err != nil {
+		log.Error("Get profile failed: ", err)


Please change to lower case.

leonwanghui · 2019-05-09T15:22:40Z

pkg/controller/selector/selector.go

+	}
+	pools, err := db.C.ListPools(c.NewAdminContext())
+	if err != nil {
+		log.Error("When list pools in resources SelectSupportedPool: ", err)


Done in entire function

xing-yang · 2019-05-09T15:26:15Z

contrib/drivers/filesharedrivers/drivers.go

+package filesharedrivers
+
+import (
+	"github.com/opensds/opensds/contrib/drivers/filesharedrivers/nfsnative"


Rename "nfsnative" to "nfs".

xing-yang · 2019-05-09T15:26:51Z

contrib/drivers/filesharedrivers/drivers.go

+func Init(resourceType string) FileShareDriver {
+	var f FileShareDriver
+	switch resourceType {
+	case config.NFSNativeDriverType:


s/NFSNativeDriverType/NFSDriverType:

xing-yang · 2019-05-09T15:27:42Z

contrib/drivers/filesharedrivers/nfsnative/nfsnative.go

@@ -0,0 +1,50 @@
+// Copyright 2019 The OpenSDS Authors.


Change to contrib/drivers/filesharedrivers/nfs/nfs.go

xing-yang · 2019-05-09T15:27:56Z

contrib/drivers/filesharedrivers/nfsnative/nfsnative.go

+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package nfsnative


Change to "nfs"

xing-yang · 2019-05-09T15:28:53Z

contrib/drivers/utils/config/constants.go


-	DRBDDriverType = "drbd"
+const (
+	NFSNativeDriverType = "nfsnative"


NFSDriverType = "nfs"

xing-yang · 2019-05-09T15:29:59Z

pkg/api/controllers/fileshare.go

+		return
+	}
+
+	// NOTE:It will create a file share entry into the database and initialize its status


Add a space after "NOTE:"

xing-yang · 2019-05-09T15:30:16Z

pkg/api/controllers/fileshare.go

-
 	f.SuccessHandle(StatusAccepted, body)
+
+	// NOTE:The real file share creation process.


Space after "NOTE:"

xing-yang · 2019-05-09T15:31:23Z

pkg/api/controllers/fileshare.go


 	f.SuccessHandle(StatusAccepted, nil)

+	// NOTE:The real file share deletion process.


Space after "NOTE:"

xing-yang · 2019-05-09T15:31:38Z

pkg/api/controllers/fileshare.go

 	}

-	// NOTE:It will update the the status of the volume snapshot waiting for deletion in
+	// NOTE:It will update the the status of the file share snapshot waiting for deletion in


space after NOTE:

xing-yang · 2019-05-09T15:33:52Z

Also need a rebase.

xing-yang · 2019-05-09T15:35:56Z

pkg/model/proto/model.proto

+    // The locality that file share belongs to, required.
+    string availabilityZone = 6;
+    // The service level that file share belongs to, required.
+    string profileId = 7;


This should be removed.

ok i will remove

xing-yang · 2019-05-09T15:36:27Z

pkg/model/proto/model.proto

+    string id = 1;
+    // The service level that fileshare belongs to, required.
+    // This item will be replace by profile
+    string profileId = 2;


Remove it. We already have profile below.

ok i will remove

pkg/utils/config/config_define.go

leonwanghui

LGTM

Shruthi-1MN mentioned this pull request May 9, 2019

[WIP] Add implementation of separate file share controller and dock processes #704

Closed

wisererik approved these changes May 9, 2019

View reviewed changes

leonwanghui reviewed May 9, 2019

View reviewed changes

Shruthi-1MN force-pushed the fileshare-patch branch 2 times, most recently from abb9dee to ddad98e Compare May 9, 2019 15:00

leonwanghui assigned Shruthi-1MN May 9, 2019

leonwanghui added the feature there is a huge framework change or feature addition label May 9, 2019

leonwanghui requested changes May 9, 2019

View reviewed changes

xing-yang reviewed May 9, 2019

View reviewed changes

pkg/utils/config/config_define.go Outdated Show resolved Hide resolved

Shruthi-1MN force-pushed the fileshare-patch branch 3 times, most recently from 7b25b29 to 047e9ba Compare May 10, 2019 07:28

Add dock and controller of file share

732aa53

Shruthi-1MN force-pushed the fileshare-patch branch from 047e9ba to 732aa53 Compare May 10, 2019 07:55

leonwanghui approved these changes May 10, 2019

View reviewed changes

Merge branch 'development' into fileshare-patch

141d347

wisererik merged commit e772087 into sodafoundation:development May 10, 2019

Shruthi-1MN deleted the fileshare-patch branch May 20, 2019 05:10

		@@ -1,4 +1,4 @@
		// Copyright (c) 2018 Huawei Technologies Co., Ltd. All Rights Reserved.
		// Copyright 2019 The OpenSDS Authors


		f.SuccessHandle(StatusAccepted, body)

		// NOTE:The real file share creation process.


		f.SuccessHandle(StatusAccepted, nil)

		// NOTE:The real file share deletion process.

Add dock and controller for file share #726

Add dock and controller for file share #726

Uh oh!

Conversation

Shruthi-1MN commented May 9, 2019

Uh oh!

Shruthi-1MN commented May 9, 2019

Uh oh!

coveralls commented May 9, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wisererik left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

xing-yang commented May 9, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Shruthi-1MN May 9, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

coveralls commented May 9, 2019 •

edited

Loading

Shruthi-1MN May 9, 2019 •

edited

Loading

Shruthi-1MN May 9, 2019 •

edited

Loading