chg folder

diff --cc src/discoverymgr/discovery_init.go
index 80778338b146e4eef85b4c31518b80db8f27bb33,fe4ca1e0557874abfa6a29006e002f6ff92be306..306844cb0cf899ae5ad8b18c7cf5b7353e5c9782
--- 1/src/discoverymgr/discovery_init.go
--- 2/src/discoverymgr/discovery_init.go
+++ b/src/discoverymgr/discovery_init.go
@@@ -69,7 -67,7 +69,7 @@@ func DeviceList() ([]DeviceReturnInfo, 
                }
        }(entries)
  
--      ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(100))
++      ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(10))
        defer cancel()
        err = resolver.Browse(ctx, serviceType, domain, entries)
        if err != nil {

diff --cc src/discoverymgr/discoverymgr_test.go
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..ebf2e305ba967ed367a797ae73cb3ee8062d473e
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/src/discoverymgr/discoverymgr_test.go
@@@ -1,0 -1,0 +1,88 @@@
++package test
++
++import (
++      "discoverymgr"
++      "net"
++      "os"
++      "testing"
++)
++
++//@Todo os dependency check
++func getIP() string {
++      addrs, err := net.InterfaceAddrs()
++      if err != nil {
++              os.Stderr.WriteString("Oops: " + err.Error() + "\n")
++              os.Exit(1)
++      }
++      var ipv4 string
++      for _, a := range addrs {
++              if ipnet, ok := a.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
++                      if ipnet.IP.To4() != nil {
++                              if ipnet.IP.String()[:2] == "10" {
++                                      os.Stdout.WriteString(ipnet.IP.String() + "\n")
++                                      ipv4 = ipnet.IP.String()
++                                      break
++                              }
++
++                      }
++              }
++      }
++      return ipv4
++}
++func TestSetServiceNames(t *testing.T) {
++      err := discoverymgr.InitDiscovery()
++      if err != nil {
++              t.Fail()
++      }
++      ServiceNames := []string{"Test1", "Test2"}
++      err = discoverymgr.SetServiceNames(ServiceNames)
++      if err != nil {
++              t.Fail()
++      }
++
++      ret, err := discoverymgr.DeviceList()
++      if err != nil {
++              t.Fail()
++      }
++
++      ipv4 := getIP()
++      isExist := -1
++      for i, v := range ret {
++              if v.DeviceIP == ipv4 {
++                      isExist = i
++              }
++      }
++
++      if isExist == -1 {
++              t.Fail()
++      }
++
++      if ret[isExist].ServiceNames[0] != ServiceNames[0] ||
++              ret[isExist].ServiceNames[1] != ServiceNames[1] {
++              t.Fail()
++      }
++}
++func TestInitDiscovery(t *testing.T) {
++      err := discoverymgr.InitDiscovery()
++      if err != nil {
++              t.Fail()
++      }
++
++      ret, err := discoverymgr.DeviceList()
++      if err != nil {
++              t.Fail()
++      }
++
++      ipv4 := getIP()
++      isExist := -1
++      for i, v := range ret {
++              if v.DeviceIP == ipv4 {
++                      isExist = i
++              }
++      }
++
++      if isExist == -1 {
++              t.Error("no device")
++              t.Fail()
++      }
++}

diff --cc src/restapi/v1/restapi.go
Simple merge

diff --cc src/restapi/v1/restapi_test.go
index 1b166e4ea21f0473ad44d8f1b4f66ef006bb299e,021e65d4e8b4837e6003ba43bf68a6cd555765d9..d9b5e4b407c07da512f456779a841858e04605c2
--- 1/src/restapi/v1/restapi_test.go
--- 2/src/restapi/v1/restapi_test.go
+++ b/src/restapi/v1/restapi_test.go
@@@ -29,11 -27,11 +27,12 @@@ const 
        ConstDeviceResourceUsageNetworkGet = "/api/v1/device/resource/usage/network"
  
        // @TODO discovery mgr URI
 -      ConstDiscoverymgrDevices = "/api/v1/discoverymgr/devices"
 +      ConstDiscoverymgrDevicesGet  = "/api/v1/discoverymgr/devices"
 +      ConstDiscoverymgrDevicesPost = "/api/v1/discoverymgr/devices"
  
        // Service mgr URI
