adding the model discovery url prefix

Change-Id: I3b8308e7461b2655324c697644fef4601a887832
Signed-off-by: rajdeep11 <rajdeep.sin@samsung.com>

diff --git a/apis_test/mmes_apis_test.go b/apis_test/mmes_apis_test.go
index eae8d77..d5bb898 100644 (file)
--- a/apis_test/mmes_apis_test.go
+++ b/apis_test/mmes_apis_test.go
@@ -139,7 +139,7 @@ func TestWhenSuccessGetModelInfoList(t *testing.T) {
        router := routers.InitRouter(handler)
        responseRecorder := httptest.NewRecorder()
 
-       req, _ := http.NewRequest("GET", "/ai-ml-model-registration/v1/models", nil)
+       req, _ := http.NewRequest("GET", "/ai-ml-model-discovery/v1/models", nil)
        router.ServeHTTP(responseRecorder, req)
 
        response := responseRecorder.Result()
@@ -165,7 +165,7 @@ func TestWhenFailGetModelInfoList(t *testing.T) {
        router := routers.InitRouter(handler)
        responseRecorder := httptest.NewRecorder()
 
-       req, _ := http.NewRequest("GET", "/ai-ml-model-registration/v1/models", nil)
+       req, _ := http.NewRequest("GET", "/ai-ml-model-discovery/v1/models", nil)
        router.ServeHTTP(responseRecorder, req)
 
        response := responseRecorder.Result()

diff --git a/routers/router.go b/routers/router.go
index da6fbc2..a8d0bff 100644 (file)
--- a/routers/router.go
+++ b/routers/router.go
@@ -27,17 +27,21 @@ func InitRouter(handler *apis.MmeApiHandler) *gin.Engine {
        r.Use(gin.Logger())
        r.Use(gin.Recovery())
        api := r.Group("/ai-ml-model-registration/v1")
+    {
+        api.POST("/model-registrations", handler.RegisterModel)
+        api.POST("/model-registrations/updateArtifact/:modelname/:modelversion/:artifactversion", handler.UpdateArtifact)
+        api.GET("/model-registrations/:modelRegistrationId", handler.GetModelInfoById)
+        api.PUT("/model-registrations/:modelRegistrationId", handler.UpdateModel)
+        api.DELETE("/model-registrations/:modelRegistrationId", handler.DeleteModel)
+        api.GET("/getModelInfo/:modelName", handler.GetModelInfoByName)
+        api.POST("/uploadModel/:modelName", handler.UploadModel)
+        api.GET("/downloadModel/:modelName/model.zip", handler.DownloadModel)
+    }
        // As per R1-AP v6
-       api.POST("/model-registrations", handler.RegisterModel)
-       api.POST("/model-registrations/updateArtifact/:modelname/:modelversion/:artifactversion", handler.UpdateArtifact)
-       api.GET("/model-registrations/:modelRegistrationId", handler.GetModelInfoById)
-       api.PUT("/model-registrations/:modelRegistrationId", handler.UpdateModel)
-       api.DELETE("/model-registrations/:modelRegistrationId", handler.DeleteModel)
 
-       api.GET("/models", handler.GetModelInfo)
-
-       api.GET("/getModelInfo/:modelName", handler.GetModelInfoByName)
-       api.POST("/uploadModel/:modelName", handler.UploadModel)
-       api.GET("/downloadModel/:modelName/model.zip", handler.DownloadModel)
+    modelDiscovery:= r.Group("/ai-ml-model-discovery/v1")
+    {
+        modelDiscovery.GET("/models", handler.GetModelInfo)
+    }
        return r
 }