Add support for handling catalog storage profiles #345
Conversation
| @@ -42,6 +42,74 @@ func (adminOrg *AdminOrg) CreateCatalog(name, description string) (AdminCatalog, | |||
| return CreateCatalog(adminOrg.client, adminOrg.AdminOrg.Link, name, description) | |||
| } | |||
|
|
|||
| // CreateCatalogWithStorageProfile is like CreateCatalog, but allows to specify storage profile | |||
| func (adminOrg *AdminOrg) CreateCatalogWithStorageProfile(name, description string, storageProfiles *types.CatalogStorageProfiles) (AdminCatalog, error) { | |||
| return CreateCatalogWithStorageProfile(adminOrg.client, adminOrg.AdminOrg.Link, name, description, storageProfiles) | |||
There was a problem hiding this comment.
does this mean that catalog can have assigned multi storage profiles?
There was a problem hiding this comment.
Nope, but API structure is such. The other way is I could always wrap it in this function. I just accepted this structure as it looked more convenient (and maybe future proof although I know it may never happen).
There was a problem hiding this comment.
Well due this naming and type I got strange impression that multi storage profiles supported:)
There was a problem hiding this comment.
Yes, the structure accepts a slice, but I left it as I see it as a possibility for future. If it can use "any of all", why can't it use "any of specified".
govcd/adminorg.go
Outdated
| return CreateCatalogWithStorageProfile(adminOrg.client, adminOrg.AdminOrg.Link, name, description, storageProfiles) | ||
| } | ||
|
|
||
| // GetAllVDCs returns all child VDCs |
There was a problem hiding this comment.
I would say "all depending VDCs" because using "child" as adjective for plural recipients doesn't sound right
govcd/adminorg.go
Outdated
| return allVdcs, nil | ||
| } | ||
|
|
||
| // GetAllStorageProfileReferences traverses all child VDCs and returns a slice of storage profile references |
| return allStorageProfileReferences, nil | ||
| } | ||
|
|
||
| func (adminOrg *AdminOrg) GetStorageProfileReferenceById(id string, refresh bool) (*types.Reference, error) { |
| @@ -91,13 +91,19 @@ func (org *Org) GetVdcByName(vdcname string) (Vdc, error) { | |||
| } | |||
|
|
|||
| func CreateCatalog(client *Client, links types.LinkList, Name, Description string) (AdminCatalog, error) { | |||
There was a problem hiding this comment.
missing func description
| @@ -603,7 +603,7 @@ type ComputeCapacity struct { | |||
| // Description: A reference to a resource. Contains an href attribute and optional name and type attributes. | |||
| // Since: 0.9 | |||
| type Reference struct { | |||
| HREF string `xml:"href,attr"` | |||
| HREF string `xml:"href,attr,omitempty"` | |||
There was a problem hiding this comment.
In which case does a Reference return an empty HREF?
There was a problem hiding this comment.
In fact this was not for return, but for "POST"/"PUT". When attaching storage profile to catalog I wanted to use IDs (because they are what we use and having only ID is sufficient for the task). What happened is it would send ID and empty HREF field (href="")which caused validation error.
CHANGELOG.md
Outdated
| @@ -8,6 +8,9 @@ | |||
| * Added functions `edge.GetLbAppRules`, `edge.GetLbServerPools`, `edge.GetLbAppProfiles`, `edge.GetNsxvNatRules`, `client.GetOrgList` | |||
| * Exported private function `client.maxSupportedVersion` to `client.MaxSupportedVersion` | |||
| * Able to upload an OVF without ovf:size defined in File part. Some bug fix for uploading OVA/OVF. [#331](https://github.com/vmware/go-vcloud-director/pull/331) | |||
| * Add support for handling catalog storage profiles (`adminOrg.CreateCatalogWithStorageProfile`, | |||
There was a problem hiding this comment.
I thought that catalog can only have ONE storage profile.
There was a problem hiding this comment.
I had this as a general term "storage profiles" and yes - it is true that it only handles one. Will change.
It can be tricky to use catalogs while working with multiple VDCs without specifying particular storage profile (vmware/terraform-provider-vcd#598)
This PR adds functions to SDK so that one can handle Storage profiles for catalog during creation and update phases.
It improves functions
func (adminCatalog *AdminCatalog) Update()and addsfunc (adminOrg *AdminOrg) CreateCatalogWithStorageProfilefunc (org *Org) CreateCatalogWithStorageProfileAdditionally these functions are added for convenience:
func (adminOrg *AdminOrg) GetAllStorageProfileReferencesfunc (adminOrg *AdminOrg) GetStorageProfileReferenceByIdfunc (adminOrg *AdminOrg) GetAllVDCsNote. Test suite passed on at least one env.