Changeset 81398 in vbox

Timestamp:

Oct 21, 2019 11:18:35 AM (6 years ago)

Author:

vboxsync

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

134111

Message:

bugref:9589. OCI: Added public SSH key support during instance creation.

Location:

trunk

Files:

• doc/manual/en_US/SDKRef.xml (modified) (1 diff)
• doc/manual/en_US/man_VBoxManage-cloudinstance.xml (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageCloud.cpp (modified) (4 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)

trunk/doc/manual/en_US/SDKRef.xml

@@ -2655 +2655 @@
           <listitem>
             <para>VirtualSystemDescriptionType::CloudPublicIP - Whether the instance will have a public IP or not.</para>
+          </listitem>
+          <listitem>
+            <para>VirtualSystemDescriptionType::CloudPublicSSHKey - Public SSH key which is used to connect to an instance via SSH</para>
           </listitem>
         </itemizedlist>

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

@@ -49 +49 @@
       <arg rep="norepeat">--publicip=<replaceable>true/false</replaceable></arg>
       <arg rep="norepeat">--privateip=<replaceable>IP address</replaceable></arg>
+      <arg rep="norepeat">--public-ssh-key=<replaceable>key string</replaceable></arg>
       <arg rep="norepeat">--launch-mode=<replaceable>NATIVE/EMULATED/PARAVIRTUALIZED</replaceable></arg>
     </cmdsynopsis>
@@ -147 +148 @@
         </varlistentry>
         <varlistentry>
+          <term><option>--public-ssh-key</option></term><listitem><para>Public SSH key used to connect to the instance via SSH</para></listitem>
+        </varlistentry>
+        <varlistentry>
           <term><option>--launch-mode</option></term><listitem><para>The most known values here may be EMULATED, NATIVE, PARAVIRTUALIZED. </para></listitem>
         </varlistentry>

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

@@ -480 +480 @@
         { "--privateip",      'P', RTGETOPT_REQ_STRING },
         { "--launch",         'l', RTGETOPT_REQ_STRING },
+        { "--public-ssh-key", 'k', RTGETOPT_REQ_STRING },
     };
     RTGETOPTSTATE GetState;
@@ -496 +497 @@
     ComPtr<IVirtualSystemDescription> pVSD = virtualSystemDescriptions[0];
 
-    Utf8Str strDisplayName, strImageId, strBootVolumeId;
+    Utf8Str strDisplayName, strImageId, strBootVolumeId, strPublicSSHKey;
     int c;
     while ((c = RTGetOpt(&GetState, &ValueUnion)) != 0)
@@ -565 +566 @@
                     break;
                 }
+            case 'k':
+                strPublicSSHKey = ValueUnion.psz;
+                pVSD->AddDescription(VirtualSystemDescriptionType_CloudPublicSSHKey,
+                                     Bstr(ValueUnion.psz).raw(),
+                                     Bstr(ValueUnion.psz).raw());
+                break;
             case VINF_GETOPT_NOT_OPTION:
                 return errorUnknownSubcommand(ValueUnion.psz);
@@ -571 +578 @@
         }
     }
+
+    if (strPublicSSHKey.isEmpty())
+        RTPrintf("Warning!!! Public SSH key doesn't present in the passed arguments...\n");
 
     if (strImageId.isNotEmpty() && strBootVolumeId.isNotEmpty())

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -4037 +4037 @@
   <enum
     name="VirtualSystemDescriptionType"
-    uuid="eca6989c-1de0-456b-8c4f-49c609791156"
+    uuid="29c2299c-2c40-44b5-9775-2927f20763f3"
     >
     <desc>Used with <link to="IVirtualSystemDescription" /> to describe the type of
@@ -4103 +4103 @@
     <const name="CloudOCIVCNCompartment" value="46" />
     <const name="CloudOCISubnetCompartment" value="47" />
+    <const name="CloudPublicSSHKey" value="48" />
   </enum>