Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reintroduce CT primitive label feature #103

Merged
merged 1 commit into from
Aug 22, 2023
Merged

Reintroduce CT primitive label feature #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions apstra/two_stage_l3_clos_connectivity_template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ type ConnectivityTemplatePrimitiveUserData struct {

type ConnectivityTemplatePrimitive struct {
Id *ObjectId
Label string
Attributes ConnectivityTemplatePrimitiveAttributes
Subpolicies []*ConnectivityTemplatePrimitive // batch of pointers to pipelines
BatchId *ObjectId
Expand Down Expand Up @@ -300,7 +301,7 @@ func (o *ConnectivityTemplatePrimitive) rawPipeline() ([]rawConnectivityTemplate
actual := rawConnectivityTemplatePolicy{
Description: attributes.Description(),
Tags: []string{}, // always empty slice
Label: attributes.Label(),
Label: o.Label,
PolicyTypeName: attributes.PolicyTypeName().raw(),
Attributes: rawAttributes,
Id: *o.Id,
Expand All @@ -324,7 +325,7 @@ func (o *ConnectivityTemplatePrimitive) rawPipeline() ([]rawConnectivityTemplate
pipeline := rawConnectivityTemplatePolicy{
Description: attributes.Description(),
Tags: []string{}, // always empty slice
Label: attributes.Label() + string(policyTypePipelineSuffix),
Label: o.Label + string(policyTypePipelineSuffix),
PolicyTypeName: ctPrimitivePolicyTypeNamePipeline,
Attributes: rawPipelineAttribtes,
Id: *o.PipelineId,
Expand All @@ -333,7 +334,7 @@ func (o *ConnectivityTemplatePrimitive) rawPipeline() ([]rawConnectivityTemplate
result := []rawConnectivityTemplatePolicy{pipeline, actual}

if len(o.Subpolicies) > 0 {
batchPolicies, err := rawBatch(*o.BatchId, attributes.Description(), attributes.Label(), o.Subpolicies)
batchPolicies, err := rawBatch(*o.BatchId, attributes.Description(), o.Label, o.Subpolicies)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -567,6 +568,7 @@ func parsePrimitiveTreeByPipelineId(pipelineId ObjectId, policyMap map[ObjectId]

return &ConnectivityTemplatePrimitive{
Id: &actual.Id,
Label: actual.Label,
Attributes: attributes,
Subpolicies: subpolicies,
BatchId: batchId,
Expand Down
66 changes: 53 additions & 13 deletions apstra/two_stage_l3_clos_connectivity_template_primitive_attributes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,18 @@ import (
// from each other. In Apstra 4.1.2 there are 10 CT primitives, so there are 10
// implementations of the ConnectivityTemplatePrimitiveAttributes interface.
type ConnectivityTemplatePrimitiveAttributes interface {
raw() (json.RawMessage, error)
PolicyTypeName() CtPrimitivePolicyTypeName
Label() string
Description() string
PolicyTypeName() CtPrimitivePolicyTypeName
fromRawJson(json.RawMessage) error
label() string
raw() (json.RawMessage, error)
}

// AttachSingleVlan
var _ ConnectivityTemplatePrimitiveAttributes = &ConnectivityTemplatePrimitiveAttributesAttachSingleVlan{}

type ConnectivityTemplatePrimitiveAttributesAttachSingleVlan struct {
Label string
Tagged bool
VnNodeId *ObjectId
}
Expand Down Expand Up @@ -56,7 +57,10 @@ func (o *ConnectivityTemplatePrimitiveAttributesAttachSingleVlan) PolicyTypeName
return CtPrimitivePolicyTypeNameAttachSingleVlan
}

func (o *ConnectivityTemplatePrimitiveAttributesAttachSingleVlan) Label() string {
func (o *ConnectivityTemplatePrimitiveAttributesAttachSingleVlan) label() string {
if o.Label != "" {
return o.Label
}
return "Virtual Network (Single)"
}

Expand All @@ -68,6 +72,7 @@ func (o *ConnectivityTemplatePrimitiveAttributesAttachSingleVlan) Description()
var _ ConnectivityTemplatePrimitiveAttributes = &ConnectivityTemplatePrimitiveAttributesAttachMultipleVlan{}

type ConnectivityTemplatePrimitiveAttributesAttachMultipleVlan struct {
Label string
UntaggedVnNodeId *ObjectId
TaggedVnNodeIds []ObjectId
}
Expand Down Expand Up @@ -95,7 +100,10 @@ func (o *ConnectivityTemplatePrimitiveAttributesAttachMultipleVlan) PolicyTypeNa
return CtPrimitivePolicyTypeNameAttachMultipleVlan
}

func (o *ConnectivityTemplatePrimitiveAttributesAttachMultipleVlan) Label() string {
func (o *ConnectivityTemplatePrimitiveAttributesAttachMultipleVlan) label() string {
if o.Label != "" {
return o.Label
}
return "Virtual Network (Multiple)"
}

Expand All @@ -107,6 +115,7 @@ func (o *ConnectivityTemplatePrimitiveAttributesAttachMultipleVlan) Description(
var _ ConnectivityTemplatePrimitiveAttributes = &ConnectivityTemplatePrimitiveAttributesAttachLogicalLink{}

type ConnectivityTemplatePrimitiveAttributesAttachLogicalLink struct {
Label string
SecurityZone *ObjectId
Tagged bool
Vlan *Vlan
Expand Down Expand Up @@ -155,7 +164,10 @@ func (o *ConnectivityTemplatePrimitiveAttributesAttachLogicalLink) PolicyTypeNam
return CtPrimitivePolicyTypeNameAttachLogicalLink
}

func (o *ConnectivityTemplatePrimitiveAttributesAttachLogicalLink) Label() string {
func (o *ConnectivityTemplatePrimitiveAttributesAttachLogicalLink) label() string {
if o.Label != "" {
return o.Label
}
return "IP Link"
}

Expand All @@ -167,6 +179,7 @@ func (o *ConnectivityTemplatePrimitiveAttributesAttachLogicalLink) Description()
var _ ConnectivityTemplatePrimitiveAttributes = &ConnectivityTemplatePrimitiveAttributesAttachStaticRoute{}

type ConnectivityTemplatePrimitiveAttributesAttachStaticRoute struct {
Label string
ShareIpEndpoint bool
Network *net.IPNet
}
Expand All @@ -190,7 +203,10 @@ func (o *ConnectivityTemplatePrimitiveAttributesAttachStaticRoute) PolicyTypeNam
return CtPrimitivePolicyTypeNameAttachStaticRoute
}

func (o *ConnectivityTemplatePrimitiveAttributesAttachStaticRoute) Label() string {
func (o *ConnectivityTemplatePrimitiveAttributesAttachStaticRoute) label() string {
if o.Label != "" {
return o.Label
}
return "Static Route"
}

Expand All @@ -212,6 +228,7 @@ func (o *ConnectivityTemplatePrimitiveAttributesAttachStaticRoute) fromRawJson(i
var _ ConnectivityTemplatePrimitiveAttributes = &ConnectivityTemplatePrimitiveAttributesAttachCustomStaticRoute{}

type ConnectivityTemplatePrimitiveAttributesAttachCustomStaticRoute struct {
Label string
Network *net.IPNet
NextHop net.IP
SecurityZone *ObjectId
Expand Down Expand Up @@ -243,7 +260,10 @@ func (o *ConnectivityTemplatePrimitiveAttributesAttachCustomStaticRoute) PolicyT
return CtPrimitivePolicyTypeNameAttachCustomStaticRoute
}

func (o *ConnectivityTemplatePrimitiveAttributesAttachCustomStaticRoute) Label() string {
func (o *ConnectivityTemplatePrimitiveAttributesAttachCustomStaticRoute) label() string {
if o.Label != "" {
return o.Label
}
return "Custom Static Route"
}

Expand All @@ -265,6 +285,7 @@ func (o *ConnectivityTemplatePrimitiveAttributesAttachCustomStaticRoute) fromRaw
var _ ConnectivityTemplatePrimitiveAttributes = &ConnectivityTemplatePrimitiveAttributesAttachIpEndpointWithBgpNsxt{}

type ConnectivityTemplatePrimitiveAttributesAttachIpEndpointWithBgpNsxt struct {
Label string
Asn *uint32
Bfd bool
Holdtime *uint16
Expand Down Expand Up @@ -331,7 +352,10 @@ func (o *ConnectivityTemplatePrimitiveAttributesAttachIpEndpointWithBgpNsxt) Pol
return CtPrimitivePolicyTypeNameAttachIpEndpointWithBgpNsxt
}

func (o *ConnectivityTemplatePrimitiveAttributesAttachIpEndpointWithBgpNsxt) Label() string {
func (o *ConnectivityTemplatePrimitiveAttributesAttachIpEndpointWithBgpNsxt) label() string {
if o.Label != "" {
return o.Label
}
return "BGP Peering (IP Endpoint)"
}

Expand All @@ -343,6 +367,7 @@ func (o *ConnectivityTemplatePrimitiveAttributesAttachIpEndpointWithBgpNsxt) Des
var _ ConnectivityTemplatePrimitiveAttributes = &ConnectivityTemplatePrimitiveAttributesAttachBgpOverSubinterfacesOrSvi{}

type ConnectivityTemplatePrimitiveAttributesAttachBgpOverSubinterfacesOrSvi struct {
Label string
Bfd bool
Holdtime *uint16
Ipv4Safi bool
Expand Down Expand Up @@ -408,7 +433,10 @@ func (o *ConnectivityTemplatePrimitiveAttributesAttachBgpOverSubinterfacesOrSvi)
return CtPrimitivePolicyTypeNameAttachBgpOverSubinterfacesOrSvi
}

func (o *ConnectivityTemplatePrimitiveAttributesAttachBgpOverSubinterfacesOrSvi) Label() string {
func (o *ConnectivityTemplatePrimitiveAttributesAttachBgpOverSubinterfacesOrSvi) label() string {
if o.Label != "" {
return o.Label
}
return "BGP Peering (Generic System)"
}

Expand All @@ -420,6 +448,7 @@ func (o *ConnectivityTemplatePrimitiveAttributesAttachBgpOverSubinterfacesOrSvi)
var _ ConnectivityTemplatePrimitiveAttributes = &ConnectivityTemplatePrimitiveAttributesAttachBgpWithPrefixPeeringForSviOrSubinterface{}

type ConnectivityTemplatePrimitiveAttributesAttachBgpWithPrefixPeeringForSviOrSubinterface struct {
Label string
Bfd bool
Holdtime *uint16
Ipv4Safi bool
Expand Down Expand Up @@ -469,7 +498,10 @@ func (o *ConnectivityTemplatePrimitiveAttributesAttachBgpWithPrefixPeeringForSvi
return CtPrimitivePolicyTypeNameAttachBgpWithPrefixPeeringForSviOrSubinterface
}

func (o *ConnectivityTemplatePrimitiveAttributesAttachBgpWithPrefixPeeringForSviOrSubinterface) Label() string {
func (o *ConnectivityTemplatePrimitiveAttributesAttachBgpWithPrefixPeeringForSviOrSubinterface) label() string {
if o.Label != "" {
return o.Label
}
return "Dynamic BGP Peering"
}

Expand All @@ -491,6 +523,7 @@ func (o *ConnectivityTemplatePrimitiveAttributesAttachBgpWithPrefixPeeringForSvi
var _ ConnectivityTemplatePrimitiveAttributes = &ConnectivityTemplatePrimitiveAttributesAttachExistingRoutingPolicy{}

type ConnectivityTemplatePrimitiveAttributesAttachExistingRoutingPolicy struct {
Label string
RpToAttach *ObjectId
}

Expand All @@ -515,7 +548,10 @@ func (o *ConnectivityTemplatePrimitiveAttributesAttachExistingRoutingPolicy) Pol
return CtPrimitivePolicyTypeNameAttachExistingRoutingPolicy
}

func (o *ConnectivityTemplatePrimitiveAttributesAttachExistingRoutingPolicy) Label() string {
func (o *ConnectivityTemplatePrimitiveAttributesAttachExistingRoutingPolicy) label() string {
if o.Label != "" {
return o.Label
}
return "Routing Policy"
}

Expand All @@ -527,6 +563,7 @@ func (o *ConnectivityTemplatePrimitiveAttributesAttachExistingRoutingPolicy) Des
var _ ConnectivityTemplatePrimitiveAttributes = &ConnectivityTemplatePrimitiveAttributesAttachRoutingZoneConstraint{}

type ConnectivityTemplatePrimitiveAttributesAttachRoutingZoneConstraint struct {
Label string
RoutingZoneConstraint *ObjectId
}

Expand All @@ -542,7 +579,10 @@ func (o *ConnectivityTemplatePrimitiveAttributesAttachRoutingZoneConstraint) Pol
return CtPrimitivePolicyTypeNameAttachRoutingZoneConstraint
}

func (o *ConnectivityTemplatePrimitiveAttributesAttachRoutingZoneConstraint) Label() string {
func (o *ConnectivityTemplatePrimitiveAttributesAttachRoutingZoneConstraint) label() string {
if o.Label != "" {
return o.Label
}
return "Routing Zone Constraint"
}

Expand Down
12 changes: 6 additions & 6 deletions apstra/two_stage_l3_clos_connectivity_template_unit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ func TestParseCT(t *testing.T) {
"visible": false,
"policy_type_name": "batch",
"attributes": {
"Subpolicies": [
"subpolicies": [
"2e264a0a-ca5b-413c-9bab-c8c1c4aa4e6e"
]
},
Expand Down Expand Up @@ -331,7 +331,7 @@ func TestParseCT(t *testing.T) {
"visible": true,
"policy_type_name": "batch",
"attributes": {
"Subpolicies": [
"subpolicies": [
"c303e784-82e5-48f5-9ddc-4242641e3770"
]
},
Expand All @@ -357,7 +357,7 @@ func TestParseCT(t *testing.T) {
"visible": false,
"policy_type_name": "batch",
"attributes": {
"Subpolicies": [
"subpolicies": [
"7ae346b7-9136-4d0a-acd1-37856c23b68f"
]
},
Expand Down Expand Up @@ -418,7 +418,7 @@ func TestParseCT(t *testing.T) {
"visible": true,
"policy_type_name": "batch",
"attributes": {
"Subpolicies": [
"subpolicies": [
"7621d11a-ca48-410f-a413-96505bd14812"
]
},
Expand Down Expand Up @@ -467,7 +467,7 @@ func TestParseCT(t *testing.T) {
"visible": false,
"policy_type_name": "batch",
"attributes": {
"Subpolicies": [
"subpolicies": [
"5760f3de-8228-46fd-958a-8f3ad1402814",
"3862d50e-ea13-4d14-8852-fd041a2225ca"
]
Expand Down Expand Up @@ -554,7 +554,7 @@ func TestParseCT(t *testing.T) {
"visible": false,
"policy_type_name": "batch",
"attributes": {
"Subpolicies": [
"subpolicies": [
"c46106e6-671c-44e1-ae8c-43835509fa5e",
"816f4aad-bee5-47a1-8ddf-30e04ba113ed"
]
Expand Down