esx: Move occurrence check into esxVI_LookupObjectContentByType

This simplifies the callers of esxVI_LookupObjectContentByType.

diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 67325de00905896e37264a5fd082910e7d3f4b5a..de3e49f0be537f47bc703eb8110caad60bbf1f1b 100644 (file)
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -3886,7 +3886,8 @@ esxNodeGetFreeMemory(virConnectPtr conn)
         esxVI_LookupObjectContentByType(priv->primary,
                                         priv->primary->computeResource->resourcePool,
                                         "ResourcePool", propertyNameList,
-                                        &resourcePool) < 0) {
+                                        &resourcePool,
+                                        esxVI_Occurrence_RequiredItem) < 0) {
         goto cleanup;
     }
 

diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index 62b28a23c40762addfbde856a59f48392e4c9099..7446ec50e0b4699dffae47b45d5b72c143fd637b 100644 (file)
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -499,13 +499,8 @@ esxVI_Context_LookupObjectsByPath(esxVI_Context *ctx,
                                            "hostFolder\0") < 0 ||
         esxVI_LookupObjectContentByType(ctx, ctx->service->rootFolder,
                                         "Datacenter", propertyNameList,
-                                        &datacenterList) < 0) {
-        goto cleanup;
-    }
-
-    if (datacenterList == NULL) {
-        ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s",
-                     _("Could not retrieve datacenter list"));
+                                        &datacenterList,
+                                        esxVI_Occurrence_RequiredList) < 0) {
         goto cleanup;
     }
 
@@ -548,13 +543,8 @@ esxVI_Context_LookupObjectsByPath(esxVI_Context *ctx,
                                            "resourcePool\0") < 0 ||
         esxVI_LookupObjectContentByType(ctx, ctx->datacenter->hostFolder,
                                         "ComputeResource", propertyNameList,
-                                        &computeResourceList) < 0) {
-        goto cleanup;
-    }
-
-    if (computeResourceList == NULL) {
-        ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s",
-                     _("Could not retrieve compute resource list"));
+                                        &computeResourceList,
+                                        esxVI_Occurrence_RequiredList) < 0) {
         goto cleanup;
     }
 
@@ -610,13 +600,8 @@ esxVI_Context_LookupObjectsByPath(esxVI_Context *ctx,
                                            "configManager\0") < 0 ||
         esxVI_LookupObjectContentByType(ctx, ctx->computeResource->_reference,
                                         "HostSystem", propertyNameList,
-                                        &hostSystemList) < 0) {
-        goto cleanup;
-    }
-
-    if (hostSystemList == NULL) {
-        ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s",
-                     _("Could not retrieve host system list"));
+                                        &hostSystemList,
+                                        esxVI_Occurrence_RequiredList) < 0) {
         goto cleanup;
     }
 
@@ -687,17 +672,9 @@ esxVI_Context_LookupObjectsByHostSystemIp(esxVI_Context *ctx,
                        &managedObjectReference) < 0 ||
         esxVI_LookupObjectContentByType(ctx, managedObjectReference,
                                         "HostSystem", propertyNameList,
-                                        &hostSystem) < 0) {
-        goto cleanup;
-    }
-
-    if (hostSystem == NULL) {
-        ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s",
-                     _("Could not retrieve host system"));
-        goto cleanup;
-    }
-
-    if (esxVI_HostSystem_CastFromObjectContent(hostSystem,
+                                        &hostSystem,
+                                        esxVI_Occurrence_RequiredItem) < 0 ||
+        esxVI_HostSystem_CastFromObjectContent(hostSystem,
                                                &ctx->hostSystem) < 0) {
         goto cleanup;
     }
@@ -711,17 +688,9 @@ esxVI_Context_LookupObjectsByHostSystemIp(esxVI_Context *ctx,
                                            "resourcePool\0") < 0 ||
         esxVI_LookupObjectContentByType(ctx, hostSystem->obj,
                                         "ComputeResource", propertyNameList,
-                                        &computeResource) < 0) {
-        goto cleanup;
-    }
-
-    if (computeResource == NULL) {
-        ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s",
-                     _("Could not retrieve compute resource of host system"));
-        goto cleanup;
-    }
-
-    if (esxVI_ComputeResource_CastFromObjectContent(computeResource,
+                                        &computeResource,
+                                        esxVI_Occurrence_RequiredItem) < 0 ||
+        esxVI_ComputeResource_CastFromObjectContent(computeResource,
                                                     &ctx->computeResource) < 0) {
         goto cleanup;
     }
