Add http_proxy to the SmartProxy entity (#1314)

(cherry picked from commit b31009f)

Author: vsedmik

nailgun/entities.py

@@ -7889,9 +7889,10 @@ class SmartProxy(
     def __init__(self, server_config=None, **kwargs):
         self._fields = {
             'download_policy': entity_fields.StringField(
-                choices=('background', 'immediate', 'on_demand'),
+                choices=('on_demand', 'immediate', 'inherit', 'streamed'),
                 default='on_demand',
             ),
+            'http_proxy': entity_fields.OneToOneField(HTTPProxy),
             'name': entity_fields.StringField(
                 required=True, str_type='alpha', length=(6, 12), unique=True
             ),
@@ -7977,6 +7978,7 @@ def read(self, entity=None, attrs=None, ignore=None, params=None):
         if ignore is None:
             ignore = set()
         ignore.add('download_policy')
+        ignore.add('http_proxy')
         return super().read(entity, attrs, ignore, params)
 
     def update(self, fields=None):

tests/test_entities.py

@@ -1288,7 +1288,7 @@ def test_ignore_arg_v1(self):
             (entities.AzureRMComputeResource, {'secret_key'}),
             (entities.Errata, {'content_view_version', 'environment', 'repository'}),
             (entities.OVirtComputeResource, {'password'}),
-            (entities.SmartProxy, {'download_policy'}),
+            (entities.SmartProxy, {'download_policy', 'http_proxy'}),
             (entities.SmartClassParameters, {'hidden_value'}),
             (
                 entities.Subnet,