vatesfr · pdonias · Feb 27, 2023 · Feb 20, 2023 · Feb 20, 2023 · Feb 21, 2023
diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
@@ -7,6 +7,8 @@
 
 > Users must be able to say: “Nice enhancement, I'm eager to test it”
 
+- [Import VM] Ability to import a VM from ESXi (PR [#6663](https://github.com/vatesfr/xen-orchestra/pull/6663))
+
 ### Bug fixes
 
 > Users must be able to say: “I had this issue, happy to know it's fixed”
@@ -27,4 +29,6 @@
 
 <!--packages-start-->
 
+- xo-web minor
+
 <!--packages-end-->
diff --git a/packages/xo-web/src/common/intl/locales/es.js b/packages/xo-web/src/common/intl/locales/es.js
@@ -2598,8 +2598,8 @@ export default {
   // Original text: "To SR:"
   vmImportToSr: 'al SR:',
 
-  // Original text: "VMs to import"
-  vmsToImport: 'VMs para importar',
+  // Original text: "VM{nVms, plural, one {} other {s}} to import"
+  vmsToImport: 'VM{nVms, plural, one {} other {s}} para importar',
 
   // Original text: "Reset"
   importVmsCleanList: 'Reiniciar',

diff --git a/packages/xo-web/src/common/intl/locales/fr.js b/packages/xo-web/src/common/intl/locales/fr.js
@@ -2657,8 +2657,8 @@ export default {
   // Original text: "To SR:"
   vmImportToSr: 'Sur le SR:',
 
-  // Original text: "VMs to import"
-  vmsToImport: 'VMs à importer',
+  // Original text: "VM{nVms, plural, one {} other {s}}  to import"
+  vmsToImport: 'VM{nVms, plural, one {} other {s}}  à importer',
 
   // Original text: "Reset"
   importVmsCleanList: 'Réinitialiser',

diff --git a/packages/xo-web/src/common/intl/locales/he.js b/packages/xo-web/src/common/intl/locales/he.js
@@ -2276,7 +2276,7 @@ export default {
   // Original text: 'To SR:'
   vmImportToSr: undefined,
 
-  // Original text: 'VMs to import'
+  // Original text: 'VM{nVms, plural, one {} other {s}} to import'
   vmsToImport: undefined,
 
   // Original text: 'Reset'

diff --git a/packages/xo-web/src/common/intl/locales/hu.js b/packages/xo-web/src/common/intl/locales/hu.js
@@ -2490,7 +2490,7 @@ export default {
   // Original text: "To SR:"
   vmImportToSr: 'Adattárolóra:',
 
-  // Original text: "VMs to import"
+  // Original text: "VM{nVms, plural, one {} other {s}} to import"
   vmsToImport: 'Importálandó VPS-el',
 
   // Original text: "Reset"

diff --git a/packages/xo-web/src/common/intl/locales/it.js b/packages/xo-web/src/common/intl/locales/it.js
@@ -3746,8 +3746,8 @@ export default {
   // Original text: 'To SR:'
   vmImportToSr: 'Per SR:',
 
-  // Original text: 'VMs to import'
-  vmsToImport: 'VMs da importare',
+  // Original text: 'VM{nVms, plural, one {} other {s}} to import'
+  vmsToImport: 'VM{nVms, plural, one {} other {s}} da importare',
 
   // Original text: 'Reset'
   importVmsCleanList: 'Ripristina',

diff --git a/packages/xo-web/src/common/intl/locales/pl.js b/packages/xo-web/src/common/intl/locales/pl.js
@@ -2280,8 +2280,8 @@ export default {
   // Original text: "To SR:"
   vmImportToSr: 'To SR:',
 
-  // Original text: "VMs to import"
-  vmsToImport: 'VMs to import',
+  // Original text: "VM{nVms, plural, one {} other {s}} to import"
+  vmsToImport: 'VM{nVms, plural, one {} other {s}} to import',
 
   // Original text: "Reset"
   importVmsCleanList: 'Reset',

diff --git a/packages/xo-web/src/common/intl/locales/pt.js b/packages/xo-web/src/common/intl/locales/pt.js
@@ -2279,8 +2279,8 @@ export default {
   // Original text: "To SR:"
   vmImportToSr: 'Enviar para SR:',
 
-  // Original text: "VMs to import"
-  vmsToImport: 'Importar VMs',
+  // Original text: "VM{nVms, plural, one {} other {s}} to import"
+  vmsToImport: 'Importar VM{nVms, plural, one {} other {s}} ',
 
   // Original text: "Reset"
   importVmsCleanList: 'Reiniciar',

diff --git a/packages/xo-web/src/common/intl/locales/ru.js b/packages/xo-web/src/common/intl/locales/ru.js
@@ -2600,7 +2600,7 @@ export default {
   // Original text: "To SR:"
   vmImportToSr: 'В SR:',
 
-  // Original text: "VMs to import"
+  // Original text: "VM{nVms, plural, one {} other {s}} to import"
   vmsToImport: 'ВМ для импорта',
 
   // Original text: "Reset"

diff --git a/packages/xo-web/src/common/intl/locales/tr.js b/packages/xo-web/src/common/intl/locales/tr.js
@@ -3223,7 +3223,7 @@ export default {
   // Original text: "To SR:"
   vmImportToSr: 'SR:',
 
-  // Original text: "VMs to import"
+  // Original text: "VM{nVms, plural, one {} other {s}} to import"
   vmsToImport: "içe aktarılacak VM'ler",
 
   // Original text: "Reset"

diff --git a/packages/xo-web/src/common/intl/locales/zh.js b/packages/xo-web/src/common/intl/locales/zh.js
@@ -1739,7 +1739,7 @@ export default {
   // Original text: "To SR:"
   vmImportToSr: '到存储库',
 
-  // Original text: "VMs to import"
+  // Original text: "VM{nVms, plural, one {} other {s}} to import"
   vmsToImport: '导入虚拟机',
 
   // Original text: "Reset"

diff --git a/packages/xo-web/src/common/intl/messages.js b/packages/xo-web/src/common/intl/messages.js
@@ -9,7 +9,10 @@ const messages = {
   description: 'Description',
   deleteSourceVm: 'Delete source VM',
   expiration: 'Expiration',
+  hostIp: 'Host IP',
   keyValue: '{key}: {value}',
+  sslCertificate: 'SSL certificate',
+  vmSrUsage: 'Storage: {used} used of {total} ({free} free)',
 
   notDefined: 'Not defined',
   statusConnecting: 'Connecting',
@@ -1608,13 +1611,16 @@ const messages = {
 
   // ---- VM import ---
   fileType: 'File type:',
+  firmware: 'Firmware',
   fromUrl: 'From URL',
+  fromVmware: 'From VMware',
   importVmsList: 'Drop OVA or XVA files here to import Virtual Machines.',
   noSelectedVms: 'No selected VMs.',
+  noToolsInstalled: 'No tools installed',
   url: 'URL:',
   vmImportToPool: 'To Pool:',
   vmImportToSr: 'To SR:',
-  vmsToImport: 'VMs to import',
+  vmsToImport: 'VM{nVms, plural, one {} other {s}} to import',
   importVmsCleanList: 'Reset',
   vmImportSuccess: 'VM import success',
   vmImportFailed: 'VM import failed',
@@ -1636,6 +1642,7 @@ const messages = {
   vmImportError: 'Error:',
   vmImportFileType: '{type} file:',
   vmImportConfigAlert: 'Please check and/or modify the VM configuration.',
+  toolsInstalled: 'The tools are installed',
 
   // ---- Disk import ---
   diskImportFailed: 'Disk import failed',

diff --git a/packages/xo-web/src/common/xo/index.js b/packages/xo-web/src/common/xo/index.js
@@ -3468,3 +3468,10 @@ export const synchronizeNetbox = pools =>
     body: _('syncNetboxWarning'),
     icon: 'refresh',
   }).then(() => _call('netbox.synchronize', { pools: resolveIds(pools) }))
+
+// ESXi import ---------------------------------------------------------------
+
+export const esxiConnect = (host, user, password, sslVerify) =>
+  _call('esxi.connect', { host, user, password, sslVerify })
+
+export const importVmFromEsxi = params => _call('vm.importFromEsxi', params)
diff --git a/packages/xo-web/src/xo-app/import/index.js b/packages/xo-web/src/xo-app/import/index.js
@@ -7,6 +7,7 @@ import { NavLink, NavTabs } from 'nav'
 import { routes } from 'utils'
 
 import DiskImport from '../disk-import'
+import EsxiImport from '../vm-import/esxi/esxi-import'
 import VmImport from '../vm-import'
 
 const HEADER = (
@@ -25,6 +26,9 @@ const HEADER = (
           <NavLink to='/import/disk'>
             <Icon icon='disk' /> {_('labelDisk')}
           </NavLink>
+          <NavLink to='/import/vmware'>
+            <Icon icon='vm' /> {_('fromVmware')}
+          </NavLink>
         </NavTabs>
       </Col>
     </Row>
@@ -34,6 +38,7 @@ const HEADER = (
 const Import = routes('vm', {
   disk: DiskImport,
   vm: VmImport,
+  vmware: EsxiImport,
 })(({ children }) => (
   <Page header={HEADER} title='newImport' formatTitle>
     {children}

diff --git a/packages/xo-web/src/xo-app/menu/index.js b/packages/xo-web/src/xo-app/menu/index.js
@@ -494,6 +494,11 @@ export default class Menu extends Component {
             icon: 'disk',
             label: 'labelDisk',
           },
+          {
+            to: '/import/vmware',
+            icon: 'vm',
+            label: 'fromVmware',
+          },
         ],
       },
       !(noOperatablePools && noResourceSets) && {