-       ConstServicemgrServices = "/api/v1/servicemgr/services"
+       ConstServicemgrServices     = "/api/v1/servicemgr/services"
+       ConstServicemgrServicesNoti = "/api/v1/servicemgr/services/notification/"
  
        ConstAppName     = "AppName"
        ConstServiceName = "ls"
@@@ -248,61 -226,20 +227,32 @@@ func TestAPIV1DiscoverymgrDevicesGet(t 
        testGet(t, targetURI, http.StatusOK)
  }
  
 +func TestAPIV1DiscoverymgrDevicesPost(t *testing.T) {
 +      targetURI := ConstDiscoverymgrDevicesPost
 +      ServiceNames := make(map[string][]string)
 +      ServiceNames["ServiceNames"] = []string{"Distributed Web Engine", "Television", "Soundbox"}
 +
 +      bdbytes, err := json.Marshal(ServiceNames)
 +      if err != nil {
 +              t.Log(err.Error())
 +              t.Error()
 +      }
 +      testPost(t, targetURI, bdbytes, http.StatusOK)
 +}
  func TestAPIV1ServicemgrServicesPost(t *testing.T) {
-       registerService(t)
+       executeService(t)
  }
  
- func TestAPIV1ServicemgrServicesGet(t *testing.T) {
-       registerService(t)
+ func TestAPIV1ServicemgrServicesNotificationServiceIDPost(t *testing.T) {
+       statusNotificationRequest := make(map[string]interface{})
+       statusNotificationRequest["ServiceID"] = 1
+       statusNotificationRequest["Status"] = "Failed"
  
-       targetURI := ConstServicemgrServices
-       testGet(t, targetURI, http.StatusOK)
- }
+       snbytes, _ := json.Marshal(statusNotificationRequest)
  
- func TestAPIV1ServicemgrServicesGetByAppName(t *testing.T) {
-       // @TODO add register service
-       registerService(t)
+       targetURI := ConstServicemgrServicesNoti
  
-       targetURI := ConstServicemgrServices + "/" + ConstAppName
-       testGet(t, targetURI, http.StatusOK)
- }
- 
- func TestAPIV1ServicemgrServicesGetByServiceID(t *testing.T) {
-       // @TODO add register service
-       createResponse := registerService(t)
- 
-       targetURI := ConstServicemgrServices + "/" + strconv.FormatUint(createResponse.ServiceList[0].ID, 10)
-       testGet(t, targetURI, http.StatusOK)
- }
- 
- func TestAPIV1ServicemgrServicesServiceIDPost(t *testing.T) {
-       createResponse := registerService(t)
-       executeService(t, createResponse.ServiceList[0].ID)
- 
-       time.Sleep(time.Second * 2)
- }
- 
- func TestAPIV1ServicemgrServicesServiceIDDeleteNotFoundService(t *testing.T) {
-       // createResponse := registerService(t)
-       // executeService(t, createResponse.ServiceList[0].ID)
- 
-       // time.Sleep(time.Second * 1)
-       // targetURI := ConstServicemgrServices + "/" + strconv.FormatUint(createResponse.ServiceList[0].ID, 10)
- 
-       targetURI := ConstServicemgrServices + "/6"
-       res, err := DoDelete(testURL + targetURI)
+       res, err := DoPost(testURL+targetURI+"1", snbytes)
        if err != nil {
                t.Log(err.Error())
                t.Error()

diff --cc src/restapi/v1/routers.go
index 76f89899424751799aee250757fcae1700fe79b1,5834c112e1057faf8282672e0e3fb70c432045c5..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/src/restapi/v1/routers.go
--- 2/src/restapi/v1/routers.go
+++ /dev/null
@@@ -1,152 -1,117 +1,0 @@@
--/*
-- * Edge Orchestration
-- *
-- * Edge Orchestration support to deliver distributed service process environment.
-- *
-- * API version: v1-20190318
-- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
-- */
--
--package v1
--
--import (
--      "fmt"
--      "net/http"
--      "strings"
--
--      "github.com/gorilla/mux"
--)
--
--// Route type
--type Route struct {
--      Name        string
--      Method      string
--      Pattern     string
--      HandlerFunc http.HandlerFunc
--}
--
--// Routes type
--type Routes []Route
--
--// NewRouter function
--func NewRouter() *mux.Router {
--      router := mux.NewRouter().StrictSlash(true)
--      for _, route := range routes {
--              var handler http.Handler
--              handler = route.HandlerFunc
--              handler = Logger(handler, route.Name)
--
--              router.
--                      Methods(route.Method).
--                      Path(route.Pattern).
--                      Name(route.Name).
--                      Handler(handler)
--      }
--
--      return router
--}
--
--// Index function
--func Index(w http.ResponseWriter, r *http.Request) {
--      fmt.Fprintf(w, "Hello World!")
--}
--
--var routes = Routes{
--      Route{
--              "Index",
--              "GET",
--              "/",
--              Index,
--      },
--
--      Route{
--              "APIV1DeviceResourceUsageCPUGet",
--              strings.ToUpper("Get"),
--              "/api/v1/device/resource/usage/cpu",
--              APIV1DeviceResourceUsageCPUGet,
--      },
--
--      Route{
--              "APIV1DeviceResourceUsageDiskGet",
--              strings.ToUpper("Get"),
--              "/api/v1/device/resource/usage/disk",
--              APIV1DeviceResourceUsageDiskGet,
--      },
--
--      Route{
--              "APIV1DeviceResourceUsageMemoryGet",
--              strings.ToUpper("Get"),
--              "/api/v1/device/resource/usage/memory",
--              APIV1DeviceResourceUsageMemoryGet,
--      },
--
--      Route{
--              "APIV1DeviceResourceUsageNetworkGet",
--              strings.ToUpper("Get"),
--              "/api/v1/device/resource/usage/network",
--              APIV1DeviceResourceUsageNetworkGet,
--      },
--
--      Route{
--              "APIV1DiscoverymgrDevicesDeviceIDGet",
--              strings.ToUpper("Get"),
--              "/api/v1/discoverymgr/devices/{deviceid}",
--              APIV1DiscoverymgrDevicesDeviceIDGet,
--      },
--
--      Route{
--              "APIV1DiscoverymgrDevicesGet",
--              strings.ToUpper("Get"),
--              "/api/v1/discoverymgr/devices",
--              APIV1DiscoverymgrDevicesGet,
-       },
- 
-       Route{
-               "APIV1DiscoverymgrDevicesPost",
-               strings.ToUpper("Post"),
-               "/api/v1/discoverymgr/devices",
-               APIV1DiscoverymgrDevicesPost,
-       },
- 
-       Route{
-               "APIV1ServicemgrServicesAppnameGet",
-               strings.ToUpper("Get"),
-               "/api/v1/servicemgr/services/{appname}",
-               APIV1ServicemgrServicesAppnameGet,
-       },
- 
-       Route{
-               "APIV1ServicemgrServicesDelete",
-               strings.ToUpper("Delete"),
-               "/api/v1/servicemgr/services",
-               APIV1ServicemgrServicesDelete,
-       },
- 
-       Route{
-               "APIV1ServicemgrServicesGet",
-               strings.ToUpper("Get"),
-               "/api/v1/servicemgr/services",
-               APIV1ServicemgrServicesGet,
--      },
--
--      Route{
--              "APIV1ServicemgrServicesPost",
--              strings.ToUpper("Post"),
--              "/api/v1/servicemgr/services",
--              APIV1ServicemgrServicesPost,
-       },
- 
-       Route{
-               "APIV1ServicemgrServicesServiceIDDelete",
-               strings.ToUpper("Delete"),
-               "/api/v1/servicemgr/services/{serviceid}",
-               APIV1ServicemgrServicesServiceIDDelete,
--      },
--
--      Route{
-               "APIV1ServicemgrServicesServiceIDPost",
 -              "APIV1ServicemgrServicesNotificationServiceIDPost",
--              strings.ToUpper("Post"),
-               "/api/v1/servicemgr/services/{serviceid}",
-               APIV1ServicemgrServicesServiceIDPost,
 -              "/api/v1/servicemgr/services/notification/{serviceid}",
 -              APIV1ServicemgrServicesNotificationServiceIDPost,
--      },
--}