esx: Restrict vpx:// to handle a single host in a vCenter

Now a vpx:// connection has an explicitly specified host. This
allows to enabled several functions for a vpx:// connection
again, like host UUID, hostname, general node info, max vCPU
count, free memory, migration and defining new domains.

Lookup datacenter, compute resource, resource pool and host
system once and cache them. This simplifies the rest of the
code and reduces overall HTTP(S) traffic a bit.

esx:// and vpx:// can be mixed freely for a migration.

Ensure that migration source and destination refer to the
same vCenter. Also directly encode the resource pool and
host system object IDs into the migration URI in the prepare
function. Then directly build managed object references in
the perform function instead of re-looking up already known
information.

docs/drvesx.html.in

@@ -28,7 +28,7 @@
         Some example remote connection URIs for the driver are:
     </p>
 <pre>
-vpx://example-vcenter.com              (VPX over HTTPS)
+vpx://example-vcenter.com/dc1/srv1     (VPX over HTTPS, select ESX server 'srv1' in datacenter 'dc1')
 esx://example-esx.com                  (ESX over HTTPS)
 gsx://example-gsx.com                  (GSX over HTTPS)
 esx://example-esx.com/?transport=http  (ESX over HTTP)
@@ -48,7 +48,7 @@ esx://example-esx.com/?no_verify=1     (ESX over HTTPS, but doesn't verify the s
         URIs have this general form (<code>[...]</code> marks an optional part).
     </p>
 <pre>
-type://[username@]hostname[:port]/[?extraparameters]
+type://[username@]hostname[:port]/[datacenter[/cluster]/server][?extraparameters]
 </pre>
     <p>
         The <code>type://</code> is either <code>esx://</code> or
@@ -58,6 +58,20 @@ type://[username@]hostname[:port]/[?extraparameters]
         is 443, for <code>gsx://</code> it is 8333.
         If the port parameter is given, it overrides the default port.
     </p>
+    <p>
+        A <code>vpx://</code> connection is currently restricted to a single
+        ESX server. This might be relaxed in the future. The path part of the
+        URI is used to specify the datacenter and the ESX server in it. If the
+        ESX server is part of a cluster then the cluster has to be specified too.
+    </p>
+    <p>
+        An example: ESX server <code>example-esx.com</code> is managed by
+        vCenter <code>example-vcenter.com</code> and part of cluster
+        <code>cluster1</code>. This cluster is part of datacenter <code>dc1</code>.
+    </p>
+<pre>
+vpx://example-vcenter.com/dc1/cluster1/example-esx.com
+</pre>
 
 
     <h4>Extra parameters</h4>
@@ -588,7 +602,7 @@ ethernet0.address = "00:50:56:25:48:C7"
 esx://example.com/?vcenter=example-vcenter.com
 </pre>
     <p>
-        Here an example how to migrate the domain <code>Fedora11</code> from
+        Here's an example how to migrate the domain <code>Fedora11</code> from
         ESX server <code>example-src.com</code> to ESX server
         <code>example-dst.com</code> implicitly involving vCenter
         <code>example-vcenter.com</code> using <code>virsh</code>.
@@ -603,6 +617,19 @@ Enter username for example-dst.com [root]:
 Enter root password for example-dst.com:
 Enter username for example-vcenter.com [administrator]:
 Enter administrator password for example-vcenter.com:
+</pre>
+    <p>
+        <span class="since">Since 0.8.3</span> you can directly connect to a vCenter.
+        This simplifies migration a bit. Here's the same migration as above but
+        using <code>vpx://</code> connections and assuming both ESX server are in
+        datacenter <code>dc1</code> and aren't part of a cluster.
+    </p>
+<pre>
+$ virsh -c vpx://example-vcenter.com/dc1/example-src.com migrate Fedora11 vpx://example-vcenter.com/dc1/example-dst.com
+Enter username for example-vcenter.com [administrator]:
+Enter administrator password for example-vcenter.com:
+Enter username for example-vcenter.com [administrator]:
+Enter administrator password for example-vcenter.com:
 </pre>
 
 

src/esx/esx_storage_driver.c

@@ -78,9 +78,7 @@ esxNumberOfStoragePools(virConnectPtr conn)
         return -1;
     }
 
