Policies Object tag

Crystal-SDS · Oct 18, 2017 · 7faccca · 7faccca
1 parent 7ade1a3
commit 7faccca
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/api/api/settings.py b/api/api/settings.py
@@ -23,8 +23,8 @@
 DEPENDENCY_DIR = os.path.join('/opt', 'crystal', 'dependencies')
 CONTROLLERS_DIR = os.path.join('/opt', 'crystal', 'controllers')
 
-NATIVE_FILTER_KEYS = ('id', 'filter_name', 'filter_type', 'language', 'dsl_name', 'dependencies', 'main', 'put', 'get', 'execution_server', 'reverse', 'path')
-STORLET_FILTER_KEYS = ('id', 'filter_name', 'filter_type', 'language', 'dsl_name', 'interface_version', 'dependencies', 'main', 'put', 'get', 'execution_server', 'reverse', 'path')
+NATIVE_FILTER_KEYS = ('id', 'filter_name', 'filter_type', 'language', 'dsl_name', 'dependencies', 'main', 'put', 'get', 'valid_parameters', 'execution_server', 'reverse', 'path')
+STORLET_FILTER_KEYS = ('id', 'filter_name', 'filter_type', 'language', 'dsl_name', 'interface_version', 'dependencies', 'main', 'put', 'get', 'valid_parameters', 'execution_server', 'reverse', 'path')
 DEPENDENCY_KEYS = ('id', 'name', 'version', 'permissions', 'path')
 
 # Quick-start development settings - unsuitable for production

diff --git a/api/filters/views.py b/api/filters/views.py
@@ -250,6 +250,7 @@ def filter_deploy(request, filter_id, project_id, container=None, swift_object=N
             "policy_id": policy_id,
             "object_type": params['object_type'],
             "object_size": params['object_size'],
+            "object_tag": params['object_tag'],
             "execution_order": policy_id,
             "params": params['params'],
             "callable": False

diff --git a/api/policies/views.py b/api/policies/views.py
@@ -47,6 +47,7 @@ def policy_list(request):
                                      'filter_name': policy['filter_name'],
                                      'object_type': policy['object_type'],
                                      'object_size': policy['object_size'],
+                                     'object_tag': policy['object_tag'],
                                      'execution_server': policy['execution_server'],
                                      'reverse': policy['reverse'],
                                      'execution_order': policy['execution_order'],
@@ -211,6 +212,7 @@ def deploy_static_policy(request, r, parsed_rule):
                     "policy_id": policy_id,
                     "object_type": "",
                     "object_size": "",
+                    "object_tag": "",
                     "execution_order": policy_id,
                     "params": "",
                     "callable": False