openstack/octavia
Code Issues Proposed changes

Merge "Fixes small typos in comments in source files of api"

Browse Source
This commit is contained in:
Jenkins 2016-06-06 17:43:18 +00:00 committed by Gerrit Code Review
commit 63524a885a
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
octavia/api/v1/controllers/l7policy.py
View File

@ -165,7 +165,7 @@ class L7PolicyController(base.BaseController):
@pecan.expose() @pecan.expose()
def _lookup(self, l7policy_id, *remainder): def _lookup(self, l7policy_id, *remainder):
"""Overriden pecan _lookup method for custom routing. """Overridden pecan _lookup method for custom routing.
Verifies that the l7policy passed in the url exists, and if so decides Verifies that the l7policy passed in the url exists, and if so decides
which controller, if any, should control be passed. which controller, if any, should control be passed.

2
octavia/api/v1/controllers/listener.py
View File

@ -229,7 +229,7 @@ class ListenersController(base.BaseController):
@pecan.expose() @pecan.expose()
def _lookup(self, listener_id, *remainder): def _lookup(self, listener_id, *remainder):
"""Overriden pecan _lookup method for custom routing. """Overridden pecan _lookup method for custom routing.
Verifies that the listener passed in the url exists, and if so decides Verifies that the listener passed in the url exists, and if so decides
which controller, if any, should control be passed. which controller, if any, should control be passed.

4
octavia/api/v1/controllers/load_balancer.py
View File

@ -52,7 +52,7 @@ class LoadBalancersController(base.BaseController):
@wsme_pecan.wsexpose([lb_types.LoadBalancerResponse], wtypes.text, @wsme_pecan.wsexpose([lb_types.LoadBalancerResponse], wtypes.text,
wtypes.text) wtypes.text)
def get_all(self, tenant_id=None, project_id=None): def get_all(self, tenant_id=None, project_id=None):
"""Lists all listeners on a load balancer.""" """Lists all load balancers."""
# NOTE(blogan): tenant_id and project_id are optional query parameters # NOTE(blogan): tenant_id and project_id are optional query parameters
# tenant_id and project_id are the same thing. tenant_id will be kept # tenant_id and project_id are the same thing. tenant_id will be kept
# around for a short amount of time. # around for a short amount of time.
@ -173,7 +173,7 @@ class LoadBalancersController(base.BaseController):
@pecan.expose() @pecan.expose()
def _lookup(self, lb_id, *remainder): def _lookup(self, lb_id, *remainder):
"""Overriden pecan _lookup method for custom routing. """Overridden pecan _lookup method for custom routing.
Verifies that the load balancer passed in the url exists, and if so Verifies that the load balancer passed in the url exists, and if so
decides which controller, if any, should control be passed. decides which controller, if any, should control be passed.

3
octavia/api/v1/controllers/pool.py
View File

@ -52,7 +52,6 @@ class PoolsController(base.BaseController):
@wsme_pecan.wsexpose([pool_types.PoolResponse], wtypes.text) @wsme_pecan.wsexpose([pool_types.PoolResponse], wtypes.text)
def get_all(self, listener_id=None): def get_all(self, listener_id=None):
"""Lists all pools on a listener or loadbalancer.""" """Lists all pools on a listener or loadbalancer."""
context = pecan.request.context.get('octavia_context') context = pecan.request.context.get('octavia_context')
if listener_id is not None: if listener_id is not None:
@ -206,7 +205,7 @@ class PoolsController(base.BaseController):
@pecan.expose() @pecan.expose()
def _lookup(self, pool_id, *remainder): def _lookup(self, pool_id, *remainder):
"""Overriden pecan _lookup method for custom routing. """Overridden pecan _lookup method for custom routing.
Verifies that the pool passed in the url exists, and if so decides Verifies that the pool passed in the url exists, and if so decides
which controller, if any, should control be passed. which controller, if any, should control be passed.