Fix a distribution tree LCE migration from a recreated pulp2 repo.

closes #7080
https://pulp.plan.io/issues/7080

CHANGES/7080.bugfix

@@ -0,0 +1 @@
+Fixed a distribution migration case when a repository in Pulp 2 has been recreated.

pulp_2to3_migration/app/plugin/content.py

@@ -283,6 +283,8 @@ def get_remote_by_importer_id(importer_id):
                     # find already created pulp3 content
                     pulp3content = pulp2content.pulp3_content
                     extra_info = None
+                    if is_multi_artifact:
+                        extra_info = pulp_2to3_detail_content.get_treeinfo_serialized()
 
                 else:
                     # create pulp3 content and assign relations if present

pulp_2to3_migration/app/plugin/rpm/pulp_2to3_models.py

@@ -723,9 +723,13 @@ def pre_migrate_content_detail(cls, content_batch):
             for distribution in pulp2_distribution_content_batch]
         cls.objects.bulk_create(pulp2distribution_to_save, ignore_conflicts=True)
 
-    def create_pulp3_content(self):
+    def get_treeinfo_serialized(self):
         """
         Create a Pulp 3 Distribution content for saving later in a bulk operation.
+
+        Returns:
+            dict: a serialized treeinfo data
+
         """
         namespaces = [".treeinfo", "treeinfo"]
         for namespace in namespaces:
@@ -749,8 +753,20 @@ def create_pulp3_content(self):
             treeinfo_serialized['variants'] = variants
             # Reset build_timestamp so Pulp will fetch all the addons during the next sync
             treeinfo_serialized['distribution_tree']['build_timestamp'] = 0
-            return (DistributionTree(**treeinfo_serialized["distribution_tree"]),
-                    treeinfo_serialized)
+            return treeinfo_serialized
+
+    def create_pulp3_content(self):
+        """
+        Create a Pulp 3 Distribution content for saving later in a bulk operation.
+
+        Returns:
+            (DistributionTree, dict): an in-memory DistributionTree content and serialized
+                                      treeinfo data
+
+        """
+        treeinfo_serialized = self.get_treeinfo_serialized()
+        return (DistributionTree(**treeinfo_serialized["distribution_tree"]),
+                treeinfo_serialized)
 
 
 class Pulp2PackageLangpacks(Pulp2to3Content):