Skip to content
This repository has been archived by the owner on Dec 7, 2022. It is now read-only.

Commit

Permalink
Renaming RepositoryVersion fields
Browse files Browse the repository at this point in the history
_versions_href to versions_href
_latest_version_href to latest_version_href

ref #5548
https://pulp.plan.io/issues/5548

Required PR: pulp/pulpcore#329
Required PR: pulp/pulp-smash#1221
  • Loading branch information
fao89 committed Oct 10, 2019
1 parent 8d5f382 commit a96d4cb
Show file tree
Hide file tree
Showing 7 changed files with 66 additions and 65 deletions.
1 change: 1 addition & 0 deletions CHANGES/5548.removal
@@ -0,0 +1 @@
Remove "_" from `_versions_href`, `_latest_version_href`
4 changes: 2 additions & 2 deletions docs/workflows/sync.rst
Expand Up @@ -17,8 +17,8 @@ Repository GET Response::
{
"pulp_created": "2019-09-05T14:29:43.424822Z",
"pulp_href": "/pulp/api/v3/repositories/fcf03266-f0e4-4497-8434-0fe9d94c8053/",
"_latest_version_href": null,
"_versions_href": "/pulp/api/v3/repositories/fcf03266-f0e4-4497-8434-0fe9d94c8053/versions/",
"latest_version_href": null,
"versions_href": "/pulp/api/v3/repositories/fcf03266-f0e4-4497-8434-0fe9d94c8053/versions/",
"description": null,
"name": "codzo"
}
Expand Down
4 changes: 2 additions & 2 deletions pulp_docker/tests/functional/api/test_pull_content.py
Expand Up @@ -84,7 +84,7 @@ def setUpClass(cls):
# Step 5.
response_dict = cls.client.using_handler(api.task_handler).post(
DOCKER_DISTRIBUTION_PATH,
gen_distribution(repository_version=cls.repo['_latest_version_href'])
gen_distribution(repository_version=cls.repo['latest_version_href'])
)
distribution_href = response_dict['pulp_href']
cls.distribution_with_repo_version = cls.client.get(distribution_href)
Expand Down Expand Up @@ -300,7 +300,7 @@ def setUpClass(cls):
# Step 5.
response_dict = cls.client.using_handler(api.task_handler).post(
DOCKER_DISTRIBUTION_PATH,
gen_distribution(repository_version=cls.repo['_latest_version_href'])
gen_distribution(repository_version=cls.repo['latest_version_href'])
)
distribution_href = response_dict['pulp_href']
cls.distribution_with_repo_version = cls.client.get(distribution_href)
Expand Down
72 changes: 36 additions & 36 deletions pulp_docker/tests/functional/api/test_recursive_add.py

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions pulp_docker/tests/functional/api/test_recursive_remove.py
Expand Up @@ -34,7 +34,7 @@ def setUpClass(cls):
remote_data = gen_docker_remote(upstream_name=DOCKERHUB_PULP_FIXTURE_1)
cls.remote = cls.client.post(DOCKER_REMOTE_PATH, remote_data)
sync(cls.cfg, cls.remote, cls.from_repo)
latest_version = cls.client.get(cls.from_repo['pulp_href'])['_latest_version_href']
latest_version = cls.client.get(cls.from_repo['pulp_href'])['latest_version_href']
cls.latest_from_version = "repository_version={version}".format(version=latest_version)

def setUp(self):
Expand All @@ -58,12 +58,12 @@ def test_repository_only(self):
"""Passing only a repository creates a new version."""
# Create a new version, repository must have latest version to be valid.
self.client.post(DOCKER_RECURSIVE_ADD_PATH, {'repository': self.to_repo['pulp_href']})
after_add_version_href = self.client.get(self.to_repo['pulp_href'])['_latest_version_href']
after_add_version_href = self.client.get(self.to_repo['pulp_href'])['latest_version_href']

