From: 차지원/Service Innovation Lab(SR)/Engineer/삼성전자 <jw_wonny.cha@samsung.com>
Date: Mon, 25 Mar 2019 08:07:18 +0000 (+0900)
Subject: Merge branch 'master' into EDGE-242
X-Git-Tag: submit/tizen/20190409.085658~19^2~1^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d137658b25b44cc76bc45b81c72db5ce39f93e5;p=platform%2Fcore%2Fsystem%2Fedge-orchestration.git

Merge branch 'master' into EDGE-242
---

8d137658b25b44cc76bc45b81c72db5ce39f93e5
diff --cc src/restapi/v1/restapi.go
index 5262db7,c53d11e..5346dc7
--- a/src/restapi/v1/restapi.go
+++ b/src/restapi/v1/restapi.go
@@@ -113,30 -107,18 +113,25 @@@ func APIV1ServicemgrServicesServiceIDDe
  func APIV1ServicemgrEventServiceIDPost(w http.ResponseWriter, r *http.Request) {
  	log.Printf("[%s] APIV1ServicemgrEventServiceIDPost", logPrefix)
  
 -	vars := mux.Vars(r)
 -	serviceID := vars["serviceid"]
 -	id, err := strconv.ParseUint(serviceID, 10, 64)
 +	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
 +	writeJSONResponse(w, nil, http.StatusNotImplemented)
  
 -	if len(serviceID) == 0 || err != nil {
 -		writeJSONResponse(w, nil, http.StatusBadRequest)
 -	} else {
 -		servicemgr.DataPathHandler(w, r, id)
 -		writeJSONResponse(w, nil, http.StatusOK)
 -	}
 +	// @ TODO
 +	// vars := mux.Vars(r)
 +	// serviceID := vars["serviceid"]
 +	// 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)
 +	// } else {
 +	// 	servicemgr.DataPathHandler(w, r, id)
 +
 +	// 	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
 +	// 	w.WriteHeader(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)