Introduce KindSpecifics

Author: steiler

clab/sshconfig.go

@@ -17,9 +17,9 @@ type SSHConfigTmpl struct {
 // SSHConfigNodeTmpl represents values for a single node
 // in the sshconfig template.
 type SSHConfigNodeTmpl struct {
-	Name     string
-	Username string
-	Kind     string
+	Name         string
+	Username     string
+	SSHSpecifics *types.SSHSpecifics
 }
 
 // tmplSshConfig is the SSH config template.
@@ -32,8 +32,8 @@ Host {{ .Name }}
 	{{- end }}
 	StrictHostKeyChecking=no
 	UserKnownHostsFile=/dev/null
-	{{- if eq .Kind "sros" }}
-	PubkeyAuthentication="unbound"
+	{{- if ne .SSHSpecifics.PubkeyAuthentication "" }}
+	PubkeyAuthentication={{ .SSHSpecifics.PubkeyAuthentication.String }}
 	{{- end }}
 {{ end }}`
 
@@ -60,9 +60,9 @@ func (c *CLab) AddSSHConfig(topoPaths *types.TopoPaths) error {
 		// the kind registered Username
 		NodeRegistryEntry := c.Reg.Kind(n.Config().Kind)
 		nodeData := SSHConfigNodeTmpl{
-			Name:     n.Config().LongName,
-			Username: NodeRegistryEntry.Credentials().GetUsername(),
-			Kind:     NodeRegistryEntry.GetMainKindName(),
+			Name:         n.Config().LongName,
+			Username:     NodeRegistryEntry.Credentials().GetUsername(),
+			SSHSpecifics: n.GetKindSpecifics().SSHSpecifics,
 		}
 		tmpl.Nodes = append(tmpl.Nodes, nodeData)
 	}

mocks/mocknodes/node.go

@@ -35,6 +35,7 @@ type DefaultNode struct {
 	Mgmt             *types.MgmtNet
 	Runtime          runtime.ContainerRuntime
 	HostRequirements *types.HostRequirements
+	KindSpecifics    *types.KindSpecifics
 	// Indicates that the node should not start without no license file defined
 	LicensePolicy types.LicensePolicy
 	// OverwriteNode stores the interface used to overwrite methods defined
@@ -57,6 +58,7 @@ func NewDefaultNode(n NodeOverwrites) *DefaultNode {
 		HostRequirements: types.NewHostRequirements(),
 		OverwriteNode:    n,
 		LicensePolicy:    types.LicensePolicyNone,
+		KindSpecifics:    types.NewKindSpecifics(),
 	}
 
 	return dn
@@ -509,3 +511,7 @@ func (d *DefaultNode) SetState(s state.NodeState) {
 	defer d.statemutex.Unlock()
 	d.state = s
 }
+
+func (d *DefaultNode) GetKindSpecifics() *types.KindSpecifics {
+	return d.KindSpecifics
+}

nodes/default_node.go

@@ -34,7 +34,6 @@ type linux struct {
 func (n *linux) Init(cfg *types.NodeConfig, opts ...nodes.NodeOption) error {
 	// Init DefaultNode
 	n.DefaultNode = *nodes.NewDefaultNode(n)
-
 	n.Cfg = cfg
 	for _, o := range opts {
 		o(n)

nodes/linux/linux.go

@@ -107,6 +107,8 @@ type Node interface {
 	ExecFunction(func(ns.NetNS) error) error
 	GetState() state.NodeState
 	SetState(state.NodeState)
+	// return the kind specifics
+	GetKindSpecifics() *types.KindSpecifics
 }
 
 type NodeOption func(Node)

nodes/node.go

@@ -62,6 +62,7 @@ func (s *vrSROS) Init(cfg *types.NodeConfig, opts ...nodes.NodeOption) error {
 	// set virtualization requirement
 	s.HostRequirements.VirtRequired = true
 	s.LicensePolicy = types.LicensePolicyWarn
+	s.KindSpecifics.SSHSpecifics.PubkeyAuthentication = types.PubkeyAuthValueUnbound
 
 	s.Cfg = cfg
 	for _, o := range opts {

nodes/vr_sros/vr-sros.go

@@ -0,0 +1,32 @@
+package types
+
+type PubkeyAuthValue string
+
+const (
+	PubkeyAuthValueYes       PubkeyAuthValue = "yes"
+	PubkeyAuthValueNo        PubkeyAuthValue = "no"
+	PubkeyAuthValueHostBound PubkeyAuthValue = "host-bound"
+	PubkeyAuthValueUnbound   PubkeyAuthValue = "unbound"
+)
+
+func (p PubkeyAuthValue) String() string {
+	return string(p)
+}
+
+type KindSpecifics struct {
+	SSHSpecifics *SSHSpecifics
+}
+
+func NewKindSpecifics() *KindSpecifics {
+	return &KindSpecifics{
+		SSHSpecifics: NewSSHSpecifics(),
+	}
+}
+
+type SSHSpecifics struct {
+	PubkeyAuthentication PubkeyAuthValue
+}
+
+func NewSSHSpecifics() *SSHSpecifics {
+	return &SSHSpecifics{}
+}