From 61a7539340385307d0968df058df9f6141369a9e Mon Sep 17 00:00:00 2001 From: Daniel Alley Date: Mon, 20 May 2019 09:28:54 -0400 Subject: [PATCH] Make it possible to list modules under "pulp-admin rpm content" closes #4868 https://pulp.plan.io/issues/4868 --- .../pulp_rpm/extensions/admin/contents.py | 11 +++++++++++ .../pulp_rpm/extensions/admin/rpm_repo/pulp_cli.py | 1 + 2 files changed, 12 insertions(+) diff --git a/extensions_admin/pulp_rpm/extensions/admin/contents.py b/extensions_admin/pulp_rpm/extensions/admin/contents.py index 5e6f14960..52aa36f65 100644 --- a/extensions_admin/pulp_rpm/extensions/admin/contents.py +++ b/extensions_admin/pulp_rpm/extensions/admin/contents.py @@ -17,6 +17,7 @@ TYPE_DRPM = 'drpm' TYPE_ERRATUM = 'erratum' TYPE_DISTRIBUTION = 'distribution' +TYPE_MODULEMD = 'modulemd' TYPE_PACKAGE_GROUP = 'package_group' TYPE_PACKAGE_CATEGORY = 'package_category' TYPE_PACKAGE_ENVIRONMENT = 'package_environment' @@ -128,6 +129,7 @@ 'in a repository') DESC_LANGPACKS = _('search for package langpacks in a repository') DESC_DISTRIBUTIONS = _('list distributions in a repository') +DESC_MODULEMD = _('search for modules in a repository') DESC_ERRATA = _('search errata in a repository') DESC_YUM_METADATA_FILE = _('search for Yum Metadata Files in a repository') @@ -296,6 +298,15 @@ def drpm(self, **kwargs): self.run_search([TYPE_DRPM], **kwargs) +class SearchModulemdCommand(BaseSearchCommand): + def __init__(self, context): + super(SearchModulemdCommand, self).__init__(self.modulemd, context, name='modulemd', + description=DESC_MODULEMD) + + def modulemd(self, **kwargs): + self.run_search([TYPE_MODULEMD], **kwargs) + + class SearchPackageGroupsCommand(BaseSearchCommand): def __init__(self, context): super(SearchPackageGroupsCommand, self).__init__(self.package_group, context, name='group', diff --git a/extensions_admin/pulp_rpm/extensions/admin/rpm_repo/pulp_cli.py b/extensions_admin/pulp_rpm/extensions/admin/rpm_repo/pulp_cli.py index 1b64a0940..a42298a1b 100644 --- a/extensions_admin/pulp_rpm/extensions/admin/rpm_repo/pulp_cli.py +++ b/extensions_admin/pulp_rpm/extensions/admin/rpm_repo/pulp_cli.py @@ -59,6 +59,7 @@ def initialize(context): contents_section = structure.repo_contents_section(context.cli) contents_section.add_command(contents.SearchRpmsCommand(context)) contents_section.add_command(contents.SearchDrpmsCommand(context)) + contents_section.add_command(contents.SearchModulemdCommand(context)) contents_section.add_command(contents.SearchSrpmsCommand(context)) contents_section.add_command(contents.SearchPackageGroupsCommand(context)) contents_section.add_command(contents.SearchPackageCategoriesCommand(context))