@@ -735,17 +704,9 @@ esxVI_Context_LookupObjectsByHostSystemIp(esxVI_Context *ctx,
                                            "hostFolder\0") < 0 ||
         esxVI_LookupObjectContentByType(ctx, computeResource->obj,
                                         "Datacenter", propertyNameList,
-                                        &datacenter) < 0) {
-        goto cleanup;
-    }
-
-    if (datacenter == NULL) {
-        ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s",
-                     _("Could not retrieve datacenter of compute resource"));
-        goto cleanup;
-    }
-
-    if (esxVI_Datacenter_CastFromObjectContent(datacenter,
+                                        &datacenter,
+                                        esxVI_Occurrence_RequiredItem) < 0 ||
+        esxVI_Datacenter_CastFromObjectContent(datacenter,
                                                &ctx->datacenter) < 0) {
         goto cleanup;
     }
@@ -1586,7 +1547,8 @@ esxVI_EnsureSession(esxVI_Context *ctx)
                                            "currentSession") < 0 ||
             esxVI_LookupObjectContentByType(ctx, ctx->service->sessionManager,
                                             "SessionManager", propertyNameList,
-                                            &sessionManager) < 0) {
+                                            &sessionManager,
+                                            esxVI_Occurrence_RequiredItem) < 0) {
             goto cleanup;
         }
 
@@ -1636,7 +1598,8 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx,
                                 esxVI_ManagedObjectReference *root,
                                 const char *type,
                                 esxVI_String *propertyNameList,
-                                esxVI_ObjectContent **objectContentList)
+                                esxVI_ObjectContent **objectContentList,
+                                esxVI_Occurrence occurrence)
 {
     int result = -1;
     esxVI_ObjectSpec *objectSpec = NULL;
@@ -1710,12 +1673,41 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx,
         esxVI_PropertySpec_AppendToList(&propertyFilterSpec->propSet,
                                         propertySpec) < 0 ||
         esxVI_ObjectSpec_AppendToList(&propertyFilterSpec->objectSet,
-                                      objectSpec) < 0) {
+                                      objectSpec) < 0 ||
+        esxVI_RetrieveProperties(ctx, propertyFilterSpec,
+                                 objectContentList) < 0) {
         goto cleanup;
     }
 
-    result = esxVI_RetrieveProperties(ctx, propertyFilterSpec,
-                                      objectContentList);
+    if (objectContentList == NULL) {
+        switch (occurrence) {
+          case esxVI_Occurrence_OptionalItem:
+          case esxVI_Occurrence_OptionalList:
+            result = 0;
+            break;
+
+          case esxVI_Occurrence_RequiredItem:
+            ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR,
+                         _("Could not lookup '%s' from '%s'"),
+                         type, root->type);
+            break;
+
+          case esxVI_Occurrence_RequiredList:
+            ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR,
+                         _("Could not lookup '%s' list from '%s'"),
+                         type, root->type);
+            break;
+
+          default:
+            ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s",
+                         _("Invalid occurrence value"));
+            break;
+        }
+
+        goto cleanup;
+    }
+
+    result = 0;
 
   cleanup:
     /*
@@ -2276,7 +2268,8 @@ esxVI_LookupHostSystemProperties(esxVI_Context *ctx,
 {
     return esxVI_LookupObjectContentByType(ctx, ctx->hostSystem->_reference,
                                            "HostSystem", propertyNameList,
-                                           hostSystem);
+                                           hostSystem,
+                                           esxVI_Occurrence_RequiredItem);
 }
 
 
@@ -2290,7 +2283,8 @@ esxVI_LookupVirtualMachineList(esxVI_Context *ctx,
      *        for cluster support */
     return esxVI_LookupObjectContentByType(ctx, ctx->hostSystem->_reference,
                                            "VirtualMachine", propertyNameList,
-                                           virtualMachineList);
+                                           virtualMachineList,
+                                           esxVI_Occurrence_OptionalList);
 }
 
 
