diff --git a/internal/cloudapi/v2/v2_test.go b/internal/cloudapi/v2/v2_test.go index 7db56aa6b..ebb9a55f8 100644 --- a/internal/cloudapi/v2/v2_test.go +++ b/internal/cloudapi/v2/v2_test.go @@ -540,4 +540,61 @@ func TestImageTypes(t *testing.T) { "href": "/api/image-builder-composer/v2/compose", "kind": "ComposeId" }`, "id") + test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(` + { + "distribution": "%s", + "image_request":{ + "architecture": "%s", + "image_type": "%s", + "repositories": [{ + "baseurl": "somerepo.org", + "rhsm": false + }], + "upload_options": { + "region": "eu-central-1" + } + } + }`, test_distro.TestDistroName, test_distro.TestArch3Name, string(v2.ImageTypes_image_installer)), http.StatusCreated, ` + { + "href": "/api/image-builder-composer/v2/compose", + "kind": "ComposeId" + }`, "id") + test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(` + { + "distribution": "%s", + "image_request":{ + "architecture": "%s", + "image_type": "%s", + "repositories": [{ + "baseurl": "somerepo.org", + "rhsm": false + }], + "upload_options": { + "region": "eu-central-1" + } + } + }`, test_distro.TestDistroName, test_distro.TestArch3Name, string(v2.ImageTypes_guest_image)), http.StatusCreated, ` + { + "href": "/api/image-builder-composer/v2/compose", + "kind": "ComposeId" + }`, "id") + test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(` + { + "distribution": "%s", + "image_request":{ + "architecture": "%s", + "image_type": "%s", + "repositories": [{ + "baseurl": "somerepo.org", + "rhsm": false + }], + "upload_options": { + "region": "eu-central-1" + } + } + }`, test_distro.TestDistroName, test_distro.TestArch3Name, string(v2.ImageTypes_vsphere)), http.StatusCreated, ` + { + "href": "/api/image-builder-composer/v2/compose", + "kind": "ComposeId" + }`, "id") } diff --git a/internal/distro/test_distro/distro.go b/internal/distro/test_distro/distro.go index 7f5550aa4..585d846f9 100644 --- a/internal/distro/test_distro/distro.go +++ b/internal/distro/test_distro/distro.go @@ -47,10 +47,13 @@ const ( TestImageType2Name = "test_type2" // added for cloudapi tests - TestImageTypeAmi = "ami" - TestImageTypeVhd = "vhd" - TestImageTypeEdgeCommit = "rhel-edge-commit" - TestImageTypeEdgeInstaller = "rhel-edge-installer" + TestImageTypeAmi = "ami" + TestImageTypeVhd = "vhd" + TestImageTypeEdgeCommit = "rhel-edge-commit" + TestImageTypeEdgeInstaller = "rhel-edge-installer" + TestImageTypeImageInstaller = "image-installer" + TestImageTypeQcow2 = "qcow2" + TestImageTypeVmdk = "vmdk" ) // TestDistro @@ -259,9 +262,21 @@ func newTestDistro(name, modulePlatformID, releasever string) *TestDistro { name: TestImageTypeEdgeInstaller, } + it7 := TestImageType{ + name: TestImageTypeImageInstaller, + } + + it8 := TestImageType{ + name: TestImageTypeQcow2, + } + + it9 := TestImageType{ + name: TestImageTypeVmdk, + } + ta1.addImageTypes(it1) ta2.addImageTypes(it1, it2) - ta3.addImageTypes(it3, it4, it5, it6) + ta3.addImageTypes(it3, it4, it5, it6, it7, it8, it9) td.addArches(&ta1, &ta2, &ta3)