Merge pull request #995 from Juniper/bug/994-disable-dashboard-and-wi…

…dget-code disable widget and dashboard code
Juniper · Dec 15, 2024 · 4513764 · 4513764
2 parents f8744fb + 3a81b08
commit 4513764
Show file tree

Hide file tree

Showing 20 changed files with 53 additions and 445 deletions.
diff --git a/...ra/data_source_blueprint_iba_dashboard.go → ...a/data_source_blueprint_iba_dashboard.gox b/...ra/data_source_blueprint_iba_dashboard.go → ...a/data_source_blueprint_iba_dashboard.gox
diff --git a/...ta_source_blueprint_iba_dashboard_test.go → ...a_source_blueprint_iba_dashboard_test.gox b/...ta_source_blueprint_iba_dashboard_test.go → ...a_source_blueprint_iba_dashboard_test.gox
diff --git a/apstra/data_source_blueprint_iba_widget.go → apstra/data_source_blueprint_iba_widget.gox b/apstra/data_source_blueprint_iba_widget.go → apstra/data_source_blueprint_iba_widget.gox
diff --git a/.../data_source_blueprint_iba_widget_test.go → ...data_source_blueprint_iba_widget_test.gox b/.../data_source_blueprint_iba_widget_test.go → ...data_source_blueprint_iba_widget_test.gox
diff --git a/apstra/data_source_blueprint_iba_widgets.go → apstra/data_source_blueprint_iba_widgets.gox b/apstra/data_source_blueprint_iba_widgets.go → apstra/data_source_blueprint_iba_widgets.gox
diff --git a/apstra/iba/dashboard.go → apstra/iba/dashboard.gox b/apstra/iba/dashboard.go → apstra/iba/dashboard.gox
diff --git a/apstra/iba/widget.go → apstra/iba/widget.gox b/apstra/iba/widget.go → apstra/iba/widget.gox
diff --git a/apstra/provider.go b/apstra/provider.go
@@ -516,9 +516,9 @@ func (p *Provider) DataSources(_ context.Context) []func() datasource.DataSource
 		func() datasource.DataSource { return &dataSourceBlueprintAnomalies{} },
 		func() datasource.DataSource { return &dataSourceBlueprintDeploy{} },
 		func() datasource.DataSource { return &dataSourceBlueprintIbaPredefinedProbe{} },
-		func() datasource.DataSource { return &dataSourceBlueprintIbaWidget{} },
-		func() datasource.DataSource { return &dataSourceBlueprintIbaWidgets{} },
-		func() datasource.DataSource { return &dataSourceBlueprintIbaDashboard{} },
+		// func() datasource.DataSource { return &dataSourceBlueprintIbaWidget{} },
+		// func() datasource.DataSource { return &dataSourceBlueprintIbaWidgets{} },
+		// func() datasource.DataSource { return &dataSourceBlueprintIbaDashboard{} },
 		func() datasource.DataSource { return &dataSourceBlueprintIbaDashboards{} },
 		func() datasource.DataSource { return &dataSourceBlueprintNodeConfig{} },
 		func() datasource.DataSource { return &dataSourceBlueprints{} },
