Clean-up Mikrotik username suffix.

udhos · Mar 27, 2017 · a704adc · a704adc
1 parent 8e3daa5
commit a704adc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/conf/conf.go b/conf/conf.go
@@ -79,6 +79,7 @@ type DevAttributes struct {
 	ErrlogHistSize               int           // max number of lines in errlog history
 	PostLoginPromptPattern       string        // mikrotik: Please press "Enter" to continue!
 	PostLoginPromptResponse      string        // mikrotik: \r\n
+	UsernameAppend               string        // mikrotik: +cte
 
 	// readTimeout: per-read timeout (protection against inactivity)
 	// matchTimeout: full match timeout (protection against slow sender -- think 1 byte per second)

diff --git a/dev/model.go b/dev/model.go
@@ -32,10 +32,7 @@ type Device struct {
 
 // Username gets the username for login into a device.
 func (d *Device) Username() string {
-	if d.Model() == "mikrotik" {
-		return d.DevConfig.LoginUser + "+cte"
-	}
-	return d.DevConfig.LoginUser
+	return d.DevConfig.LoginUser + d.DevConfig.Attr.UsernameAppend
 }
 
 // Printf formats device-specific messages into logs.

diff --git a/dev/model_mikrotik.go b/dev/model_mikrotik.go
@@ -25,6 +25,7 @@ func registerModelMikrotik(logger hasPrintf, t *DeviceTable) {
 	a.CommandReadTimeout = 20 * time.Second  // larger timeout for slow 'sh run'
 	a.CommandMatchTimeout = 30 * time.Second // larger timeout for slow 'sh run'
 	a.QuoteSentCommandsFormat = `##[%s]`
+	a.UsernameAppend = "+cte"
 
 	m := &Model{name: "mikrotik"}
 	m.defaultAttr = a