Skip to content

Commit

Permalink
#
Browse files Browse the repository at this point in the history
Signed-off-by: abarreiro <abarreiro@vmware.com>
  • Loading branch information
adambarreiro committed Jun 18, 2024
1 parent 0968faf commit 1430ca8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .changes/v2.25.0/688-bug-fixes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
* Fixed an error that occurred when sending a `OpenAPIEdgeGatewayEdgeClusterConfig` section from an Edge Gateway configuration,
when the struct was sent with empty fields, and it should not be sent at all [GH-688]
10 changes: 5 additions & 5 deletions govcd/nsxt_edgegateway_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ func (vcd *TestVCD) Test_NsxtEdgeCreate(check *C) {
check.Assert(err, IsNil)
check.Assert(nsxtExternalNetwork, NotNil)

edgeCluster, err := nsxtVdc.GetNsxtEdgeClusterByName(vcd.config.VCD.Nsxt.NsxtEdgeCluster)
check.Assert(err, IsNil)
check.Assert(edgeCluster, NotNil)

egwDefinition := &types.OpenAPIEdgeGateway{
Name: "nsx-t-edge",
Description: "nsx-t-edge-description",
Expand All @@ -66,12 +62,16 @@ func (vcd *TestVCD) Test_NsxtEdgeCreate(check *C) {
openApiEndpoint := types.OpenApiPathVersion1_0_0 + types.OpenApiEndpointEdgeGateways + createdEdge.EdgeGateway.ID
AddToCleanupListOpenApi(createdEdge.EdgeGateway.Name, check.TestName(), openApiEndpoint)

createdEdge.EdgeGateway.Name = "renamed-edge"
edgeCluster, err := nsxtVdc.GetNsxtEdgeClusterByName(vcd.config.VCD.Nsxt.NsxtEdgeCluster)
check.Assert(err, IsNil)
check.Assert(edgeCluster, NotNil)

createdEdge.EdgeGateway.EdgeClusterConfig = &types.OpenAPIEdgeGatewayEdgeClusterConfig{
PrimaryEdgeCluster: types.OpenAPIEdgeGatewayEdgeCluster{
BackingID: edgeCluster.NsxtEdgeCluster.ID,
},
}
createdEdge.EdgeGateway.Name = "renamed-edge"
updatedEdge, err := createdEdge.Update(createdEdge.EdgeGateway)
check.Assert(err, IsNil)
check.Assert(updatedEdge.EdgeGateway.Name, Equals, "renamed-edge")
Expand Down

0 comments on commit 1430ca8

Please sign in to comment.