Add names to service and router. Add more store tests. Fixes GH-101

controller/handler_mgmt/create_router.go

@@ -42,7 +42,7 @@ func (h *createRouterHandler) HandleReceive(msg *channel2.Message, ch channel2.C
 
 	create := &mgmt_pb.CreateRouterRequest{}
 	if err := proto.Unmarshal(msg.Body, create); err == nil {
-		r := network.NewRouter(create.Router.Id, create.Router.Fingerprint)
+		r := network.NewRouter(create.Router.Id, create.Router.Name, create.Router.Fingerprint)
 		if err := h.network.CreateRouter(r); err == nil {
 			log.Infof("created router [r/%s] with fingerprint [%s]", r.Id, create.Router.Fingerprint)
 			handler_common.SendSuccess(msg, ch, "")

controller/handler_mgmt/create_service.go

@@ -41,8 +41,12 @@ func (h *createServiceHandler) HandleReceive(msg *channel2.Message, ch channel2.
 	cs := &mgmt_pb.CreateServiceRequest{}
 	err := proto.Unmarshal(msg.Body, cs)
 	if err == nil {
+		if cs.Service.Name == "" {
+			cs.Service.Name = cs.Service.Id
+		}
 		service := &network.Service{
 			BaseEntity:         models.BaseEntity{Id: cs.Service.Id},
+			Name:               cs.Service.Name,
 			TerminatorStrategy: cs.Service.TerminatorStrategy,
 		}
 		for _, terminator := range cs.Service.Terminators {

controller/handler_mgmt/get_service.go

@@ -72,6 +72,7 @@ func toApiService(s *network.Service) *mgmt_pb.Service {
 
 	return &mgmt_pb.Service{
 		Id:                 s.Id,
+		Name:               s.Name,
 		TerminatorStrategy: s.TerminatorStrategy,
 		Terminators:        terminators,
 	}

controller/handler_mgmt/get_terminator.go

@@ -56,8 +56,9 @@ func (h *getTerminatorHandler) HandleReceive(msg *channel2.Message, ch channel2.
 	if err == nil {
 		responseMsg := channel2.NewMessage(int32(mgmt_pb.ContentType_GetTerminatorResponseType), body)
 		responseMsg.ReplyTo(msg)
-		ch.Send(responseMsg)
-
+		if err = ch.Send(responseMsg); err != nil {
+			pfxlog.ContextLogger(ch.Label()).Errorf("unexpected error (%s)", err)
+		}
 	} else {
 		pfxlog.ContextLogger(ch.Label()).Errorf("unexpected error (%s)", err)
 	}

controller/handler_mgmt/list_routers.go

@@ -58,6 +58,7 @@ func (h *listRoutersHandler) HandleReceive(msg *channel2.Message, ch channel2.Ch
 
 				responseR := &mgmt_pb.Router{
 					Id:          router.Id,
+					Name:        router.Name,
 					Fingerprint: stringz.OrEmpty(router.Fingerprint),
 				}