Filter endpoint filter mismatch with keystoneauth1

keystoneauth1 accept region_name as endpoint filter,
which will match either region_id or region of the
endpoint catalog

Change-Id: I7ba1f7904e4b3004565d826f4ea3cd345ce45f62
Issue-ID: MULTICLOUD-364
Signed-off-by: Xiaohua Zhang <xiaohua.zhang@windriver.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/share/newton_base/proxy/services.py b/share/newton_base/proxy/services.py
index 36ae9840..631ee359 100644
--- a/share/newton_base/proxy/services.py
+++ b/share/newton_base/proxy/services.py
@@ -103,9 +103,8 @@ class Services(APIView):
             service = {
                 'service_type': servicetype,
                 'interface': interface,
-                       'region_id': vim['openstack_region_id']
-                           if vim.get('openstack_region_id')
-                           else vim['cloud_region_id']
+                'region_name': vim['openstack_region_id']
+                     if vim.get('openstack_region_id') else vim['cloud_region_id']
             }
 
 
@@ -113,7 +112,7 @@ class Services(APIView):
             if querystr:
                 req_resource += "?" + querystr
 
-            self._logger.info("service " + action + " request with uri %s" % (req_resource))
+            self._logger.info("service " + action + " request with uri %s,%s" % (req_resource, service))
             if(action == "get"):
                 resp = sess.get(req_resource, endpoint_filter=service,
                                 headers={"Content-Type": "application/json",
@@ -186,13 +185,13 @@ class Services(APIView):
             interface = 'public'
             service = {'service_type': servicetype,
                        'interface': interface,
-                       'region_id': vim['openstack_region_id']
+                       'region_name': vim['openstack_region_id']
                            if vim.get('openstack_region_id')
                            else vim['cloud_region_id']
                        }
 
 
-            self._logger.info("service head request with uri %s" % (req_resource))
+            self._logger.info("service head request with uri %s, %s" % (req_resource, service))
             resp = sess.head(req_resource, endpoint_filter=service)
             self._logger.info("service head response status %s" % (resp.status_code))