# Actual test
self.client.post(DOCKER_RECURSIVE_REMOVE_PATH, {'repository': self.to_repo['pulp_href']})
after_remove_version_href = self.client.get(
self.to_repo['pulp_href'])['_latest_version_href']
self.to_repo['pulp_href'])['latest_version_href']
self.assertNotEqual(after_add_version_href, after_remove_version_href)
latest = self.client.get(after_remove_version_href)
for content_type in ['docker.tag', 'docker.manifest', 'docker.blob']:
Expand All @@ -72,7 +72,7 @@ def test_repository_only(self):
def test_repository_only_no_latest_version(self):
"""Create a new version, even when there is nothing to remove."""
self.client.post(DOCKER_RECURSIVE_REMOVE_PATH, {'repository': self.to_repo['pulp_href']})
latest_version_href = self.client.get(self.to_repo['pulp_href'])['_latest_version_href']
latest_version_href = self.client.get(self.to_repo['pulp_href'])['latest_version_href']
self.assertIsNotNone(latest_version_href)
latest = self.client.get(latest_version_href)
for content_type in ['docker.tag', 'docker.manifest', 'docker.blob']:
Expand All @@ -87,7 +87,7 @@ def test_manifest_recursion(self):
self.client.post(
DOCKER_RECURSIVE_ADD_PATH,
{'repository': self.to_repo['pulp_href'], 'content_units': [manifest_a]})
latest_version_href = self.client.get(self.to_repo['pulp_href'])['_latest_version_href']
latest_version_href = self.client.get(self.to_repo['pulp_href'])['latest_version_href']
latest = self.client.get(latest_version_href)

# Ensure test begins in the correct state
Expand All @@ -99,7 +99,7 @@ def test_manifest_recursion(self):
self.client.post(
DOCKER_RECURSIVE_REMOVE_PATH,
{'repository': self.to_repo['pulp_href'], 'content_units': [manifest_a]})
latest_version_href = self.client.get(self.to_repo['pulp_href'])['_latest_version_href']
latest_version_href = self.client.get(self.to_repo['pulp_href'])['latest_version_href']
latest = self.client.get(latest_version_href)
self.assertFalse('docker.tag' in latest['content_summary']['removed'])
self.assertEqual(latest['content_summary']['removed']['docker.manifest']['count'], 1)
Expand All @@ -114,7 +114,7 @@ def test_manifest_list_recursion(self):
self.client.post(
DOCKER_RECURSIVE_ADD_PATH,
{'repository': self.to_repo['pulp_href'], 'content_units': [ml_i]})
latest_version_href = self.client.get(self.to_repo['pulp_href'])['_latest_version_href']
latest_version_href = self.client.get(self.to_repo['pulp_href'])['latest_version_href']
latest = self.client.get(latest_version_href)

# Ensure test begins in the correct state
Expand All @@ -126,7 +126,7 @@ def test_manifest_list_recursion(self):
self.client.post(
DOCKER_RECURSIVE_REMOVE_PATH,
{'repository': self.to_repo['pulp_href'], 'content_units': [ml_i]})
latest_version_href = self.client.get(self.to_repo['pulp_href'])['_latest_version_href']
latest_version_href = self.client.get(self.to_repo['pulp_href'])['latest_version_href']
latest = self.client.get(latest_version_href)
self.assertFalse('docker.tag' in latest['content_summary']['removed'])
self.assertEqual(latest['content_summary']['removed']['docker.manifest']['count'], 3)
Expand All @@ -141,7 +141,7 @@ def test_tagged_manifest_list_recursion(self):
self.client.post(
DOCKER_RECURSIVE_ADD_PATH,
{'repository': self.to_repo['pulp_href'], 'content_units': [ml_i_tag]})
latest_version_href = self.client.get(self.to_repo['pulp_href'])['_latest_version_href']
latest_version_href = self.client.get(self.to_repo['pulp_href'])['latest_version_href']
latest = self.client.get(latest_version_href)

