From c1378a79134c891b0953279f1431f4cbf65847bd Mon Sep 17 00:00:00 2001
From: Sanne Raymaekers <sanne.raymaekers@gmail.com>
Date: Thu, 28 Nov 2024 13:23:23 +0100
Subject: [PATCH] Wizard: Integrate HyperV selection in Azure target options

This determines the generation the image will get registered as in
Azure. V2 supports UEFI and more instance types than V1.
---
 .../steps/TargetEnvironment/Azure/index.tsx         |  2 ++
 .../CreateImageWizard/utilities/requestMapper.ts    |  4 ++++
 src/store/wizardSlice.ts                            | 13 +++++++++++++
 3 files changed, 19 insertions(+)

diff --git a/src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/index.tsx b/src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/index.tsx
index 00257c23..631629f5 100644
--- a/src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/index.tsx
+++ b/src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/index.tsx
@@ -14,6 +14,7 @@ import {
 import { ExternalLinkAltIcon } from '@patternfly/react-icons';
 
 import { AzureAuthButton } from './AzureAuthButton';
+import { AzureHyperVSelect } from './AzureHyperVSelect';
 import { AzureResourceGroups } from './AzureResourceGroups';
 import { AzureSourcesSelect } from './AzureSourcesSelect';
 
@@ -91,6 +92,7 @@ const Azure = () => {
           Learn more about OAuth 2.0
         </Button>
       </Text>
+      <AzureHyperVSelect />
       <FormGroup label="Share method:">
         <Radio
           id="radio-with-description"
diff --git a/src/Components/CreateImageWizard/utilities/requestMapper.ts b/src/Components/CreateImageWizard/utilities/requestMapper.ts
index 8f8fee4e..003b4e96 100644
--- a/src/Components/CreateImageWizard/utilities/requestMapper.ts
+++ b/src/Components/CreateImageWizard/utilities/requestMapper.ts
@@ -46,6 +46,7 @@ import {
   selectAzureSource,
   selectAzureSubscriptionId,
   selectAzureTenantId,
+  selectAzureHyperVGeneration,
   selectBaseUrl,
   selectBlueprintDescription,
   selectBlueprintName,
@@ -244,6 +245,7 @@ function commonRequestToState(
       tenantId: azureUploadOptions?.tenant_id || '',
       subscriptionId: azureUploadOptions?.subscription_id || '',
       resourceGroup: azureUploadOptions?.resource_group,
+      hyperVGeneration: azureUploadOptions?.hyper_v_generation || 'V1',
     },
     gcp: {
       shareMethod: (gcpUploadOptions?.share_with_accounts
@@ -423,12 +425,14 @@ const getImageOptions = (
         return {
           source_id: selectAzureSource(state),
           resource_group: selectAzureResourceGroup(state),
+          hyper_v_generation: selectAzureHyperVGeneration(state),
         };
       else
         return {
           tenant_id: selectAzureTenantId(state),
           subscription_id: selectAzureSubscriptionId(state),
           resource_group: selectAzureResourceGroup(state),
+          hyper_v_generation: selectAzureHyperVGeneration(state),
         };
     case 'gcp': {
       let googleAccount: string = '';
diff --git a/src/store/wizardSlice.ts b/src/store/wizardSlice.ts
index e3d2ed5a..a28a2c3e 100644
--- a/src/store/wizardSlice.ts
+++ b/src/store/wizardSlice.ts
@@ -63,6 +63,7 @@ export type wizardState = {
     subscriptionId: string;
     source: string;
     resourceGroup: string;
+    hyperVGeneration: 'V1' | 'V2';
   };
   gcp: {
     shareMethod: GcpShareMethod;
@@ -136,6 +137,7 @@ export const initialState: wizardState = {
     subscriptionId: '',
     source: '',
     resourceGroup: '',
+    hyperVGeneration: 'V2',
   },
   gcp: {
     shareMethod: 'withGoogle',
@@ -242,6 +244,10 @@ export const selectAzureResourceGroup = (state: RootState) => {
   return state.wizard.azure.resourceGroup;
 };
 
+export const selectAzureHyperVGeneration = (state: RootState) => {
+  return state.wizard.azure.hyperVGeneration;
+};
+
 export const selectGcpShareMethod = (state: RootState) => {
   return state.wizard.gcp.shareMethod;
 };
@@ -406,6 +412,12 @@ export const wizardSlice = createSlice({
     changeAzureResourceGroup: (state, action: PayloadAction<string>) => {
       state.azure.resourceGroup = action.payload;
     },
+    changeAzureHyperVGeneration: (
+      state,
+      action: PayloadAction<'V1' | 'V2'>
+    ) => {
+      state.azure.hyperVGeneration = action.payload;
+    },
     reinitializeAzure: (state) => {
       state.azure.shareMethod = 'sources';
       state.azure.tenantId = '';
@@ -690,6 +702,7 @@ export const {
   changeAzureSubscriptionId,
   changeAzureSource,
   changeAzureResourceGroup,
+  changeAzureHyperVGeneration,
   reinitializeAzure,
   changeGcpShareMethod,
   changeGcpAccountType,