Merge "Load akamai driver during functional tests"

tests/etc/default_functional.conf

@@ -24,7 +24,10 @@ consumer_key = "MYCONSUMERKEY"
 
 [drivers:provider:akamai]
 akamai_https_access_url_suffix = "my_https_url_suffix"
-san_cert_cnames = secure1.test_san.com,secure2.test_san.com
+akamai_https_san_config_numbers = 200000
+akamai_https_custom_config_numbers = 200000
+san_cert_cnames = secure1.test-san.com,secure2.test-san.com
+cert_info_storage_type = cassandra
 
 [drivers:provider:cloudfront]
 aws_access_key_id = "MY_AWS_ACCESS_KEY_ID"

tests/functional/transport/pecan/base.py

@@ -53,6 +53,28 @@ def setUp(self):
         self.b_obj.distributed_task.job_board.return_value = (
             mock_persistence.copy())
         self.b_obj.distributed_task.is_alive = mock.Mock(return_value=True)
+
+        self.sps_api_client_mock = mock.MagicMock()
+        if 'akamai' in self.b_obj.provider:
+            # akamai driver was loaded. mock out queues
+            akamai_driver = self.b_obj.provider['akamai'].obj
+
+            mock_cert_info = mock.MagicMock()
+            mock_cert_info.get_cert_config.return_value = {}
+
+            mod_san_q = mock.MagicMock()
+            mod_san_q.traverse_queue.return_value = []
+            mod_san_q.mod_san_queue_backend.__len__.return_value = 0
+
+            san_mapping_q = mock.MagicMock()
+            san_mapping_q.traverse_queue.return_value = []
+
+            akamai_driver.mod_san_queue = mod_san_q
+            akamai_driver.san_mapping_queue = san_mapping_q
+            akamai_driver.is_alive = mock.Mock(return_value=True)
+            type(akamai_driver).cert_info_storage = mock_cert_info
+            type(akamai_driver).sps_api_client = self.sps_api_client_mock
+
         # Note(tonytan4ever):Need this hack to preserve mockdb storage
         # controller's service cache
         # b_obj.manager.ssl_certificate_controller.storage_controller = (

tests/functional/transport/pecan/controllers/test_san_cert_config.py

@@ -17,6 +17,7 @@
 import uuid
 
 import ddt
+import mock
 
 from tests.functional.transport.pecan import base
 
@@ -39,7 +40,7 @@ def test_get_san_cert_config(self):
 
     @ddt.file_data("data_update_san_cert_config_bad.json")
     def test_update_san_cert_config_negative(self, config_data):
-        # create with errorenous data: invalid json data
+        # create with erroneous data: invalid json data
         response = self.app.post('/v1.0/admin/provider/akamai/'
                                  'ssl_certificate/config/'
                                  'secure1.test-san.com',
@@ -52,6 +53,17 @@ def test_update_san_cert_config_negative(self, config_data):
         self.assertEqual(400, response.status_code)
 
     def test_update_san_cert_config_positive(self):
+        resp_mock = mock.Mock()
+        type(resp_mock).status_code = 200
+        type(resp_mock).ok = True
+        resp_mock.json.return_value = {
+            'requestList': [
+                {'jobId': 1234}
+            ]
+        }
+
+        self.sps_api_client_mock.get.return_value = resp_mock
+
         config_data = {
             'spsId': 1345,
             'enabled': False