discoverymgr/.go : refactory discoverymgr

remove go channel
remove go function

Change-Id: I7e59861074f4a0f86d73dbd8b35887de838389ef

diff --git a/src/discoverymgr/configure.go b/src/discoverymgr/configure.go
index 54f1ec5..83f965e 100755 (executable)
--- a/src/discoverymgr/configure.go
+++ b/src/discoverymgr/configure.go
@@ -32,3 +32,6 @@ const (
 
 // ExitChan is orchestration agent exit chan
 var ExitChan chan int
+
+// ExitPollingOutBoundCh is polling stop
+var ExitPollingOutBoundCh chan int

diff --git a/src/discoverymgr/discovery_execution.go b/src/discoverymgr/discovery_execution.go
index 359a854..9f02add 100755 (executable)
--- a/src/discoverymgr/discovery_execution.go
+++ b/src/discoverymgr/discovery_execution.go
@@ -18,6 +18,7 @@ package discoverymgr
 
 import (
        "context"
+       "errors"
        "log"
        "net"
        "time"
@@ -25,8 +26,12 @@ import (
        "grandcat/zeroconf"
 )
 
-//GetDeviceList retune device list
+//GetDeviceList return device list
 func GetDeviceList() ([]DeviceReturnInfo, error) {
+       if gServer == nil {
+               return nil, errors.New("zeroconf server is nil")
+       }
+
        gServer.IsInterfaceChange()
 
        zeroconf.MapMTX.Lock()
@@ -44,6 +49,9 @@ func GetDeviceList() ([]DeviceReturnInfo, error) {
 
 //GetDeviceListWithService retune device list
 func GetDeviceListWithService(target string) ([]string, error) {
+       if gServer == nil {
+               return nil, errors.New("zeroconf server is nil")
+       }
        gServer.IsInterfaceChange()
 
        zeroconf.MapMTX.Lock()
@@ -92,6 +100,7 @@ func discoveryBGR() {
 }
 
 func discoverDevice(t int) (map[string][]string, error) {
+
        domain := "local"
 
        // Options for IPType.
@@ -120,10 +129,10 @@ func discoverDevice(t int) (map[string][]string, error) {
        go func(results <-chan *zeroconf.ServiceEntry) {
                for entry := range results {
                        deviceIP := entry.AddrIPv4[0].String()
-                       log.Println(logPrefix, "Discoverd Device: "+deviceIP)
                        ServiceNames := make([]string, len(entry.Text))
                        ServiceNames = entry.Text
                        data[deviceIP] = ServiceNames
+                       log.Println(logPrefix, "Discoverd Device: "+deviceIP)
                }
        }(entries)
 
@@ -136,5 +145,8 @@ func discoverDevice(t int) (map[string][]string, error) {
 
        <-ctx.Done()
 
+       // ExitChan <- 1
+       // InitDiscovery()
+
        return data, nil
 }