Changeset 86709 in vbox

Timestamp:

Oct 26, 2020 2:27:40 PM (4 years ago)

Author:

vboxsync

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

141093

Message:

The public SSH key is mandatory for the command "cloud instance create"

Location:

trunk

Files:

• doc/manual/en_US/man_VBoxManage-cloud.xml (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageCloud.cpp (modified) (3 diffs)

trunk/doc/manual/en_US/man_VBoxManage-cloud.xml

@@ -68 +68 @@
        <arg choice="req" rep="norepeat">--shape=<replaceable>type</replaceable></arg>
        <arg choice="req" rep="norepeat">--subnet=<replaceable>id</replaceable></arg>
+       <arg choice="req" rep="repeat">--public-ssh-key=<replaceable>key string</replaceable></arg>
        <arg rep="norepeat">--boot-disk-size=<replaceable>size in GB</replaceable></arg>
        <arg rep="norepeat">--publicip=<replaceable>true/false</replaceable></arg>
        <arg rep="norepeat">--privateip=<replaceable>IP address</replaceable></arg>
-       <arg rep="repeat">--public-ssh-key=<replaceable>key string</replaceable></arg>
        <arg rep="norepeat">--launch-mode=<replaceable>NATIVE/EMULATED/PARAVIRTUALIZED</replaceable></arg>
      </cmdsynopsis>
@@ -289 +289 @@
          1. Create an instance from an existing custom image.
          2. Create an instance from an existing bootable volume. This bootable volume shouldn't  be attached to any instance.
-        For the 1st approach next parameters are required: image-id and  boot-disk-size.
-        For the 2nd approach next parameters are required: boot-volume-id;
+        For the 1st approach next parameters are required: image-id, boot-disk-size and public-ssh-key.
+        For the 2nd approach next parameters are required: boot-volume-id and public-ssh-key;
         The rest parameters are common for both cases:
          display-name, launch-mode, subnet-id, publicIP, privateIP, shape, domain.

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

@@ -530 +530 @@
 
     Utf8Str strDisplayName, strImageId, strBootVolumeId, strPublicSSHKey;
+    bool fKeyPresented = false;
     int c;
     while ((c = RTGetOpt(&GetState, &ValueUnion)) != 0)
@@ -591 +592 @@
                 pVSD->AddDescription(VirtualSystemDescriptionType_CloudPublicSSHKey,
                                      Bstr(ValueUnion.psz).raw(), NULL);
+                if ( !strPublicSSHKey.isEmpty() )
+                    fKeyPresented = true;
                 break;
             case 1001:
@@ -608 +611 @@
         return RTEXITCODE_FAILURE;
 
-    if (strPublicSSHKey.isEmpty())
-        RTPrintf("Warning!!! Public SSH key doesn't present in the passed arguments...\n");
+    if ( !fKeyPresented )
+        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())