-    if (esxVI_LookupObjectContentByType(priv->primary, priv->primary->datacenter,
-                                        "Datastore", NULL, esxVI_Boolean_True,
-                                        &datastoreList) < 0) {
+    if (esxVI_LookupDatastoreList(priv->primary, NULL, &datastoreList) < 0) {
         return -1;
     }
 
@@ -123,10 +121,8 @@ esxListStoragePools(virConnectPtr conn, char **const names, int maxnames)
 
     if (esxVI_String_AppendValueToList(&propertyNameList,
                                        "summary.name") < 0 ||
-        esxVI_LookupObjectContentByType(priv->primary, priv->primary->datacenter,
-                                        "Datastore", propertyNameList,
-                                        esxVI_Boolean_True,
-                                        &datastoreList) < 0) {
+        esxVI_LookupDatastoreList(priv->primary, propertyNameList,
+                                  &datastoreList) < 0) {
         goto cleanup;
     }
 
@@ -308,15 +304,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
     char *name = NULL;
     virStoragePoolPtr pool = NULL;
 
-    /* FIXME: Need to handle this for a vpx:// connection */
-    if (priv->host == NULL ||
-        ! (priv->host->productVersion & esxVI_ProductVersion_ESX)) {
-        ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s",
-                  _("Lookup by UUID is supported on ESX only"));
-        return NULL;
-    }
-
-    if (esxVI_EnsureSession(priv->host) < 0) {
+    if (esxVI_EnsureSession(priv->primary) < 0) {
         return NULL;
     }
 
@@ -334,7 +322,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
      * part of the 'summary.url' property if there is no name match.
      */
     if (esxVI_String_AppendValueToList(&propertyNameList, "summary.name") < 0 ||
-        esxVI_LookupDatastoreByName(priv->host, uuid_string,
+        esxVI_LookupDatastoreByName(priv->primary, uuid_string,
                                     propertyNameList, &datastore,
                                     esxVI_Occurrence_OptionalItem) < 0) {
         goto cleanup;
@@ -350,7 +338,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
     if (datastore == NULL && STREQ(uuid_string + 17, "-0000-000000000000")) {
         uuid_string[17] = '\0';
 
-        if (esxVI_LookupDatastoreByName(priv->host, uuid_string,
+        if (esxVI_LookupDatastoreByName(priv->primary, uuid_string,
                                         propertyNameList, &datastore,
                                         esxVI_Occurrence_RequiredItem) < 0) {
             goto cleanup;

src/esx/esx_vi.h

@@ -158,10 +158,11 @@ struct _esxVI_Context {
     esxVI_APIVersion apiVersion;
     esxVI_ProductVersion productVersion;
     esxVI_UserSession *session;
-    esxVI_ManagedObjectReference *datacenter;
-    esxVI_ManagedObjectReference *vmFolder;
-    esxVI_ManagedObjectReference *hostFolder;
+    esxVI_Datacenter *datacenter;
+    esxVI_ComputeResource *computeResource;
+    esxVI_HostSystem *hostSystem;
     esxVI_SelectionSpec *fullTraversalSpecList;
+    esxVI_SelectionSpec *fullTraversalSpecList2;
 };
 
 int esxVI_Context_Alloc(esxVI_Context **ctx);
@@ -169,6 +170,10 @@ void esxVI_Context_Free(esxVI_Context **ctx);
 int esxVI_Context_Connect(esxVI_Context *ctx, const char *ipAddress,
                           const char *url, const char *username,
                           const char *password, esxUtil_ParsedUri *parsedUri);
+int esxVI_Context_LookupObjectsByPath(esxVI_Context *ctx,
+                                      esxUtil_ParsedUri *parsedUri);
+int esxVI_Context_LookupObjectsByHostSystemIp(esxVI_Context *ctx,
+                                              const char *hostSystemIpAddress);
 int esxVI_Context_DownloadFile(esxVI_Context *ctx, const char *url,
                                char **content);
 int esxVI_Context_UploadFile(esxVI_Context *ctx, const char *url,
@@ -327,13 +332,13 @@ int esxVI_GetSnapshotTreeBySnapshot
        esxVI_ManagedObjectReference *snapshot,
        esxVI_VirtualMachineSnapshotTree **snapshotTree);
 
-int esxVI_LookupResourcePoolByHostSystem
-      (esxVI_Context *ctx, esxVI_ObjectContent *hostSystem,
-       esxVI_ManagedObjectReference **resourcePool);
+int esxVI_LookupHostSystemProperties(esxVI_Context *ctx,
+                                     esxVI_String *propertyNameList,
+                                     esxVI_ObjectContent **hostSystem);
 
-int esxVI_LookupHostSystemByIp(esxVI_Context *ctx, const char *ipAddress,
-                               esxVI_String *propertyNameList,
-                               esxVI_ObjectContent **hostSystem);
+int esxVI_LookupVirtualMachineList(esxVI_Context *ctx,
+                                   esxVI_String *propertyNameList,
+                                   esxVI_ObjectContent **virtualMachineList);
 
 int esxVI_LookupVirtualMachineByUuid(esxVI_Context *ctx,
                                      const unsigned char *uuid,
@@ -351,6 +356,9 @@ int esxVI_LookupVirtualMachineByUuidAndPrepareForTask
        esxVI_String *propertyNameList, esxVI_ObjectContent **virtualMachine,
        esxVI_Boolean autoAnswer);
 
+int esxVI_LookupDatastoreList(esxVI_Context *ctx, esxVI_String *propertyNameList,
+                              esxVI_ObjectContent **datastoreList);
+
 int esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name,
                                 esxVI_String *propertyNameList,
                                 esxVI_ObjectContent **datastore,

src/esx/esx_vmx.c

@@ -2711,6 +2711,10 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virCapsPtr caps, virDomainDefPtr def,
       case esxVI_ProductVersion_ESX40:
       case esxVI_ProductVersion_ESX41:
       case esxVI_ProductVersion_ESX4x:
+      /* FIXME: Putting VPX* here is a hack until a more fine grained system is in place */
+      case esxVI_ProductVersion_VPX40:
+      case esxVI_ProductVersion_VPX41:
+      case esxVI_ProductVersion_VPX4x:
         virBufferAddLit(&buffer, "virtualHW.version = \"7\"\n");
         break;