Filter hostnames that are already activated

When creating a new request to update papi property
hostnames, skip hostnames that we activated in a previous
execution of the akamai_update_papi_property job_type.

Change-Id: I11752ac19035c856c3d2b4ec837493a9dc5f89d5

poppy/manager/default/background_job.py

@@ -156,6 +156,15 @@ class BackgroundJobController(base.BackgroundJobController):
                             )
                             continue
 
+                        if cert_dict.get('property_activated', False) is True:
+                            ignore_list.append(cert_dict)
+                            LOG.info(
+                                "{0} ignored for property update because "
+                                "hostname has already been activated. "
+                                "Set property_activated = False to "
+                                "activation.".format(cert_obj.domain_name))
+                            continue
+
                         service_obj = self.service_storage.\
                             get_service_details_by_domain_name(
                                 cert_obj.domain_name,
@@ -180,7 +189,7 @@ class BackgroundJobController(base.BackgroundJobController):
                             ):
                                 found = True
                         if found is False:
-                            # skip the task for current cert obj is the
+                            # skip the task for current cert obj if the
                             # domain doesn't exist on a service with the
                             # same protocol and certificate.
                             ignore_list.append(cert_dict)
@@ -325,6 +334,14 @@ class BackgroundJobController(base.BackgroundJobController):
                                 )
                             )
                             continue
+                        if cert_dict.get('property_activated', False) is True:
+                            ignore_list.append(cert_dict)
+                            LOG.info(
+                                "{0} ignored for property update because "
+                                "hostname has already been activated. "
+                                "Set property_activated = False to "
+                                "activation.".format(cert_obj.domain_name))
+                            continue
 
                         found = False
                         for domain in service_obj.domains:

tests/unit/manager/default/test_background_job.py

@@ -279,7 +279,10 @@ class DefaultSSLCertificateControllerTests(base.TestCase):
                         }
                     }
                 },
-                'property_activated': True
+                'property_activated': (
+                    True
+                    if job_type == "akamai_check_and_update_cert_status"
+                    else False)
             })
         ]
 
@@ -294,6 +297,69 @@ class DefaultSSLCertificateControllerTests(base.TestCase):
             self.bgc.distributed_task_controller.submit_task.called
         )
 
+    @ddt.data(
+        ("akamai_update_papi_property_for_mod_san", "san"),
+        ("akamai_update_papi_property_for_mod_sni", "sni")
+    )
+    def test_post_job_skip_activated(self, job_tuple):
+        job_type, cert_type = job_tuple
+        # mock ssl storage returning a cert
+        self.mock_storage.certificates_controller.\
+            get_certs_by_domain.return_value = [
+                mock.Mock()
+            ]
+        # mock service storage returning a service with domain with
+        # correct protocol + cert
+        self.mock_storage.services_controller. \
+            get_service_details_by_domain_name.return_value = service.Service(
+                'service_id',
+                'name',
+                [
+                    domain.Domain(
+                        "www.example.com",
+                        protocol='https',
+                        certificate=cert_type
+                    )
+                ],
+                [],
+                'flavor_id',
+                project_id='project_id'
+            )
+
+        san_mapping_queue = self.manager_driver.providers[
+            'akamai'].obj.san_mapping_queue
+        cert_key = ('san cert' if cert_type == 'san' else 'sni_cert')
+        san_mapping_queue.traverse_queue.return_value = [
+            json.dumps({
+                "domain_name": "www.example.com",
+                "flavor_id": "flavor_id",
+                "project_id": "project_id",
+                "cert_type": cert_type,
+                "cert_details": {
+                    "Akamai": {
+                        "extra_info": {
+                            cert_key: "{0}.example.com".format(cert_type),
+                            "akamai_spsId": 1
+                        }
+                    }
+                },
+                # This item will be skipped if repeated attempts
+                # to activate the same domain_name are made.
+                "property_activated": True
+            })
+        ]
+
+        run_list, ignore_list = self.bgc.post_job(
+            job_type,
+            {'project_id': 'project_id'}
+        )
+        self.assertEqual(0, len(run_list))
+        self.assertEqual(1, len(ignore_list))
+
+        self.assertFalse(
+            self.bgc.distributed_task_controller.submit_task.called
+        )
+
     @ddt.data("san", "sni")
     def test_post_job_ignored_cert_no_longer_exists(self, cert_type):
         self.mock_storage.certificates_controller.\