Add RegisterService flag

internal/config/config.go

@@ -46,7 +46,8 @@ type Config struct {
 	LogLevel              string        `default:"INFO" desc:"Log level" split_words:"true"`
 	OpenTelemetryEndpoint string        `default:"otel-collector.observability.svc.cluster.local:4317" desc:"OpenTelemetry Collector Endpoint"`
 
-	Services []ServiceConfig `default:"" desc:"list of supported services"`
+	ServiceNames    []ServiceConfig `default:"" desc:"list of supported services" split_words:"true"`
+	RegisterService bool            `default:"true" desc:"if true then registers network service on startup" split_words:"true"`
 }
 
 // Process prints and processes env to config

internal/networkservice/mapserver/server.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2021 Doc.ai and/or its affiliates.
+// Copyright (c) 2020-2022 Doc.ai and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -42,11 +42,11 @@ type entry struct {
 // NewServer returns a new `network service -> { MAC, VLAN }` mapping server chain element
 func NewServer(cfg *config.Config) networkservice.NetworkServiceServer {
 	s := &mapServer{
-		entries: make(map[string]*entry, len(cfg.Services)),
+		entries: make(map[string]*entry, len(cfg.ServiceNames)),
 	}
 
-	for i := range cfg.Services {
-		service := &cfg.Services[i]
+	for i := range cfg.ServiceNames {
+		service := &cfg.ServiceNames[i]
 		s.entries[service.Name] = &entry{
 			macAddr: service.MACAddr,
 			vlanTag: service.VLANTag,

main.go

@@ -208,18 +208,20 @@ func main() {
 		grpcfd.WithChainUnaryInterceptor(),
 	)
 
-	nsRegistryClient := registryclient.NewNetworkServiceRegistryClient(ctx,
-		registryclient.WithClientURL(&cfg.ConnectTo),
-		registryclient.WithDialOptions(clientOptions...),
-		registryclient.WithAuthorizeNSRegistryClient(registryauthorize.NewNetworkServiceRegistryClient()))
-	for i := range cfg.Services {
-		nsName := cfg.Services[i].Name
-		nsPayload := cfg.Services[i].Payload
-		if _, err = nsRegistryClient.Register(ctx, &registry.NetworkService{
-			Name:    nsName,
-			Payload: nsPayload,
-		}); err != nil {
-			log.FromContext(ctx).Fatalf("failed to register ns(%s) %s", nsName, err.Error())
+	if cfg.RegisterService {
+		nsRegistryClient := registryclient.NewNetworkServiceRegistryClient(ctx,
+			registryclient.WithClientURL(&cfg.ConnectTo),
+			registryclient.WithDialOptions(clientOptions...),
+			registryclient.WithAuthorizeNSRegistryClient(registryauthorize.NewNetworkServiceRegistryClient()))
+		for i := range cfg.ServiceNames {
+			nsName := cfg.ServiceNames[i].Name
+			nsPayload := cfg.ServiceNames[i].Payload
+			if _, err = nsRegistryClient.Register(ctx, &registry.NetworkService{
+				Name:    nsName,
+				Payload: nsPayload,
+			}); err != nil {
+				log.FromContext(ctx).Fatalf("failed to register ns(%s) %s", nsName, err.Error())
+			}
 		}
 	}
 
@@ -267,14 +269,14 @@ func registryEndpoint(listenOn *url.URL, cfg *config.Config) *registry.NetworkSe
 
 	nse := &registry.NetworkServiceEndpoint{
 		Name:                 cfg.Name,
-		NetworkServiceNames:  make([]string, len(cfg.Services)),
-		NetworkServiceLabels: make(map[string]*registry.NetworkServiceLabels, len(cfg.Services)),
+		NetworkServiceNames:  make([]string, len(cfg.ServiceNames)),
+		NetworkServiceLabels: make(map[string]*registry.NetworkServiceLabels, len(cfg.ServiceNames)),
 		Url:                  grpcutils.URLToTarget(listenOn),
 		ExpirationTime:       expireTime,
 	}
 
-	for i := range cfg.Services {
-		service := &cfg.Services[i]
+	for i := range cfg.ServiceNames {
+		service := &cfg.ServiceNames[i]
 
 		labels := service.Labels
 		if labels == nil {