Make project_id optional for background job

of type akamai_check_and_update_cert_status Change-Id: I972052c89de17d5c857dd4900d762dfb280c8bc9
openstack-archive · Aug 2, 2016 · 1598779 · 1598779
1 parent b76d981
commit 1598779
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/poppy/manager/default/background_job.py b/poppy/manager/default/background_job.py
@@ -54,9 +54,10 @@ def post_job(self, job_type, kwargs):
                     consume=True
                 )
 
-                for cert_dict in queue_data:
+                for cert in queue_data:
+                    cert_dict = dict()
                     try:
-                        cert_dict = json.loads(cert_dict)
+                        cert_dict = json.loads(cert)
                         LOG.info(
                             'Starting to check status on domain: {0},'
                             'for project_id: {1}'
@@ -69,7 +70,7 @@ def post_job(self, job_type, kwargs):
                         )
                         t_kwargs = {
                             "cert_obj_json": json.dumps(cert_dict),
-                            "project_id": kwargs.get("project_id")
+                            "project_id": cert_dict.get("project_id")
                         }
                         self.distributed_task_controller.submit_task(
                             check_cert_status_and_update_flow.
@@ -99,9 +100,10 @@ def post_job(self, job_type, kwargs):
 
             cname_host_info_list = []
 
-            for cert_dict in queue_data:
+            for cert in queue_data:
+                cert_dict = dict()
                 try:
-                    cert_dict = json.loads(cert_dict)
+                    cert_dict = json.loads(cert)
 
                     domain_name = cert_dict["domain_name"]
                     san_cert = (

diff --git a/poppy/transport/validators/schemas/background_jobs.py b/poppy/transport/validators/schemas/background_jobs.py
@@ -33,7 +33,7 @@ class BackgroundJobSchema(schema_base.SchemaBase):
                         },
                         'project_id': {
                             'type': 'string',
-                            'required': True
+                            'required': False
                         }
                     }
                 },