Merge changes from topics "listprofiles", "tagprofile", "tag_defn"

* changes:
  Add list api for profiles
  Make profile db tags specific
  Make definition tags specific

3 files changed, 126 insertions, 1 deletions

diff --git a/src/k8splugin/api/api.go b/src/k8splugin/api/api.go
index 353972a1..a6cdfc7a 100644
--- a/src/k8splugin/api/api.go
+++ b/src/k8splugin/api/api.go
@@ -78,6 +78,7 @@ func NewRouter(defClient rb.DefinitionManager,
 	}
 	profileHandler := rbProfileHandler{client: profileClient}
 	resRouter.HandleFunc("/definition/{rbname}/{rbversion}/profile", profileHandler.createHandler).Methods("POST")
+	resRouter.HandleFunc("/definition/{rbname}/{rbversion}/profile", profileHandler.listHandler).Methods("GET")
 	resRouter.HandleFunc("/definition/{rbname}/{rbversion}/profile/{prname}/content", profileHandler.uploadHandler).Methods("POST")
 	resRouter.HandleFunc("/definition/{rbname}/{rbversion}/profile/{prname}", profileHandler.getHandler).Methods("GET")
 	resRouter.HandleFunc("/definition/{rbname}/{rbversion}/profile/{prname}", profileHandler.deleteHandler).Methods("DELETE")
diff --git a/src/k8splugin/api/profilehandler.go b/src/k8splugin/api/profilehandler.go
index adb9249b..68ab77a4 100644
--- a/src/k8splugin/api/profilehandler.go
+++ b/src/k8splugin/api/profilehandler.go
@@ -20,9 +20,10 @@ import (
 	"encoding/json"
 	"io"
 	"io/ioutil"
-	"github.com/onap/multicloud-k8s/src/k8splugin/internal/rb"
 	"net/http"
 
+	"github.com/onap/multicloud-k8s/src/k8splugin/internal/rb"
+
 	"github.com/gorilla/mux"
 )
 
@@ -119,6 +120,28 @@ func (h rbProfileHandler) getHandler(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
+// getHandler handles GET operations on a particular ids
+// Returns a rb.Definition
+func (h rbProfileHandler) listHandler(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	rbName := vars["rbname"]
+	rbVersion := vars["rbversion"]
+
+	ret, err := h.client.List(rbName, rbVersion)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(http.StatusOK)
+	err = json.NewEncoder(w).Encode(ret)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+}
+
 // deleteHandler handles DELETE operations on a particular bundle definition id
 func (h rbProfileHandler) deleteHandler(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
diff --git a/src/k8splugin/api/profilehandler_test.go b/src/k8splugin/api/profilehandler_test.go
index e81fb262..4dae377c 100644
--- a/src/k8splugin/api/profilehandler_test.go
+++ b/src/k8splugin/api/profilehandler_test.go
@@ -23,6 +23,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"reflect"
+	"sort"
 	"testing"
 
 	"github.com/onap/multicloud-k8s/src/k8splugin/internal/rb"
@@ -57,6 +58,14 @@ func (m *mockRBProfile) Get(rbname, rbversion, prname string) (rb.Profile, error
 	return m.Items[0], nil
 }
 
+func (m *mockRBProfile) List(rbname, rbversion string) ([]rb.Profile, error) {
+	if m.Err != nil {
+		return []rb.Profile{}, m.Err
+	}
+
+	return m.Items, nil
+}
+
 func (m *mockRBProfile) Delete(rbname, rbversion, prname string) error {
 	return m.Err
 }
@@ -210,6 +219,98 @@ func TestRBProfileGetHandler(t *testing.T) {
 	}
 }
 
+func TestRBProfileListHandler(t *testing.T) {
+
+	testCases := []struct {
+		def          string
+		version      string
+		label        string
+		expected     []rb.Profile
+		expectedCode int
+		rbProClient  *mockRBProfile
+	}{
+		{
+			def:          "test-rbdef",
+			version:      "v1",
+			label:        "List Profiles",
+			expectedCode: http.StatusOK,
+			expected: []rb.Profile{
+				{
+					RBName:            "test-rbdef",
+					RBVersion:         "v1",
+					ProfileName:       "profile1",
+					ReleaseName:       "testprofilereleasename",
+					Namespace:         "ns1",
+					KubernetesVersion: "1.12.3",
+				},
+				{
+					RBName:            "test-rbdef",
+					RBVersion:         "v1",
+					ProfileName:       "profile2",
+					ReleaseName:       "testprofilereleasename",
+					Namespace:         "ns2",
+					KubernetesVersion: "1.12.3",
+				},
+			},
+			rbProClient: &mockRBProfile{
+				// list of Profiles that will be returned by the mockclient
+				Items: []rb.Profile{
+					{
+						RBName:            "test-rbdef",
+						RBVersion:         "v1",
+						ProfileName:       "profile1",
+						ReleaseName:       "testprofilereleasename",
+						Namespace:         "ns1",
+						KubernetesVersion: "1.12.3",
+					},
+					{
+						RBName:            "test-rbdef",
+						RBVersion:         "v1",
+						ProfileName:       "profile2",
+						ReleaseName:       "testprofilereleasename",
+						Namespace:         "ns2",
+						KubernetesVersion: "1.12.3",
+					},
+				},
+			},
+		},
+	}
+
+	for _, testCase := range testCases {
+		t.Run(testCase.label, func(t *testing.T) {
+			request := httptest.NewRequest("GET", "/v1/rb/definition/"+testCase.def+"/"+testCase.version+"/profile", nil)
+			resp := executeRequest(request, NewRouter(nil, testCase.rbProClient, nil, nil, nil, nil))
+
+			//Check returned code
+			if resp.StatusCode != testCase.expectedCode {
+				t.Fatalf("Expected %d; Got: %d", testCase.expectedCode, resp.StatusCode)
+			}
+
+			//Check returned body only if statusOK
+			if resp.StatusCode == http.StatusOK {
+				got := []rb.Profile{}
+				json.NewDecoder(resp.Body).Decode(&got)
+
+				// Since the order of returned slice is not guaranteed
+				// Check both and return error if both don't match
+				sort.Slice(got, func(i, j int) bool {
+					return got[i].ProfileName < got[j].ProfileName
+				})
+				// Sort both as it is not expected that testCase.expected
+				// is sorted
+				sort.Slice(testCase.expected, func(i, j int) bool {
+					return testCase.expected[i].ProfileName < testCase.expected[j].ProfileName
+				})
+
+				if reflect.DeepEqual(testCase.expected, got) == false {
+					t.Errorf("listHandler returned unexpected body: got %v;"+
+						" expected %v", got, testCase.expected)
+				}
+			}
+		})
+	}
+}
+
 func TestRBProfileDeleteHandler(t *testing.T) {
 
 	testCases := []struct {