update restapi function

diff --git a/.gitignore b/.gitignore
index 5d0f86ba94888b1d6044829e4a173c9d373d3dc3..ebc62b8aec022fc6a32da994e0f6228758a072e9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 bin/*
 pkg/*
 vendor/src
+doc/generate-api/*
 
 # Test binary, build with `go test -c`
 *.test

diff --git a/doc/README.md b/doc/README.md
index 32c27976a3f9b336bb588e2eac42bacca4f79fe3..03ad8a47c85b49e7c48c25d3130a9dc9df81f124 100644 (file)
--- a/doc/README.md
+++ b/doc/README.md
@@ -10,5 +10,5 @@ Java HotSpot(TM) 64-Bit Server VM (build 25.201-b09, mixed mode)
 ```
 ### 2. Code generate
 ```
-$ java -jar swagger-codegen-cli.jar generate -i ../edge-orchestration-api.json -l go-server
+$ java -jar swagger-codegen-cli.jar generate -i edge-orchestration-api.json -l go-server
 ```

diff --git a/doc/edge-orchestration-api.json b/doc/edge-orchestration-api.json
index 7bd3287fe3d5289946a07eef8fc4825e9ff3881e..e058a7d93a6e1e6c3164284d54b422b846418580 100644 (file)
--- a/doc/edge-orchestration-api.json
+++ b/doc/edge-orchestration-api.json
@@ -341,6 +341,37 @@
                                        }
                                }
                        }
+               },
+               "/api/v1/servicemgr/services/{appname}": {
+                       "get": {
+                               "tags": [
+                                       "Service Manager"
+                               ],
+                               "description": "Get information of app",
+                               "consumes": [
+                                       "application/json"
+                               ],
+                               "produces": [
+                                       "application/json"
+                               ],
+                               "parameters": [
+                                       {
+                                               "name": "appname",
+                                               "in": "path",
+                                               "description": "Name of executed app",
+                                               "required": true,
+                                               "type": "string"
+                                       }
+                               ],
+                               "responses": {
+                                       "200": {
+                                               "description": "Successful operation",
+                                               "schema": {
+                                                       "$ref": "#/definitions/ServiceInfo"
+                                               }
+                                       }
+                               }
+                       }
                }
        },
        "definitions": {

diff --git a/doc/generate-api/api/swagger.yaml b/doc/generate-api/api/swagger.yaml
index c5ef1b4dd3c8dda740f9574a5a40fa61f3dd1a2d..05f3174435216d43359722a2df33287cd447c8c8 100644 (file)
--- a/doc/generate-api/api/swagger.yaml
+++ b/doc/generate-api/api/swagger.yaml
@@ -235,6 +235,27 @@ paths:
           description: "Successful operation"
           schema:
             $ref: "#/definitions/APIResponse"
+  /api/v1/servicemgr/services/{appname}:
+    get:
+      tags:
+      - "Service Manager"
+      description: "Get information of app"
+      consumes:
+      - "application/json"
+      produces:
+      - "application/json"
+      parameters:
+      - name: "appname"
+        in: "path"
+        description: "Name of executed app"
+        required: true
+        type: "string"
+        x-exportParamName: "Appname"
+      responses:
+        200:
+          description: "Successful operation"
+          schema:
+            $ref: "#/definitions/ServiceInfo"
 definitions:
   EdgeResource:
     type: "string"
@@ -400,6 +421,9 @@ definitions:
         description: "Name of requested user service"
       serviceList:
         $ref: "#/definitions/MicroServiceList"
+    example:
+      appName: "GreetWorldApp"
+      serviceList: ""
   ServiceList:
     type: "array"
     items:

diff --git a/doc/generate-api/go/api_service_manager.go b/doc/generate-api/go/api_service_manager.go
index 11cdb89005646f073e2c62bd989815bf4d85678c..368b81342e25edf6a124adc742da033e780578f6 100644 (file)
--- a/doc/generate-api/go/api_service_manager.go
+++ b/doc/generate-api/go/api_service_manager.go
@@ -13,6 +13,11 @@ import (
        "net/http"
 )
 
+func ApiV1ServicemgrServicesAppnameGet(w http.ResponseWriter, r *http.Request) {
+       w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+       w.WriteHeader(http.StatusOK)
+}
+
 func ApiV1ServicemgrServicesDelete(w http.ResponseWriter, r *http.Request) {
        w.Header().Set("Content-Type", "application/json; charset=UTF-8")
        w.WriteHeader(http.StatusOK)

diff --git a/doc/generate-api/go/routers.go b/doc/generate-api/go/routers.go
index ca2e5b32f3434e2feb7c7cad5c1a62c55b56d9b1..0d53db1011c8f5af09ef695f721ecb8d9ba7bdbe 100644 (file)
--- a/doc/generate-api/go/routers.go
+++ b/doc/generate-api/go/routers.go
@@ -97,6 +97,13 @@ var routes = Routes{
                ApiV1DiscoverymgrDevicesGet,
        },
 
+       Route{
+               "ApiV1ServicemgrServicesAppnameGet",
+               strings.ToUpper("Get"),
+               "/api/v1/servicemgr/services/{appname}",
+               ApiV1ServicemgrServicesAppnameGet,
+       },
+
        Route{
                "ApiV1ServicemgrServicesDelete",
                strings.ToUpper("Delete"),

diff --git a/doc/generate-api/swagger-codegen-cli.jar b/doc/generate-api/swagger-codegen-cli.jar
deleted file mode 100644 (file)
index 73f8501..0000000
Binary files a/doc/generate-api/swagger-codegen-cli.jar and /dev/null differ

diff --git a/doc/swagger-codegen-cli.jar b/doc/swagger-codegen-cli.jar
new file mode 100644 (file)
index 0000000..73f8501
Binary files /dev/null and b/doc/swagger-codegen-cli.jar differ

diff --git a/src/restapi/v1/restapi.go b/src/restapi/v1/restapi.go
index 0df85e026fa98cef777c58ac26c92516ee9adf50..304cf9b622de8592d26293642b136d99c9f1cee0 100644 (file)
--- a/src/restapi/v1/restapi.go
+++ b/src/restapi/v1/restapi.go
@@ -71,11 +71,6 @@ func APIV1ServicemgrServicesDelete(w http.ResponseWriter, r *http.Request) {
        log.Printf("[%s] APIV1ServicemgrServicesDelete", logPrefix)
 }
 
-// APIV1ServicemgrServicesGet function
-func APIV1ServicemgrServicesGet(w http.ResponseWriter, r *http.Request) {
-       log.Printf("[%s] APIV1ServicemgrServicesGet", logPrefix)
-}
-
 // APIV1ServicemgrServicesPost function
 func APIV1ServicemgrServicesPost(w http.ResponseWriter, r *http.Request) {
        log.Printf("[%s] APIV1ServicemgrServicesPost", logPrefix)
@@ -117,21 +112,13 @@ func APIV1ServicemgrEventServiceIDPost(w http.ResponseWriter, r *http.Request) {
        id, err := strconv.ParseUint(serviceID, 10, 64)
 
        if len(serviceID) == 0 || err != nil {
-               w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-               w.WriteHeader(http.StatusBadRequest)
+               writeJSONResponse(w, nil, http.StatusBadRequest)
        } else {
                servicemgr.DataPathHandler(w, r, id)
-
-               w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-               w.WriteHeader(http.StatusOK)
+               writeJSONResponse(w, nil, http.StatusOK)
        }
 }
 
-// APIV1ServicemgrServicesServiceIDGet function
-func APIV1ServicemgrServicesServiceIDGet(w http.ResponseWriter, r *http.Request) {
-       log.Printf("[%s] APIV1ServicemgrServicesServiceIDGet", logPrefix)
-}
-
 // APIV1ServicemgrServicesServiceIDPost function
 func APIV1ServicemgrServicesServiceIDPost(w http.ResponseWriter, r *http.Request) {
        log.Printf("[%s] APIV1ServicemgrServicesServiceIDPost", logPrefix)
@@ -160,72 +147,58 @@ func APIV1ServicemgrServicesGet(w http.ResponseWriter, r *http.Request) {
 
        ret, err := servicemgr.ServiceList()
        if err != nil {
-               w.Header().Set("Content-Type", "application/json; charset=UTF-8")
                writeJSONResponse(w, nil, http.StatusBadRequest)
-               return
        }
 
        json, err := json.Marshal(ret)
        if err == nil {
-               w.Header().Set("Content-Type", "application/json; charset=UTF-8")
                writeJSONResponse(w, json, http.StatusOK)
        } else {
-               w.Header().Set("Content-Type", "application/json; charset=UTF-8")
                writeJSONResponse(w, nil, http.StatusBadRequest)
        }
 }
 
-// APIV1ServicemgrServicesGetByAppName function
-func APIV1ServicemgrServicesGetByAppName(w http.ResponseWriter, r *http.Request) {
-       log.Printf("[%s] APIV1ServicemgrServicesGetByAppName", logPrefix)
+// APIV1ServicemgrServicesAppnameGet function
+func APIV1ServicemgrServicesAppnameGet(w http.ResponseWriter, r *http.Request) {
+       log.Printf("[%s] APIV1ServicemgrServicesAppnameGet", logPrefix)
 
        vars := mux.Vars(r)
        appName := vars["appname"]
 
        ret, err := servicemgr.FindServiceByName(appName)
        if err != nil {
-               w.Header().Set("Content-Type", "application/json; charset=UTF-8")
                writeJSONResponse(w, nil, http.StatusBadRequest)
-               return
        }
 
        json, err := json.Marshal(ret)
        if err == nil {
-               w.Header().Set("Content-Type", "application/json; charset=UTF-8")
                writeJSONResponse(w, json, http.StatusOK)
        } else {
-               w.Header().Set("Content-Type", "application/json; charset=UTF-8")
                writeJSONResponse(w, nil, http.StatusBadRequest)
        }
 }
 
-// APIV1ServicemgrServicesGetByServiceID function
-func APIV1ServicemgrServicesGetByServiceID(w http.ResponseWriter, r *http.Request) {
-       log.Printf("[%s] APIV1ServicemgrServicesGetByServiceID", logPrefix)
+// APIV1ServicemgrServicesServiceIDGet function
+func APIV1ServicemgrServicesServiceIDGet(w http.ResponseWriter, r *http.Request) {
+       log.Printf("[%s] APIV1ServicemgrServicesServiceIDGet", logPrefix)
 
        vars := mux.Vars(r)
        serviceID := vars["serviceid"]
 
        id, err := strconv.ParseUint(serviceID, 10, 64)
        if err != nil {
-               w.Header().Set("Content-Type", "application/json; charset=UTF-8")
                writeJSONResponse(w, nil, http.StatusBadRequest)
-               return
        }
 
        ret, err := servicemgr.FindServiceByID(id)
        if err != nil {
-               w.Header().Set("Content-Type", "application/json; charset=UTF-8")
                writeJSONResponse(w, nil, http.StatusBadRequest)
-               return
        }
 
        json, err := json.Marshal(ret)
        if err == nil {
-               w.Header().Set("Content-Type", "application/json; charset=UTF-8")
                writeJSONResponse(w, json, http.StatusOK)
        } else {
-               w.Header().Set("Content-Type", "application/json; charset=UTF-8")
                writeJSONResponse(w, nil, http.StatusBadRequest)
        }
 }

diff --git a/src/restapi/v1/routers.go b/src/restapi/v1/routers.go
index 8ab65f6d05a7d4641e911ee452277df0e5b37aeb..c31eac22a9b3e4679a8b902963f7343af8f878b1 100644 (file)
--- a/src/restapi/v1/routers.go
+++ b/src/restapi/v1/routers.go
@@ -101,6 +101,13 @@ var routes = Routes{
                APIV1DiscoverymgrDevicesGet,
        },
 
+       Route{
+               "APIV1ServicemgrServicesAppnameGet",
+               strings.ToUpper("Get"),
+               "/api/v1/servicemgr/services/{appname}",
+               APIV1ServicemgrServicesAppnameGet,
+       },
+
        Route{
                "APIV1ServicemgrServicesDelete",
                strings.ToUpper("Delete"),
@@ -142,25 +149,4 @@ var routes = Routes{
                "/api/v1/servicemgr/services/{serviceid}",
                APIV1ServicemgrServicesServiceIDPost,
        },
-
-       Route{
-               "APIV1ServicemgrServicesGet",
-               strings.ToUpper("Get"),
-               "/api/v1/servicemgr/services",
-               APIV1ServicemgrServicesGet,
-       },
-
-       Route{
-               "APIV1ServicemgrServicesGetByAppName",
-               strings.ToUpper("Get"),
-               "/api/v1/servicemgr/services/{appname}",
-               APIV1ServicemgrServicesGetByAppName,
-       },
-
-       Route{
-               "APIV1ServicemgrServicesGetByServiceID",
-               strings.ToUpper("Get"),
-               "/api/v1/servicemgr/services/{serviceid}",
-               APIV1ServicemgrServicesGetByServiceID,
-       },
 }