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.

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

TM VDC and Region Zones #720

Open
wants to merge 47 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
0e7290d
Region PR
Didainius Oct 28, 2024
6ae2108
Add changelog note
Didainius Oct 28, 2024
c2c7276
Self review
Didainius Oct 28, 2024
42d6028
Adjustments
Didainius Oct 30, 2024
c6c4843
Self review
Didainius Oct 30, 2024
05169e7
Self review
Didainius Oct 30, 2024
571c687
WIP
Didainius Nov 4, 2024
e2286ae
Address comments
Didainius Nov 4, 2024
bf7c06b
Address comment - improve code comment
Didainius Nov 5, 2024
f471193
Merge branch 'region-pr' into vdc
Didainius Nov 6, 2024
df26ea1
Rename StoragePolicies to StorageClasses
Nov 6, 2024
8588c19
#
Nov 6, 2024
2c6b7fe
Pick Dainius PR
Nov 6, 2024
4c5dd85
#
Nov 6, 2024
8eaea24
#
Nov 6, 2024
28e9d26
#
Nov 6, 2024
5a32850
WIP
Didainius Nov 7, 2024
8a1f72a
Add VCDClient.GetSupervisorByNameAndVcenterId and test
Didainius Nov 7, 2024
ab3709b
#
Nov 7, 2024
f086097
Cleanup funcs
Nov 7, 2024
d83628c
Merge
Nov 7, 2024
283a1a3
merge main
Didainius Nov 7, 2024
223f26f
Fixes
Nov 7, 2024
910ea72
Tests pass
Nov 7, 2024
f4b7f79
#
Nov 7, 2024
5c1d049
#
Nov 7, 2024
b8c2ccb
#
Nov 7, 2024
864a36a
Move to separate file
Nov 8, 2024
1d72ea2
#
Nov 8, 2024
95a6a12
#
Nov 8, 2024
e071b96
WIP
Didainius Nov 11, 2024
d061a34
Merge branch 'fix-region-sp' into vdc
Didainius Nov 11, 2024
810f8af
Merge up
Didainius Nov 11, 2024
05277dc
Improve test
Didainius Nov 11, 2024
aef69b5
Merge main
Didainius Nov 11, 2024
2986270
Improve test, gitignore and region setup func
Didainius Nov 12, 2024
6fac201
Self review, docs
Didainius Nov 13, 2024
9956f91
Typos and comments
Didainius Nov 14, 2024
ed5f990
Self review
Didainius Nov 15, 2024
96d6ca8
Improve cleanup
Didainius Nov 15, 2024
37b4091
improve names
Didainius Nov 15, 2024
2647d4b
Add GetTmVdcByNameAndOrgId
Didainius Nov 18, 2024
dd39659
Improve test
Didainius Nov 18, 2024
2220bec
Self review - docs
Didainius Nov 18, 2024
63a0abc
Use native filtering in GetTmVdcByName and GetTmVdcByNameAndOrgId
Didainius Nov 25, 2024
42ff199
Add changelog adjustment
Didainius Nov 26, 2024
77d1655
Revert "Add changelog adjustment" - wrong branch
Didainius Nov 26, 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
Prev Previous commit
Next Next commit
Rename StoragePolicies to StorageClasses
Signed-off-by: abarreiro <[email protected]>
  • Loading branch information
abarreiro committed Nov 6, 2024
commit df26ea18ce44f96ed6f797ac70c5d5ded746caa9
12 changes: 6 additions & 6 deletions govcd/tm_content_library_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ func (vcd *TestVCD) Test_ContentLibraryProvider(check *C) {
check.Assert(rsp, NotNil)

clDefinition := &types.ContentLibrary{
Name: check.TestName(),
StoragePolicies: []types.OpenApiReference{{ID: rsp.RegionStoragePolicy.Id}},
AutoAttach: true, // TODO: TM: Test with false, still does not work
Description: check.TestName(),
Name: check.TestName(),
StorageClasses: []*types.OpenApiReference{{ID: rsp.RegionStoragePolicy.Id}},
AutoAttach: true, // TODO: TM: Test with false, still does not work
Description: check.TestName(),
}

createdCl, err := vcd.client.CreateContentLibrary(clDefinition)
Expand All @@ -46,8 +46,8 @@ func (vcd *TestVCD) Test_ContentLibraryProvider(check *C) {
check.Assert(isUrn(createdCl.ContentLibrary.Id), Equals, true)
check.Assert(createdCl.ContentLibrary.Name, Equals, clDefinition.Name)
check.Assert(createdCl.ContentLibrary.Description, Equals, clDefinition.Description)
check.Assert(len(createdCl.ContentLibrary.StoragePolicies), Equals, 1)
check.Assert(createdCl.ContentLibrary.StoragePolicies[0].ID, Equals, rsp.RegionStoragePolicy.Id)
check.Assert(len(createdCl.ContentLibrary.StorageClasses), Equals, 1)
check.Assert(createdCl.ContentLibrary.StorageClasses[0].ID, Equals, rsp.RegionStoragePolicy.Id)
check.Assert(createdCl.ContentLibrary.AutoAttach, Equals, clDefinition.AutoAttach)
// "Computed" values
check.Assert(createdCl.ContentLibrary.IsShared, Equals, true) // TODO: TM: Still not used in UI
Expand Down
4 changes: 2 additions & 2 deletions types/v56/tm.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ type RegionStoragePolicy struct {
type ContentLibrary struct {
// The name of the Content Library
Name string `json:"name"`
// A collection of RegionStoragePolicy or VdcStoragePolicy references used by this Content Library
StoragePolicies []OpenApiReference `json:"storagePolicies"`
// A collection of storage class references used by this Content Library
StorageClasses []*OpenApiReference `json:"storageClasses,omitempty"`
// For Tenant Content Libraries this field represents whether this Content Library should be automatically attached to
// all current and future namespaces in the tenant organization. If no value is supplied during Tenant Content Library
// creation then this field will default to true. If a value of false is supplied, then this Tenant Content Library will
Expand Down
Loading