Add tenant to fill_params

Author: manisandro

src/report_compiler.py

@@ -329,7 +329,7 @@ def print_memory_usage(self):
             self.human_size(non_heap_memory_usage.getUsed()), self.human_size(non_heap_memory_usage.getMax()))
         )
 
-    def get_document(self, config, permitted_resources, template, fill_params, format):
+    def get_document(self, config, permitted_resources, tenant, template, fill_params, format):
         """Return report with specified template and format.
 
         :param obj config: Service config
@@ -378,6 +378,9 @@ def get_document(self, config, permitted_resources, template, fill_params, forma
         # Set resource dir in fill_params
         fill_params["REPORT_DIR"] = self.report_dir + "/"
 
+        # Set the tenant in fill_params
+        fill_params["TENANT"] = tenant
+
         tmpdir = tempfile.mkdtemp()
 
         # Set virtualizer in fill_params

src/server.py

@@ -69,7 +69,7 @@ def get_identity_or_auth(config):
     return identity
 
 
-def get_document_worker(config, permitted_resources, template, args, format):
+def get_document_worker(config, permitted_resources, tenant, template, args, format):
     result = None
 
     try:
@@ -87,7 +87,7 @@ def get_document_worker(config, permitted_resources, template, args, format):
         jpype.java.lang.System.setErr(jpype.java.io.PrintStream(jpype.java.io.File(os.path.join(tmpdir, "stderr"))))
 
         report_compiler = ReportCompiler(app.logger)
-        result = report_compiler.get_document(config, permitted_resources, template, dict(request.args), format)
+        result = report_compiler.get_document(config, permitted_resources, tenant, template, dict(request.args), format)
 
     except Exception as e:
         app.logger.debug(str(e))
@@ -142,7 +142,7 @@ def get(self, template):
             format = 'pdf'
 
         with multiprocessing.Pool(1) as pool:
-            result = pool.apply(get_document_worker, args=(config, permitted_resources, template, dict(request.args), format))
+            result = pool.apply(get_document_worker, args=(config, permitted_resources, tenant, template, dict(request.args), format))
 
         return result