Merge pull request #908 from mturley/conv-host-wizard-ssh-keys

Conversion Host Configuration Wizard - Properly pass SSH keys and VDDK path to API
ManageIQ · Mar 14, 2019 · e65d65e · e65d65e
2 parents dc8eb8b + 5928e32
commit e65d65e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/...stWizard/ConversionHostWizardAuthenticationStep/ConversionHostWizardAuthenticationStep.js b/...stWizard/ConversionHostWizardAuthenticationStep/ConversionHostWizardAuthenticationStep.js
@@ -39,7 +39,7 @@ const ConversionHostWizardAuthenticationStep = ({ selectedProviderType, selected
       <Field
         {...fieldBaseProps}
         name="conversionHostSshKey"
-        label={__('Conversion Host SSH key')}
+        label={__('Conversion Host SSH private key')}
         component={FormField}
         info={sshKeyInfo}
         controlId="host-ssh-key-input"
@@ -72,7 +72,7 @@ const ConversionHostWizardAuthenticationStep = ({ selectedProviderType, selected
         <Field
           {...fieldBaseProps}
           name="vmwareSshKey"
-          label={__('VMware hypervisors SSH key')}
+          label={__('VMware hypervisors SSH private key')}
           component={FormField}
           controlId="vmware-ssh-key-input"
           required

diff --git a/...nHostsSettings/components/ConversionHostWizard/ConversionHostWizardResultsStep/helpers.js b/...nHostsSettings/components/ConversionHostWizard/ConversionHostWizardResultsStep/helpers.js
@@ -5,18 +5,16 @@ export const getConfigureConversionHostPostBodies = (locationStepValues, hostsSt
   hostsStepValues.hosts.map(host => {
     const openstackSpecificProperties =
       locationStepValues.providerType === OPENSTACK ? { auth_user: authStepValues.openstackUser } : {};
-    const vddkSpecificProperties =
+    const vmwareAuthProperties =
       authStepValues.transformationMethod === VDDK
-        ? { param_v2v_vddk_package_url: authStepValues.vddkLibraryPath }
-        : {};
+        ? { vmware_vddk_package_url: authStepValues.vddkLibraryPath }
+        : { vmware_ssh_private_key: authStepValues.vmwareSshKey.body };
     return {
       name: host.name,
       resource_type: host.type,
       resource_id: host.id,
+      ssh_key: authStepValues.conversionHostSshKey.body,
       ...openstackSpecificProperties,
-      ...vddkSpecificProperties
+      ...vmwareAuthProperties
     };
-    // TODO: handle authStepValues.conversionHostSshKey
-    // TODO: handle authStepValues.transformationMethod (explicitly?)
-    // TODO: handle authStepValues.vmwareSshKey (if transformationMethod === SSH)
   });