Distribution tree tests

Sync test:
update main repo of DT
update addon repo of DT
update variant repo DT
remove repository with DT, and orphan cleanup to remove DT

Copy test:
simple copy of DT
copy DT by content specified

[nocoverage]
closes: #7571
https://pulp.plan.io/issues/7571

CHANGES/7571.misc

@@ -0,0 +1 @@
+Add tests for sync and copy of distribution tree.

pulp_rpm/tests/functional/api/test_copy.py

@@ -16,9 +16,11 @@
 
 from pulp_rpm.tests.functional.constants import (
     KICKSTART_CONTENT_PATH,
+    PULP_TYPE_DISTRIBUTION_TREE,
     PULP_TYPE_PACKAGE,
     PULP_TYPE_PACKAGE_CATEGORY,
     PULP_TYPE_PACKAGE_GROUP,
+    RPM_DISTRIBUTION_TREE_URL,
     RPM_KICKSTART_CONTENT_NAME,
     RPM_FIXTURE_SUMMARY,
     RPM_KICKSTART_FIXTURE_URL,
@@ -33,6 +35,7 @@
 from pulp_rpm.tests.functional.utils import set_up_module as setUpModule  # noqa:F401
 
 from pulpcore.client.pulp_rpm import (
+    ContentDistributionTreesApi,
     ContentPackagesApi,
     RepositoriesRpmApi,
     RpmRepositorySyncURL,
@@ -501,3 +504,90 @@ def test_strict_copy_package_to_existing_repo(self):
         self.assertEqual(
             copy_response['content_summary']['added'][PULP_TYPE_PACKAGE]['count'], 2
         )
+
+
+class DistributionTreeCopyTestCase(PulpTestCase):
+    """Test copy of distribution tree."""
+
+    @classmethod
+    def setUpClass(cls):
+        """Create class-wide variables."""
+        cls.cfg = config.get_config()
+        cls.client = gen_rpm_client()
+        cls.dist_tree_api = ContentDistributionTreesApi(cls.client)
+        cls.repo_api = RepositoriesRpmApi(cls.client)
+        cls.remote_api = RemotesRpmApi(cls.client)
+        delete_orphans(cls.cfg)
+
+    def do_sync(self, remote_url):
+        """Create and sync repository with remote_url
+
+        Returns (dict): created repository url
+        """
+        repo = self.repo_api.create(gen_repo())
+        self.addCleanup(self.repo_api.delete, repo.pulp_href)
+
+        body = gen_rpm_remote(url=remote_url)
+        remote = self.remote_api.create(body)
+        self.addCleanup(self.remote_api.delete, remote.pulp_href)
+
+        repository_sync_data = RpmRepositorySyncURL(remote=remote.pulp_href)
+        sync_response = self.repo_api.sync(repo.pulp_href, repository_sync_data)
+        monitor_task(sync_response.task)
+
+        return self.repo_api.read(repo.pulp_href).to_dict()
+
+    def test_simple_copy_distribution_tree(self):
+        """Sync repository with a distribution tree."""
+        source_repo = self.do_sync(RPM_DISTRIBUTION_TREE_URL)
+        dest_repo = self.repo_api.create(gen_repo()).to_dict()
+        self.addCleanup(self.repo_api.delete, dest_repo['pulp_href'])
+
+        config = [{
+            'source_repo_version': source_repo['latest_version_href'],
+            'dest_repo': dest_repo['pulp_href'],
+        }]
+
+        rpm_copy(self.cfg, config, recursive=True)
+        dest_repo = self.repo_api.read(dest_repo['pulp_href']).to_dict()
+
+        self.assertEqual(
+            get_added_content_summary(dest_repo)[PULP_TYPE_DISTRIBUTION_TREE], 1
+        )
+
+    def test_dist_tree_copy_as_content(self):
+        """Test sync distribution tree repository and copy it."""
+        repo = self.do_sync(RPM_DISTRIBUTION_TREE_URL)
+        repo_copy = self.repo_api.create(gen_repo()).to_dict()
+        self.addCleanup(self.repo_api.delete, repo_copy['pulp_href'])
+        distribution_tree_href = get_content(repo)[PULP_TYPE_DISTRIBUTION_TREE][0]['pulp_href']
+
+        copy_config = [{
+            'source_repo_version': repo['latest_version_href'],
+            'dest_repo': repo_copy['pulp_href'],
+            'content': [distribution_tree_href]
+        }]
+        rpm_copy(self.cfg, copy_config, recursive=True)
+
+        repo_copy = self.repo_api.read(repo_copy['pulp_href']).to_dict()
+
+        self.assertEqual(
+            get_content(repo)[PULP_TYPE_DISTRIBUTION_TREE],
+            get_content(repo_copy)[PULP_TYPE_DISTRIBUTION_TREE]
+        )
+        self.assertEqual(
+            repo['latest_version_href'].rstrip('/')[-1],
+            '1'
+        )
+        self.assertEqual(
+            repo_copy['latest_version_href'].rstrip('/')[-1],
+            '1'
+        )
+        self.assertEqual(
+            len(get_content(repo)[PULP_TYPE_DISTRIBUTION_TREE]),
+            1
+        )
+        self.assertEqual(
+            len(get_content(repo_copy)[PULP_TYPE_DISTRIBUTION_TREE]),
+            1
+        )

pulp_rpm/tests/functional/api/test_sync.py

@@ -33,6 +33,10 @@
     RPM_ADVISORY_TEST_ID,
     RPM_ADVISORY_TEST_REMOVE_COUNT,
     RPM_ADVISORY_TEST_ADDED_COUNT,
+    RPM_DISTRIBUTION_TREE_URL,
+    RPM_DISTRIBUTION_TREE_CHANGED_ADDON_URL,
+    RPM_DISTRIBUTION_TREE_CHANGED_MAIN_URL,
+    RPM_DISTRIBUTION_TREE_CHANGED_VARIANT_URL,
     RPM_EPEL_URL,
     RPM_FIXTURE_SUMMARY,
     RPM_INVALID_FIXTURE_URL,
@@ -64,6 +68,7 @@
 
 from pulpcore.client.pulp_rpm import (
     ContentDistributionTreesApi,
+    ContentPackagesApi,
     RepositoriesRpmApi,
     RpmRepositorySyncURL,
     RemotesRpmApi,
@@ -1215,3 +1220,164 @@ def test_all(self):
             RPM_FIXTURE_SUMMARY,
             get_content_summary(repo.to_dict())
         )
+
+
+class DistributionTreeTest(PulpTestCase):
+    """Test Distribution Trees."""
+
+    @classmethod
+    def setUpClass(cls):
+        """Create class-wide variables."""
+        cls.cfg = config.get_config()
+        cls.client = gen_rpm_client()
+        cls.dist_tree_api = ContentDistributionTreesApi(cls.client)
+        cls.packages_api = ContentPackagesApi(cls.client)
+        cls.repo_api = RepositoriesRpmApi(cls.client)
+        cls.remote_api = RemotesRpmApi(cls.client)
+        delete_orphans(cls.cfg)
+
+    def do_test(self, repository=None, remote=None):
+        """Sync a repository.
+
+        Args:
+            repository (pulp_rpm.app.models.repository.RpmRepository):
+                object of RPM repository
+            remote (pulp_rpm.app.models.repository.RpmRemote):
+                object of RPM Remote
+        Returns (tuple):
+            tuple of instances of
+            pulp_rpm.app.models.repository.RpmRepository, pulp_rpm.app.models.repository.RpmRemote
+        """
+        if repository:
+            repo = self.repo_api.read(repository.pulp_href)
+        else:
+            repo = self.repo_api.create(gen_repo())
+            self.assertEqual(repo.latest_version_href, f"{repo.pulp_href}versions/0/")
+
+        if not remote:
+            body = gen_rpm_remote()
+            remote = self.remote_api.create(body)
+        else:
+            remote = self.remote_api.read(remote.pulp_href)
+
+        repository_sync_data = RpmRepositorySyncURL(remote=remote.pulp_href)
+        sync_response = self.repo_api.sync(repo.pulp_href, repository_sync_data)
+        monitor_task(sync_response.task)
+        return self.repo_api.read(repo.pulp_href), self.remote_api.read(remote.pulp_href)
+
+    def test_sync_dist_tree_change_addon_repo(self):
+        """Test changed addon repository."""
+        addon_test_pkg_name = 'test-srpm02'
+        body = gen_rpm_remote(RPM_DISTRIBUTION_TREE_URL)
+        remote = self.remote_api.create(body)
+
+        # sync & update repo object
+        repo, remote = self.do_test(remote=remote)
+        repo = self.repo_api.read(repo.pulp_href)
+        self.addCleanup(self.remote_api.delete, remote.pulp_href)
+        self.addCleanup(self.repo_api.delete, repo.pulp_href)
+
+        # check testing package is not present
+        self.assertNotIn(
+            addon_test_pkg_name,
+            [pkg['name'] for pkg in self.packages_api.list().to_dict()['results']]
+        )
+
+        # new remote
+        body = gen_rpm_remote(RPM_DISTRIBUTION_TREE_CHANGED_ADDON_URL)
+        remote = self.remote_api.create(body)
+        self.addCleanup(self.remote_api.delete, remote.pulp_href)
+
+        # re-sync & update repo object
+        repo, remote = self.do_test(repo, remote)
+        repo = self.repo_api.read(repo.pulp_href)
+
+        # check new pacakge is synced to subrepo
+        self.assertIn(
+            addon_test_pkg_name,
+            [pkg['name'] for pkg in self.packages_api.list().to_dict()['results']]
+        )
+
+    def test_sync_dist_tree_change_main_repo(self):
+        """Test changed main repository."""
+        main_repo_test_pkg_name = 'test-srpm01'
+        body = gen_rpm_remote(RPM_DISTRIBUTION_TREE_URL)
+        remote = self.remote_api.create(body)
+
+        # sync & update repo object
+        repo, remote = self.do_test(remote=remote)
+        repo = self.repo_api.read(repo.pulp_href)
+        repo_version = repo.latest_version_href.rstrip('/')[-1]
+        self.addCleanup(self.remote_api.delete, remote.pulp_href)
+        self.addCleanup(self.repo_api.delete, repo.pulp_href)
+
+        # new remote
+        body = gen_rpm_remote(RPM_DISTRIBUTION_TREE_CHANGED_MAIN_URL)
+        remote = self.remote_api.create(body)
+        self.addCleanup(self.remote_api.delete, remote.pulp_href)
+
+        # re-sync & update repo object
+        repo, remote = self.do_test(repo, remote)
+        repo = self.repo_api.read(repo.pulp_href)
+        updated_repo_version = repo.latest_version_href.rstrip('/')[-1]
+
+        # Assert new content was added and repo version was increased
+        self.assertNotEqual(
+            repo_version, updated_repo_version
+        )
+        self.assertIn(
+            main_repo_test_pkg_name,
+            [pkg['name'] for pkg in self.packages_api.list().to_dict()['results']]
+        )
+
+    def test_sync_dist_tree_change_variant_repo(self):
+        """Test changed variant repository."""
+        variant_test_pkg_name = 'test-srpm03'
+        body = gen_rpm_remote(RPM_DISTRIBUTION_TREE_URL)
+        remote = self.remote_api.create(body)
+
+        # sync & update repo object
+        repo, remote = self.do_test(remote=remote)
+        repo = self.repo_api.read(repo.pulp_href)
+        self.addCleanup(self.remote_api.delete, remote.pulp_href)
+        self.addCleanup(self.repo_api.delete, repo.pulp_href)
+
+        # check testing package is not present
+        self.assertNotIn(
+            variant_test_pkg_name,
+            [pkg['name'] for pkg in self.packages_api.list().to_dict()['results']]
+        )
+
+        # new remote
+        body = gen_rpm_remote(RPM_DISTRIBUTION_TREE_CHANGED_VARIANT_URL)
+        remote = self.remote_api.create(body)
+        self.addCleanup(self.remote_api.delete, remote.pulp_href)
+
+        # re-sync & update repo object
+        repo, remote = self.do_test(repo, remote)
+        repo = self.repo_api.read(repo.pulp_href)
+
+        # check new pacakge is synced to subrepo
+        self.assertIn(
+            variant_test_pkg_name,
+            [pkg['name'] for pkg in self.packages_api.list().to_dict()['results']]
+        )
+
+    def test_remove_repo_with_distribution_tree(self):
+        """Sync repository with distribution tree and remove the repository."""
+        body = gen_rpm_remote(RPM_DISTRIBUTION_TREE_URL)
+        remote = self.remote_api.create(body)
+
+        repo, _ = self.do_test(remote=remote)
+
+        task = self.repo_api.delete(repo.pulp_href)
+        monitor_task(task.task)
+
+        self.assertEqual(
+            self.repo_api.list().count, 0
+        )
+        # Remove orphans and check if distribution tree was removed.
+        delete_orphans(self.cfg)
+        self.assertEqual(
+            self.dist_tree_api.list().count, 0
+        )

pulp_rpm/tests/functional/constants.py

@@ -331,6 +331,13 @@
 """The location of RPM Distribution Trees on the content endpoint."""
 
 RPM_KICKSTART_FIXTURE_URL = urljoin(PULP_FIXTURES_BASE_URL, 'rpm-distribution-tree/')
+RPM_DISTRIBUTION_TREE_URL = urljoin(PULP_FIXTURES_BASE_URL, 'rpm-distribution-tree/')
+RPM_DISTRIBUTION_TREE_CHANGED_ADDON_URL = urljoin(
+    PULP_FIXTURES_BASE_URL, 'rpm-distribution-tree-changed-addon/')
+RPM_DISTRIBUTION_TREE_CHANGED_MAIN_URL = urljoin(
+    PULP_FIXTURES_BASE_URL, 'rpm-distribution-tree-changed-main/')
+RPM_DISTRIBUTION_TREE_CHANGED_VARIANT_URL = urljoin(
+    PULP_FIXTURES_BASE_URL, 'rpm-distribution-tree-changed-variant/')
 
 RPM_KICKSTART_CONTENT_NAME = 'rpm.distribution_tree'
 
@@ -373,6 +380,7 @@
 EPEL8_PLAYGROUND_KICKSTART_URL = "http://mirrors.sonic.net/epel/playground/8/Everything/x86_64/os/"
 
 PULP_TYPE_ADVISORY = 'rpm.advisory'
+PULP_TYPE_DISTRIBUTION_TREE = 'rpm.distribution_tree'
 PULP_TYPE_PACKAGE = 'rpm.package'
 PULP_TYPE_PACKAGE_CATEGORY = 'rpm.packagecategory'
 PULP_TYPE_PACKAGE_GROUP = 'rpm.packagegroup'