From: rajdeep11 Date: Thu, 26 Dec 2024 10:32:12 +0000 (+0530) Subject: changing the url based on specs X-Git-Tag: 4.0.0~14^2 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F77%2F13977%2F1;p=aiml-fw%2Fawmf%2Fmodelmgmtservice.git changing the url based on specs Change-Id: Ie40f54e55f862ad0fdbaf57e9758b747291a1ba3 Signed-off-by: rajdeep11 --- diff --git a/apis_test/mmes_apis_test.go b/apis_test/mmes_apis_test.go index 159db44..eae8d77 100644 --- a/apis_test/mmes_apis_test.go +++ b/apis_test/mmes_apis_test.go @@ -106,7 +106,7 @@ func TestRegisterModel(t *testing.T) { handler := apis.NewMmeApiHandler(nil, iDBMockInst) router := routers.InitRouter(handler) w := httptest.NewRecorder() - req, _ := http.NewRequest("POST", "/model-registrations", strings.NewReader(registerModelBody)) + req, _ := http.NewRequest("POST", "/ai-ml-model-registration/v1/model-registrations", strings.NewReader(registerModelBody)) router.ServeHTTP(w, req) assert.Equal(t, 201, w.Code) } @@ -139,7 +139,7 @@ func TestWhenSuccessGetModelInfoList(t *testing.T) { router := routers.InitRouter(handler) responseRecorder := httptest.NewRecorder() - req, _ := http.NewRequest("GET", "/models", nil) + req, _ := http.NewRequest("GET", "/ai-ml-model-registration/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", "/models", nil) + req, _ := http.NewRequest("GET", "/ai-ml-model-registration/v1/models", nil) router.ServeHTTP(responseRecorder, req) response := responseRecorder.Result() diff --git a/routers/router.go b/routers/router.go index f90e5bf..da6fbc2 100644 --- a/routers/router.go +++ b/routers/router.go @@ -26,17 +26,18 @@ func InitRouter(handler *apis.MmeApiHandler) *gin.Engine { r := gin.New() r.Use(gin.Logger()) r.Use(gin.Recovery()) + api := r.Group("/ai-ml-model-registration/v1") // As per R1-AP v6 - r.POST("/model-registrations", handler.RegisterModel) - r.POST("/model-registrations/updateArtifact/:modelname/:modelversion/:artifactversion", handler.UpdateArtifact) - r.GET("/model-registrations/:modelRegistrationId", handler.GetModelInfoById) - r.PUT("/model-registrations/:modelRegistrationId", handler.UpdateModel) - r.DELETE("/model-registrations/:modelRegistrationId", handler.DeleteModel) + 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) - r.GET("/models", handler.GetModelInfo) + api.GET("/models", handler.GetModelInfo) - r.GET("/getModelInfo/:modelName", handler.GetModelInfoByName) - r.POST("/uploadModel/:modelName", handler.UploadModel) - r.GET("/downloadModel/:modelName/model.zip", handler.DownloadModel) + api.GET("/getModelInfo/:modelName", handler.GetModelInfoByName) + api.POST("/uploadModel/:modelName", handler.UploadModel) + api.GET("/downloadModel/:modelName/model.zip", handler.DownloadModel) return r }