Merge changes I56fb4643,Ia1e9802a

* changes:
  Add etcd support in infrastructure layer
  Restructure code and create module library

1 files changed, 9 insertions, 10 deletions

diff --git a/src/orchestrator/api/api.go b/src/orchestrator/api/api.go
index 83f17bbe..e37b158a 100644
--- a/src/orchestrator/api/api.go
+++ b/src/orchestrator/api/api.go
@@ -10,29 +10,28 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-
 package api
 
 import (
-	"github.com/onap/multicloud-k8s/src/orchestrator/internal/project"
+	moduleLib "github.com/onap/multicloud-k8s/src/orchestrator/pkg/module"
 
 	"github.com/gorilla/mux"
 )
-
+var moduleClient *moduleLib.Client
 // NewRouter creates a router that registers the various urls that are supported
-func NewRouter(projectClient project.ProjectManager) *mux.Router {
+func NewRouter(projectClient moduleLib.ProjectManager) *mux.Router {
 
 	router := mux.NewRouter().PathPrefix("/v2").Subrouter()
-
+	moduleClient = moduleLib.NewClient()
 	if projectClient == nil {
-		projectClient = project.NewProjectClient()
+		projectClient = moduleClient.Project
 	}
 	projHandler := projectHandler{
 		client: projectClient,
 	}
-	router.HandleFunc("/project", projHandler.createHandler).Methods("POST")
-	router.HandleFunc("/project/{project-name}", projHandler.getHandler).Methods("GET")
-	router.HandleFunc("/project/{project-name}", projHandler.deleteHandler).Methods("DELETE")
+	router.HandleFunc("/projects", projHandler.createHandler).Methods("POST")
+	router.HandleFunc("/projects/{project-name}", projHandler.getHandler).Methods("GET")
+	router.HandleFunc("/projects/{project-name}", projHandler.deleteHandler).Methods("DELETE")
 
 	return router
-}
+}
\ No newline at end of file