Merge pull request #39 from linkernetworks/hwchiu/minor-fix

Add the testing for invalid page and unexposed the restful handler Former-commit-id: 7f5e8683b9236d603763adeb6b05c08d10b3568e [formerly 7f5e8683b9236d603763adeb6b05c08d10b3568e [formerly 057ca64]] Former-commit-id: 204e6b8583a86aafba61bc4e6cdb25a1f0039deb Former-commit-id: 4c04bba
linkernetworks · Jun 25, 2018 · 647fcbb · 647fcbb
2 parents ba89e57 + 2f40a87
commit 647fcbb
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/src/server/handler_network.go b/src/server/handler_network.go
@@ -15,7 +15,7 @@ import (
 	"gopkg.in/mgo.v2/bson"
 )
 
-func CreateNetworkHandler(ctx *web.Context) {
+func createNetworkHandler(ctx *web.Context) {
 	as, req, resp := ctx.ServiceProvider, ctx.Request, ctx.Response
 
 	network := entity.Network{}
@@ -59,7 +59,7 @@ func CreateNetworkHandler(ctx *web.Context) {
 	})
 }
 
-func ListNetworkHandler(ctx *web.Context) {
+func listNetworkHandler(ctx *web.Context) {
 	as, req, resp := ctx.ServiceProvider, ctx.Request, ctx.Response
 
 	var pageSize = 10
@@ -105,7 +105,7 @@ func ListNetworkHandler(ctx *web.Context) {
 	resp.WriteEntity(networks)
 }
 
-func GetNetworkHandler(ctx *web.Context) {
+func getNetworkHandler(ctx *web.Context) {
 	as, req, resp := ctx.ServiceProvider, ctx.Request, ctx.Response
 
 	id := req.PathParameter("id")
@@ -126,7 +126,7 @@ func GetNetworkHandler(ctx *web.Context) {
 	resp.WriteEntity(network)
 }
 
-func DeleteNetworkHandler(ctx *web.Context) {
+func deleteNetworkHandler(ctx *web.Context) {
 	as, req, resp := ctx.ServiceProvider, ctx.Request, ctx.Response
 
 	id := req.PathParameter("id")

diff --git a/src/server/handler_network_test.go b/src/server/handler_network_test.go
@@ -328,4 +328,13 @@ func TestListNetworkWithInvalidPage(t *testing.T) {
 	service = newNetworkService(sp)
 	wc.Dispatch(httpWriter, httpRequest)
 	assertResponseCode(t, http.StatusBadRequest, httpWriter)
+
+	httpRequest, err = http.NewRequest("GET", "http://localhost:7890/v1/networks?page=-1", nil)
+	assert.NoError(t, err)
+
+	httpWriter = httptest.NewRecorder()
+	service = newNetworkService(sp)
+	wc.Dispatch(httpWriter, httpRequest)
+	assertResponseCode(t, http.StatusInternalServerError, httpWriter)
+
 }
diff --git a/src/server/handler_storage_provider.go b/src/server/handler_storage_provider.go
@@ -15,7 +15,7 @@ import (
 	"gopkg.in/mgo.v2/bson"
 )
 
-func CreateStorageProvider(ctx *web.Context) {
+func createStorageProvider(ctx *web.Context) {
 	sp, req, resp := ctx.ServiceProvider, ctx.Request, ctx.Response
 
 	storageProvider := entity.StorageProvider{}
@@ -49,7 +49,7 @@ func CreateStorageProvider(ctx *web.Context) {
 	})
 }
 
-func ListStorageProvider(ctx *web.Context) {
+func listStorageProvider(ctx *web.Context) {
 	sp, req, resp := ctx.ServiceProvider, ctx.Request, ctx.Response
 
 	var pageSize = 10

diff --git a/src/server/route.go b/src/server/route.go
@@ -33,18 +33,18 @@ func newVersionService(sp *serviceprovider.Container) *restful.WebService {
 func newNetworkService(sp *serviceprovider.Container) *restful.WebService {
 	webService := new(restful.WebService)
 	webService.Path("/v1/networks").Consumes(restful.MIME_JSON, restful.MIME_JSON).Produces(restful.MIME_JSON, restful.MIME_JSON)
-	webService.Route(webService.GET("/").To(handler.RESTfulServiceHandler(sp, ListNetworkHandler)))
-	webService.Route(webService.GET("/{id}").To(handler.RESTfulServiceHandler(sp, GetNetworkHandler)))
-	webService.Route(webService.POST("/").To(handler.RESTfulServiceHandler(sp, CreateNetworkHandler)))
-	webService.Route(webService.DELETE("/{id}").To(handler.RESTfulServiceHandler(sp, DeleteNetworkHandler)))
+	webService.Route(webService.GET("/").To(handler.RESTfulServiceHandler(sp, listNetworkHandler)))
+	webService.Route(webService.GET("/{id}").To(handler.RESTfulServiceHandler(sp, getNetworkHandler)))
+	webService.Route(webService.POST("/").To(handler.RESTfulServiceHandler(sp, createNetworkHandler)))
+	webService.Route(webService.DELETE("/{id}").To(handler.RESTfulServiceHandler(sp, deleteNetworkHandler)))
 	return webService
 }
 
 func newStorageProviderService(sp *serviceprovider.Container) *restful.WebService {
 	webService := new(restful.WebService)
 	webService.Path("/v1/storageprovider").Consumes(restful.MIME_JSON, restful.MIME_JSON).Produces(restful.MIME_JSON, restful.MIME_JSON)
-	webService.Route(webService.POST("/").To(handler.RESTfulServiceHandler(sp, CreateStorageProvider)))
-	webService.Route(webService.GET("/").To(handler.RESTfulServiceHandler(sp, ListStorageProvider)))
+	webService.Route(webService.POST("/").To(handler.RESTfulServiceHandler(sp, createStorageProvider)))
+	webService.Route(webService.GET("/").To(handler.RESTfulServiceHandler(sp, listStorageProvider)))
 	return webService
 }