- Timestamp:
- Dec 12, 2018 6:15:04 PM (6 years ago)
- Location:
- trunk/src/VBox
- Files:
-
- 5 edited
-
Frontends/VBoxManage/VBoxManageAppliance.cpp (modified) (5 diffs)
-
Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp (modified) (13 diffs)
-
Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp (modified) (1 diff)
-
Main/idl/VirtualBox.xidl (modified) (3 diffs)
-
Main/src-server/ApplianceImplExport.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp
r75920 r76192 910 910 break; 911 911 912 913 case VirtualSystemDescriptionType_CloudOCIInstanceShape: 914 case VirtualSystemDescriptionType_CloudOCIDomain: 915 case VirtualSystemDescriptionType_CloudOCIBootDiskSize: 916 case VirtualSystemDescriptionType_CloudOCIBucket: 912 case VirtualSystemDescriptionType_CloudInstanceShape: 913 case VirtualSystemDescriptionType_CloudDomain: 914 case VirtualSystemDescriptionType_CloudBootDiskSize: 915 case VirtualSystemDescriptionType_CloudBucket: 917 916 case VirtualSystemDescriptionType_CloudOCIVCN: 918 case VirtualSystemDescriptionType_Cloud OCIPublicIP:919 case VirtualSystemDescriptionType_Cloud OCIProfileName:917 case VirtualSystemDescriptionType_CloudPublicIP: 918 case VirtualSystemDescriptionType_CloudProfileName: 920 919 case VirtualSystemDescriptionType_CloudOCISubnet: 921 case VirtualSystemDescriptionType_Cloud OCIKeepObject:922 case VirtualSystemDescriptionType_Cloud OCILaunchInstance:920 case VirtualSystemDescriptionType_CloudKeepObject: 921 case VirtualSystemDescriptionType_CloudLaunchInstance: 923 922 case VirtualSystemDescriptionType_Miscellaneous: 924 923 /** @todo VirtualSystemDescriptionType_Miscellaneous? */ 925 924 break; 925 926 926 case VirtualSystemDescriptionType_Ignore: 927 927 #ifdef VBOX_WITH_XPCOM_CPP_ENUM_HACK … … 1122 1122 case 'V': // --vmname 1123 1123 if (exportType == NOT_SET || ulCurVsys == (uint32_t)-1) 1124 return errorSyntax(USAGE_EXPORTAPPLIANCE, "Option \"%s\" requires preceding --vsys argument.", GetState.pDef->pszLong); 1124 return errorSyntax(USAGE_EXPORTAPPLIANCE, "Option \"%s\" requires preceding --vsys or --cloud argument.", 1125 GetState.pDef->pszLong); 1125 1126 mapArgsMapsPerVsys[ulCurVsys]["vmname"] = ValueUnion.psz; 1126 1127 break; … … 1413 1414 /* add cloud export settings */ 1414 1415 else if (itD->first == "cloudshape") 1415 pVSD->AddDescription(VirtualSystemDescriptionType_Cloud OCIInstanceShape,1416 pVSD->AddDescription(VirtualSystemDescriptionType_CloudInstanceShape, 1416 1417 Bstr(itD->second).raw(), 1417 1418 Bstr(itD->second).raw()); 1418 1419 else if (itD->first == "clouddomain") 1419 pVSD->AddDescription(VirtualSystemDescriptionType_Cloud OCIDomain,1420 pVSD->AddDescription(VirtualSystemDescriptionType_CloudDomain, 1420 1421 Bstr(itD->second).raw(), 1421 1422 Bstr(itD->second).raw()); 1422 1423 else if (itD->first == "clouddisksize") 1423 pVSD->AddDescription(VirtualSystemDescriptionType_Cloud OCIBootDiskSize,1424 pVSD->AddDescription(VirtualSystemDescriptionType_CloudBootDiskSize, 1424 1425 Bstr(itD->second).raw(), 1425 1426 Bstr(itD->second).raw()); 1426 1427 else if (itD->first == "cloudbucket") 1427 pVSD->AddDescription(VirtualSystemDescriptionType_Cloud OCIBucket,1428 pVSD->AddDescription(VirtualSystemDescriptionType_CloudBucket, 1428 1429 Bstr(itD->second).raw(), 1429 1430 Bstr(itD->second).raw()); … … 1433 1434 Bstr(itD->second).raw()); 1434 1435 else if (itD->first == "cloudpublicip") 1435 pVSD->AddDescription(VirtualSystemDescriptionType_Cloud OCIPublicIP,1436 pVSD->AddDescription(VirtualSystemDescriptionType_CloudPublicIP, 1436 1437 Bstr(itD->second).raw(), 1437 1438 Bstr(itD->second).raw()); 1438 1439 else if (itD->first == "cloudprofile") 1439 pVSD->AddDescription(VirtualSystemDescriptionType_Cloud OCIProfileName,1440 pVSD->AddDescription(VirtualSystemDescriptionType_CloudProfileName, 1440 1441 Bstr(itD->second).raw(), 1441 1442 Bstr(itD->second).raw()); … … 1445 1446 Bstr(itD->second).raw()); 1446 1447 else if (itD->first == "cloudkeepobject") 1447 pVSD->AddDescription(VirtualSystemDescriptionType_Cloud OCIKeepObject,1448 pVSD->AddDescription(VirtualSystemDescriptionType_CloudKeepObject, 1448 1449 Bstr(itD->second).raw(), 1449 1450 Bstr(itD->second).raw()); 1450 1451 else if (itD->first == "cloudlaunchinstance") 1451 pVSD->AddDescription(VirtualSystemDescriptionType_Cloud OCILaunchInstance,1452 pVSD->AddDescription(VirtualSystemDescriptionType_CloudLaunchInstance, 1452 1453 Bstr(itD->second).raw(), 1453 1454 Bstr(itD->second).raw()); -
trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp
r75744 r76192 365 365 m_enmVSDType == KVirtualSystemDescriptionType_SoundCard || 366 366 m_enmVSDType == KVirtualSystemDescriptionType_NetworkAdapter || 367 m_enmVSDType == KVirtualSystemDescriptionType_Cloud OCIPublicIP ||368 m_enmVSDType == KVirtualSystemDescriptionType_Cloud OCIKeepObject ||369 m_enmVSDType == KVirtualSystemDescriptionType_Cloud OCILaunchInstance)367 m_enmVSDType == KVirtualSystemDescriptionType_CloudPublicIP || 368 m_enmVSDType == KVirtualSystemDescriptionType_CloudKeepObject || 369 m_enmVSDType == KVirtualSystemDescriptionType_CloudLaunchInstance) 370 370 enmFlags |= Qt::ItemIsUserCheckable; 371 371 /* Some items are editable */ … … 388 388 m_enmVSDType == KVirtualSystemDescriptionType_BaseFolder || 389 389 m_enmVSDType == KVirtualSystemDescriptionType_PrimaryGroup || 390 m_enmVSDType == KVirtualSystemDescriptionType_Cloud OCIInstanceShape ||391 m_enmVSDType == KVirtualSystemDescriptionType_Cloud OCIDomain ||392 m_enmVSDType == KVirtualSystemDescriptionType_Cloud OCIBootDiskSize ||393 m_enmVSDType == KVirtualSystemDescriptionType_Cloud OCIBucket ||390 m_enmVSDType == KVirtualSystemDescriptionType_CloudInstanceShape || 391 m_enmVSDType == KVirtualSystemDescriptionType_CloudDomain || 392 m_enmVSDType == KVirtualSystemDescriptionType_CloudBootDiskSize || 393 m_enmVSDType == KVirtualSystemDescriptionType_CloudBucket || 394 394 m_enmVSDType == KVirtualSystemDescriptionType_CloudOCIVCN || 395 395 m_enmVSDType == KVirtualSystemDescriptionType_CloudOCISubnet) && … … 423 423 } 424 424 /* These option items can be enabled: */ 425 case KVirtualSystemDescriptionType_Cloud OCIPublicIP:426 case KVirtualSystemDescriptionType_Cloud OCIKeepObject:427 case KVirtualSystemDescriptionType_Cloud OCILaunchInstance:425 case KVirtualSystemDescriptionType_CloudPublicIP: 426 case KVirtualSystemDescriptionType_CloudKeepObject: 427 case KVirtualSystemDescriptionType_CloudLaunchInstance: 428 428 { 429 429 if (value.toInt() == Qt::Unchecked) … … 496 496 case KVirtualSystemDescriptionType_BaseFolder: value = UIApplianceEditorWidget::tr("Base Folder"); break; 497 497 case KVirtualSystemDescriptionType_PrimaryGroup: value = UIApplianceEditorWidget::tr("Primary Group"); break; 498 case KVirtualSystemDescriptionType_CloudOCIInstanceShape: 499 case KVirtualSystemDescriptionType_CloudOCIDomain: 500 case KVirtualSystemDescriptionType_CloudOCIBootDiskSize: 501 case KVirtualSystemDescriptionType_CloudOCIBucket: 498 case KVirtualSystemDescriptionType_CloudProfileName: 499 case KVirtualSystemDescriptionType_CloudInstanceShape: 500 case KVirtualSystemDescriptionType_CloudDomain: 501 case KVirtualSystemDescriptionType_CloudBootDiskSize: 502 case KVirtualSystemDescriptionType_CloudBucket: 502 503 case KVirtualSystemDescriptionType_CloudOCIVCN: 503 504 case KVirtualSystemDescriptionType_CloudOCISubnet: 504 case KVirtualSystemDescriptionType_CloudOCIPublicIP: 505 case KVirtualSystemDescriptionType_CloudOCIKeepObject: 506 case KVirtualSystemDescriptionType_CloudOCILaunchInstance: value = UIApplianceEditorWidget::tr(m_pParent->nameHint(m_enmVSDType).toUtf8().constData()); break; 505 case KVirtualSystemDescriptionType_CloudPublicIP: 506 case KVirtualSystemDescriptionType_CloudKeepObject: 507 case KVirtualSystemDescriptionType_CloudLaunchInstance: 508 value = UIApplianceEditorWidget::tr(m_pParent->nameHint(m_enmVSDType).toUtf8().constData()); break; 507 509 default: value = UIApplianceEditorWidget::tr("Unknown Hardware Item"); break; 508 510 } … … 529 531 case KVirtualSystemDescriptionType_SoundCard: value = gpConverter->toString(static_cast<KAudioControllerType>(m_strConfigValue.toInt())); break; 530 532 case KVirtualSystemDescriptionType_NetworkAdapter: value = gpConverter->toString(static_cast<KNetworkAdapterType>(m_strConfigValue.toInt())); break; 531 case KVirtualSystemDescriptionType_Cloud OCIInstanceShape:532 case KVirtualSystemDescriptionType_Cloud OCIDomain:533 case KVirtualSystemDescriptionType_Cloud OCIBootDiskSize:534 case KVirtualSystemDescriptionType_Cloud OCIBucket:533 case KVirtualSystemDescriptionType_CloudInstanceShape: 534 case KVirtualSystemDescriptionType_CloudDomain: 535 case KVirtualSystemDescriptionType_CloudBootDiskSize: 536 case KVirtualSystemDescriptionType_CloudBucket: 535 537 case KVirtualSystemDescriptionType_CloudOCIVCN: 536 538 case KVirtualSystemDescriptionType_CloudOCISubnet: … … 568 570 break; 569 571 } 570 case KVirtualSystemDescriptionType_Cloud OCIPublicIP: break;571 case KVirtualSystemDescriptionType_Cloud OCIKeepObject: break;572 case KVirtualSystemDescriptionType_Cloud OCILaunchInstance: break;572 case KVirtualSystemDescriptionType_CloudPublicIP: break; 573 case KVirtualSystemDescriptionType_CloudKeepObject: break; 574 case KVirtualSystemDescriptionType_CloudLaunchInstance: break; 573 575 default: value = m_strConfigValue; break; 574 576 } … … 589 591 switch (m_enmVSDType) 590 592 { 591 case KVirtualSystemDescriptionType_Cloud OCIInstanceShape:592 case KVirtualSystemDescriptionType_Cloud OCIDomain:593 case KVirtualSystemDescriptionType_Cloud OCIBootDiskSize:594 case KVirtualSystemDescriptionType_Cloud OCIBucket:593 case KVirtualSystemDescriptionType_CloudInstanceShape: 594 case KVirtualSystemDescriptionType_CloudDomain: 595 case KVirtualSystemDescriptionType_CloudBootDiskSize: 596 case KVirtualSystemDescriptionType_CloudBucket: 595 597 case KVirtualSystemDescriptionType_CloudOCIVCN: 596 598 case KVirtualSystemDescriptionType_CloudOCISubnet: … … 668 670 case KVirtualSystemDescriptionType_BaseFolder: value = vboxGlobal().icon(QFileIconProvider::Folder); break; 669 671 case KVirtualSystemDescriptionType_PrimaryGroup: value = UIIconPool::iconSet(":/vm_group_name_16px.png"); break; 670 case KVirtualSystemDescriptionType_CloudOCIInstanceShape: 671 case KVirtualSystemDescriptionType_CloudOCIDomain: 672 case KVirtualSystemDescriptionType_CloudOCIBootDiskSize: 673 case KVirtualSystemDescriptionType_CloudOCIBucket: 672 case KVirtualSystemDescriptionType_CloudProfileName: 673 case KVirtualSystemDescriptionType_CloudInstanceShape: 674 case KVirtualSystemDescriptionType_CloudDomain: 675 case KVirtualSystemDescriptionType_CloudBootDiskSize: 676 case KVirtualSystemDescriptionType_CloudBucket: 674 677 case KVirtualSystemDescriptionType_CloudOCIVCN: 675 678 case KVirtualSystemDescriptionType_CloudOCISubnet: 676 case KVirtualSystemDescriptionType_Cloud OCIPublicIP:677 case KVirtualSystemDescriptionType_Cloud OCIKeepObject:678 case KVirtualSystemDescriptionType_Cloud OCILaunchInstance: value = UIIconPool::iconSet(":/session_info_16px.png"); break;679 case KVirtualSystemDescriptionType_CloudPublicIP: 680 case KVirtualSystemDescriptionType_CloudKeepObject: 681 case KVirtualSystemDescriptionType_CloudLaunchInstance: value = UIIconPool::iconSet(":/session_info_16px.pn g"); break; 679 682 default: break; 680 683 } … … 724 727 } 725 728 /* These option items can be enabled: */ 726 case KVirtualSystemDescriptionType_Cloud OCIPublicIP:727 case KVirtualSystemDescriptionType_Cloud OCIKeepObject:728 case KVirtualSystemDescriptionType_Cloud OCILaunchInstance:729 case KVirtualSystemDescriptionType_CloudPublicIP: 730 case KVirtualSystemDescriptionType_CloudKeepObject: 731 case KVirtualSystemDescriptionType_CloudLaunchInstance: 729 732 { 730 733 if (m_strConfigValue == "true") … … 882 885 break; 883 886 } 884 case KVirtualSystemDescriptionType_Cloud OCIInstanceShape:885 case KVirtualSystemDescriptionType_Cloud OCIDomain:886 case KVirtualSystemDescriptionType_Cloud OCIBootDiskSize:887 case KVirtualSystemDescriptionType_Cloud OCIBucket:887 case KVirtualSystemDescriptionType_CloudInstanceShape: 888 case KVirtualSystemDescriptionType_CloudDomain: 889 case KVirtualSystemDescriptionType_CloudBootDiskSize: 890 case KVirtualSystemDescriptionType_CloudBucket: 888 891 case KVirtualSystemDescriptionType_CloudOCIVCN: 889 892 case KVirtualSystemDescriptionType_CloudOCISubnet: … … 1029 1032 break; 1030 1033 } 1031 case KVirtualSystemDescriptionType_Cloud OCIInstanceShape:1032 case KVirtualSystemDescriptionType_Cloud OCIDomain:1033 case KVirtualSystemDescriptionType_Cloud OCIBootDiskSize:1034 case KVirtualSystemDescriptionType_Cloud OCIBucket:1034 case KVirtualSystemDescriptionType_CloudInstanceShape: 1035 case KVirtualSystemDescriptionType_CloudDomain: 1036 case KVirtualSystemDescriptionType_CloudBootDiskSize: 1037 case KVirtualSystemDescriptionType_CloudBucket: 1035 1038 case KVirtualSystemDescriptionType_CloudOCIVCN: 1036 1039 case KVirtualSystemDescriptionType_CloudOCISubnet: … … 1216 1219 break; 1217 1220 } 1218 case KVirtualSystemDescriptionType_Cloud OCIInstanceShape:1219 case KVirtualSystemDescriptionType_Cloud OCIDomain:1220 case KVirtualSystemDescriptionType_Cloud OCIBootDiskSize:1221 case KVirtualSystemDescriptionType_Cloud OCIBucket:1221 case KVirtualSystemDescriptionType_CloudInstanceShape: 1222 case KVirtualSystemDescriptionType_CloudDomain: 1223 case KVirtualSystemDescriptionType_CloudBootDiskSize: 1224 case KVirtualSystemDescriptionType_CloudBucket: 1222 1225 case KVirtualSystemDescriptionType_CloudOCIVCN: 1223 1226 case KVirtualSystemDescriptionType_CloudOCISubnet: … … 1677 1680 KVirtualSystemDescriptionType_HardDiskControllerSAS, 1678 1681 /* OCI */ 1679 KVirtualSystemDescriptionType_CloudOCIBucket, 1680 KVirtualSystemDescriptionType_CloudOCIKeepObject, 1681 KVirtualSystemDescriptionType_CloudOCILaunchInstance, 1682 KVirtualSystemDescriptionType_CloudOCIInstanceShape, 1683 KVirtualSystemDescriptionType_CloudOCIBootDiskSize, 1682 1683 KVirtualSystemDescriptionType_CloudProfileName, 1684 KVirtualSystemDescriptionType_CloudBucket, 1685 KVirtualSystemDescriptionType_CloudKeepObject, 1686 KVirtualSystemDescriptionType_CloudLaunchInstance, 1687 KVirtualSystemDescriptionType_CloudInstanceShape, 1688 KVirtualSystemDescriptionType_CloudBootDiskSize, 1684 1689 KVirtualSystemDescriptionType_CloudOCIVCN, 1685 1690 KVirtualSystemDescriptionType_CloudOCISubnet, 1686 KVirtualSystemDescriptionType_Cloud OCIPublicIP,1687 KVirtualSystemDescriptionType_Cloud OCIDomain1691 KVirtualSystemDescriptionType_CloudPublicIP, 1692 KVirtualSystemDescriptionType_CloudDomain 1688 1693 }; 1689 1694 -
trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp
r75971 r76192 57 57 << KVirtualSystemDescriptionType_HardDiskControllerSCSI 58 58 << KVirtualSystemDescriptionType_HardDiskControllerSAS 59 << KVirtualSystemDescriptionType_Cloud OCIProfileName;59 << KVirtualSystemDescriptionType_CloudProfileName; 60 60 } 61 61 }; -
trunk/src/VBox/Main/idl/VirtualBox.xidl
r76092 r76192 3596 3596 <enum 3597 3597 name="VirtualSystemDescriptionType" 3598 uuid=" 99870ce5-c613-4a49-8ac8-bdad54565c54"3598 uuid="425d0e49-eb9c-43e8-bb0d-be7f78fd3b47" 3599 3599 > 3600 3600 <desc>Used with <link to="IVirtualSystemDescription" /> to describe the type of … … 3641 3641 using <link to="IMachine::groups"/>, after importing.</desc> 3642 3642 </const> 3643 <const name="Cloud OCIInstanceShape" value="27" />3644 <const name="Cloud OCIDomain" value="28" />3645 <const name="Cloud OCIBootDiskSize" value="29" />3646 <const name="Cloud OCIBucket" value="30" />3643 <const name="CloudInstanceShape" value="27" /> 3644 <const name="CloudDomain" value="28" /> 3645 <const name="CloudBootDiskSize" value="29" /> 3646 <const name="CloudBucket" value="30" /> 3647 3647 <const name="CloudOCIVCN" value="31" /> 3648 <const name="Cloud OCIPublicIP" value="32" />3649 <const name="Cloud OCIProfileName" value="33" />3648 <const name="CloudPublicIP" value="32" /> 3649 <const name="CloudProfileName" value="33" /> 3650 3650 <const name="CloudOCISubnet" value="34" /> 3651 <const name="Cloud OCIKeepObject" value="35" />3652 <const name="Cloud OCILaunchInstance" value="36" />3651 <const name="CloudKeepObject" value="35" /> 3652 <const name="CloudLaunchInstance" value="36" /> 3653 3653 </enum> 3654 3654 … … 3669 3669 <interface 3670 3670 name="IVirtualSystemDescription" extends="$unknown" 3671 uuid=" 316c99a2-405d-41af-8508-46889144d067"3671 uuid="ec49259c-1c50-4353-97a5-0fd92e2caac2" 3672 3672 wsmap="managed" 3673 3673 reservedMethods="4" reservedAttributes="4" -
trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp
r75922 r76192 863 863 */ 864 864 std::list<VirtualSystemDescriptionEntry*> profileName = 865 vsdescThis->i_findByType(VirtualSystemDescriptionType_Cloud OCIProfileName);865 vsdescThis->i_findByType(VirtualSystemDescriptionType_CloudProfileName); 866 866 if (profileName.size() > 1) 867 867 return setError(VBOX_E_OBJECT_NOT_FOUND, … … 2267 2267 com::SafeArray<BSTR> aExtraConfigValues; 2268 2268 2269 hrc = vsd->GetDescriptionByType(VirtualSystemDescriptionType_Cloud OCIProfileName,2269 hrc = vsd->GetDescriptionByType(VirtualSystemDescriptionType_CloudProfileName, 2270 2270 ComSafeArrayAsOutParam(retTypes), 2271 2271 ComSafeArrayAsOutParam(aRefs),
Note:
See TracChangeset
for help on using the changeset viewer.

