Merge pull request #93 from davidk/poeCycleFix

Populate model after detection for cycle and set

Author: nitram509

poe_cycle.go

@@ -22,6 +22,8 @@ func (poe *PoeCyclePowerCommand) Run(args *GlobalOptions) error {
 		if err != nil {
 			return err
 		}
+		args.model = model
+
 	}
 	if isModel30x(model) {
 		return poe.cyclePowerGs30xEPx(args)

port_set.go

@@ -50,6 +50,8 @@ func (portSet *PortSetCommand) Run(args *GlobalOptions) error {
 		if err != nil {
 			return err
 		}
+		args.model = model
+
 	}
 	if isModel30x(model) {
 		return portSet.runPortSetGs30xEPx(args)

token.go

@@ -32,9 +32,11 @@ func tokenFilename(configDir string, host string) string {
 }
 
 func readTokenAndModel2GlobalOptions(args *GlobalOptions, host string) (NetgearModel, string, error) {
-	if len(args.model) > 0 {
+
+	if len(args.model) > 0 && len(args.token) > 0 {
 		return args.model, args.token, nil
 	}
+
 	if args.Verbose {
 		fmt.Println("reading token from: " + tokenFilename(args.TokenDir, host))
 	}

token_test.go

@@ -1,9 +1,10 @@
 package main
 
 import (
+	"testing"
+
 	"github.com/corbym/gocrest/is"
 	"github.com/corbym/gocrest/then"
-	"testing"
 )
 
 func Test_storing_and_loading_a_token_also_preserves_the_model(t *testing.T) {
@@ -28,3 +29,25 @@ func Test_storing_and_loading_a_token_also_preserves_the_model(t *testing.T) {
 	then.AssertThat(t, args.token, is.EqualTo("1234567890"))
 	then.AssertThat(t, args.model, is.EqualTo(GS30xEPx))
 }
+
+func Test_loading_a_token_with_model(t *testing.T) {
+	// setup
+	args := GlobalOptions{
+		Verbose: false,
+		model:   GS30xEPx,
+	}
+	const host = "ntgrrc-test-case-host"
+	// given
+	err := storeToken(&args, host, "1234567890")
+	then.AssertThat(t, err, is.Nil())
+
+	// when
+	model, token, err := readTokenAndModel2GlobalOptions(&args, host)
+
+	// then
+	then.AssertThat(t, err, is.Nil())
+	then.AssertThat(t, token, is.EqualTo("1234567890"))
+	then.AssertThat(t, model, is.EqualTo(GS30xEPx))
+	then.AssertThat(t, args.token, is.EqualTo("1234567890"))
+	then.AssertThat(t, args.model, is.EqualTo(GS30xEPx))
+}