Skip to content

Commit 0664071

Browse files
committed
Assert PRN support to advanced copy API
Fixes: pulp#3853
1 parent 14d5e02 commit 0664071

File tree

4 files changed

+62
-14
lines changed

4 files changed

+62
-14
lines changed

CHANGES/3853.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Extended PRN support to Advanced Copy API and DistributionTree.

pulp_rpm/app/serializers/repository.py

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
)
3838
from pulp_rpm.app.schema import COPY_CONFIG_SCHEMA
3939
from urllib.parse import urlparse
40+
from textwrap import dedent
4041

4142

4243
class RpmRepositorySerializer(RepositorySerializer):
@@ -543,7 +544,30 @@ class CopySerializer(ValidateFieldsMixin, serializers.Serializer):
543544
"""
544545

545546
config = CustomJSONField(
546-
help_text=_("A JSON document describing sources, destinations, and content to be copied"),
547+
help_text=_(
548+
dedent(
549+
"""\
550+
A JSON document describing sources, destinations, and content to be copied.
551+
552+
Its a list of dictionaries with the following form:
553+
554+
```json
555+
[
556+
{
557+
"source_repo_version": <RepositoryVersion.[pulp_href|prn]>),
558+
"dest_repo": <RpmRepository.[pulp_href|prn]>),
559+
"content": [<Content.[pulp_href|prn]>, <Content.[pulp_href|prn]>]
560+
}
561+
]
562+
```
563+
564+
If domains are enabled, the refered pulp object must be part of the current domain.
565+
566+
For usage examples, refer to the advanced copy guide:
567+
<https://pulpproject.org/pulp_rpm/docs/user/guides/modify/#advanced-copy-workflow>
568+
"""
569+
)
570+
),
547571
)
548572

549573
dependency_solving = serializers.BooleanField(
@@ -559,6 +583,10 @@ def validate(self, data):
559583
"""
560584

561585
def check_domain(domain, href, name):
586+
# PRNs dont have domain info.
587+
# Has to be checked on the task context
588+
if href.startswith("prn:"):
589+
return
562590
# We're doing just a string-check here rather than checking objects
563591
# because there can be A LOT of objects, and this is happening in the view-layer
564592
# where we have strictly-limited timescales to work with

pulp_rpm/tests/functional/api/test_copy.py

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,26 @@
1818

1919
from pulpcore.client.pulp_rpm import Copy
2020
from pulpcore.client.pulp_rpm.exceptions import ApiException
21+
import subprocess
2122

2223

24+
def noop(uri):
25+
return uri
26+
27+
28+
def get_prn(uri):
29+
"""Utility to get prn without having to setup django.
30+
TODO: This is a Copy-paste from pulpcore. Make it public there.
31+
"""
32+
commands = f"from pulpcore.app.util import get_prn; print(get_prn(uri='{uri}'));"
33+
process = subprocess.run(["pulpcore-manager", "shell", "-c", commands], capture_output=True)
34+
35+
assert process.returncode == 0
36+
prn = process.stdout.decode().strip()
37+
return prn
38+
39+
40+
@pytest.mark.parametrize("get_id", [noop, get_prn], ids=["without-prn", "with-prn"])
2341
@pytest.mark.parallel
2442
def test_modular_static_context_copy(
2543
init_and_sync,
@@ -28,13 +46,19 @@ def test_modular_static_context_copy(
2846
rpm_modulemd_api,
2947
rpm_repository_factory,
3048
rpm_repository_api,
49+
get_id,
3150
):
3251
"""Test copying a static_context-using repo to an empty destination."""
3352
src, _ = init_and_sync(url=RPM_MODULES_STATIC_CONTEXT_FIXTURE_URL)
3453
dest = rpm_repository_factory()
3554

3655
data = Copy(
37-
config=[{"source_repo_version": src.latest_version_href, "dest_repo": dest.pulp_href}],
56+
config=[
57+
{
58+
"source_repo_version": get_id(src.latest_version_href),
59+
"dest_repo": get_id(dest.pulp_href),
60+
}
61+
],
3862
dependency_solving=False,
3963
)
4064
monitor_task(rpm_copy_api.copy_content(data).task)
@@ -44,7 +68,7 @@ def test_modular_static_context_copy(
4468
assert get_content_summary(dest.to_dict()) == RPM_MODULAR_STATIC_FIXTURE_SUMMARY
4569
assert get_added_content_summary(dest.to_dict()) == RPM_MODULAR_STATIC_FIXTURE_SUMMARY
4670

47-
modules = rpm_modulemd_api.list(repository_version=dest.latest_version_href).results
71+
modules = rpm_modulemd_api.list(repository_version=get_id(dest.latest_version_href)).results
4872
module_static_contexts = [
4973
(module.name, module.version) for module in modules if module.static_context
5074
]
@@ -141,6 +165,7 @@ def test_invalid_config(
141165
)
142166
rpm_copy_api.copy_content(data)
143167

168+
@pytest.mark.parametrize("get_id", [noop, get_prn], ids=["without-prn", "with-prn"])
144169
def test_content(
145170
self,
146171
monitor_task,
@@ -149,20 +174,21 @@ def test_content(
149174
rpm_repository_api,
150175
rpm_repository_factory,
151176
rpm_unsigned_repo_immediate,
177+
get_id,
152178
):
153179
"""Test the content parameter."""
154180
src = rpm_unsigned_repo_immediate
155181

156182
content = rpm_advisory_api.list(repository_version=src.latest_version_href).results
157-
content_to_copy = (content[0].pulp_href, content[1].pulp_href)
183+
content_to_copy = (get_id(content[0].pulp_href), get_id(content[1].pulp_href))
158184

159185
dest = rpm_repository_factory()
160186

161187
data = Copy(
162188
config=[
163189
{
164-
"source_repo_version": src.latest_version_href,
165-
"dest_repo": dest.pulp_href,
190+
"source_repo_version": get_id(src.latest_version_href),
191+
"dest_repo": get_id(dest.pulp_href),
166192
"content": content_to_copy,
167193
}
168194
],
@@ -172,7 +198,7 @@ def test_content(
172198

173199
dest = rpm_repository_api.read(dest.pulp_href)
174200
dc = rpm_advisory_api.list(repository_version=dest.latest_version_href)
175-
dest_content = [c.pulp_href for c in dc.results]
201+
dest_content = [get_id(c.pulp_href) for c in dc.results]
176202

177203
assert sorted(content_to_copy) == sorted(dest_content)
178204

pulp_rpm/tests/functional/api/test_prn.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
import pytest
2-
import requests
32

43

5-
6-
# @pytest.fixture(scope="session")
7-
# def pulp_openapi_schema_rpm(pulp_api_v3_url):
8-
# COMPONENT="rpm"
9-
# return requests.get(f"{pulp_api_v3_url}docs/api.json?bindings&component={COMPONENT}").json()
10-
114
@pytest.mark.parallel
125
def test_prn_schema(pulp_openapi_schema):
136
"""Test that PRN is a part of every serializer with a pulp_href."""

0 commit comments

Comments
 (0)