Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion SoftLayer/transports.py
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,8 @@ def _format_object_mask(objectmask):
objectmask = objectmask.strip()

if (not objectmask.startswith('mask') and
not objectmask.startswith('[')):
not objectmask.startswith('[') and
not objectmask.startswith('filteredMask')):
objectmask = "mask[%s]" % objectmask
return objectmask

Expand Down
16 changes: 16 additions & 0 deletions tests/transport_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,22 @@ def test_mask_call_v2(self, request):
"<value><string>mask[something[nested]]</string></value>",
kwargs['data'])

@mock.patch('SoftLayer.transports.requests.Session.request')
def test_mask_call_filteredMask(self, request):
request.return_value = self.response

req = transports.Request()
req.endpoint = "http://something.com"
req.service = "SoftLayer_Service"
req.method = "getObject"
req.mask = "filteredMask[something[nested]]"
self.transport(req)

args, kwargs = request.call_args
self.assertIn(
"<value><string>filteredMask[something[nested]]</string></value>",
kwargs['data'])

@mock.patch('SoftLayer.transports.requests.Session.request')
def test_mask_call_v2_dot(self, request):
request.return_value = self.response
Expand Down