Support vs-specific config

githedgehog · Nov 15, 2023 · e4930c5 · e4930c5
1 parent 4f1f16b
commit e4930c5
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 5 deletions.
diff --git a/api/agent/v1alpha2/agent_types.go b/api/agent/v1alpha2/agent_types.go
@@ -50,6 +50,7 @@ type AgentSpecConfig struct {
 	ControlVIP    string                        `json:"controlVIP,omitempty"`
 	CollapsedCore *AgentSpecConfigCollapsedCore `json:"collapsedCore,omitempty"`
 	SpineLeaf     *AgentSpecConfigSpineLeaf     `json:"spineLeaf,omitempty"`
+	VS            bool                          `json:"vs,omitempty"`
 }
 
 type AgentSpecConfigCollapsedCore struct {

diff --git a/config/crd/bases/agent.githedgehog.com_agents.yaml b/config/crd/bases/agent.githedgehog.com_agents.yaml
@@ -99,6 +99,8 @@ spec:
                     type: string
                   spineLeaf:
                     type: object
+                  vs:
+                    type: boolean
                 type: object
               connections:
                 items:

diff --git a/docs/api.md b/docs/api.md
@@ -75,6 +75,7 @@ _Appears in:_
 | `controlVIP` _string_ |  |
 | `collapsedCore` _[AgentSpecConfigCollapsedCore](#agentspecconfigcollapsedcore)_ |  |
 | `spineLeaf` _[AgentSpecConfigSpineLeaf](#agentspecconfigspineleaf)_ |  |
+| `vs` _boolean_ |  |
 
 
 #### AgentSpecConfigCollapsedCore

diff --git a/pkg/agent/dozer/bcm/plan.go b/pkg/agent/dozer/bcm/plan.go
@@ -345,7 +345,7 @@ func planFabricConnections(agent *agentapi.Agent, spec *dozer.Spec) error {
 
 				spec.VRFs[VRF_DEFAULT].BGP.Neighbors[ip.String()] = &dozer.SpecVRFBGPNeighbor{
 					Enabled:     boolPtr(true),
-					Description: stringPtr(fmt.Sprintf("Fabric %s // %s", remote, conn.Name)),
+					Description: stringPtr(fmt.Sprintf("Fabric @%s #%s", remote, conn.Name)),
 					RemoteAS:    uint32Ptr(peerSw.ASN),
 					IPv4Unicast: boolPtr(true),
 					L2VPNEVPN:   boolPtr(true),
@@ -442,6 +442,11 @@ func planDefaultVRFWithBGP(agent *agentapi.Agent, spec *dozer.Spec) error {
 		return errors.Wrapf(err, "failed to parse protocol ip %s", agent.Spec.Switch.ProtocolIP)
 	}
 
+	maxPaths := uint32(64)
+	if agent.Spec.Config.VS {
+		maxPaths = 16
+	}
+
 	spec.VRFs[VRF_DEFAULT] = &dozer.SpecVRF{
 		Enabled:    boolPtr(true),
 		Interfaces: map[string]*dozer.SpecVRFInterface{},
@@ -453,7 +458,7 @@ func planDefaultVRFWithBGP(agent *agentapi.Agent, spec *dozer.Spec) error {
 			Neighbors:          map[string]*dozer.SpecVRFBGPNeighbor{},
 			IPv4Unicast: dozer.SpecVRFBGPIPv4Unicast{
 				Enabled:  true,
-				MaxPaths: uint32Ptr(64),
+				MaxPaths: uint32Ptr(maxPaths),
 			},
 			L2VPNEVPN: dozer.SpecVRFBGPL2VPNEVPN{
 				Enabled:         true,
@@ -583,7 +588,7 @@ func planMCLAGDomain(agent *agentapi.Agent, spec *dozer.Spec) (bool, error) {
 
 	spec.VRFs[VRF_DEFAULT].BGP.Neighbors[peerIP] = &dozer.SpecVRFBGPNeighbor{
 		Enabled:     boolPtr(true),
-		Description: stringPtr(fmt.Sprintf("MCLAG peer %s", mclagPeerSwitch)),
+		Description: stringPtr(fmt.Sprintf("MCLAG session @%s", mclagPeerSwitch)),
 		PeerType:    stringPtr(dozer.SpecVRFBGPNeighborPeerTypeInternal),
 		IPv4Unicast: boolPtr(true),
 	}

diff --git a/pkg/agent/dozer/bcm/spec_vrf.go b/pkg/agent/dozer/bcm/spec_vrf.go
@@ -52,8 +52,11 @@ var specVRFEnforcer = &DefaultValueEnforcer[string, *dozer.SpecVRF]{
 }
 
 var specVRFBaseEnforcer = &DefaultValueEnforcer[string, *dozer.SpecVRF]{
-	Summary:      "VRF %s base",
-	Getter:       func(name string, value *dozer.SpecVRF) any { return []any{value.Enabled, value.Description} },
+	Summary: "VRF %s base",
+	Getter: func(name string, value *dozer.SpecVRF) any {
+		return []any{value.Enabled, value.Description, value.AnycastMAC}
+	},
+	NoReplace:    true,
 	UpdateWeight: ActionWeightVRFBaseUpdate,
 	DeleteWeight: ActionWeightVRFBaseDelete,
 	Marshal: func(name string, value *dozer.SpecVRF) (ygot.ValidatedGoStruct, error) {

diff --git a/pkg/ctrl/agent/agent_ctrl.go b/pkg/ctrl/agent/agent_ctrl.go
@@ -273,6 +273,7 @@ func (r *AgentReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl
 		agent.Spec.Role = sw.Spec.Role
 		agent.Spec.Description = sw.Spec.Description
 		agent.Spec.Config.ControlVIP = r.Cfg.ControlVIP
+		agent.Spec.Config.VS = r.Cfg.VS
 		agent.Spec.Switch = sw.Spec
 		agent.Spec.Switches = switches
 		agent.Spec.Connections = conns

diff --git a/pkg/manager/config/config.go b/pkg/manager/config/config.go
@@ -25,6 +25,7 @@ type Fabric struct {
 	SNATAllowed    bool                 `json:"snatAllowed,omitempty"`
 	VPCSubnet      string               `json:"vpcSubnet,omitempty"`
 	FabricMode     FabricMode           `json:"fabricMode,omitempty"`
+	VS             bool                 `json:"vs,omitempty"`
 }
 
 type FabricMode string