Merge pull request softlayer#702 from sudorandom/issue-701

briancline · briancline · commit 576fd0a5c327 · 2016-03-24T23:29:11.000-05:00
Updates CDN manager to use new purge method
diff --git a/SoftLayer/fixtures/SoftLayer_Network_ContentDelivery_Account.py b/SoftLayer/fixtures/SoftLayer_Network_ContentDelivery_Account.py
@@ -33,3 +33,5 @@
 loadContent = True
 
 purgeContent = True
+
+purgeCache = True
diff --git a/SoftLayer/managers/cdn.py b/SoftLayer/managers/cdn.py
@@ -131,8 +131,8 @@ def purge_content(self, account_id, urls):
             urls = [urls]
 
         for i in range(0, len(urls), MAX_URLS_PER_PURGE):
-            result = self.account.purgeContent(urls[i:i + MAX_URLS_PER_PURGE],
-                                               id=account_id)
+            result = self.account.purgeCache(urls[i:i + MAX_URLS_PER_PURGE],
+                                             id=account_id)
             if not result:
                 return result
 
diff --git a/tests/managers/cdn_tests.py b/tests/managers/cdn_tests.py
@@ -105,7 +105,7 @@ def test_purge_content(self):
 
         self.cdn_client.purge_content(12345, urls)
         calls = self.calls('SoftLayer_Network_ContentDelivery_Account',
-                           'purgeContent')
+                           'purgeCache')
         self.assertEqual(len(calls),
                          math.ceil(len(urls) / float(cdn.MAX_URLS_PER_PURGE)))
 
@@ -115,12 +115,12 @@ def test_purge_content_failure(self):
                 'http://x/img/0x001.png']
 
         mock = self.set_mock('SoftLayer_Network_ContentDelivery_Account',
-                             'purgeContent')
+                             'purgeCache')
         mock.return_value = False
 
         self.cdn_client.purge_content(12345, urls)
         calls = self.calls('SoftLayer_Network_ContentDelivery_Account',
-                           'purgeContent')
+                           'purgeCache')
         self.assertEqual(len(calls),
                          math.ceil(len(urls) / float(cdn.MAX_URLS_PER_PURGE)))
 
@@ -129,6 +129,6 @@ def test_purge_content_single(self):
 
         self.cdn_client.purge_content(12345, url)
         self.assert_called_with('SoftLayer_Network_ContentDelivery_Account',
-                                'purgeContent',
+                                'purgeCache',
                                 args=([url],),
                                 identifier=12345)
