Revert "Update brokerhandler API to conform with /v1/ path pattern"

This reverts commit 4ae60c1b50750587ab9d3960617a47d7db57b311.

Reason for revert: Unable to reproduce bug, reverting fix implementation

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

diff --git a/src/k8splugin/api/api.go b/src/k8splugin/api/api.go
index ff2270a..c836fc6 100644 (file)
--- a/src/k8splugin/api/api.go
+++ b/src/k8splugin/api/api.go
@@ -54,11 +54,10 @@ func NewRouter(defClient rb.DefinitionManager,
        //Setup the broker handler here
        //Use the base router without any path prefixes
        brokerHandler := brokerInstanceHandler{client: instClient}
-       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")
+       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")
 
        //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 12774eb..c822f6d 100644 (file)
--- 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", "/v1/cloudowner/cloudregion/infra_workload", testCase.input)
+                       request := httptest.NewRequest("POST", "/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", "/v1/cloudowner/cloudregion/infra_workload/"+testCase.input, nil)
+                       request := httptest.NewRequest("GET", "/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", "/v1/cloudowner/cloudregion/infra_workload?name="+testCase.input, nil)
+                       request := httptest.NewRequest("GET", "/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", "/v1/cloudowner/cloudregion/infra_workload/"+testCase.input, nil)
+                       request := httptest.NewRequest("DELETE", "/cloudowner/cloudregion/infra_workload/"+testCase.input, nil)
                        resp := executeRequest(request, NewRouter(nil, nil, testCase.instClient, nil, nil, nil))
 
                        if testCase.expectedCode != resp.StatusCode {