summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2016-11-14 06:31:21 -0600
committerMonty Taylor <mordred@inaugust.com>2016-11-14 06:31:21 -0600
commit9732db18a17872db7e69ee31986c686e484d0c49 (patch)
tree6440acdd5c0f3a926c4e6f589d4e60bee4a17ca1
parent15b519cc416002b9609b710b73b7ef654ffc02eb (diff)
Rename Search to List
Notes
Notes (review): Code-Review+2: Monty Taylor <mordred@inaugust.com> Workflow+1: Monty Taylor <mordred@inaugust.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 14 Nov 2016 13:38:55 +0000 Reviewed-on: https://review.openstack.org/397167 Project: openstack/oaktree Branch: refs/heads/master
-rw-r--r--devstack/test.py4
-rw-r--r--oaktree/server.py16
2 files changed, 10 insertions, 10 deletions
diff --git a/devstack/test.py b/devstack/test.py
index 8d12963..781808b 100644
--- a/devstack/test.py
+++ b/devstack/test.py
@@ -15,7 +15,7 @@ if len(sys.argv) > 1:
15else: 15else:
16 cloud.cloud = 'devstack' 16 cloud.cloud = 'devstack'
17 17
18flavors = stub.SearchFlavors(model.Filter(location=cloud)) 18flavors = stub.ListFlavors(model.Filter(location=cloud))
19print flavors 19print flavors
20images = stub.SearchImages(model.Filter(location=cloud)) 20images = stub.ListImages(model.Filter(location=cloud))
21print images 21print images
diff --git a/oaktree/server.py b/oaktree/server.py
index dccded5..df4b01f 100644
--- a/oaktree/server.py
+++ b/oaktree/server.py
@@ -175,8 +175,8 @@ class OaktreeServicer(oaktree_pb2.OaktreeServicer):
175 name_or_id=request.name_or_id, 175 name_or_id=request.name_or_id,
176 filters=request.jmespath)) 176 filters=request.jmespath))
177 177
178 def SearchFlavors(self, request, context): 178 def ListFlavors(self, request, context):
179 logging.info('searching flavors') 179 logging.info('listing flavors')
180 cloud = _get_cloud(request) 180 cloud = _get_cloud(request)
181 return convert_flavors( 181 return convert_flavors(
182 cloud.search_flavors( 182 cloud.search_flavors(
@@ -191,8 +191,8 @@ class OaktreeServicer(oaktree_pb2.OaktreeServicer):
191 name_or_id=request.name_or_id, 191 name_or_id=request.name_or_id,
192 filters=request.jmespath)) 192 filters=request.jmespath))
193 193
194 def SearchImages(self, request, context): 194 def ListImages(self, request, context):
195 logging.info('searching images') 195 logging.info('listing images')
196 cloud = _get_cloud(request) 196 cloud = _get_cloud(request)
197 return convert_images( 197 return convert_images(
198 cloud.search_images( 198 cloud.search_images(
@@ -207,8 +207,8 @@ class OaktreeServicer(oaktree_pb2.OaktreeServicer):
207 name_or_id=request.name_or_id, 207 name_or_id=request.name_or_id,
208 filters=request.jmespath)) 208 filters=request.jmespath))
209 209
210 def SearchSecurityGroups(self, request, context): 210 def ListSecurityGroups(self, request, context):
211 logging.info('searching security groups') 211 logging.info('listing security groups')
212 cloud = _get_cloud(request) 212 cloud = _get_cloud(request)
213 return convert_security_groups( 213 return convert_security_groups(
214 cloud.search_security_groups( 214 cloud.search_security_groups(
@@ -223,8 +223,8 @@ class OaktreeServicer(oaktree_pb2.OaktreeServicer):
223 name_or_id=request.name_or_id, 223 name_or_id=request.name_or_id,
224 filters=request.jmespath)) 224 filters=request.jmespath))
225 225
226 def SearchSecurityGroupRules(self, request, context): 226 def ListSecurityGroupRules(self, request, context):
227 logging.info('searching security group rules') 227 logging.info('listing security group rules')
228 cloud = _get_cloud(request) 228 cloud = _get_cloud(request)
229 return convert_security_group_rules( 229 return convert_security_group_rules(
230 cloud.search_security_group_rules( 230 cloud.search_security_group_rules(