internal/v1: support Azure's HyperV generation

osbuild · Nov 26, 2024 · 41ef88a · 41ef88a
1 parent 02aa450
commit 41ef88a
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 12 deletions.
diff --git a/internal/v1/api.go b/internal/v1/api.go
diff --git a/internal/v1/api.yaml b/internal/v1/api.yaml
@@ -1337,6 +1337,15 @@ components:
             Name of the created image.
             Must begin with a letter or number, end with a letter, number or underscore, and may contain only letters, numbers, underscores, periods, or hyphens.
             The total length is limited to 60 characters.
+        hyper_v_generation:
+          type: string
+          enum:
+            - V1
+            - V2
+          default: V1
+          description: |
+            Choose the VM Image HyperV generation, different features on Azure are available
+            depending on the HyperV generation.
     OCIUploadRequestOptions:
       type: object
     OSTree:

diff --git a/internal/v1/handler_compose_image.go b/internal/v1/handler_compose_image.go
@@ -486,11 +486,17 @@ func (h *Handlers) buildUploadOptions(ctx echo.Context, ur UploadRequest, it Ima
 			subscriptionId = *uploadInfo.Azure.SubscriptionId
 		}
 
+		var hyperVGen *composer.AzureUploadOptionsHyperVGeneration
+		if uo.HyperVGeneration != nil {
+			hyperVGen = common.ToPtr(composer.AzureUploadOptionsHyperVGeneration(*uo.HyperVGeneration))
+		}
+
 		err = uploadOptions.FromAzureUploadOptions(composer.AzureUploadOptions{
-			TenantId:       tenantId,
-			SubscriptionId: subscriptionId,
-			ResourceGroup:  uo.ResourceGroup,
-			ImageName:      uo.ImageName,
+			TenantId:         tenantId,
+			SubscriptionId:   subscriptionId,
+			ResourceGroup:    uo.ResourceGroup,
+			ImageName:        uo.ImageName,
+			HyperVGeneration: hyperVGen,
 		})
 		if err != nil {
 			return uploadOptions, "", err

diff --git a/internal/v1/handler_post_compose_test.go b/internal/v1/handler_post_compose_test.go
@@ -1465,10 +1465,11 @@ func TestComposeCustomizations(t *testing.T) {
 	}))
 	var auo UploadRequest_Options
 	require.NoError(t, auo.FromAzureUploadRequestOptions(AzureUploadRequestOptions{
-		ResourceGroup:  "group",
-		SubscriptionId: common.ToPtr("id"),
-		TenantId:       common.ToPtr("tenant"),
-		ImageName:      common.ToPtr("azure-image"),
+		ResourceGroup:    "group",
+		SubscriptionId:   common.ToPtr("id"),
+		TenantId:         common.ToPtr("tenant"),
+		ImageName:        common.ToPtr("azure-image"),
+		HyperVGeneration: common.ToPtr(V2),
 	}))
 	var auo2 UploadRequest_Options
 	require.NoError(t, auo2.FromAzureUploadRequestOptions(AzureUploadRequestOptions{
@@ -1957,10 +1958,11 @@ func TestComposeCustomizations(t *testing.T) {
 						},
 					},
 					UploadOptions: makeUploadOptions(t, composer.AzureUploadOptions{
-						ImageName:      common.ToPtr("azure-image"),
-						ResourceGroup:  "group",
-						SubscriptionId: "id",
-						TenantId:       "tenant",
+						ImageName:        common.ToPtr("azure-image"),
+						ResourceGroup:    "group",
+						SubscriptionId:   "id",
+						TenantId:         "tenant",
+						HyperVGeneration: common.ToPtr(composer.V2),
 					}),
 				},
 			},