Update router querying method (#834)

* Add address to router query options. Drop Query interface for QueryOptions

* Cleanup isMatch function

* Update network proto

network/handler/handler.go

@@ -7,6 +7,7 @@ import (
 	"github.com/micro/go-micro/errors"
 	"github.com/micro/go-micro/network"
 	pbNet "github.com/micro/go-micro/network/proto"
+	"github.com/micro/go-micro/router"
 	pbRtr "github.com/micro/go-micro/router/proto"
 )
 
@@ -100,7 +101,29 @@ func (n *Network) Graph(ctx context.Context, req *pbNet.GraphRequest, resp *pbNe
 
 // Routes returns a list of routing table routes
 func (n *Network) Routes(ctx context.Context, req *pbNet.RoutesRequest, resp *pbNet.RoutesResponse) error {
-	routes, err := n.Network.Options().Router.Table().List()
+	// build query
+
+	var qOpts []router.QueryOption
+
+	if q := req.Query; q != nil {
+		if len(q.Service) > 0 {
+			qOpts = append(qOpts, router.QueryService(q.Service))
+		}
+		if len(q.Address) > 0 {
+			qOpts = append(qOpts, router.QueryAddress(q.Address))
+		}
+		if len(q.Gateway) > 0 {
+			qOpts = append(qOpts, router.QueryGateway(q.Gateway))
+		}
+		if len(q.Router) > 0 {
+			qOpts = append(qOpts, router.QueryRouter(q.Router))
+		}
+		if len(q.Network) > 0 {
+			qOpts = append(qOpts, router.QueryNetwork(q.Network))
+		}
+	}
+
+	routes, err := n.Network.Options().Router.Table().Query(qOpts...)
 	if err != nil {
 		return errors.InternalServerError("go.micro.network", "failed to list routes: %s", err)
 	}