summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-07-09 20:24:42 +0000
committerGerrit Code Review <review@openstack.org>2013-07-09 20:24:42 +0000
commitdf1b6167cd5868e4ff881942490bc78cb0cb42ec (patch)
tree7d1c7de4a515b405c306787ad394b008226ee10b
parent6d0afcc98e3df36f9b57642daef25d4d3091acf7 (diff)
parentd2702e17c9c03e3de71cc6fdd464f57e5830ce62 (diff)
downloadpython-keystoneclient-df1b6167cd5868e4ff881942490bc78cb0cb42ec.tar.gz
Merge "Remove endpoint.name attribute from v3 manager (bug 1191152)"
-rw-r--r--keystoneclient/v3/endpoints.py18
1 files changed, 10 insertions, 8 deletions
diff --git a/keystoneclient/v3/endpoints.py b/keystoneclient/v3/endpoints.py
index 010572b..7030d28 100644
--- a/keystoneclient/v3/endpoints.py
+++ b/keystoneclient/v3/endpoints.py
@@ -47,22 +47,23 @@ class EndpointManager(base.CrudManager):
msg = msg % ', '.join(VALID_INTERFACES)
raise Exception(msg)
- def create(self, service, url, name=None, interface=None, region=None,
- enabled=True):
+ def create(self, service, url, interface=None, region=None, enabled=True,
+ **kwargs):
self._validate_interface(interface)
return super(EndpointManager, self).create(
service_id=base.getid(service),
interface=interface,
url=url,
region=region,
- enabled=enabled)
+ enabled=enabled,
+ **kwargs)
def get(self, endpoint):
return super(EndpointManager, self).get(
endpoint_id=base.getid(endpoint))
- def list(self, service=None, interface=None, region=None,
- enabled=None, **kwargs):
+ def list(self, service=None, interface=None, region=None, enabled=None,
+ **kwargs):
"""List endpoints.
If ``**kwargs`` are provided, then filter endpoints with
@@ -76,8 +77,8 @@ class EndpointManager(base.CrudManager):
enabled=enabled,
**kwargs)
- def update(self, endpoint, service=None, url=None, name=None,
- interface=None, region=None, enabled=None):
+ def update(self, endpoint, service=None, url=None, interface=None,
+ region=None, enabled=None, **kwargs):
self._validate_interface(interface)
return super(EndpointManager, self).update(
endpoint_id=base.getid(endpoint),
@@ -85,7 +86,8 @@ class EndpointManager(base.CrudManager):
interface=interface,
url=url,
region=region,
- enabled=enabled)
+ enabled=enabled,
+ **kwargs)
def delete(self, endpoint):
return super(EndpointManager, self).delete(