Remove extra v1 from broker path

Remove extra v1 from path as it is added
in the MSB api anyway.

Issue-ID: MULTICLOUD-630
Change-Id: Ib7adbf2315e0a3b1fe8170096d877df8f1b64683
Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>

diff --git a/src/k8splugin/api/api.go b/src/k8splugin/api/api.go
index 5fed28a..2976b82 100644 (file)
--- a/src/k8splugin/api/api.go
+++ b/src/k8splugin/api/api.go
@@ -43,12 +43,11 @@ func NewRouter(defClient rb.DefinitionManager,
        // instRouter.HandleFunc("/{vnfInstanceId}", UpdateHandler).Methods("PUT")
 
        //Setup the broker handler here
+       //Use the base router without any path prefixes
        brokerHandler := brokerInstanceHandler{client: instClient}
-       instRouter.HandleFunc("/{cloud-owner}/{cloud-region}/infra_workload", brokerHandler.createHandler).Methods("POST")
-       instRouter.HandleFunc("/{cloud-owner}/{cloud-region}/infra_workload/{instID}",
-               brokerHandler.getHandler).Methods("GET")
-       instRouter.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/{instID}", brokerHandler.deleteHandler).Methods("DELETE")
 
        //Setup the connectivity api handler here
        connectionClient := connection.NewConnectionClient()

diff --git a/src/k8splugin/api/brokerhandler_test.go b/src/k8splugin/api/brokerhandler_test.go
index d9991e6..1604663 100644 (file)
--- a/src/k8splugin/api/brokerhandler_test.go
+++ b/src/k8splugin/api/brokerhandler_test.go
@@ -122,7 +122,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))
 
                        if testCase.expectedCode != resp.StatusCode {
@@ -204,7 +204,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))
 
                        if testCase.expectedCode != resp.StatusCode {
@@ -251,7 +251,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))
 
                        if testCase.expectedCode != resp.StatusCode {