diff options
author | Xiaohua Zhang <xiaohua.zhang@windriver.com> | 2018-09-20 04:53:04 +0000 |
---|---|---|
committer | Xiaohua Zhang <xiaohua.zhang@windriver.com> | 2018-09-20 04:53:04 +0000 |
commit | d6d8cbf451a596aa7cbaa240fbcafb288a3494bc (patch) | |
tree | e2ccc49af7370ba9dac76dc51f873bd0b01c045b /share/newton_base/openoapi/server.py | |
parent | d6279df2157d37978895cb246b2e52cb992c3d1f (diff) |
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>
Diffstat (limited to 'share/newton_base/openoapi/server.py')
-rw-r--r-- | share/newton_base/openoapi/server.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/share/newton_base/openoapi/server.py b/share/newton_base/openoapi/server.py index 0dd813c4..57f76196 100644 --- a/share/newton_base/openoapi/server.py +++ b/share/newton_base/openoapi/server.py @@ -63,7 +63,7 @@ class ServerVolumeAttachThread (threading.Thread): vim = VimDriverUtils.get_vim_info(vimid) sess = VimDriverUtils.get_session(vim, tenantid) - self.service['region_id'] = vim['openstack_region_id'] \ + self.service['region_name'] = vim['openstack_region_id'] \ if vim.get('openstack_region_id') \ else vim['cloud_region_id'] @@ -113,7 +113,7 @@ class ServerVolumeAttachThread (threading.Thread): vim = VimDriverUtils.get_vim_info(vimid) sess = VimDriverUtils.get_session(vim, tenantid) - self.service['region_id'] = vim['openstack_region_id'] \ + self.service['region_name'] = vim['openstack_region_id'] \ if vim.get('openstack_region_id') \ else vim['cloud_region_id'] @@ -167,7 +167,7 @@ class Servers(APIView): vim = VimDriverUtils.get_vim_info(vimid) sess = VimDriverUtils.get_session(vim, tenantid) - self.service['region_id'] = vim['openstack_region_id'] \ + self.service['region_name'] = vim['openstack_region_id'] \ if vim.get('openstack_region_id') \ else vim['cloud_region_id'] @@ -247,7 +247,7 @@ class Servers(APIView): sess = VimDriverUtils.get_session(vim, tenantid) req_resouce = "servers/%s/os-interface" % serverid - self.service['region_id'] = vim['openstack_region_id'] \ + self.service['region_name'] = vim['openstack_region_id'] \ if vim.get('openstack_region_id') \ else vim['cloud_region_id'] @@ -276,7 +276,7 @@ class Servers(APIView): vim = VimDriverUtils.get_vim_info(vimid) sess = VimDriverUtils.get_session(vim, tenantid) - self.service['region_id'] = vim['openstack_region_id'] \ + self.service['region_name'] = vim['openstack_region_id'] \ if vim.get('openstack_region_id') \ else vim['cloud_region_id'] @@ -415,7 +415,7 @@ class Servers(APIView): vim = VimDriverUtils.get_vim_info(vimid) sess = VimDriverUtils.get_session(vim, tenantid) - self.service['region_id'] = vim['openstack_region_id'] \ + self.service['region_name'] = vim['openstack_region_id'] \ if vim.get('openstack_region_id') \ else vim['cloud_region_id'] @@ -477,7 +477,7 @@ class Servers(APIView): vim = VimDriverUtils.get_vim_info(vimid) sess = VimDriverUtils.get_session(vim, tenantid) - self.service['region_id'] = vim['openstack_region_id'] \ + self.service['region_name'] = vim['openstack_region_id'] \ if vim.get('openstack_region_id') \ else vim['cloud_region_id'] |