Skip to content

Commit 0a8395c

Browse files
committed
Updates CDN manager to use new purge method
1 parent 2cf4ed5 commit 0a8395c

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

SoftLayer/fixtures/SoftLayer_Network_ContentDelivery_Account.py

+2
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,5 @@
3333
loadContent = True
3434

3535
purgeContent = True
36+
37+
purgeCache = True

SoftLayer/managers/cdn.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ def purge_content(self, account_id, urls):
131131
urls = [urls]
132132

133133
for i in range(0, len(urls), MAX_URLS_PER_PURGE):
134-
result = self.account.purgeContent(urls[i:i + MAX_URLS_PER_PURGE],
135-
id=account_id)
134+
result = self.account.purgeCache(urls[i:i + MAX_URLS_PER_PURGE],
135+
id=account_id)
136136
if not result:
137137
return result
138138

tests/managers/cdn_tests.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def test_purge_content(self):
105105

106106
self.cdn_client.purge_content(12345, urls)
107107
calls = self.calls('SoftLayer_Network_ContentDelivery_Account',
108-
'purgeContent')
108+
'purgeCache')
109109
self.assertEqual(len(calls),
110110
math.ceil(len(urls) / float(cdn.MAX_URLS_PER_PURGE)))
111111

@@ -115,12 +115,12 @@ def test_purge_content_failure(self):
115115
'http://x/img/0x001.png']
116116

117117
mock = self.set_mock('SoftLayer_Network_ContentDelivery_Account',
118-
'purgeContent')
118+
'purgeCache')
119119
mock.return_value = False
120120

121121
self.cdn_client.purge_content(12345, urls)
122122
calls = self.calls('SoftLayer_Network_ContentDelivery_Account',
123-
'purgeContent')
123+
'purgeCache')
124124
self.assertEqual(len(calls),
125125
math.ceil(len(urls) / float(cdn.MAX_URLS_PER_PURGE)))
126126

@@ -129,6 +129,6 @@ def test_purge_content_single(self):
129129

130130
self.cdn_client.purge_content(12345, url)
131131
self.assert_called_with('SoftLayer_Network_ContentDelivery_Account',
132-
'purgeContent',
132+
'purgeCache',
133133
args=([url],),
134134
identifier=12345)

0 commit comments

Comments
 (0)