Skip to content

Commit 95f4f2c

Browse files
Merge pull request #1313 from allmightyspiff/filteredMask
added support for filteredMask
2 parents 08037a5 + 1d25ad8 commit 95f4f2c

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

SoftLayer/transports.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,8 @@ def _format_object_mask(objectmask):
564564
objectmask = objectmask.strip()
565565

566566
if (not objectmask.startswith('mask') and
567-
not objectmask.startswith('[')):
567+
not objectmask.startswith('[') and
568+
not objectmask.startswith('filteredMask')):
568569
objectmask = "mask[%s]" % objectmask
569570
return objectmask
570571

tests/transport_tests.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,22 @@ def test_mask_call_v2(self, request):
228228
"<value><string>mask[something[nested]]</string></value>",
229229
kwargs['data'])
230230

231+
@mock.patch('SoftLayer.transports.requests.Session.request')
232+
def test_mask_call_filteredMask(self, request):
233+
request.return_value = self.response
234+
235+
req = transports.Request()
236+
req.endpoint = "http://something.com"
237+
req.service = "SoftLayer_Service"
238+
req.method = "getObject"
239+
req.mask = "filteredMask[something[nested]]"
240+
self.transport(req)
241+
242+
args, kwargs = request.call_args
243+
self.assertIn(
244+
"<value><string>filteredMask[something[nested]]</string></value>",
245+
kwargs['data'])
246+
231247
@mock.patch('SoftLayer.transports.requests.Session.request')
232248
def test_mask_call_v2_dot(self, request):
233249
request.return_value = self.response

0 commit comments

Comments
 (0)