Redefined and polished some interfaces and data structures.

router/default.go

@@ -8,7 +8,7 @@ import (
 type router struct {
 	opts Options
 	goss registry.Registry
-	t    *Table
+	t    Table
 }
 
 func newRouter(opts ...Option) Router {
@@ -62,13 +62,13 @@ func (r *router) Lookup(q Query) ([]*Entry, error) {
 }
 
 // Table returns routing table
-func (r *router) Table() *Table {
+func (r *router) Table() Table {
 	return nil
 }
 
 // Address returns router's network address
 func (r *router) Address() string {
-	return ""
+	return r.opts.Address
 }
 
 // String prints debugging information about router

router/options.go

@@ -2,22 +2,38 @@ package router
 
 import (
 	"context"
-
-	"github.com/micro/go-micro/registry"
 )
 
 // Options allows to set Router options
 type Options struct {
-	// Registry is route source registry i.e. local registry
-	Registry registry.Registry
+	// Address is router address
+	Address string
+	// RIB is Routing Information Base
+	RIB RIB
+	// Table is routing table
+	Table Table
 	// Context stores arbitrary options
 	Context context.Context
 }
 
-// Registry allows to set local service registry
-func Registry(r registry.Registry) Option {
+// RIBase allows to configure RIB
+func RIBase(r RIB) Option {
 	return func(o *Options) {
-		o.Registry = r
+		o.RIB = r
+	}
+}
+
+// Address allows to set router address
+func Address(a string) Option {
+	return func(o *Options) {
+		o.Address = a
+	}
+}
+
+// RoutingTable allows to specify custom routing table
+func RoutingTable(t Table) Option {
+	return func(o *Options) {
+		o.Table = t
 	}
 }
 

router/router.go

@@ -1,10 +1,6 @@
 // Package router provides an interface for micro network routers
 package router
 
-import (
-	"github.com/micro/go-micro/registry"
-)
-
 var (
 	// DefaultRouter returns default micro router
 	DefaultRouter = NewRouter()
@@ -25,13 +21,19 @@ type Router interface {
 	// Lookup queries the routing table and returns matching entries
 	Lookup(Query) ([]*Entry, error)
 	// Table returns routing table
-	Table() *Table
+	Table() Table
 	// Address is Router adddress
 	Address() string
 	// String implemens fmt.Stringer interface
 	String() string
 }
 
+// RIB is Routing Information Base
+type RIB interface {
+	// String returns debug info
+	String() string
+}
+
 // Option used by the Router
 type Option func(*Options)
 
@@ -43,9 +45,9 @@ type QueryOption func(*QueryOptions)
 
 // NewRouter creates new Router and returns it
 func NewRouter(opts ...Option) Router {
-	// router registry to DefaultRegistry
+	// set default options
 	ropts := Options{
-		Registry: registry.DefaultRegistry,
+		Table: DefaultTable,
 	}
 
 	for _, o := range opts {

router/table.go

@@ -3,12 +3,34 @@ package router
 import "errors"
 
 var (
-	// ErrRouteNotFound is returned when no rout was found
+	// DefaultRouter returns default micro router
+	DefaultTable = NewTable()
+	// ErrRouteNotFound is returned when no route was found
 	ErrRouteNotFound = errors.New("route not found")
+	// ErrDuplicateRoute is return when route already exists
+	ErrDuplicateRoute = errors.New("duplicate route")
 )
 
+// Table is routing table
+type Table interface {
+	// Add adds new route to the table
+	Add(*Entry) error
+	// Remove removes route from the table
+	Remove(*Entry) error
+	// Update updates route in the table
+	Update(*Entry) error
+	// Lookup looks up routes in the table
+	Lookup(Query) ([]*Entry, error)
+	// Size returns the size of the table
+	Size() int
+	// String prints the routing table
+	String() string
+}
+
 // Entry is micro network routing table entry
 type Entry struct {
+	// DestAddr is destination address
+	DestAddr string
 	// NetID is micro network ID
 	NetID string
 	// Hop is the next route hop
@@ -17,42 +39,46 @@ type Entry struct {
 	Metric int
 }
 
-// Table is routing table
+// table is routing table
 // It maps service name to routes
-type Table struct {
+type table struct {
 	// m stores routing table map
 	m map[string][]Entry
 }
 
 // NewTable creates new routing table and returns it
-func NewTable() *Table {
-	return &Table{
+func NewTable() Table {
+	return &table{
 		m: make(map[string][]Entry),
 	}
 }
 
-// TODO: Define lookup query interface
-// Lookup looks up entry in the routing table
-func (t *Table) Lookup() (*Entry, error) {
-	return nil, nil
+// Add adds new routing entry
+func (t *table) Add(e *Entry) error {
+	return nil
 }
 
 // Remove removes entry from the routing table
-func (t *Table) Remove(e *Entry) error {
+func (t *table) Remove(e *Entry) error {
 	return nil
 }
 
 // Update updates routin entry
-func (t *Table) Update(e *Entry) error {
+func (t *table) Update(e *Entry) error {
 	return nil
 }
 
+// Lookup looks up entry in the routing table
+func (t *table) Lookup(q Query) ([]*Entry, error) {
+	return nil, nil
+}
+
 // Size returns the size of the routing table
-func (t *Table) Size() int {
-	return 0
+func (t *table) Size() int {
+	return len(t.m)
 }
 
 // String returns text representation of routing table
-func (t *Table) String() string {
+func (t *table) String() string {
 	return ""
 }