ESD-1687: Expose as-override on VXC BGP connections

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/fatih/color v1.19.0
 	github.com/jedib0t/go-pretty/v6 v6.8.3
 	github.com/jmespath/go-jmespath v0.4.0
-	github.com/megaport/megaportgo v1.15.0
+	github.com/megaport/megaportgo v1.17.0
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d
 	github.com/spf13/cobra v1.10.2
 	github.com/spf13/pflag v1.0.10

go.sum

@@ -68,8 +68,8 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D
 github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
 github.com/mattn/go-runewidth v0.0.17 h1:78v8ZlW0bP43XfmAfPsdXcoNCelfMHsDmd/pkENfrjQ=
 github.com/mattn/go-runewidth v0.0.17/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/megaport/megaportgo v1.15.0 h1:e1l/0lJcr0RQ1kPdEeLuBHPGbvjgXUa1FAeFkc8K4mE=
-github.com/megaport/megaportgo v1.15.0/go.mod h1:dF1MxT8/kD6FWb4/ojrklWinIUp5exn8v8xYJVUB3Zc=
+github.com/megaport/megaportgo v1.17.0 h1:H1aGlUCREFf2F0LH0SIzwYUosQyuZEtynekSzai1mZE=
+github.com/megaport/megaportgo v1.17.0/go.mod h1:LoNE7I/7Btg6A63ZezVaMqO5WiGYhDxLsPdPRmt1k78=
 github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI=
 github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk=

internal/commands/vxc/vxc_inputs_partner.go

@@ -676,6 +676,11 @@ func parseBGPConnections(raw interface{}, ifaceIndex int) ([]megaport.BgpConnect
 		} else if ok {
 			conn.PeerType = v
 		}
+		if v, ok, err := boolField("asOverride"); err != nil {
+			return nil, err
+		} else if ok {
+			conn.AsOverride = &v
+		}
 
 		conns = append(conns, conn)
 	}

internal/commands/vxc/vxc_inputs_test.go

@@ -851,6 +851,7 @@ func TestParseVRouterConfigBGP(t *testing.T) {
 								"exportBlacklist":    202.0,
 								"asPathPrependCount": 3.0,
 								"peerType":           "NON_CLOUD",
+								"asOverride":         true,
 							},
 						},
 					},
