Skip to content

Commit 30fc69a

Browse files
TerryHoweTerryHowe
committed
Proxy database lists
Change-Id: I0384b07a8c2310521f8ed0cceed1b45a44750193
1 parent d4c4d8d commit 30fc69a

2 files changed

Lines changed: 44 additions & 20 deletions

File tree

‎openstack/database/v1/_proxy.py‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,13 @@ def delete_database(self, value, ignore_missing=True):
4949
def find_database(self, name_or_id):
5050
return database.Database.find(self.session, name_or_id)
5151

52-
def list_database(self):
53-
return database.Database.list(self.session)
52+
def databases(self):
53+
"""Return a generator of databases
54+
55+
:returns: A generator of database objects
56+
:rtype: :class:`~openstack.database.v1.database.Database`
57+
"""
58+
return self._list(database.Database)
5459

5560
def get_database(self, value):
5661
"""Get a single database
@@ -80,8 +85,13 @@ def get_flavor(self, value):
8085
"""
8186
return self._get(flavor.Flavor, value)
8287

83-
def list_flavor(self):
84-
return flavor.Flavor.list(self.session)
88+
def flavors(self):
89+
"""Return a generator of flavors
90+
91+
:returns: A generator of flavor objects
92+
:rtype: :class:`~openstack.database.v1.flavor.Flavor`
93+
"""
94+
return self._list(flavor.Flavor)
8595

8696
def create_instance(self, **attrs):
8797
"""Create a new instance from attributes
@@ -126,8 +136,13 @@ def get_instance(self, value):
126136
"""
127137
return self._get(instance.Instance, value)
128138

129-
def list_instance(self):
130-
return instance.Instance.list(self.session)
139+
def instances(self):
140+
"""Return a generator of instances
141+
142+
:returns: A generator of instance objects
143+
:rtype: :class:`~openstack.database.v1.instance.Instance`
144+
"""
145+
return self._list(instance.Instance)
131146

132147
def update_instance(self, value, **attrs):
133148
"""Update a instance
@@ -173,8 +188,13 @@ def delete_user(self, value, ignore_missing=True):
173188
def find_user(self, name_or_id):
174189
return user.User.find(self.session, name_or_id)
175190

176-
def list_user(self):
177-
return user.User.list(self.session)
191+
def users(self):
192+
"""Return a generator of users
193+
194+
:returns: A generator of user objects
195+
:rtype: :class:`~openstack.database.v1.user.User`
196+
"""
197+
return self._list(user.User)
178198

179199
def get_user(self, value):
180200
"""Get a single user

‎openstack/tests/unit/database/v1/test_proxy.py‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@ def test_database_find(self):
4343
self.verify_find('openstack.database.v1.database.Database.find',
4444
self.proxy.find_database)
4545

46-
def test_database_list(self):
47-
self.verify_list('openstack.database.v1.database.Database.list',
48-
self.proxy.list_database)
46+
def test_databases(self):
47+
self.verify_list2(self.proxy.databases,
48+
expected_args=[database.Database],
49+
expected_kwargs={})
4950

5051
def test_database_get(self):
5152
self.verify_get2('openstack.proxy.BaseProxy._get',
@@ -63,9 +64,10 @@ def test_flavor_get(self):
6364
method_args=["resource_or_id"],
6465
expected_args=[flavor.Flavor, "resource_or_id"])
6566

66-
def test_flavor_list(self):
67-
self.verify_list('openstack.database.v1.flavor.Flavor.list',
68-
self.proxy.list_flavor)
67+
def test_flavors(self):
68+
self.verify_list2(self.proxy.flavors,
69+
expected_args=[flavor.Flavor],
70+
expected_kwargs={})
6971

7072
def test_instance_create_attrs(self):
7173
kwargs = {"x": 1, "y": 2, "z": 3}
@@ -93,9 +95,10 @@ def test_instance_get(self):
9395
method_args=["resource_or_id"],
9496
expected_args=[instance.Instance, "resource_or_id"])
9597

96-
def test_instance_list(self):
97-
self.verify_list('openstack.database.v1.instance.Instance.list',
98-
self.proxy.list_instance)
98+
def test_instances(self):
99+
self.verify_list2(self.proxy.instances,
100+
expected_args=[instance.Instance],
101+
expected_kwargs={})
99102

100103
def test_instance_update(self):
101104
kwargs = {"x": 1, "y": 2, "z": 3}
@@ -125,9 +128,10 @@ def test_user_find(self):
125128
self.verify_find('openstack.database.v1.user.User.find',
126129
self.proxy.find_user)
127130

128-
def test_user_list(self):
129-
self.verify_list('openstack.database.v1.user.User.list',
130-
self.proxy.list_user)
131+
def test_users(self):
132+
self.verify_list2(self.proxy.users,
133+
expected_args=[user.User],
134+
expected_kwargs={})
131135

132136
def test_user_get(self):
133137
self.verify_get2('openstack.proxy.BaseProxy._get',

0 commit comments

Comments
 (0)