Merge branch '37-read-restconf-client-from-config-toml' into 'develop'

Resolve "Read RESTCONF Client from config.toml"

See merge request cocsn/gosdn!51

clients.toml

+[[client]]
+identifier = "ciena-mcp"
+endpoint = "141.100.70.170:8080"
\ No newline at end of file

nucleus/controller.go

@@ -18,6 +18,10 @@ type controllerConfig struct {
 	ConfigPath       string
 }
 
+type clientConfigs struct {
+	Client []interfaces.ClientConfig `toml:"client"`
+}
+
 type Core struct {
 	//Assert type with clients[key].(*MCPClient)
 	clients  map[string]interfaces.Client
@@ -26,33 +30,22 @@ type Core struct {
 	IsRunning chan bool
 }
 
-func (c *Core) Init(socket, configfile string, IsRunningChannel chan bool) {
-	if configfile == "" {
-		configfile = "gosdn.toml"
-	}
-	_, err := os.Stat(configfile)
-	if err != nil {
-		log.Fatal("Config file is missing: ", configfile)
-	}
-
-	c.config = controllerConfig{}
-	if _, err := toml.DecodeFile(configfile, &c.config); err != nil {
+func (c *Core) Init(socket, configFileController, configFileClient string, IsRunningChannel chan bool) {
+	if err := c.readControllerConfig(configFileController); err != nil {
 		log.Fatal(err)
 	}
+
 	if socket != "localhost:55055" {
 		c.config.CliSocket = socket
 	}
-	if c.config.ConfigPath == "" {
-		c.config.ConfigPath = configfile
-	}
 
 	c.AttachDatabase()
 
 	c.IsRunning = IsRunningChannel
 
-	//TODO: Create client config/CLI adapter
-	c.clients["ciena-mcp"] = ciena.NewMCPClient("141.100.70.170:8080", "", "", &c.database)
-
+	if err := c.readClientConfig(configFileClient); err != nil {
+		log.Fatal(err)
+	}
 }
 
 func (c *Core) AttachDatabase() {
@@ -61,13 +54,8 @@ func (c *Core) AttachDatabase() {
 
 func (c *Core) Shutdown() {
 
-	stopIt := <- c.IsRunning
-	if !stopIt {
-		log.Debug("Shutdown() received action to shutdown")
-	}else {
-		log.Debug("Shutdown() received something else.")
-	}
-
+	<- c.IsRunning
+	log.Info("Received shutdown signal. Shutting down")
 
 	f, err := os.Create(c.config.ConfigPath)
 	if err != nil {
@@ -77,6 +65,42 @@ func (c *Core) Shutdown() {
 	if err := enc.Encode(c.config); err != nil {
 		log.Fatal(err)
 	}
-
+	log.Info("Shutdown complete")
 	os.Exit(0)
 }
+
+func (c *Core)readControllerConfig(configFileController string) error {
+	if configFileController == "" {
+		configFileController = "gosdn.toml"
+	}
+	if _, err := os.Stat(configFileController); err != nil {
+		return err
+	}
+
+	c.config = controllerConfig{}
+	if _, err := toml.DecodeFile(configFileController, &c.config); err != nil {
+		return err
+	}
+
+	if c.config.ConfigPath == "" {
+		c.config.ConfigPath = configFileController
+	}
+	return nil
+}
+
+func (c *Core)readClientConfig(configFileClient string) error {
+	if configFileClient == "" {
+		configFileClient = "clients.toml"
+	}
+	if _,err := os.Stat(configFileClient); err != nil {
+		return err
+	}
+	clients := clientConfigs{}
+	if _,err := toml.DecodeFile(configFileClient, &clients); err != nil {
+		return err
+	}
+	for _,client := range clients.Client {
+		c.clients[client.Identifier] = ciena.NewMCPClient(client.Endpoint, client.Username, client.Password, &c.database, &client)
+	}
+	return nil
+}
\ No newline at end of file

nucleus/interfaces/client.go

 package interfaces
 
 type Client interface {
-	GetConfig() string
+	GetConfig() ClientConfig
 }

nucleus/interfaces/clientConfig.go

+package interfaces
+
+type ClientConfig struct {
+	Identifier string `toml:"identifier"`
+	Endpoint   string `toml:"endpoint"`
+	Username   string `toml:"username"`
+	Password   string `toml:"password"`
+}

nucleus/nucleus-core.go

@@ -17,7 +17,7 @@ func StartAndRun(socket, filename string, IsRunningChannel chan bool) {
 		clients:  make(map[string]interfaces.Client),
 		database: database.Database{},
 	}
-	core.Init(socket, filename, IsRunningChannel)
+	core.Init(socket, filename,"", IsRunningChannel)
 	// Start the GRCP CLI
 	go getCLIGoing(&core)
 	go core.Shutdown()
@@ -25,10 +25,8 @@ func StartAndRun(socket, filename string, IsRunningChannel chan bool) {
 	log.Info("and ready for take off")
 
 	//Just to produce some signs of vitality...
-	for (true) {
+	for {
 		time.Sleep(10 * time.Second)
 		log.Debug("Still alive...")
 	}
-
-	log.Info("Good bye....!")
 }

restconf/client/ciena/client.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"code.fbi.h-da.de/cocsn/gosdn/database"
 	"code.fbi.h-da.de/cocsn/gosdn/log"
+	"code.fbi.h-da.de/cocsn/gosdn/nucleus/interfaces"
 	"code.fbi.h-da.de/cocsn/gosdn/restconf/util"
 	apiclient "code.fbi.h-da.de/cocsn/swagger/apis/mcp/client"
 	"crypto/tls"
@@ -19,15 +20,15 @@ type MCPClient struct {
 	client    *apiclient.ServiceTopologyTAPI
 	database  *database.Database
 	buffer    *bytes.Buffer
+	config    *interfaces.ClientConfig
 }
 
-func (c MCPClient) GetConfig() string {
-	//TODO: Fill with life
-	return "..."
+func (c MCPClient) GetConfig() interfaces.ClientConfig {
+	return *c.config
 }
 
 //NewMCPClient creates a client
-func NewMCPClient(endpoint, username, password string, database *database.Database) *MCPClient {
+func NewMCPClient(endpoint, username, password string, database *database.Database, config *interfaces.ClientConfig) *MCPClient {
 	// create the transport
 	transport := httptransport.New(endpoint, "/", nil)
 	transport.Transport.(*http.Transport).TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
@@ -45,6 +46,7 @@ func NewMCPClient(endpoint, username, password string, database *database.Databa
 		client:    client,
 		database:  database,
 		buffer:    buffer,
+		config: config,
 	}
 }