@@ -598,9 +598,9 @@ func (p *Provider) Resources(_ context.Context) []func() resource.Resource {
 		func() resource.Resource { return &resourceAgentProfile{} },
 		func() resource.Resource { return &resourceAsnPool{} },
 		func() resource.Resource { return &resourceBlueprintDeploy{} },
-		func() resource.Resource { return &resourceBlueprintIbaDashboard{} },
+		// func() resource.Resource { return &resourceBlueprintIbaDashboard{} },
 		func() resource.Resource { return &resourceBlueprintIbaProbe{} },
-		func() resource.Resource { return &resourceBlueprintIbaWidget{} },
+		// func() resource.Resource { return &resourceBlueprintIbaWidget{} },
 		func() resource.Resource { return &resourceConfiglet{} },
 		func() resource.Resource { return &resourceDatacenterBlueprint{} },
 		func() resource.Resource { return &resourceDatacenterConfiglet{} },

diff --git a/apstra/resource_blueprint_iba_dashboard.go → apstra/resource_blueprint_iba_dashboard.gox b/apstra/resource_blueprint_iba_dashboard.go → apstra/resource_blueprint_iba_dashboard.gox
diff --git a/.../resource_blueprint_iba_dashboard_test.go → ...resource_blueprint_iba_dashboard_test.gox b/.../resource_blueprint_iba_dashboard_test.go → ...resource_blueprint_iba_dashboard_test.gox
diff --git a/apstra/resource_blueprint_iba_widget.go → apstra/resource_blueprint_iba_widget.gox b/apstra/resource_blueprint_iba_widget.go → apstra/resource_blueprint_iba_widget.gox
diff --git a/apstra/resource_blueprint_iba_widget_test.go → ...ra/resource_blueprint_iba_widget_test.gox b/apstra/resource_blueprint_iba_widget_test.go → ...ra/resource_blueprint_iba_widget_test.gox
diff --git a/apstra/test_utils/blueprint_configlet.go b/apstra/test_utils/blueprint_configlet.go
@@ -5,7 +5,6 @@ import (
 	"testing"
 
 	"github.com/Juniper/apstra-go-sdk/apstra"
-	"github.com/Juniper/apstra-go-sdk/apstra/enum"
 	"github.com/Juniper/terraform-provider-apstra/apstra/utils"
 	"github.com/stretchr/testify/require"
 )
@@ -52,47 +51,47 @@ func BlueprintConfigletA(t testing.TB, ctx context.Context, client *apstra.TwoSt
 
 // TestWidgetsAB instantiates two predefined probes and creates widgets from them,
 // returning the widget Object Id and the IbaWidgetData object used for creation
-func TestWidgetsAB(t testing.TB, ctx context.Context, bpClient *apstra.TwoStageL3ClosClient) (apstra.ObjectId, apstra.IbaWidgetData, apstra.ObjectId, apstra.IbaWidgetData) {
-	probeAId, err := bpClient.InstantiateIbaPredefinedProbe(ctx, &apstra.IbaPredefinedProbeRequest{
-		Name: "bgp_session",
-		Data: []byte(`{
-			"Label":     "BGP Session Flapping",
-			"Duration":  300,
-			"Threshold": 40
-		}`),
-	})
-	require.NoError(t, err)
-	t.Cleanup(func() { require.NoError(t, bpClient.DeleteIbaProbe(ctx, probeAId)) })
-
-	probeBId, err := bpClient.InstantiateIbaPredefinedProbe(ctx, &apstra.IbaPredefinedProbeRequest{
-		Name: "drain_node_traffic_anomaly",
-		Data: []byte(`{
-			"Label":     "Drain Traffic Anomaly",
-			"Threshold": 100000
-		}`),
-	})
-	require.NoError(t, err)
-	t.Cleanup(func() { require.NoError(t, bpClient.DeleteIbaProbe(ctx, probeBId)) })
-
-	widgetA := apstra.IbaWidgetData{
-		Type:      enum.IbaWidgetTypeStage,
-		Label:     "BGP Session Flapping",
-		ProbeId:   probeAId,
-		StageName: "BGP Session",
-	}
-	widgetAId, err := bpClient.CreateIbaWidget(ctx, &widgetA)
-	require.NoError(t, err)
-	t.Cleanup(func() { require.NoError(t, bpClient.DeleteIbaWidget(ctx, widgetAId)) })
-
-	widgetB := apstra.IbaWidgetData{
-		Type:      enum.IbaWidgetTypeStage,
-		Label:     "Drain Traffic Anomaly",
-		ProbeId:   probeBId,
-		StageName: "excess_range",
-	}
-	widgetBId, err := bpClient.CreateIbaWidget(ctx, &widgetB)
-	require.NoError(t, err)
-	t.Cleanup(func() { require.NoError(t, bpClient.DeleteIbaWidget(ctx, widgetBId)) })
-
-	return widgetAId, widgetA, widgetBId, widgetB
-}
+//func TestWidgetsAB(t testing.TB, ctx context.Context, bpClient *apstra.TwoStageL3ClosClient) (apstra.ObjectId, apstra.IbaWidgetData, apstra.ObjectId, apstra.IbaWidgetData) {
+//	probeAId, err := bpClient.InstantiateIbaPredefinedProbe(ctx, &apstra.IbaPredefinedProbeRequest{
+//		Name: "bgp_session",
+//		Data: []byte(`{
+//			"Label":     "BGP Session Flapping",
+//			"Duration":  300,
+//			"Threshold": 40
+//		}`),
+//	})
+//	require.NoError(t, err)
+//	t.Cleanup(func() { require.NoError(t, bpClient.DeleteIbaProbe(ctx, probeAId)) })
+//
+//	probeBId, err := bpClient.InstantiateIbaPredefinedProbe(ctx, &apstra.IbaPredefinedProbeRequest{
+//		Name: "drain_node_traffic_anomaly",
+//		Data: []byte(`{
+//			"Label":     "Drain Traffic Anomaly",
+//			"Threshold": 100000
+//		}`),
+//	})
+//	require.NoError(t, err)
+//	t.Cleanup(func() { require.NoError(t, bpClient.DeleteIbaProbe(ctx, probeBId)) })
+//
+//	widgetA := apstra.IbaWidgetData{
+//		Type:      enum.IbaWidgetTypeStage,
+//		Label:     "BGP Session Flapping",
+//		ProbeId:   probeAId,
+//		StageName: "BGP Session",
+//	}
+//	widgetAId, err := bpClient.CreateIbaWidget(ctx, &widgetA)
+//	require.NoError(t, err)
+//	t.Cleanup(func() { require.NoError(t, bpClient.DeleteIbaWidget(ctx, widgetAId)) })
+//
+//	widgetB := apstra.IbaWidgetData{
+//		Type:      enum.IbaWidgetTypeStage,
+//		Label:     "Drain Traffic Anomaly",
+//		ProbeId:   probeBId,
+//		StageName: "excess_range",
+//	}
+//	widgetBId, err := bpClient.CreateIbaWidget(ctx, &widgetB)
+//	require.NoError(t, err)
+//	t.Cleanup(func() { require.NoError(t, bpClient.DeleteIbaWidget(ctx, widgetBId)) })
+//
+//	return widgetAId, widgetA, widgetBId, widgetB
+//}
diff --git a/docs/data-sources/blueprint_iba_dashboard.md b/docs/data-sources/blueprint_iba_dashboard.md
diff --git a/docs/data-sources/blueprint_iba_widget.md b/docs/data-sources/blueprint_iba_widget.md
diff --git a/docs/data-sources/blueprint_iba_widgets.md b/docs/data-sources/blueprint_iba_widgets.md