diff options
Diffstat (limited to 'src/orchestrator/api')
| -rw-r--r-- | src/orchestrator/api/projecthandler.go | 4 | ||||
| -rw-r--r-- | src/orchestrator/api/projecthandler_test.go | 52 |
2 files changed, 38 insertions, 18 deletions
diff --git a/src/orchestrator/api/projecthandler.go b/src/orchestrator/api/projecthandler.go index 1830b91d..1e78c676 100644 --- a/src/orchestrator/api/projecthandler.go +++ b/src/orchestrator/api/projecthandler.go @@ -49,7 +49,7 @@ func (h projectHandler) createHandler(w http.ResponseWriter, r *http.Request) { } // Name is required. - if p.ProjectName == "" { + if p.MetaData.Name == "" { http.Error(w, "Missing name in POST request", http.StatusBadRequest) return } @@ -70,7 +70,7 @@ func (h projectHandler) createHandler(w http.ResponseWriter, r *http.Request) { } // Get handles GET operations on a particular Project Name -// Returns a rb.Project +// Returns a Project func (h projectHandler) getHandler(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) name := vars["project-name"] diff --git a/src/orchestrator/api/projecthandler_test.go b/src/orchestrator/api/projecthandler_test.go index 41f515d0..ee6ed358 100644 --- a/src/orchestrator/api/projecthandler_test.go +++ b/src/orchestrator/api/projecthandler_test.go @@ -1,5 +1,5 @@ /* - * Copyright 2018 Intel Corporation, Inc + * Copyright 2020 Intel Corporation, Inc * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -77,20 +77,32 @@ func TestProjectCreateHandler(t *testing.T) { label: "Create Project", expectedCode: http.StatusCreated, reader: bytes.NewBuffer([]byte(`{ - "project-name":"testProject", - "description":"Test Project used for unit testing" - }`)), + "metadata" : { + "name": "testProject", + "description": "Test Project used for unit testing", + "userData1": "data1", + "userData2": "data2" + } + }`)), expected: moduleLib.Project{ - ProjectName: "testProject", - Description: "Test Project used for unit testing", + MetaData: moduleLib.ProjectMetaData{ + Name: "testProject", + Description: "Test Project used for unit testing", + UserData1: "data1", + UserData2: "data2", + }, }, projectClient: &mockProjectManager{ //Items that will be returned by the mocked Client Items: []moduleLib.Project{ - { - ProjectName: "testProject", - Description: "Test Project used for unit testing", - }, + moduleLib.Project{ + MetaData: moduleLib.ProjectMetaData{ + Name: "testProject", + Description: "Test Project used for unit testing", + UserData1: "data1", + UserData2: "data2", + }, + }, }, }, }, @@ -141,16 +153,24 @@ func TestProjectGetHandler(t *testing.T) { label: "Get Project", expectedCode: http.StatusOK, expected: moduleLib.Project{ - ProjectName: "testProject", - Description: "A Test project for unit testing", + MetaData: moduleLib.ProjectMetaData{ + Name: "testProject", + Description: "Test Project used for unit testing", + UserData1: "data1", + UserData2: "data2", + }, }, name: "testProject", projectClient: &mockProjectManager{ Items: []moduleLib.Project{ - { - ProjectName: "testProject", - Description: "A Test project for unit testing", - }, + moduleLib.Project{ + MetaData: moduleLib.ProjectMetaData{ + Name: "testProject", + Description: "Test Project used for unit testing", + UserData1: "data1", + UserData2: "data2", + }, + }, }, }, }, |