source ssh config path from TopoPaths

clab/sshconfig.go

@@ -1,9 +1,10 @@
 package clab
 
 import (
-	"fmt"
 	"os"
 	"text/template"
+
+	"github.com/srl-labs/containerlab/types"
 )
 
 // SSHConfigTmpl is the top-level data structure for the
@@ -32,22 +33,18 @@ Host {{ .Name }}
 	UserKnownHostsFile=/dev/null
 {{ end }}`
 
-// sshConfigFileTmpl is the template for the ssh config file.
-const sshConfigFileTmpl = "/etc/ssh/ssh_config.d/clab-%s.conf"
-
 // RemoveSSHConfig removes the lab specific ssh config file
-func (c *CLab) RemoveSSHConfig() error {
-	filename := fmt.Sprintf(sshConfigFileTmpl, c.Config.Name)
-	err := os.Remove(filename)
+func (c *CLab) RemoveSSHConfig(topoPaths *types.TopoPaths) error {
+	err := os.Remove(topoPaths.SSHConfigPath())
 	// if there is an error, thats not "Not Exists", then return it
-	if err != nil && err != os.ErrNotExist {
+	if err != nil && !os.IsNotExist(err) {
 		return err
 	}
 	return nil
 }
 
 // AddSSHConfig adds the lab specific ssh config file.
-func (c *CLab) AddSSHConfig() error {
+func (c *CLab) AddSSHConfig(topoPaths *types.TopoPaths) error {
 	tmpl := &SSHConfigTmpl{
 		TopologyName: c.Config.Name,
 		Nodes:        make([]SSHConfigNodeTmpl, 0, len(c.Nodes)),
@@ -70,10 +67,7 @@ func (c *CLab) AddSSHConfig() error {
 		return err
 	}
 
-	// resolve the output filename with the topology name
-	filename := fmt.Sprintf(sshConfigFileTmpl, c.Config.Name)
-
-	f, err := os.Create(filename)
+	f, err := os.Create(topoPaths.SSHConfigPath())
 	if err != nil {
 		return err
 	}

cmd/deploy.go

@@ -276,7 +276,7 @@ func deployFn(_ *cobra.Command, _ []string) error {
 	}
 
 	log.Info("Adding ssh config for containerlab nodes")
-	err = c.AddSSHConfig()
+	err = c.AddSSHConfig(c.TopoPaths)
 	if err != nil {
 		log.Errorf("failed to create ssh config file: %v", err)
 	}

cmd/destroy.go

@@ -212,7 +212,7 @@ func destroyLab(ctx context.Context, c *clab.CLab) (err error) {
 	}
 
 	log.Info("Removing ssh config for containerlab nodes")
-	err = c.RemoveSSHConfig()
+	err = c.RemoveSSHConfig(c.TopoPaths)
 	if err != nil {
 		log.Errorf("failed to remove ssh config file: %v", err)
 	}

types/topo_paths.go

@@ -23,6 +23,7 @@ const (
 	CertFileSuffix            = ".pem"
 	KeyFileSuffix             = ".key"
 	CSRFileSuffix             = ".csr"
+	sshConfigFilePathTmpl     = "/etc/ssh/ssh_config.d/clab-%s.conf"
 )
 
 // clabTmpDir is the directory where clab stores temporary and/or downloaded files.
@@ -110,6 +111,10 @@ func (t *TopoPaths) SetExternalCaFiles(certFile, keyFile string) error {
 	return nil
 }
 
+func (t *TopoPaths) SSHConfigPath() string {
+	return fmt.Sprintf(sshConfigFilePathTmpl, t.topoName)
+}
+
 // TLSBaseDir returns the path of the TLS directory structure.
 func (t *TopoPaths) TLSBaseDir() string {
 	return path.Join(t.labDir, tlsDir)