remove NewQuery()

Juniper · Aug 19, 2023 · 8693c18 · 8693c18
1 parent 92821ce
commit 8693c18
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/apstra/client.go b/apstra/client.go
@@ -1215,11 +1215,6 @@ func (o *Client) DeleteTemplate(ctx context.Context, id ObjectId) error {
 	return o.deleteTemplate(ctx, id)
 }
 
-// NewQuery returns a *PathQuery with embedded *Client
-func (o *Client) NewQuery(blueprint ObjectId) *PathQuery {
-	return o.newQuery(blueprint)
-}
-
 // ListAllInterfaceMapIds returns []ObjectId representing all interface maps
 func (o *Client) ListAllInterfaceMapIds(ctx context.Context) ([]ObjectId, error) {
 	return o.listAllInterfaceMapIds(ctx)
@@ -1674,7 +1669,9 @@ func (o *Client) BlueprintOverlayControlProtocol(ctx context.Context, id ObjectI
 		} `json:"items"`
 	}
 
-	query := o.NewQuery(id).
+	query := new(PathQuery).
+		SetBlueprintId(id).
+		SetClient(o).
 		Node([]QEEAttribute{
 			{"type", QEStringVal("virtual_network_policy")},
 			{"name", QEStringVal("n_virtual_network_policy")},

diff --git a/apstra/query_engine_test.go b/apstra/query_engine_test.go
@@ -171,8 +171,10 @@ func TestParsingQueryInfo(t *testing.T) {
 				} `json:"n_system"`
 			} `json:"items"`
 		}
-		log.Printf("testing NewQuery() against %s %s (%s)", client.clientType, clientName, client.client.ApiVersion())
-		err = client.client.NewQuery(bpClient.Id()).
+		log.Printf("testing PathQuery.Do() against %s %s (%s)", client.clientType, clientName, client.client.ApiVersion())
+		err = new(PathQuery).
+			SetClient(bpClient.client).
+			SetBlueprintId(bpClient.Id()).
 			Node([]QEEAttribute{
 				{"type", QEStringVal("system")},
 				{"name", QEStringVal("n_system")},

diff --git a/apstra/two_stage_l3_clos_virtual_networks_integration_test.go b/apstra/two_stage_l3_clos_virtual_networks_integration_test.go
@@ -208,12 +208,15 @@ func TestCreateUpdateDeleteVirtualNetwork(t *testing.T) {
 			} `json:"items"`
 		}
 
-		query := client.client.NewQuery(bpClient.Id()).Node([]QEEAttribute{
-			{"type", QEStringVal("system")},
-			{"system_type", QEStringVal("switch")},
-			{"role", QEStringVal("leaf")},
-			{"name", QEStringVal("system")},
-		})
+		query := new(PathQuery).
+			SetClient(client.client).
+			SetBlueprintId(bpClient.Id()).
+			Node([]QEEAttribute{
+				{"type", QEStringVal("system")},
+				{"system_type", QEStringVal("switch")},
+				{"role", QEStringVal("leaf")},
+				{"name", QEStringVal("system")},
+			})
 
 		err = query.Do(ctx, &result)
 		if err != nil {