ing

discovery/discoverer.go

@@ -1,7 +1,6 @@
 package discovery
 
 import (
-	"fmt"
 	"sync"
 	"time"
 
@@ -144,70 +143,12 @@ func (d *ofDiscoverer) discover(req types.DiscoveryRequest) {
 		session.ReleaseDiscoverySession(s)
 	}()
 
-	params := req.Params()
+	if err := s.InitWithRequest(req); nil != err {
-
+		req.SendMessage(types.DiscoveryMessageTypeError, nil, err)
-	switch req.RequestType() {
+		return
-	case types.DiscoveryRequestTypeHost:
-		if nil == params || 2 != len(params) {
-			req.SendMessage(types.DiscoveryMessageTypeError, nil, fmt.Errorf("Parameter is not valid"))
-			break
-		}
-
-		zone, ok := params[0].(*omd.Zone)
-		if !ok {
-			req.SendMessage(types.DiscoveryMessageTypeError, nil, fmt.Errorf("Zone of parameter is not valid"))
-			break
-		}
-
-		dh, ok := params[1].(*omd.DiscoverHost)
-		if !ok {
-			req.SendMessage(types.DiscoveryMessageTypeError, nil, fmt.Errorf("DiscoverHost of parameter is not valid"))
-			break
-		}
-
-		s.InitWithDiscoverHost(req, zone, dh)
-	case types.DiscoveryRequestTypePort:
-		if nil == params || 2 != len(params) {
-			req.SendMessage(types.DiscoveryMessageTypeError, nil, fmt.Errorf("Parameter is not valid"))
-			break
-		}
-
-		host, ok := params[0].(*omd.Host)
-		if !ok {
-			req.SendMessage(types.DiscoveryMessageTypeError, nil, fmt.Errorf("Host of parameter is not valid"))
-			break
-		}
-
-		dp, ok := params[1].(*omd.DiscoverPort)
-		if !ok {
-			req.SendMessage(types.DiscoveryMessageTypeError, nil, fmt.Errorf("DiscoverPort of parameter is not valid"))
-			break
-		}
-
-		s.InitWithDiscoverPort(req, host, dp)
-	case types.DiscoveryRequestTypeService:
-		if nil == params || 2 != len(params) {
-			req.SendMessage(types.DiscoveryMessageTypeError, nil, fmt.Errorf("Parameter is not valid"))
-			break
-		}
-
-		port, ok := params[0].(*omd.Port)
-		if !ok {
-			req.SendMessage(types.DiscoveryMessageTypeError, nil, fmt.Errorf("Port of parameter is not valid"))
-			break
-		}
-
-		ds, ok := params[1].(*omd.DiscoverService)
-		if !ok {
-			req.SendMessage(types.DiscoveryMessageTypeError, nil, fmt.Errorf("DiscoverService of parameter is not valid"))
-			break
-		}
-
-		s.InitWithDiscoverService(req, port, ds)
 	}
 
 	d.preDiscovery(s)
-
 	d.layerDiscovery(s)
 }
 

discovery/session/discovery-session.go

@@ -18,9 +18,8 @@ type DiscoverySession interface {
 	DiscoverPort() *omd.DiscoverPort
 	DiscoverService() *omd.DiscoverService
 
-	InitWithDiscoverHost(request types.DiscoveryRequest, zone *omd.Zone, discoverHost *omd.DiscoverHost)
+	InitWithRequest(request types.DiscoveryRequest) error
-	InitWithDiscoverPort(request types.DiscoveryRequest, host *omd.Host, discoverPort *omd.DiscoverPort)
+
-	InitWithDiscoverService(request types.DiscoveryRequest, port *omd.Port, discoverService *omd.DiscoverService)
 	AddHost(host *omd.Host) *omd.Host
 	AddPort(port *omd.Port) *omd.Port
 	AddService(service *omd.Service) *omd.Service
@@ -42,8 +41,8 @@ type ofDiscoverySession struct {
 	services map[*omd.Port]map[string]map[string]*omd.Service
 }
 
-func (ds *ofDiscoverySession) init() {
+func (ds *ofDiscoverySession) init(request types.DiscoveryRequest) {
-	ds.discoveryRequest = nil
+	ds.discoveryRequest = request
 	ds.zone = nil
 	ds.host = nil
 	ds.port = nil
@@ -56,31 +55,66 @@ func (ds *ofDiscoverySession) init() {
 	ds.services = make(map[*omd.Port]map[string]map[string]*omd.Service)
 }
 
-func (ds *ofDiscoverySession) initWithRequest(request types.DiscoveryRequest) {
+func (ds *ofDiscoverySession) InitWithRequest(request types.DiscoveryRequest) error {
-	ds.init()
+	ds.init(request)
 
-	ds.discoveryRequest = request
+	params := request.Params()
-}
 
-func (ds *ofDiscoverySession) InitWithDiscoverHost(request types.DiscoveryRequest, zone *omd.Zone, discoverHost *omd.DiscoverHost) {
+	switch request.RequestType() {
-	ds.initWithRequest(request)
+	case types.DiscoveryRequestTypeHost:
+		if nil == params || 2 != len(params) {
+			return fmt.Errorf("Parameter is not valid")
+		}
 
-	ds.setZone(zone)
+		zone, ok := params[0].(*omd.Zone)
-	ds.setDiscoverHost(discoverHost)
+		if !ok {
-}
+			return fmt.Errorf("Zone of parameter is not valid")
+		}
 
-func (ds *ofDiscoverySession) InitWithDiscoverPort(request types.DiscoveryRequest, host *omd.Host, discoverPort *omd.DiscoverPort) {
+		discoverHost, ok := params[1].(*omd.DiscoverHost)
-	ds.initWithRequest(request)
+		if !ok {
+			return fmt.Errorf("DiscoverHost of parameter is not valid")
+		}
 
-	ds.setHost(host)
+		ds.setZone(zone)
-	ds.setDiscoverPort(discoverPort)
+		ds.setDiscoverHost(discoverHost)
-}
+	case types.DiscoveryRequestTypePort:
+		if nil == params || 2 != len(params) {
+			return fmt.Errorf("Parameter is not valid")
+		}
 
-func (ds *ofDiscoverySession) InitWithDiscoverService(request types.DiscoveryRequest, port *omd.Port, discoverService *omd.DiscoverService) {
+		host, ok := params[0].(*omd.Host)
-	ds.initWithRequest(request)
+		if !ok {
+			return fmt.Errorf("Host of parameter is not valid")
+		}
 
-	ds.setPort(port)
+		discoverPort, ok := params[1].(*omd.DiscoverPort)
-	ds.setDiscoverService(discoverService)
+		if !ok {
+			return fmt.Errorf("DiscoverPort of parameter is not valid")
+		}
+
+		ds.setHost(host)
+		ds.setDiscoverPort(discoverPort)
+	case types.DiscoveryRequestTypeService:
+		if nil == params || 2 != len(params) {
+			return fmt.Errorf("Parameter is not valid")
+		}
+
+		port, ok := params[0].(*omd.Port)
+		if !ok {
+			return fmt.Errorf("Port of parameter is not valid")
+		}
+
+		discoverService, ok := params[1].(*omd.DiscoverService)
+		if !ok {
+			return fmt.Errorf("DiscoverService of parameter is not valid")
+		}
+
+		ds.setPort(port)
+		ds.setDiscoverService(discoverService)
+	}
+
+	return nil
 }
 
 func (ds *ofDiscoverySession) Zone() *omd.Zone {

discovery/session/mock-discovery-session.go

@@ -2,7 +2,6 @@ package session
 
 import (
 	omd "git.loafle.net/overflow/model/discovery"
-	"git.loafle.net/overflow_scanner/probe/discovery/types"
 )
 
 func MockDiscoverySession() *mockDiscoverySession {
@@ -13,21 +12,6 @@ type mockDiscoverySession struct {
 	ofDiscoverySession
 }
 
-func (ds *mockDiscoverySession) InitWithDiscoverHost(request types.DiscoveryRequest, zone *omd.Zone, discoverHost *omd.DiscoverHost) {
-	ds.setZone(zone)
-	ds.setDiscoverHost(discoverHost)
-}
-
-func (ds *mockDiscoverySession) InitWithDiscoverPort(request types.DiscoveryRequest, host *omd.Host, discoverPort *omd.DiscoverPort) {
-	ds.setHost(host)
-	ds.setDiscoverPort(discoverPort)
-}
-
-func (ds *mockDiscoverySession) InitWithDiscoverService(request types.DiscoveryRequest, port *omd.Port, discoverService *omd.DiscoverService) {
-	ds.setPort(port)
-	ds.setDiscoverService(discoverService)
-}
-
 func (ds *mockDiscoverySession) AddHost(host *omd.Host) *omd.Host {
 	return host
 }