Skip to content

Commit

Permalink
Add sync support for content types from comps.xml
Browse files Browse the repository at this point in the history
Updates model relations, adds serializers, constants, viewsets,
libcomps parsing, and sync support for comps.xml content types

closes #5423
https://pulp.plan.io/issues/5423
  • Loading branch information
CodeHeeler committed Oct 7, 2019
1 parent bf16b64 commit 7653df2
Show file tree
Hide file tree
Showing 7 changed files with 797 additions and 17 deletions.
1 change: 1 addition & 0 deletions CHANGES/5423.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Comps.xml sync
75 changes: 75 additions & 0 deletions pulp_rpm/app/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
PACKAGE_DB_REPODATA = ['primary_db', 'filelists_db', 'other_db']
UPDATE_REPODATA = ['updateinfo']
MODULAR_REPODATA = ['modules']
COMPS_REPODATA = ['group']

CR_UPDATE_RECORD_ATTRS = SimpleNamespace(
ID='id',
Expand Down Expand Up @@ -167,3 +168,77 @@
)

PULP_MODULE_ATTR = MODULEMD_MODULE_ATTR

LIBCOMPS_GROUP_ATTRS = SimpleNamespace(
ID='id',
DEFAULT='default',
USER_VISIBLE='uservisible',
DISPLAY_ORDER='display_order',
NAME='name',
DESCRIPTION='desc',
PACKAGES='packages',
BIARCH_ONLY='biarchonly',
DESC_BY_LANG='desc_by_lang',
NAME_BY_LANG='name_by_lang'
)

LIBCOMPS_CATEGORY_ATTRS = SimpleNamespace(
ID='id',
NAME='name',
DESCRIPTION='desc',
DISPLAY_ORDER='display_order',
GROUP_IDS='group_ids',
DESC_BY_LANG='desc_by_lang',
NAME_BY_LANG='name_by_lang'
)

LIBCOMPS_ENVIRONMENT_ATTRS = SimpleNamespace(
ID='id',
NAME='name',
DESCRIPTION='desc',
DISPLAY_ORDER='display_order',
GROUP_IDS='group_ids',
OPTION_IDS='option_ids',
DESC_BY_LANG='desc_by_lang',
NAME_BY_LANG='name_by_lang'
)

LIBCOMPS_LANGPACKS_ATTRS = SimpleNamespace(
MATCHES='matches'
)

PULP_GROUP_ATTRS = SimpleNamespace(
ID='id',
DEFAULT='default',
USER_VISIBLE='user_visible',
DISPLAY_ORDER='display_order',
NAME='name',
DESCRIPTION='description',
PACKAGES='packages',
BIARCH_ONLY='biarch_only',
DESC_BY_LANG='desc_by_lang',
NAME_BY_LANG='name_by_lang'
)

PULP_CATEGORY_ATTRS = SimpleNamespace(
ID='id',
NAME='name',
DESCRIPTION='description',
DISPLAY_ORDER='display_order',
GROUP_IDS='group_ids',
DESC_BY_LANG='desc_by_lang',
NAME_BY_LANG='name_by_lang'
)

PULP_ENVIRONMENT_ATTRS = SimpleNamespace(
ID='id',
NAME='name',
DESCRIPTION='description',
DISPLAY_ORDER='display_order',
GROUP_IDS='group_ids',
OPTION_IDS='option_ids',
DESC_BY_LANG='desc_by_lang',
NAME_BY_LANG='name_by_lang'
)

PULP_LANGPACKS_ATTRS = LIBCOMPS_LANGPACKS_ATTRS
116 changes: 116 additions & 0 deletions pulp_rpm/app/migrations/0004_auto_20190926_1459.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
# Generated by Django 2.2.4 on 2019-09-26 14:59

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('core', '0007_delete_progress_proxies'),
('rpm', '0003_repometadatafile'),
]

operations = [
migrations.CreateModel(
name='PackageCategory',
fields=[
('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='rpm_packagecategory', serialize=False, to='core.Content')),
('id', models.CharField(max_length=255)),
('name', models.CharField(max_length=255)),
('description', models.TextField()),
('display_order', models.IntegerField()),
('group_ids', models.TextField(default='[]')),
('desc_by_lang', models.TextField(default='[]')),
('name_by_lang', models.TextField(default='[]')),
('digest', models.CharField(max_length=64, unique=True)),
],
options={
'default_related_name': '%(app_label)s_%(model_name)s',
},
bases=('core.content',),
),
migrations.CreateModel(
name='PackageEnvironment',
fields=[
('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='rpm_packageenvironment', serialize=False, to='core.Content')),
('id', models.CharField(max_length=255)),
('name', models.CharField(max_length=255)),
('description', models.TextField()),
('display_order', models.IntegerField()),
('group_ids', models.TextField(default='[]')),
('option_ids', models.TextField(default='[]')),
('desc_by_lang', models.TextField(default='[]')),
('name_by_lang', models.TextField(default='[]')),
('digest', models.CharField(max_length=64, unique=True)),
],
options={
'default_related_name': '%(app_label)s_%(model_name)s',
},
bases=('core.content',),
),
migrations.CreateModel(
name='PackageLangpacks',
fields=[
('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='rpm_packagelangpacks', serialize=False, to='core.Content')),
('matches', models.TextField(default='[]')),
('digest', models.CharField(max_length=64, unique=True)),
],
options={
'default_related_name': '%(app_label)s_%(model_name)s',
},
bases=('core.content',),
),
migrations.RemoveField(
model_name='environment',
name='content_ptr',
),
migrations.RemoveField(
model_name='langpacks',
name='content_ptr',
),
migrations.AddField(
model_name='packagegroup',
name='related_packages',
field=models.ManyToManyField(related_name='rpm_packagegroup', to='rpm.Package'),
),
migrations.AlterField(
model_name='packagegroup',
name='desc_by_lang',
field=models.TextField(default='[]'),
),
migrations.AlterField(
model_name='packagegroup',
name='name_by_lang',
field=models.TextField(default='[]'),
),
migrations.AlterField(
model_name='packagegroup',
name='packages',
field=models.TextField(default='[]'),
),
migrations.DeleteModel(
name='Category',
),
migrations.DeleteModel(
name='Environment',
),
migrations.DeleteModel(
name='Langpacks',
),
migrations.AddField(
model_name='packageenvironment',
name='optionalgroups',
field=models.ManyToManyField(related_name='optionalgroups_to_env', to='rpm.PackageGroup'),
),
migrations.AddField(
model_name='packageenvironment',
name='packagegroups',
field=models.ManyToManyField(related_name='packagegroups_to_env', to='rpm.PackageGroup'),
),
migrations.AddField(
model_name='packagecategory',
name='packagegroups',
field=models.ManyToManyField(related_name='rpm_packagecategory', to='rpm.PackageGroup'),
),
]
Loading

0 comments on commit 7653df2

Please sign in to comment.