Skip to content

Add acs for debian #1392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dosas wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Add acs for debian #1392

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 22 additions & 17 deletions nailgun/entities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,9 @@ def __init__(self, server_config=None, **kwargs):
'name': entity_fields.StringField(
required=True, str_type='alpha', length=(6, 12), unique=True
),
'content_type': entity_fields.StringField(choices=('file', 'yum'), default='yum'),
'content_type': entity_fields.StringField(
choices=('file', 'yum', 'deb'), default='yum'
),
'alternate_content_source_type': entity_fields.StringField(
choices=('custom', 'simplified', 'rhui'), default='custom'
),
Expand All @@ -405,6 +407,9 @@ def __init__(self, server_config=None, **kwargs):
'product_ids': entity_fields.ListField(),
'products': entity_fields.ListField(),
'last_refresh': entity_fields.DictField(),
'deb_releases': entity_fields.StringField(),
'deb_components': entity_fields.StringField(),
'deb_architectures': entity_fields.StringField(),
}
self._meta = {
'api_path': 'katello/api/alternate_content_sources',
Expand All @@ -419,22 +424,22 @@ def read(self, entity=None, attrs=None, ignore=None, params=None):
ignore = set()

# fields depending on the ACS type
if 'base_url' not in attrs:
ignore.add('base_url')
if 'subpaths' not in attrs:
ignore.add('subpaths')
if 'products' not in attrs:
ignore.add('products')
if 'verify_ssl' not in attrs:
ignore.add('verify_ssl')
if 'ssl_ca_cert' not in attrs:
ignore.add('ssl_ca_cert')
if 'ssl_client_cert' not in attrs:
ignore.add('ssl_client_cert')
if 'ssl_client_key' not in attrs:
ignore.add('ssl_client_key')
if 'upstream_username' not in attrs:
ignore.add('upstream_username')
acs_dependence_fields = [
'base_url',
'subpaths',
'products',
'verify_ssl',
'ssl_ca_cert',
'ssl_client_cert',
'ssl_client_key',
'upstream_username',
'deb_releases',
'deb_components',
'deb_architectures',
]
for field in acs_dependence_fields:
if field not in attrs:
ignore.add(field)

# returned in non-id fields
ignore.add('smart_proxy_ids')
Expand Down
Loading