# Ensure test begins in the correct state
Expand All @@ -153,7 +153,7 @@ def test_tagged_manifest_list_recursion(self):
self.client.post(
DOCKER_RECURSIVE_REMOVE_PATH,
{'repository': self.to_repo['pulp_href'], 'content_units': [ml_i_tag]})
latest_version_href = self.client.get(self.to_repo['pulp_href'])['_latest_version_href']
latest_version_href = self.client.get(self.to_repo['pulp_href'])['latest_version_href']
latest = self.client.get(latest_version_href)
self.assertEqual(latest['content_summary']['removed']['docker.tag']['count'], 1)
self.assertEqual(latest['content_summary']['removed']['docker.manifest']['count'], 3)
Expand All @@ -168,7 +168,7 @@ def test_tagged_manifest_recursion(self):
self.client.post(
DOCKER_RECURSIVE_ADD_PATH,
{'repository': self.to_repo['pulp_href'], 'content_units': [manifest_a_tag]})
latest_version_href = self.client.get(self.to_repo['pulp_href'])['_latest_version_href']
latest_version_href = self.client.get(self.to_repo['pulp_href'])['latest_version_href']
latest = self.client.get(latest_version_href)

# Ensure valid starting state
Expand All @@ -180,7 +180,7 @@ def test_tagged_manifest_recursion(self):
self.client.post(
DOCKER_RECURSIVE_REMOVE_PATH,
{'repository': self.to_repo['pulp_href'], 'content_units': [manifest_a_tag]})
latest_version_href = self.client.get(self.to_repo['pulp_href'])['_latest_version_href']
latest_version_href = self.client.get(self.to_repo['pulp_href'])['latest_version_href']
latest = self.client.get(latest_version_href)

self.assertEqual(latest['content_summary']['removed']['docker.tag']['count'], 1)
Expand All @@ -200,7 +200,7 @@ def test_manifests_shared_blobs(self):
self.client.post(
DOCKER_RECURSIVE_ADD_PATH,
{'repository': self.to_repo['pulp_href'], 'content_units': [manifest_a, manifest_e]})
latest_version_href = self.client.get(self.to_repo['pulp_href'])['_latest_version_href']
latest_version_href = self.client.get(self.to_repo['pulp_href'])['latest_version_href']
latest = self.client.get(latest_version_href)
# Ensure valid starting state
self.assertFalse('docker.tag' in latest['content_summary']['added'])
Expand All @@ -213,7 +213,7 @@ def test_manifests_shared_blobs(self):
self.client.post(
DOCKER_RECURSIVE_REMOVE_PATH,
{'repository': self.to_repo['pulp_href'], 'content_units': [manifest_e]})
latest_version_href = self.client.get(self.to_repo['pulp_href'])['_latest_version_href']
latest_version_href = self.client.get(self.to_repo['pulp_href'])['latest_version_href']
latest = self.client.get(latest_version_href)
self.assertFalse('docker.tag' in latest['content_summary']['removed'])
self.assertEqual(latest['content_summary']['removed']['docker.manifest']['count'], 1)
Expand All @@ -234,7 +234,7 @@ def test_manifest_lists_shared_manifests(self):
self.client.post(
DOCKER_RECURSIVE_ADD_PATH,
{'repository': self.to_repo['pulp_href'], 'content_units': [ml_i, ml_iii]})
latest_version_href = self.client.get(self.to_repo['pulp_href'])['_latest_version_href']
latest_version_href = self.client.get(self.to_repo['pulp_href'])['latest_version_href']
latest = self.client.get(latest_version_href)
# Ensure valid starting state
self.assertFalse('docker.tag' in latest['content_summary']['added'])
Expand All @@ -246,7 +246,7 @@ def test_manifest_lists_shared_manifests(self):
self.client.post(
DOCKER_RECURSIVE_REMOVE_PATH,
{'repository': self.to_repo['pulp_href'], 'content_units': [ml_iii]})
latest_version_href = self.client.get(self.to_repo['pulp_href'])['_latest_version_href']
latest_version_href = self.client.get(self.to_repo['pulp_href'])['latest_version_href']
latest = self.client.get(latest_version_href)
self.assertFalse('docker.tag' in latest['content_summary']['removed'])
# 1 manifest list, 1 manifest
Expand Down Expand Up @@ -278,7 +278,7 @@ def test_many_tagged_manifest_lists(self):
'content_units': [ml_i_tag, ml_ii_tag, ml_iii_tag, ml_iv_tag]
}
)
latest_version_href = self.client.get(self.to_repo['pulp_href'])['_latest_version_href']
latest_version_href = self.client.get(self.to_repo['pulp_href'])['latest_version_href']
latest = self.client.get(latest_version_href)

