enable query orgs

vmware · Aug 25, 2023 · 0d5104b · 0d5104b
1 parent ad7fd03
commit 0d5104b
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 0 deletions.
diff --git a/govcd/filter_interface.go b/govcd/filter_interface.go
@@ -37,6 +37,7 @@ type (
 	QueryOrgVdc        types.QueryResultOrgVdcRecordType
 	QueryTask          types.QueryResultTaskRecordType
 	QueryAdminTask     types.QueryResultTaskRecordType
+	QueryOrg           types.QueryResultOrgRecordType
 )
 
 // getMetadataValue is a generic metadata lookup for all query items
@@ -230,6 +231,20 @@ func (vm QueryVm) GetMetadataValue(key string) string {
 	return getMetadataValue(vm.MetaData, key)
 }
 
+// --------------------------------------------------------------
+// Organization
+// --------------------------------------------------------------
+func (org QueryOrg) GetHref() string       { return org.HREF }
+func (org QueryOrg) GetName() string       { return org.Name }
+func (org QueryOrg) GetType() string       { return "organization" }
+func (org QueryOrg) GetDate() string       { return "" }
+func (org QueryOrg) GetIp() string         { return "" }
+func (org QueryOrg) GetParentId() string   { return "" }
+func (org QueryOrg) GetParentName() string { return "" }
+func (org QueryOrg) GetMetadataValue(key string) string {
+	return getMetadataValue(org.Metadata, key)
+}
+
 // --------------------------------------------------------------
 // result conversion
 // --------------------------------------------------------------
@@ -273,6 +288,10 @@ func resultToQueryItems(queryType string, results Results) ([]QueryItem, error)
 		for i, item := range results.Results.OrgVdcNetworkRecord {
 			items[i] = QueryOrgVdcNetwork(*item)
 		}
+	case types.QtOrg:
+		for i, item := range results.Results.OrgRecord {
+			items[i] = QueryOrg(*item)
+		}
 	case types.QtCatalog:
 		for i, item := range results.Results.CatalogRecord {
 			items[i] = QueryCatalog(*item)

diff --git a/govcd/query_metadata.go b/govcd/query_metadata.go
@@ -78,6 +78,8 @@ func queryFieldsOnDemand(queryType string) ([]string, error) {
 			"cpuOverheadMhz", "isVCEnabled", "memoryReservedMB", "cpuReservedMhz", "storageOverheadMB", "memoryOverheadMB", "vc"}
 		taskFields = []string{"href", "id", "type", "org", "orgName", "name", "operationFull", "message", "startDate",
 			"endDate", "status", "progress", "ownerName", "object", "objectType", "objectName", "serviceNamespace"}
+		orgFields = []string{"href", "id", "type", "name", "displayName", "isEnabled", "isReadOnly", "canPublishCatalogs",
+			"deployedVMQuota", "storedVMQuota", "numberOfCatalogs", "numberOfVdcs", "numberOfVApps", "numberOfGroups", "numberOfDisks"}
 		fieldsOnDemand = map[string][]string{
 			types.QtVappTemplate:      vappTemplatefields,
 			types.QtAdminVappTemplate: vappTemplatefields,
@@ -97,6 +99,7 @@ func queryFieldsOnDemand(queryType string) ([]string, error) {
 			types.QtAdminOrgVdc:       orgVdcFields,
 			types.QtTask:              taskFields,
 			types.QtAdminTask:         taskFields,
+			types.QtOrg:               orgFields,
 		}
 	)
 

diff --git a/types/v56/constants.go b/types/v56/constants.go
@@ -258,6 +258,7 @@ const (
 	QtVappTemplate              = "vAppTemplate"              // vApp template
 	QtAdminVappTemplate         = "adminVAppTemplate"         // vApp template as admin
 	QtEdgeGateway               = "edgeGateway"               // edge gateway
+	QtOrg                       = "organization"              // Organization
 	QtOrgVdcNetwork             = "orgVdcNetwork"             // Org VDC network
 	QtCatalog                   = "catalog"                   // catalog
 	QtAdminCatalog              = "adminCatalog"              // catalog as admin
@@ -283,6 +284,7 @@ const (
 // AdminQueryTypes returns the corresponding "admin" query type for each regular type
 var AdminQueryTypes = map[string]string{
 	QtEdgeGateway:   QtEdgeGateway,   // EdgeGateway query type is the same for admin and regular users
+	QtOrg:           QtOrg,           // Organisation query is admin per default
 	QtOrgVdcNetwork: QtOrgVdcNetwork, // Org VDC Network query type is the same for admin and regular users
 	QtVappTemplate:  QtAdminVappTemplate,
 	QtCatalog:       QtAdminCatalog,

diff --git a/types/v56/types.go b/types/v56/types.go
@@ -2369,6 +2369,7 @@ type QueryResultRecordsType struct {
 	VmGroupsRecord                  []*QueryResultVmGroupsRecordType                  `xml:"VmGroupsRecord"`                  // A record representing a VM Group
 	TaskRecord                      []*QueryResultTaskRecordType                      `xml:"TaskRecord"`                      // A record representing a Task
 	AdminTaskRecord                 []*QueryResultTaskRecordType                      `xml:"AdminTaskRecord"`                 // A record representing an Admin Task
+	OrgRecord                       []*QueryResultOrgRecordType                       `xml:"OrgRecord"`                       // A record representing an Organisation
 }
 
 // QueryResultVmGroupsRecordType represent a VM Groups record
@@ -3357,6 +3358,27 @@ type QueryResultTaskRecordType struct {
 	Metadata         *Metadata `xml:"Metadata,omitempty"`
 }
 
+// QueryResultOrgVdcRecordType represents an Organisation record
+type QueryResultOrgRecordType struct {
+	HREF               string    `xml:"href,attr,omitempty"`
+	Type               string    `xml:"type,attr,omitempty"`
+	ID                 string    `xml:"id,attr,omitempty"`
+	Name               string    `xml:"name,attr"`
+	DisplayName        string    `xml:"displayName,attr,omitempty"`
+	IsEnabled          bool      `xml:"IsEnabled,attr,omitempty"`
+	IsReadOnly         bool      `xml:"isReadOnly,attr,omitempty"`
+	CanPublishCatalogs bool      `xml:"canPublishCatalogs,attr,omitempty"`
+	DeployedVMQuota    *int      `xml:"deployedVMQuota,attr,omitempty"`
+	StoredVMQuota      *int      `xml:"storedVMQuota,attr,omitempty"`
+	NumberOfCatalogs   *int      `xml:"numberOfCatalogs,attr,omitempty"`
+	NumberOfVdcs       *int      `xml:"numberOfVdcs,attr,omitempty"`
+	NumberOfVApps      *int      `xml:"numberOfVApps,attr,omitempty"`
+	NumberOfGroups     *int      `xml:"numberOfGroups,attr,omitempty"`
+	NumberOfDisks      *int      `xml:"numberOfDisks,attr,omitempty"`
+	Link               *LinkList `xml:"Link,omitempty"`
+	Metadata           *Metadata `xml:"Metadata,omitempty"`
+}
+
 // ProviderVdcCreation contains the data needed to create a provider VDC.
 // Note that this is a subset of the full structure of a provider VDC.
 type ProviderVdcCreation struct {