Merge pull request #264 from Juniper/handle-subinterface-error

Handle 'subinterfaces' link deletion error
Juniper · Apr 30, 2024 · 3b8e9f7 · 3b8e9f7
2 parents d29c825 + 9382a20
commit 3b8e9f7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/apstra/talk_to_apstra.go b/apstra/talk_to_apstra.go
@@ -23,10 +23,10 @@ const (
 	errResponseStringLimit          = 1024
 	peekSizeForApstraTaskIdResponse = math.MaxUint8
 
-	linkHasCtAssignedErrRegexString = "Link with id (.*) can not be deleted since some of its interfaces have connectivity templates assigned"
-	lagHasCtAssignedErrRegexString  = "Deleting all links forming a LAG is not allowed since the LAG has assigned structures: \\[.*'connectivity template'.*]. Link ids: \\[(.*)]"
-	linkHasVnEndpointErrRegexString = "Link with id (.*) can not be deleted since some of its interfaces have VN endpoints"
-	//lagHasAssignedStructuresRegexString = "Operation is not permitted because link group (.*) has assigned structures (VN endpoints, subinterfaces, endpoint templates etc.). Either at least one link from this group should preserve original group label, or all its links should change group label to the same new value, keeping aggregation (LAG / NO LAG) and without other link being added to it."
+	linkHasCtAssignedErrRegexString     = "Link with id (.*) can not be deleted since some of its interfaces have connectivity templates assigned"
+	lagHasCtAssignedErrRegexString      = "Deleting all links forming a LAG is not allowed since the LAG has assigned structures: \\[.*'connectivity template'.*]. Link ids: \\[(.*)]"
+	linkHasVnEndpointErrRegexString     = "Link with id (.*) can not be deleted since some of its interfaces have VN endpoints"
+	linkHasSubinterfacesErrRegexString  = "Link with id (.*) can not be deleted since some of its interfaces have subinterfaces"
 	lagHasAssignedStructuresRegexString = "Operation is not permitted because link group (.*) has assigned structures"
 )
 
@@ -36,6 +36,7 @@ var (
 	regexpLinkHasCtAssignedErr          = regexp.MustCompile(linkHasCtAssignedErrRegexString)
 	regexpLagHasCtAssignedErr           = regexp.MustCompile(lagHasCtAssignedErrRegexString)
 	regexpLinkHasVnEndpoint             = regexp.MustCompile(linkHasVnEndpointErrRegexString)
+	regexpLinkHasSubinterfaces          = regexp.MustCompile(linkHasSubinterfacesErrRegexString)
 	regexpLagHasAssignedStructures      = regexp.MustCompile(lagHasAssignedStructuresRegexString)
 )
 

diff --git a/apstra/two_stage_l3_clos_switch_system_links.go b/apstra/two_stage_l3_clos_switch_system_links.go
@@ -275,6 +275,8 @@ func (o *TwoStageL3ClosClient) DeleteLinksFromSystem(ctx context.Context, ids []
 			lagErrs = append(lagErrs, le)
 		case regexpLinkHasVnEndpoint.MatchString(le):
 			// do nothing - this condition should trigger the regexpLinkHasCtAssignedErr also
+		case regexpLinkHasSubinterfaces.MatchString(le):
+			// do nothing - this condition should trigger the regexpLinkHasCtAssignedErr also
 		default: // cannot handle error - surface it to the user
 			return fmt.Errorf("cannot handle link error %q - %w", le, err)
 		}