self.assertEqual(latest['content_summary']['added']['docker.tag']['count'], 4)
Expand All @@ -292,7 +292,7 @@ def test_many_tagged_manifest_lists(self):
'content_units': [ml_i_tag, ml_ii_tag, ml_iii_tag, ml_iv_tag]
}
)
latest_version_href = self.client.get(self.to_repo['pulp_href'])['_latest_version_href']
latest_version_href = self.client.get(self.to_repo['pulp_href'])['latest_version_href']
latest = self.client.get(latest_version_href)

self.assertEqual(latest['content_summary']['removed']['docker.tag']['count'], 4)
Expand All @@ -314,7 +314,7 @@ def test_cannot_remove_tagged_manifest(self):
'content_units': [manifest_a_tag['pulp_href']]
}
)
latest_version_href = self.client.get(self.to_repo['pulp_href'])['_latest_version_href']
latest_version_href = self.client.get(self.to_repo['pulp_href'])['latest_version_href']
latest = self.client.get(latest_version_href)
self.assertEqual(latest['content_summary']['added']['docker.tag']['count'], 1)
self.assertEqual(latest['content_summary']['added']['docker.manifest']['count'], 1)
Expand All @@ -328,7 +328,7 @@ def test_cannot_remove_tagged_manifest(self):
}
)

latest_version_href = self.client.get(self.to_repo['pulp_href'])['_latest_version_href']
latest_version_href = self.client.get(self.to_repo['pulp_href'])['latest_version_href']
latest = self.client.get(latest_version_href)
for content_type in ['docker.tag', 'docker.manifest', 'docker.blob']:
self.assertFalse(content_type in latest['content_summary']['removed'], msg=content_type)
8 changes: 4 additions & 4 deletions pulp_docker/tests/functional/api/test_sync.py
Expand Up @@ -49,16 +49,16 @@ def test_sync(self):
self.addCleanup(self.client.delete, remote['pulp_href'])

# Sync the repository.
self.assertIsNone(repo['_latest_version_href'])
self.assertIsNone(repo['latest_version_href'])
sync(self.cfg, remote, repo)
repo = self.client.get(repo['pulp_href'])
self.assertIsNotNone(repo['_latest_version_href'])
self.assertIsNotNone(repo['latest_version_href'])

# Sync the repository again.
latest_version_href = repo['_latest_version_href']
latest_version_href = repo['latest_version_href']
sync(self.cfg, remote, repo)
repo = self.client.get(repo['pulp_href'])
self.assertNotEqual(latest_version_href, repo['_latest_version_href'])
self.assertNotEqual(latest_version_href, repo['latest_version_href'])

def test_file_decriptors(self):
"""Test whether file descriptors are closed properly.
Expand Down
2 changes: 1 addition & 1 deletion pulp_docker/tests/functional/api/test_tagging_images.py
Expand Up @@ -172,7 +172,7 @@ def get_manifest_by_tag(self, tag_name):
"""Fetch a manifest by the tag name."""
latest_version = self.client.get(
self.repository['pulp_href']
)['_latest_version_href']
)['latest_version_href']

manifest_a_href = self.client.get('{unit_path}?{filters}'.format(
unit_path=DOCKER_TAG_PATH,
Expand Down

0 comments on commit a96d4cb

Please sign in to comment.