Skip to content

Commit d1c5ba1

Browse files
Gauravtalreja1sambible
authored andcommitted
Add boolean field for content_default_http_proxy in HTTProxy entity (SatelliteQE#1254)
* Add boolean field for content_default_http_proxy in HTTProxy entity Signed-off-by: Gaurav Talreja <gtalreja@redhat.com> * Ignore content_default_http_proxy param for SAT-30769 Signed-off-by: Gaurav Talreja <gtalreja@redhat.com> --------- Signed-off-by: Gaurav Talreja <gtalreja@redhat.com>
1 parent ab01826 commit d1c5ba1

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

nailgun/entities.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5553,6 +5553,7 @@ def __init__(self, server_config=None, **kwargs):
55535553
'organization': entity_fields.OneToManyField(Organization),
55545554
'location': entity_fields.OneToManyField(Location),
55555555
'cacert': entity_fields.StringField(),
5556+
'content_default_http_proxy': entity_fields.BooleanField(),
55565557
}
55575558
self._meta = {'api_path': 'api/v2/http_proxies'}
55585559
super().__init__(server_config=server_config, **kwargs)
@@ -5575,12 +5576,17 @@ def read(self, entity=None, attrs=None, ignore=None, params=None):
55755576
For more information, see `Bugzilla #1779642
55765577
<https://bugzilla.redhat.com/show_bug.cgi?id=1779642>`_.
55775578
"""
5579+
if attrs is None:
5580+
attrs = self.read_json()
55785581
if ignore is None:
55795582
ignore = set()
55805583
ignore.add('password')
55815584
ignore.add('organization')
55825585
ignore.add('location')
55835586
ignore.add('cacert')
5587+
# Workaround for SAT-30769
5588+
if 'content_default_http_proxy' not in attrs:
5589+
ignore.add('content_default_http_proxy')
55845590
return super().read(entity, attrs, ignore, params)
55855591

55865592

0 commit comments

Comments
 (0)