Changeset 94070 in vbox

Timestamp:

Mar 3, 2022 11:54:06 AM (3 years ago)

Author:

vboxsync

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

150310

Message:

CloudNet: ​bugref:9469 Dropped local gateway parameters in VBoxManage cloud network setup, added support for cloud network attachment in VBoxManage modifyvm, updated help for both, bug fixes and minor improvements in error reporting.

Location:

trunk

Files:

• doc/manual/en_US/man_VBoxManage-cloud.xml (modified) (4 diffs)
• doc/manual/en_US/man_VBoxManage-modifyvm.xml (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageCloud.cpp (modified) (4 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (4 diffs)
• src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (1 diff)

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

@@ -182 +182 @@
       <sbr/>
       <arg choice="plain">network setup</arg>
-      <arg choice="req">--local-gateway-iso=<replaceable>path</replaceable></arg>
       <arg>--gateway-os-name=<replaceable>string</replaceable></arg>
       <arg>--gateway-os-version=<replaceable>string</replaceable></arg>
@@ -188 +187 @@
       <arg>--tunnel-network-name=<replaceable>string</replaceable></arg>
       <arg>--tunnel-network-range=<replaceable>string</replaceable></arg>
-      <arg>--guest-additions-iso=<replaceable>path</replaceable></arg>
       <arg>--proxy=<replaceable>string</replaceable></arg>
       <arg>--compartment-id=<replaceable>string</replaceable></arg>
@@ -541 +539 @@
       <variablelist>
         <varlistentry>
-          <term><option>--local-gateway-iso</option></term><listitem><para>The local path to an installation media for a local gateway.</para></listitem>
-        </varlistentry>
-        <varlistentry>
           <term><option>--gateway-os-name</option></term><listitem><para>The name of OS to use for a cloud gateway.</para></listitem>
         </varlistentry>
@@ -557 +552 @@
         <varlistentry>
           <term><option>--tunnel-network-range</option></term><listitem><para>The IP address range to use for tunneling. </para></listitem>
-        </varlistentry>
-        <varlistentry>
-          <term><option>--guest-additions-iso</option></term><listitem><para>The local path to an installation media for VirtualBox guest additions.</para></listitem>
         </varlistentry>
         <varlistentry>

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

@@ -283 +283 @@
           <arg choice="plain">generic</arg>
           <arg choice="plain">natnetwork</arg>
+          <arg choice="plain">cloud</arg>
         </group></arg>
       <arg>--nic-type<replaceable>N</replaceable>=<group choice="plain">
@@ -317 +318 @@
           <arg choice="plain"><replaceable>device-name</replaceable></arg>
         </group></arg>
+      <arg>--cloud-network<replaceable>N</replaceable>=<replaceable>network-name</replaceable></arg>
       <arg>--host-only-adapter<replaceable>N</replaceable>=<group choice="plain">
           <arg choice="plain">none</arg>

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

@@ -2654 +2654 @@
         { "--tunnel-network-name",  't', RTGETOPT_REQ_STRING },
         { "--tunnel-network-range", 'r', RTGETOPT_REQ_STRING },
-        { "--guest-additions-iso",  'a', RTGETOPT_REQ_STRING },
-        { "--local-gateway-iso",    'l', RTGETOPT_REQ_STRING },
         { "--proxy",                'p', RTGETOPT_REQ_STRING },
         { "--compartment-id",       'c', RTGETOPT_REQ_STRING }
@@ -2669 +2667 @@
     Bstr strTunnelNetworkName;
     Bstr strTunnelNetworkRange;
-    Bstr strLocalGatewayIso;
-    Bstr strGuestAdditionsIso;
     Bstr strProxy;
     Bstr strCompartmentId;
@@ -2693 +2689 @@
             case 'r':
                 strTunnelNetworkRange=ValueUnion.psz;
-                break;
-            case 'l':
-                strLocalGatewayIso=ValueUnion.psz;
-                break;
-            case 'a':
-                strGuestAdditionsIso=ValueUnion.psz;
                 break;
             case 'p':
@@ -2718 +2708 @@
         return RTEXITCODE_FAILURE;
 
-    if (strLocalGatewayIso.isEmpty())
-        return errorArgument(Cloud::tr("Missing --local-gateway-iso parameter"));
-
     ComPtr<IVirtualBox> pVirtualBox = a->virtualBox;
-
-    hrc = createLocalGatewayImage(pVirtualBox, strLocalGatewayIso, strGuestAdditionsIso, strProxy);
-    if (FAILED(hrc))
-        return RTEXITCODE_FAILURE;
 
     RTPrintf(Cloud::tr("Setting up tunnel network in the cloud...\n"));

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

@@ -136 +136 @@
     MODIFYVM_CABLECONNECTED,
     MODIFYVM_BRIDGEADAPTER,
+#ifdef VBOX_WITH_CLOUD_NET
+    MODIFYVM_CLOUDNET,
+#endif /* VBOX_WITH_CLOUD_NET */
     MODIFYVM_HOSTONLYADAPTER,
 #ifdef VBOX_WITH_VMNET
@@ -341 +344 @@
     OPT2("--cable-connected",               "--cableconnected",         MODIFYVM_CABLECONNECTED,            RTGETOPT_REQ_BOOL_ONOFF | RTGETOPT_FLAG_INDEX),
     OPT2("--bridge-adapter",                "--bridgeadapter",          MODIFYVM_BRIDGEADAPTER,             RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX),
+#ifdef VBOX_WITH_CLOUD_NET
+    OPT2("--cloud-network",                 "--cloudnetwork",           MODIFYVM_CLOUDNET,                  RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX),
+#endif /* VBOX_WITH_CLOUD_NET */
     OPT2("--host-only-adapter",             "--hostonlyadapter",        MODIFYVM_HOSTONLYADAPTER,           RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX),
 #ifdef VBOX_WITH_VMNET
@@ -1774 +1780 @@
                     CHECK_ERROR(nic, COMSETTER(AttachmentType)(NetworkAttachmentType_NATNetwork));
                 }
+#ifdef VBOX_WITH_CLOUD_NET
+                else if (!RTStrICmp(ValueUnion.psz, "cloud"))
+                {
+                    if (!fEnabled)
+                        CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
+                    CHECK_ERROR(nic, COMSETTER(AttachmentType)(NetworkAttachmentType_Cloud));
+                }
+#endif /* VBOX_WITH_CLOUD_NET */
                 else
                 {
@@ -1817 +1831 @@
                 break;
             }
+
+#ifdef VBOX_WITH_CLOUD_NET
+            case MODIFYVM_CLOUDNET:
+            {
+                if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC"))
+                    break;
+
+                ComPtr<INetworkAdapter> nic;
+                CHECK_ERROR_BREAK(sessionMachine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                /* remove it? */
+                if (!RTStrICmp(ValueUnion.psz, "none"))
+                {
+                    CHECK_ERROR(nic, COMSETTER(CloudNetwork)(Bstr().raw()));
+                }
+                else
+                {
+                    CHECK_ERROR(nic, COMSETTER(CloudNetwork)(Bstr(ValueUnion.psz).raw()));
+                }
+                break;
+            }
+#endif /* VBOX_WITH_CLOUD_NET */
 
             case MODIFYVM_HOSTONLYADAPTER:

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -6444 +6444 @@
                                                  N_("Failed to generate a key pair due to libssh error!"));
                 }
-                hrc = startCloudGateway(virtualBox, network, mGateway);                      H();
+                hrc = startCloudGateway(virtualBox, network, mGateway);
+                if (FAILED(hrc))
+                {
+                    return pVMM->pfnVMR3SetError(pUVM, hrc, RT_SRC_POS,
+                                                 N_("Failed to start cloud gateway instance.\nMake sure you set up "
+                                                    "cloud networking properly with 'VBoxManage network setup'. "
+                                                    "Check VBoxSVC.log for details."));
+                }
                 InsertConfigBytes(pDevCfg, "MAC", &mGateway.mCloudMacAddress, sizeof(mGateway.mCloudMacAddress));
                 if (!bstr.isEmpty())