Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/pushsource/_impl/model/azure.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def _from_data(cls, data):
"description": data["description"],
"generation": data.get("generation") or None,
"sku_id": data.get("sku_id") or None,
"support_legacy": data.get("support_legacy") or None,
"support_legacy": data.get("support_legacy") or False,
"release": VMIRelease._from_data(data.get("release", {})),
"legacy_sku_id": data.get("legacy_sku_id") or None,
"disk_version": data.get("disk_version") or None,
Expand Down
26 changes: 25 additions & 1 deletion tests/model/test_vhd.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from datetime import datetime

from pytest import raises
from pytest import mark, raises

from pushsource import VHDPushItem, VMIRelease, AmiRelease

Expand Down Expand Up @@ -36,6 +36,30 @@ def test_invalid_legacy_sku():
) in str(exc_info.value)


@mark.parametrize("value", [True, False, None])
def test_support_legacy(value):
"""Ensure ``support_legacy`` works for all expected inputs."""
v = VHDPushItem._from_data(
{
"name": "test",
"release": {
"product": "TEST",
"date": "20250730",
"arch": "x86_64",
"respin": 0,
},
"description": "test",
"disk_version": "1.0.0",
"sas_uri": "foo.com/bar",
"support_legacy": value,
}
)
if value:
assert v.support_legacy == value
else:
assert v.support_legacy == False


def test_vmi_release():
"""Ensure that subclasses of VMIRelease can not be associated with VHDPushItem."""
release_params = {
Expand Down
75 changes: 75 additions & 0 deletions tests/pub/data/3776845/clouds.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
[
{
"boot_mode": null,
"build": "test-prd-azure-9.6-20250730.3",
"build_info": {
"id": 3776845,
"name": "test-prd-azure",
"release": "20250730.3",
"version": "9.6"
},
"cloud_info": {
"account": "azure-na",
"provider": "azure"
},
"description": "",
"dest": [
"test-prd/9_6_prd"
],
"generation": "V2",
"md5sum": "ac3b1c069d7b3f3ce9e77de83bb4305e",
"name": "test-prd-azure-9.6-20250730.3.x86_64.vhd.xz",
"origin": "RHBA-2025:123456",
"recommended_sizes": [],
"release": {
"arch": "x86_64",
"base_product": null,
"base_version": null,
"date": "20250730",
"product": "TEST-PRD",
"respin": 0,
"type": null,
"variant": null,
"version": "9.6"
},
"sas_uri": "https://test.blob.core.windows.net/pubupload/test-prd-azure-9.6-20250730.3.x86_64.vhd?se=2028-08-05T15%3A05%3A37Z&sp=r&sv=2023-08-03&sr=b&sig=fakesig",
"src": "/mnt/koji/packages/test-prd-azure/9.6/20250730.3/images/test-prd-azure-9.6-20250730.3.x86_64.vhd.xz",
"starmap_query": {
"billing_code_config": {},
"cloud": "azure",
"mappings": {
"azure-na": {
"destinations": [
{
"ami_version_template": null,
"architecture": "x86_64",
"destination": "test-prd/9_6_prd",
"id": null,
"meta": {
"generation": "V2"
},
"overwrite": false,
"provider": null,
"restrict_major": null,
"restrict_minor": null,
"restrict_version": false,
"tags": null,
"vhd_check_base_sas_only": true
}
],
"meta": {
"generation": "V2"
},
"provider": null
}
},
"meta": {
"generation": "V2"
},
"name": "test-prd-azure",
"workflow": "stratosphere"
},
"state": "PUSHED",
"support_legacy": false
}
]
58 changes: 58 additions & 0 deletions tests/pub/test_pub_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,64 @@ def test_get_azure_push_items_single_task_clouds(requests_mock):
]


def test_get_azure_push_items_no_legacy_support(requests_mock):
"""
Tests getting push item from one Stratosphere Pub task.
"""
# test setup
task_id = 3776845
pub_url = "https://pub.example.com"
request_url = os.path.join(
pub_url, "pub/task", str(task_id), "log/clouds.json?format=raw"
)

requests_mock.register_uri(
"GET", request_url, json=make_response(task_id, "clouds.json")
)

# Add 404 for images.json
request_url = os.path.join(
pub_url, "pub/task", str(task_id), "log/images.json?format=raw"
)
requests_mock.register_uri("GET", request_url, status_code=404)

# request push items from source
with Source.get("pub:%s" % pub_url, task_id=task_id) as source:
push_items = [item for item in source]

# there should be exactly 1 push item
assert len(push_items) == 1

# with following content
assert push_items == [
VHDPushItem(
name="test-prd-azure-9.6-20250730.3.x86_64.vhd.xz",
state="PENDING",
src="/mnt/koji/packages/test-prd-azure/9.6/20250730.3/images/test-prd-azure-9.6-20250730.3.x86_64.vhd.xz",
dest=["test-prd/9_6_prd"],
build="test-prd-azure-9.6-20250730.3",
build_info=KojiBuildInfo(
name="test-prd-azure",
version="9.6",
release="20250730.3",
id=None,
),
origin="RHBA-2025:123456",
release=VMIRelease(
arch="x86_64",
date="20250730",
product="TEST-PRD",
respin=0,
version="9.6",
),
description="",
sas_uri="https://test.blob.core.windows.net/pubupload/test-prd-azure-9.6-20250730.3.x86_64.vhd?se=2028-08-05T15%3A05%3A37Z&sp=r&sv=2023-08-03&sr=b&sig=fakesig",
generation="V2",
support_legacy=False,
)
]


def test_get_ami_push_items_rhcos_task_cloud(requests_mock):
"""
Tests getting push item from one Stratosphere RHCOS Pub task.
Expand Down