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

Timestamp:

Oct 20, 2020 1:59:45 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

141024

Message:

bugref:9781. Added the placeholder @@VBOX_COND_GUEST_VERSION[>(required version)]@@. Updated the templates. Removed the obsolete function getGuestOSConditional().

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageAppliance.cpp (modified) (1 diff)
• VBoxManageCloud.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp ¶

@@ -1113 +1113 @@
                         case VirtualSystemDescriptionType_CloudPublicSSHKey:
                         case VirtualSystemDescriptionType_BootingFirmware:
+                        case VirtualSystemDescriptionType_CloudInstanceMetadata:
+                        case VirtualSystemDescriptionType_CloudInstanceFreeFormTags:
+                        case VirtualSystemDescriptionType_CloudImageFreeFormTags:
+
                             /** @todo  VirtualSystemDescriptionType_Miscellaneous? */
                             break;

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

@@ -123 +123 @@
     int vrc = RTGetOptInit(&GetState, a->argc, a->argv, s_aOptions, RT_ELEMENTS(s_aOptions), iFirst, 0);
     AssertRCReturn(vrc, RTEXITCODE_FAILURE);
-    if (a->argc == iFirst)
-    {
-        RTPrintf("Empty command parameter list, show help.\n");
-        printHelp(g_pStdOut);
-        return RTEXITCODE_SUCCESS;
-    }
 
     Utf8Str strCompartmentId;
@@ -295 +289 @@
     int vrc = RTGetOptInit(&GetState, a->argc, a->argv, s_aOptions, RT_ELEMENTS(s_aOptions), iFirst, 0);
     AssertRCReturn(vrc, RTEXITCODE_FAILURE);
-    if (a->argc == iFirst)
-    {
-        RTPrintf("Empty command parameter list, show help.\n");
-        printHelp(g_pStdOut);
-        return RTEXITCODE_SUCCESS;
-    }
 
     Utf8Str strCompartmentId;
@@ -542 +530 @@
 
     Utf8Str strDisplayName, strImageId, strBootVolumeId, strPublicSSHKey;
+    bool fKeyPresented = false;
     int c;
     while ((c = RTGetOpt(&GetState, &ValueUnion)) != 0)
@@ -603 +592 @@
                 pVSD->AddDescription(VirtualSystemDescriptionType_CloudPublicSSHKey,
                                      Bstr(ValueUnion.psz).raw(), NULL);
+                fKeyPresented = true;
                 break;
             case 1001:
@@ -620 +610 @@
         return RTEXITCODE_FAILURE;
 
-    if (strPublicSSHKey.isEmpty())
-        RTPrintf("Warning!!! Public SSH key doesn't present in the passed arguments...\n");
+    if ( fKeyPresented )
+        if (strPublicSSHKey.isEmpty())
+            RTPrintf("Warning!!! The value of the passed public SSH key is empty...\n");
+    else
+        return errorArgument("Parameter --public-ssh-key is absent. if there is no need to pass a key just use the form"
+                             " '--public-ssh-key='.");
 
     if (strImageId.isNotEmpty() && strBootVolumeId.isNotEmpty())
@@ -787 +781 @@
     };
 
-    const size_t vsdHReadableArraySize = 12;//the number of items in the vsdHReadableArray
+    const size_t vsdHReadableArraySize = 14;//the number of items in the vsdHReadableArray
     vsdHReadable vsdHReadableArray[vsdHReadableArraySize] = {
         {VirtualSystemDescriptionType_CloudDomain, "Availability domain = %ls\n", "Availability domain wasn't found\n"},
@@ -802 +796 @@
         {VirtualSystemDescriptionType_CPU, "CPUs = %ls\n", "Numbers of CPUs weren't found\n"},
         {VirtualSystemDescriptionType_CloudPublicIP, "Instance public IP = %ls\n", "Public IP wasn't found\n"},
-        {VirtualSystemDescriptionType_Miscellaneous, "%ls\n", "Free-form tags or metadata weren't found\n"}
+        {VirtualSystemDescriptionType_CloudInstanceMetadata, "%ls\n", "Metadata weren't found\n"},
+        {VirtualSystemDescriptionType_CloudInstanceFreeFormTags, "%ls\n", "Instance free-form tags weren't found\n"},
+        {VirtualSystemDescriptionType_CloudImageFreeFormTags, "%ls\n", "Image free-form tags weren't found\n"}
+
     };