@@ -882,6 +883,31 @@ func TestParseVRouterConfigBGP(t *testing.T) {
 				assert.Equal(t, 202, conn.ExportBlacklist)
 				assert.Equal(t, 3, conn.AsPathPrependCount)
 				assert.Equal(t, "NON_CLOUD", conn.PeerType)
+				if assert.NotNil(t, conn.AsOverride) {
+					assert.True(t, *conn.AsOverride)
+				}
+			},
+		},
+		{
+			name: "asOverride false sets pointer to false",
+			config: map[string]interface{}{
+				"connectType": "VROUTER",
+				"interfaces": []interface{}{
+					map[string]interface{}{
+						"bgpConnections": []interface{}{
+							map[string]interface{}{
+								"peerAsn":    65000.0,
+								"asOverride": false,
+							},
+						},
+					},
+				},
+			},
+			validate: func(t *testing.T, cfg *megaport.VXCOrderVrouterPartnerConfig) {
+				conn := cfg.Interfaces[0].BgpConnections[0]
+				if assert.NotNil(t, conn.AsOverride) {
+					assert.False(t, *conn.AsOverride)
+				}
 			},
 		},
 		{
@@ -906,6 +932,7 @@ func TestParseVRouterConfigBGP(t *testing.T) {
 				assert.Nil(t, conn.LocalAsn)
 				assert.Nil(t, conn.PermitExportTo)
 				assert.Nil(t, conn.DenyExportTo)
+				assert.Nil(t, conn.AsOverride)
 			},
 		},
 		{
@@ -1064,6 +1091,7 @@ func TestParseVRouterConfigBGP(t *testing.T) {
 		{"exportBlacklist", "nope", "exportBlacklist must be a number"},
 		{"asPathPrependCount", "lots", "asPathPrependCount must be a number"},
 		{"peerType", 123, "peerType must be a string"},
+		{"asOverride", "yes", "asOverride must be a boolean"},
 	}
 	for _, tc := range bgpFieldTypeErrors {
 		tc := tc

internal/commands/vxc/vxc_prompts_test.go

@@ -273,6 +273,7 @@ func TestPromptBGPConnections(t *testing.T) {
 				"no",       // shutdown
 				"",         // description (optional)
 				"no",       // bfdEnabled
+				"",         // asOverride (optional)
 				"",         // exportPolicy (optional)
 				"",         // peerType (optional)
 				"",         // medIn (optional)
@@ -296,6 +297,7 @@ func TestPromptBGPConnections(t *testing.T) {
 				assert.Equal(t, "10.0.0.2", conns[0].PeerIpAddress)
 				assert.False(t, conns[0].Shutdown)
 				assert.False(t, conns[0].BfdEnabled)
+				assert.Nil(t, conns[0].AsOverride)
 			},
 		},
 	}
@@ -560,6 +562,7 @@ func TestPromptBGPOptionalConfig_WithValues(t *testing.T) {
 		"yes",       // shutdown
 		"my bgp",    // description
 		"yes",       // bfdEnabled
+		"yes",       // asOverride
 		"permit",    // exportPolicy
 		"NON_CLOUD", // peerType
 		"100",       // medIn
@@ -579,13 +582,82 @@ func TestPromptBGPOptionalConfig_WithValues(t *testing.T) {
 	assert.True(t, bgp.Shutdown)
 	assert.Equal(t, "my bgp", bgp.Description)
 	assert.True(t, bgp.BfdEnabled)
+	if assert.NotNil(t, bgp.AsOverride) {
+		assert.True(t, *bgp.AsOverride)
+	}
 	assert.Equal(t, "permit", bgp.ExportPolicy)
 	assert.Equal(t, "NON_CLOUD", bgp.PeerType)
 	assert.Equal(t, 100, bgp.MedIn)
 	assert.Equal(t, 200, bgp.MedOut)
 	assert.Equal(t, 3, bgp.AsPathPrependCount)
 }
 
+func TestPromptBGPOptionalConfig_AsOverrideNo(t *testing.T) {
+	cleanup := mockPromptsAndSecrets([]string{
+		"",   // localAsn (optional)
+		"no", // shutdown
+		"",   // description
+		"no", // bfdEnabled
+		"no", // asOverride
+		"",   // exportPolicy
+		"",   // peerType
+		"",   // medIn
+		"",   // medOut
+		"",   // asPathPrepend
+	}, []string{
+		"", // password
+	})
+	defer cleanup()
+
+	bgp := &megaport.BgpConnectionConfig{}
+	err := promptBGPOptionalConfig(bgp, true)
+	assert.NoError(t, err)
+	if assert.NotNil(t, bgp.AsOverride) {
+		assert.False(t, *bgp.AsOverride)
+	}
+}
+
+func TestPromptBGPOptionalConfig_AsOverrideInvalid(t *testing.T) {
+	// The prompt returns before reaching later fields, so only the prompts up
+	// to and including asOverride need feeding.
+	cleanup := mockPromptsAndSecrets([]string{
+		"",      // localAsn (optional)
+		"no",    // shutdown
+		"",      // description
+		"no",    // bfdEnabled
+		"maybe", // asOverride (invalid)
+	}, []string{
+		"", // password
+	})
+	defer cleanup()
+
+	bgp := &megaport.BgpConnectionConfig{}
+	err := promptBGPOptionalConfig(bgp, true)
+	if assert.Error(t, err) {
+		assert.Contains(t, err.Error(), "AS Override must be 'yes' or 'no'")
+	}
+	assert.Nil(t, bgp.AsOverride)
+}
+
+func TestPromptBGPOptionalConfig_AsOverridePromptError(t *testing.T) {
+	// Exhaust the prompt queue exactly at the AS Override prompt so ResourcePrompt
+	// errors, exercising the error-propagation branch.
+	cleanup := mockPromptsAndSecrets([]string{
+		"",   // localAsn
+		"no", // shutdown
+		"",   // description
+		"no", // bfdEnabled
+	}, []string{
+		"", // password
+	})
+	defer cleanup()
+
+	bgp := &megaport.BgpConnectionConfig{}
+	err := promptBGPOptionalConfig(bgp, true)
+	assert.Error(t, err)
+	assert.Nil(t, bgp.AsOverride)
+}
+
 func TestPromptBGPExportAddresses_WithValues(t *testing.T) {
 	cleanup := mockPrompts([]string{
 		"yes",         // permit export to
@@ -679,6 +751,7 @@ func TestPromptVRouterConfig(t *testing.T) {
 				"no",            // shutdown
 				"",              // description
 				"no",            // BFD enabled
+				"",              // AS override
 				"",              // export policy
 				"",              // peer type
 				"",              // MED in

internal/commands/vxc/vxc_prompts_vrouter.go

@@ -360,6 +360,23 @@ func promptBGPOptionalConfig(bgp *megaport.BgpConnectionConfig, noColor bool) er
 	}
 	bgp.BfdEnabled = strings.ToLower(bfdEnabledStr) == "yes"
 
+	asOverrideStr, err := utils.ResourcePrompt("vxc", "Enable AS Override? (yes/no, optional - press Enter for API default): ", noColor)
+	if err != nil {
+		return err
+	}
+	if asOverrideStr != "" {
+		switch strings.ToLower(asOverrideStr) {
+		case "yes":
+			v := true
+			bgp.AsOverride = &v
+		case "no":
+			v := false
+			bgp.AsOverride = &v
+		default:
+			return fmt.Errorf("AS Override must be 'yes' or 'no'")
+		}
+	}
+
 	exportPolicy, err := utils.ResourcePrompt("vxc", "Enter export policy (permit/deny, optional): ", noColor)
 	if err != nil {
 		return err