diff --git a/magnumclient/tests/v1/test_mservices.py b/magnumclient/tests/v1/test_mservices.py index 35e6d3aa..fd835d2b 100644 --- a/magnumclient/tests/v1/test_mservices.py +++ b/magnumclient/tests/v1/test_mservices.py @@ -36,6 +36,48 @@ fake_responses = { {'mservices': [SERVICE1, SERVICE2]}, ), }, + '/v1/mservices/?limit=2': + { + 'GET': ( + {}, + {'mservices': [SERVICE1, SERVICE2]}, + ), + }, + '/v1/mservices/?marker=%s' % SERVICE2['id']: + { + 'GET': ( + {}, + {'mservices': [SERVICE1, SERVICE2]}, + ), + }, + '/v1/mservices/?limit=2&marker=%s' % SERVICE2['id']: + { + 'GET': ( + {}, + {'mservices': [SERVICE2, SERVICE1]}, + ), + }, + '/v1/mservices/?sort_dir=asc': + { + 'GET': ( + {}, + {'mservices': [SERVICE1, SERVICE2]}, + ), + }, + '/v1/mservices/?sort_key=id': + { + 'GET': ( + {}, + {'mservices': [SERVICE1, SERVICE2]}, + ), + }, + '/v1/mservices/?sort_key=id&sort_dir=desc': + { + 'GET': ( + {}, + {'mservices': [SERVICE2, SERVICE1]}, + ), + }, } @@ -53,3 +95,67 @@ class MServiceManagerTest(testtools.TestCase): ] self.assertEqual(expect, self.api.calls) self.assertThat(mservices, matchers.HasLength(2)) + + def _test_coe_service_list_with_filters( + self, limit=None, marker=None, + sort_key=None, sort_dir=None, + detail=False, expect=[]): + mservices_filter = self.mgr.list(limit=limit, marker=marker, + sort_key=sort_key, + sort_dir=sort_dir, + detail=detail) + self.assertEqual(expect, self.api.calls) + self.assertThat(mservices_filter, matchers.HasLength(2)) + + def test_coe_service_list_with_limit(self): + expect = [ + ('GET', '/v1/mservices/?limit=2', {}, None), + ] + self._test_coe_service_list_with_filters( + limit=2, + expect=expect) + + def test_coe_service_list_with_marker(self): + expect = [ + ('GET', '/v1/mservices/?marker=%s' % SERVICE2['id'], + {}, None), + ] + self._test_coe_service_list_with_filters( + marker=SERVICE2['id'], + expect=expect) + + def test_coe_service_list_with_marker_limit(self): + expect = [ + ('GET', '/v1/mservices/?limit=2&marker=%s' % SERVICE2['id'], + {}, None), + ] + self._test_coe_service_list_with_filters( + limit=2, marker=SERVICE2['id'], + expect=expect) + + def test_coe_service_list_with_sort_dir(self): + expect = [ + ('GET', '/v1/mservices/?sort_dir=asc', + {}, None), + ] + self._test_coe_service_list_with_filters( + sort_dir='asc', + expect=expect) + + def test_coe_service_list_with_sort_key(self): + expect = [ + ('GET', '/v1/mservices/?sort_key=id', + {}, None), + ] + self._test_coe_service_list_with_filters( + sort_key='id', + expect=expect) + + def test_coe_service_list_with_sort_key_dir(self): + expect = [ + ('GET', '/v1/mservices/?sort_key=id&sort_dir=desc', + {}, None), + ] + self._test_coe_service_list_with_filters( + sort_key='id', sort_dir='desc', + expect=expect)