Changeset 81421 in vbox for trunk

Timestamp:

Oct 21, 2019 5:47:42 PM (5 years ago)

Author:

vboxsync

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

134138

Message:

bugref:9589. OCI: user is able to pass several SSH keys 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) (2 diffs)

trunk/doc/manual/en_US/SDKRef.xml

@@ -2657 +2657 @@
           </listitem>
           <listitem>
-            <para>VirtualSystemDescriptionType::CloudPublicSSHKey - Public SSH key which is used to connect to an instance via SSH</para>
+            <para>VirtualSystemDescriptionType::CloudPublicSSHKey - Public SSH key which is used to connect to an instance via SSH.
+            It may be one or more records with the type VirtualSystemDescriptionType::CloudPublicSSHKey in the VirtualSystemDescription.
+            But at least one should be presented otherwise user won't be able to connect to the 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="repeat">--public-ssh-key=<replaceable>key string</replaceable></arg>
       <arg rep="norepeat">--launch-mode=<replaceable>NATIVE/EMULATED/PARAVIRTUALIZED</replaceable></arg>
     </cmdsynopsis>
@@ -148 +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>
+          <term><option>--public-ssh-key</option></term>
+            <listitem>
+              <para>Public SSH key used to connect to the instance via SSH.
+                This parameter may be repeated if you plan to use more than one key as:
+                "--public-ssh-key=firstSSHKey --public-ssh-key=secondSSHKey".
+              </para>
+            </listitem>
         </varlistentry>
         <varlistentry>

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

@@ -735 +735 @@
     };
 
-    size_t vsdHReadableArraySize = 9;//the number of items in the vsdHReadableArray
-    vsdHReadable vsdHReadableArray[9] = {
-        {VirtualSystemDescriptionType_CloudDomain, "Availability domain = '%ls'\n", "Availability domain wasn't found\n"},
-        {VirtualSystemDescriptionType_Name, "Instance displayed name = '%ls'\n", "Instance displayed name wasn't found\n"},
-        {VirtualSystemDescriptionType_CloudInstanceState, "Instance state = '%ls'\n", "Instance state wasn't found\n"},
-        {VirtualSystemDescriptionType_CloudInstanceId, "Instance Id = '%ls'\n", "Instance Id wasn't found\n"},
-        {VirtualSystemDescriptionType_CloudImageId, "Bootable image Id = '%ls'\n",
+    const size_t vsdHReadableArraySize = 12;//the number of items in the vsdHReadableArray
+    vsdHReadable vsdHReadableArray[vsdHReadableArraySize] = {
+        {VirtualSystemDescriptionType_CloudDomain, "Availability domain = %ls\n", "Availability domain wasn't found\n"},
+        {VirtualSystemDescriptionType_Name, "Instance displayed name = %ls\n", "Instance displayed name wasn't found\n"},
+        {VirtualSystemDescriptionType_CloudInstanceState, "Instance state = %ls\n", "Instance state wasn't found\n"},
+        {VirtualSystemDescriptionType_CloudInstanceId, "Instance Id = %ls\n", "Instance Id wasn't found\n"},
+        {VirtualSystemDescriptionType_CloudInstanceDisplayName, "Instance name = %ls\n", "Instance name wasn't found\n"},
+        {VirtualSystemDescriptionType_CloudImageId, "Bootable image Id = %ls\n",
             "Image Id whom the instance is booted up wasn't found\n"},
-        {VirtualSystemDescriptionType_CloudInstanceShape, "Shape of the instance = '%ls'\n",
+        {VirtualSystemDescriptionType_CloudInstanceShape, "Shape of the instance = %ls\n",
             "The shape of the instance wasn't found\n"},
-        {VirtualSystemDescriptionType_OS, "Type of guest OS = '%ls'\n", "Type of guest OS wasn't found.\n"},
-        {VirtualSystemDescriptionType_Memory, "RAM = '%ls MB'\n", "Value for RAM wasn't found\n"},
-        {VirtualSystemDescriptionType_CPU, "CPUs = '%ls'\n", "Numbers of CPUs weren't found\n"}
+        {VirtualSystemDescriptionType_OS, "Type of guest OS = %ls\n", "Type of guest OS wasn't found\n"},
+        {VirtualSystemDescriptionType_Memory, "RAM = %ls MB\n", "Value for RAM wasn't found\n"},
+        {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"}
     };
 
@@ -767 +770 @@
             LogRel((vsdHReadableArray[i].strNotFound.c_str()));
         else
-            RTPrintf(vsdHReadableArray[i].strFound.c_str(), aVBoxValues[0]);
+        {
+            LogRel(("Size is %d", aVBoxValues.size()));
+            for (size_t j = 0; j<aVBoxValues.size(); ++j)
+            {
+                RTPrintf(vsdHReadableArray[i].strFound.c_str(), aVBoxValues[j]);
+            }
+        }
 
         retTypes.setNull();