Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tests #697

Merged
merged 4 commits into from
Jul 31, 2024
Merged

Fix tests #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7f5042
Fix tests
Jul 30, 2024
0fc7a9a
Fix test
Jul 30, 2024
42aeb33
Changelog
Jul 30, 2024
4486cef
Changelog
Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .changes/v2.26.0/696-features.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
* Added CRUD operations for External Endpoints: `VCDClient.CreateExternalEndpoint`, `VCDClient.GetAllExternalEndpoints`,
`VCDClient.GetExternalEndpoint`, `VCDClient.GetExternalEndpointById`, `ExternalEndpoint.Update` and `ExternalEndpoint.Delete` [GH-696]
* Added CRUD operations for API Filters: `VCDClient.CreateApiFilter`, `VCDClient.GetAllApiFilters`, `VCDClient.GetApiFilterById`,
`ApiFilter.Update` and `ApiFilter.Delete` [GH-696]
`ApiFilter.Update` and `ApiFilter.Delete` [GH-696, GH-697]
1 change: 1 addition & 0 deletions .changes/v2.26.0/697-bug-fixes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Fixes an XML error when updating a VM spec section: `Undeclared namespace prefix "ns5"` [GH-697]
2 changes: 2 additions & 0 deletions .changes/v2.26.0/697-notes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
* Modifies `Test_CreateDeleteEdgeGatewayAdvanced` to avoid its failure as VCD returns `Connected: true` when retrieving
the Edge Gateway data [GH-697]
2 changes: 1 addition & 1 deletion govcd/api_filter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (vcd *TestVCD) Test_ApiFilter(check *C) {
check.Assert(retrievedAf.ApiFilter.UrlMatcher, NotNil)
check.Assert(retrievedAf.ApiFilter.UrlMatcher.UrlPattern, Equals, createdAf.ApiFilter.UrlMatcher.UrlPattern)
check.Assert(retrievedAf.ApiFilter.UrlMatcher.UrlScope, Equals, createdAf.ApiFilter.UrlMatcher.UrlScope)
check.Assert(retrievedAf.ApiFilter.ResponseContentType, Equals, "")
check.Assert(retrievedAf.ApiFilter.ResponseContentType, IsNil)
check.Assert(retrievedAf.ApiFilter.ExternalSystem, NotNil)
check.Assert(retrievedAf.ApiFilter.ExternalSystem.ID, Equals, createdEp.ExternalEndpoint.ID)
check.Assert(retrievedAf.ApiFilter.ExternalSystem.Name, Equals, createdEp.ExternalEndpoint.Name)
Expand Down
1 change: 1 addition & 0 deletions govcd/system_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@ func (vcd *TestVCD) Test_CreateDeleteEdgeGatewayAdvanced(check *C) {
},
UseForDefaultRoute: true,
SubnetParticipation: subnetParticipation,
Connected: true,
}

// Sort by subnet participation gateway so that below injected variables are not being added to
Expand Down
1 change: 1 addition & 0 deletions govcd/vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2178,6 +2178,7 @@ func (vm *VM) updateExtraConfig(update []*types.ExtraConfigMarshal, wantDelete b
Ns2: types.XMLNamespaceVCloud,
Ns3: types.XMLNamespaceVCloud,
Ns4: types.XMLNamespaceVCloud,
Ns5: types.XMLNamespaceVCloud,
Vmw: types.XMLNamespaceVMW,
Xmlns: types.XMLNamespaceVCloud,

Expand Down
1 change: 1 addition & 0 deletions types/v56/vm_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ type RequestVirtualHardwareSection struct {
Ns2 string `xml:"xmlns:ns2,attr"`
Ns3 string `xml:"xmlns:ns3,attr"`
Ns4 string `xml:"xmlns:ns4,attr"`
Ns5 string `xml:"xmlns:ns5,attr"`
Vmw string `xml:"xmlns:vmw,attr"`

Info string `xml:"ovf:Info"`
Expand Down
Loading