temp

pulp · Feb 7, 2020 · baabd6c · baabd6c
1 parent d134398
commit baabd6c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 29 deletions.
diff --git a/pulp_2to3_migration/app/migration.py b/pulp_2to3_migration/app/migration.py
@@ -180,11 +180,12 @@ async def migrate_repo_distributor(pb, dist_migrator, pulp2dist, repo_version=No
     )
     with ProgressReport(**progress_data) as pb:
         for plugin in plan.get_plugin_plans():
+            distributor_types = list(plugin.migrator.distributor_migrators.keys())
             pulp2distributors_qs = Pulp2Distributor.objects.filter(
                 pulp3_distribution=None,
                 pulp3_publication=None,
                 not_in_plan=False,
-                pulp2_type_id=plugin.type
+                pulp2_type_id__in=distributor_types
             )
             pb.total = pulp2distributors_qs.count()
             pb.save()
@@ -213,11 +214,9 @@ async def migrate_repo_distributor(pb, dist_migrator, pulp2dist, repo_version=No
                             # not in Pulp 2 anymore
                             continue
                         else:
-                            distributor_types = plugin.migrator.distributor_migrators.keys()
-
                             pulp2dist = Pulp2Distributor.objects.filter(
                                 pulp2_repo_id__in=dist_repositories,
-                                pulp2_type_id__in=list(distributor_types)
+                                pulp2_type_id__in=distributor_types
                             )
                             for dist in pulp2dist:
                                 dist_migrator = distributor_migrators.get(dist.pulp2_type_id)

diff --git a/pulp_2to3_migration/app/migrations/0001_initial.py b/pulp_2to3_migration/app/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.9 on 2020-01-22 15:53
+# Generated by Django 2.2.10 on 2020-02-07 16:17
 
 import django.contrib.postgres.fields
 import django.contrib.postgres.fields.jsonb
@@ -58,9 +58,9 @@ class Migration(migrations.Migration):
                 ('pulp2_last_unit_removed', models.DateTimeField(null=True)),
                 ('is_migrated', models.BooleanField(default=False)),
                 ('not_in_plan', models.BooleanField(default=False)),
-                ('type', models.CharField(max_length=25)),
+                ('pulp2_repo_type', models.CharField(max_length=25)),
                 ('pulp3_repository_remote', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='core.Remote')),
-                ('pulp3_repository_version', models.OneToOneField(null=True, on_delete=django.db.models.deletion.SET_NULL, to='core.RepositoryVersion')),
+                ('pulp3_repository_version', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='core.RepositoryVersion')),
             ],
             options={
                 'abstract': False,

diff --git a/pulp_2to3_migration/app/migrations/0002_auto_20200130_1313.py b/pulp_2to3_migration/app/migrations/0002_auto_20200130_1313.py
diff --git a/pulp_2to3_migration/app/models/repository.py b/pulp_2to3_migration/app/models/repository.py
@@ -41,7 +41,7 @@ class Pulp2Repository(BaseModel):
     pulp2_last_unit_removed = models.DateTimeField(null=True)
     is_migrated = models.BooleanField(default=False)
     not_in_plan = models.BooleanField(default=False)
-    type = models.CharField(max_length=25)
+    pulp2_repo_type = models.CharField(max_length=25)
 
     pulp3_repository_version = models.ForeignKey(RepositoryVersion,
                                                  on_delete=models.SET_NULL,

diff --git a/pulp_2to3_migration/app/serializers.py b/pulp_2to3_migration/app/serializers.py
@@ -156,7 +156,7 @@ class Pulp2RepositoriesSerializer(ModelSerializer):
     )
     pulp2_object_id = serializers.CharField(max_length=255)
     pulp2_repo_id = serializers.CharField()
-    type = serializers.CharField()
+    pulp2_repo_type = serializers.CharField()
     is_migrated = serializers.BooleanField(default=False)
     not_in_plan = serializers.BooleanField(default=False)
 
@@ -233,7 +233,7 @@ class Meta:
         fields = ModelSerializer.Meta.fields + (
             "pulp2_object_id",
             "pulp2_repo_id",
-            "type",
+            "pulp2_repo_type",
             "is_migrated",
             "not_in_plan",
             "pulp3_repository_version",