Changeset 91157 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Sep 8, 2021 2:24:32 PM (3 years ago)

Author:

vboxsync

Message:

VBoxManage: Make "cloud showvminfo" (parallel to "showvminfo" for
local vms) a synonym for "cloud machine info". bugref:10065.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.h (modified) (1 diff)
• VBoxManageCloud.cpp (modified) (4 diffs)
• VBoxManageCloudMachine.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -349 +349 @@
 /* VBoxManageCloudMachine.cpp */
 RTEXITCODE handleCloudMachine(HandlerArg *a, int iFirst,
-                              const char *pszProviderName,
-                              const char *pszProfileName);
+                              const char *pcszProviderName,
+                              const char *pcszProfileName);
 RTEXITCODE listCloudMachines(HandlerArg *a, int iFirst,
-                              const char *pszProviderName,
-                              const char *pszProfileName);
+                              const char *pcszProviderName,
+                              const char *pcszProfileName);
+RTEXITCODE handleCloudShowVMInfo(HandlerArg *a, int iFirst,
+                                 const char *pcszProviderName,
+                                 const char *pcszProfileName);
 
 /* VBoxManageUpdateCheck.cpp */

trunk/src/VBox/Frontends/VBoxManage/VBoxManageCloud.cpp

@@ -2824 +2824 @@
         kCloud_Network,
         kCloud_Object,
+        kCloud_ShowVMInfo,
         kCloud_Volume,
     };
@@ -2839 +2840 @@
         { "network",          kCloud_Network,       RTGETOPT_REQ_NOTHING },
         { "object",           kCloud_Object,        RTGETOPT_REQ_NOTHING },
+        { "showvminfo",       kCloud_ShowVMInfo,    RTGETOPT_REQ_NOTHING },
         { "volume",           kCloud_Volume,        RTGETOPT_REQ_NOTHING },
     };
@@ -2879 +2881 @@
 #endif /* VBOX_WITH_CLOUD_NET */
 
+            /* "cloud machine ..." handling is in VBoxManageCloudMachine.cpp */
             case kCloud_Machine:
                 return handleCloudMachine(a, GetState.iNext,
@@ -2884 +2887 @@
                                           commonOpts.profile.pszProfileName);
 
+            /* ... including aliases that mimic the local vm commands */
+            case kCloud_ShowVMInfo:
+                return handleCloudShowVMInfo(a, GetState.iNext,
+                                             commonOpts.provider.pszProviderName,
+                                             commonOpts.profile.pszProfileName);
+
             case VINF_GETOPT_NOT_OPTION:
                 return errorUnknownSubcommand(ValueUnion.psz);

trunk/src/VBox/Frontends/VBoxManage/VBoxManageCloudMachine.cpp

@@ -70 +70 @@
  * in handleCloud).
  */
+static int
+getCloudProfile(ComPtr<ICloudProfile> &aProfile,
+                HandlerArg *a,
+                const char *pcszProviderName,
+                const char *pcszProfileName)
+{
+    int rc;
+
+    ComPtr<ICloudProvider> pProvider;
+    rc = selectCloudProvider(pProvider, a->virtualBox, pcszProviderName);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    ComPtr<ICloudProfile> pProfile;
+    rc = selectCloudProfile(pProfile, pProvider, pcszProfileName);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    aProfile = pProfile;
+    return VINF_SUCCESS;
+}
+
+
 RTEXITCODE
 handleCloudMachine(HandlerArg *a, int iFirst,
@@ -75 +98 @@
                    const char *pcszProfileName)
 {
-    int rc;
-
-    ComPtr<ICloudProvider> pProvider;
-    rc = selectCloudProvider(pProvider, a->virtualBox, pcszProviderName);
-    if (RT_FAILURE(rc))
-        return RTEXITCODE_FAILURE;
-
     ComPtr<ICloudProfile> pProfile;
-    rc = selectCloudProfile(pProfile, pProvider, pcszProfileName);
+    int rc = getCloudProfile(pProfile, a, pcszProviderName, pcszProfileName);
     if (RT_FAILURE(rc))
         return RTEXITCODE_FAILURE;
@@ -528 +544 @@
 
 /*
+ * cloud showvminfo "id"
+ *
+ * Alias for "cloud machine info" that tries to match the local vm
+ * counterpart.
+ */
+RTEXITCODE
+handleCloudShowVMInfo(HandlerArg *a, int iFirst,
+                      const char *pcszProviderName,
+                      const char *pcszProfileName)
+{
+    ComPtr<ICloudProfile> pProfile;
+    int rc = getCloudProfile(pProfile, a, pcszProviderName, pcszProfileName);
+    if (RT_FAILURE(rc))
+        return RTEXITCODE_FAILURE;
+
+    return handleCloudMachineInfo(a, iFirst, pProfile);
+}
+
+
+/*
  * cloud machine info "id" ...
  */