From 964926c21de5629d89c31c9ccb4d0e31432f311e Mon Sep 17 00:00:00 2001 From: Siva Kumar Bavanasi Date: Fri, 8 Dec 2017 13:59:14 -0800 Subject: [PATCH] Fixed 'si page throws an error in case of vcenter mode' Added a check to not issue nova call in case of vcenter. Change-Id: I602a9b76a26f60c902b5fa4e6b807a07724cced9 Closes-bug: #1736653 (cherry picked from commit 91038a5545915cc5e12359d5e7abeecdc8963205) --- .../services/instances/ui/js/views/svcInstListView.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/webroot/config/services/instances/ui/js/views/svcInstListView.js b/webroot/config/services/instances/ui/js/views/svcInstListView.js index b0497afab..7531296c1 100644 --- a/webroot/config/services/instances/ui/js/views/svcInstListView.js +++ b/webroot/config/services/instances/ui/js/views/svcInstListView.js @@ -432,7 +432,7 @@ define([ totalActiveCnt}; }, getVlRemoteGLConfig: function (selectedProject) { - var vlRemoteGLConfig = [{ + var openstackVLRemoteConfig = [{ getAjaxConfig: function (resultJSON) { var lazyAjaxConfig = { url: ctwc.get(ctwc.URL_GET_SERVICE_INSTS_NOVA_STATUS, @@ -492,8 +492,8 @@ define([ } } } - }, - { + }]; + var vlRemoteGLConfig = [{ getAjaxConfig: function(response) { var lazyAjaxConfig = { url: ctwc.get(ctwc.URL_GET_SERVICE_INST_TMPLTS, @@ -572,6 +572,9 @@ define([ self.svcInstProjRole = roles; } }]; + if(!isVCenter()) { + vlRemoteGLConfig = openstackVLRemoteConfig.concat(vlRemoteGLConfig); + } return vlRemoteGLConfig; } });