From: Konrad Bańka <k.banka@samsung.com>
Date: Thu, 16 Apr 2020 18:16:51 +0000 (+0200)
Subject: Update brokerhandler API to conform with /v1/ path pattern
X-Git-Tag: 0.6.0~19
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4ae60c1b50750587ab9d3960617a47d7db57b311;p=multicloud%2Fk8s.git

Update brokerhandler API to conform with /v1/ path pattern

Issue-ID: MULTICLOUD-1053
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: I8f567bed2783e7257784cd4ce4c9f76207634e7a
---

diff --git a/src/k8splugin/api/api.go b/src/k8splugin/api/api.go
index c836fc65..ff2270ac 100644
--- a/src/k8splugin/api/api.go
+++ b/src/k8splugin/api/api.go
@@ -54,10 +54,11 @@ func NewRouter(defClient rb.DefinitionManager,
 	//Setup the broker handler here
 	//Use the base router without any path prefixes
 	brokerHandler := brokerInstanceHandler{client: instClient}
-	router.HandleFunc("/{cloud-owner}/{cloud-region}/infra_workload", brokerHandler.createHandler).Methods("POST")
-	router.HandleFunc("/{cloud-owner}/{cloud-region}/infra_workload/{instID}", brokerHandler.getHandler).Methods("GET")
-	router.HandleFunc("/{cloud-owner}/{cloud-region}/infra_workload", brokerHandler.findHandler).Queries("name", "{name}").Methods("GET")
-	router.HandleFunc("/{cloud-owner}/{cloud-region}/infra_workload/{instID}", brokerHandler.deleteHandler).Methods("DELETE")
+	brokerRouter := router.PathPrefix("/v1").Subrouter()
+	brokerRouter.HandleFunc("/{cloud-owner}/{cloud-region}/infra_workload", brokerHandler.createHandler).Methods("POST")
+	brokerRouter.HandleFunc("/{cloud-owner}/{cloud-region}/infra_workload/{instID}", brokerHandler.getHandler).Methods("GET")
+	brokerRouter.HandleFunc("/{cloud-owner}/{cloud-region}/infra_workload", brokerHandler.findHandler).Queries("name", "{name}").Methods("GET")
+	brokerRouter.HandleFunc("/{cloud-owner}/{cloud-region}/infra_workload/{instID}", brokerHandler.deleteHandler).Methods("DELETE")
 
 	//Setup the connectivity api handler here
 	if connectionClient == nil {
diff --git a/src/k8splugin/api/brokerhandler_test.go b/src/k8splugin/api/brokerhandler_test.go
index c822f6d1..12774eb8 100644
--- a/src/k8splugin/api/brokerhandler_test.go
+++ b/src/k8splugin/api/brokerhandler_test.go
@@ -312,7 +312,7 @@ func TestBrokerCreateHandler(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.label, func(t *testing.T) {
 
-			request := httptest.NewRequest("POST", "/cloudowner/cloudregion/infra_workload", testCase.input)
+			request := httptest.NewRequest("POST", "/v1/cloudowner/cloudregion/infra_workload", testCase.input)
 			resp := executeRequest(request, NewRouter(nil, nil, testCase.instClient, nil, nil, nil))
 			defer resp.Body.Close()
 
@@ -408,7 +408,7 @@ func TestBrokerGetHandler(t *testing.T) {
 
 	for _, testCase := range testCases {
 		t.Run(testCase.label, func(t *testing.T) {
-			request := httptest.NewRequest("GET", "/cloudowner/cloudregion/infra_workload/"+testCase.input, nil)
+			request := httptest.NewRequest("GET", "/v1/cloudowner/cloudregion/infra_workload/"+testCase.input, nil)
 			resp := executeRequest(request, NewRouter(nil, nil, testCase.instClient, nil, nil, nil))
 
 			if testCase.expectedCode != resp.StatusCode {
@@ -488,7 +488,7 @@ func TestBrokerFindHandler(t *testing.T) {
 
 	for _, testCase := range testCases {
 		t.Run(testCase.label, func(t *testing.T) {
-			request := httptest.NewRequest("GET", "/cloudowner/cloudregion/infra_workload?name="+testCase.input, nil)
+			request := httptest.NewRequest("GET", "/v1/cloudowner/cloudregion/infra_workload?name="+testCase.input, nil)
 			resp := executeRequest(request, NewRouter(nil, nil, testCase.instClient, nil, nil, nil))
 
 			if testCase.expectedCode != resp.StatusCode {
@@ -550,7 +550,7 @@ func TestBrokerDeleteHandler(t *testing.T) {
 
 	for _, testCase := range testCases {
 		t.Run(testCase.label, func(t *testing.T) {
-			request := httptest.NewRequest("DELETE", "/cloudowner/cloudregion/infra_workload/"+testCase.input, nil)
+			request := httptest.NewRequest("DELETE", "/v1/cloudowner/cloudregion/infra_workload/"+testCase.input, nil)
 			resp := executeRequest(request, NewRouter(nil, nil, testCase.instClient, nil, nil, nil))
 
 			if testCase.expectedCode != resp.StatusCode {