Skip to content

Updates CDN manager to use new purge method #702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
briancline merged 1 commit into from
Mar 25, 2016
Merged

Updates CDN manager to use new purge method #702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions SoftLayer/fixtures/SoftLayer_Network_ContentDelivery_Account.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,5 @@
loadContent = True

purgeContent = True

purgeCache = True
4 changes: 2 additions & 2 deletions SoftLayer/managers/cdn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions tests/managers/cdn_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))

Expand All @@ -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)))

Expand All @@ -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)