Merge pull request #887 from Juniper/884-add-constraint-for-iba_widge…

…t-and-fixup-some-tests more build_errors_count issues and fix unsafe Node Patch
Juniper · Oct 1, 2024 · 35692c6 · 35692c6
2 parents 34fc0b7 + 8f4f6cd
commit 35692c6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/apstra/blueprint/blueprint.go b/apstra/blueprint/blueprint.go
@@ -635,7 +635,7 @@ func (o *Blueprint) SetName(ctx context.Context, bpClient *apstra.TwoStageL3Clos
 		nodeId = v.Id
 	}
 
-	err = bpClient.PatchNode(ctx, nodeId, &node{Label: o.Name.ValueString()}, nil)
+	err = bpClient.PatchNodeUnsafe(ctx, nodeId, &node{Label: o.Name.ValueString()}, nil)
 	if err != nil {
 		diags.AddError(
 			fmt.Sprintf(errApiPatchWithTypeAndId, bpClient.Id(), nodeId),

diff --git a/apstra/resource_datacenter_blueprint_test.go b/apstra/resource_datacenter_blueprint_test.go
@@ -252,7 +252,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "58"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeEnabledStrict.String()),
@@ -296,7 +296,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "58"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeEnabledStrict.String()),
@@ -479,7 +479,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "58"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeEnabledStrict.String()),
@@ -597,7 +597,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "58"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeEnabledStrict.String()),
@@ -641,7 +641,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "58"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeEnabledStrict.String()),
@@ -759,7 +759,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "58"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeEnabledStrict.String()),
@@ -825,7 +825,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "58"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeEnabledStrict.String()),