@@ -2332,7 +2326,8 @@ esxVI_LookupVirtualMachineByUuid(esxVI_Context *ctx, const unsigned char *uuid,
 
     if (esxVI_LookupObjectContentByType(ctx, managedObjectReference,
                                         "VirtualMachine", propertyNameList,
-                                        virtualMachine) < 0) {
+                                        virtualMachine,
+                                        esxVI_Occurrence_RequiredItem) < 0) {
         goto cleanup;
     }
 
@@ -2475,7 +2470,8 @@ esxVI_LookupDatastoreList(esxVI_Context *ctx, esxVI_String *propertyNameList,
      *        support */
     return esxVI_LookupObjectContentByType(ctx, ctx->hostSystem->_reference,
                                            "Datastore", propertyNameList,
-                                           datastoreList);
+                                           datastoreList,
+                                           esxVI_Occurrence_OptionalList);
 }
 
 
@@ -2654,7 +2650,8 @@ esxVI_LookupDatastoreHostMount(esxVI_Context *ctx,
 
     if (esxVI_String_AppendValueToList(&propertyNameList, "host") < 0 ||
         esxVI_LookupObjectContentByType(ctx, datastore, "Datastore",
-                                        propertyNameList, &objectContent) < 0) {
+                                        propertyNameList, &objectContent,
+                                        esxVI_Occurrence_RequiredItem) < 0) {
         goto cleanup;
     }
 
@@ -2719,7 +2716,8 @@ esxVI_LookupTaskInfoByTask(esxVI_Context *ctx,
 
     if (esxVI_String_AppendValueToList(&propertyNameList, "info") < 0 ||
         esxVI_LookupObjectContentByType(ctx, task, "Task", propertyNameList,
-                                        &objectContent) < 0) {
+                                        &objectContent,
+                                        esxVI_Occurrence_RequiredItem) < 0) {
         goto cleanup;
     }
 
@@ -3400,13 +3398,7 @@ esxVI_LookupAutoStartDefaults(esxVI_Context *ctx,
         esxVI_LookupObjectContentByType
           (ctx, ctx->hostSystem->configManager->autoStartManager,
            "HostAutoStartManager", propertyNameList,
-           &hostAutoStartManager) < 0) {
-        goto cleanup;
-    }
-
-    if (hostAutoStartManager == NULL) {
-        ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s",
-                     _("Could not retrieve the HostAutoStartManager object"));
+           &hostAutoStartManager, esxVI_Occurrence_RequiredItem) < 0) {
         goto cleanup;
     }
 
@@ -3463,13 +3455,7 @@ esxVI_LookupAutoStartPowerInfoList(esxVI_Context *ctx,
         esxVI_LookupObjectContentByType
           (ctx, ctx->hostSystem->configManager->autoStartManager,
            "HostAutoStartManager", propertyNameList,
-           &hostAutoStartManager) < 0) {
-        goto cleanup;
-    }
-
-    if (hostAutoStartManager == NULL) {
-        ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s",
-                     _("Could not retrieve the HostAutoStartManager object"));
+           &hostAutoStartManager, esxVI_Occurrence_RequiredItem) < 0) {
         goto cleanup;
     }
 

diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h
index b071c6c8a1bf01a6f1bcd54a09975a53d3461ed6..e150dbf58b88bebc26e7a844cd6bb52625a4f4a6 100644 (file)
--- a/src/esx/esx_vi.h
+++ b/src/esx/esx_vi.h
@@ -284,7 +284,8 @@ int esxVI_LookupObjectContentByType(esxVI_Context *ctx,
                                     esxVI_ManagedObjectReference *root,
                                     const char *type,
                                     esxVI_String *propertyNameList,
-                                    esxVI_ObjectContent **objectContentList);
+                                    esxVI_ObjectContent **objectContentList,
+                                    esxVI_Occurrence occurrence);
 
 int esxVI_GetManagedEntityStatus
       (esxVI_ObjectContent *objectContent, const char *propertyName,