From c5f4d83f7841a6937346da80a35b608e6624d54b Mon Sep 17 00:00:00 2001 From: priyanshu Date: Thu, 1 Nov 2018 16:25:31 +0200 Subject: [PATCH] Access workflow from SDC in Portal Access workflow from SDC in Portal Change-Id: I6c0b64d2ed009f1a51567d4b3f9053cde8116eac Issue-ID: SDC-1887 Signed-off-by: priyanshu --- .../src/main/java/org/openecomp/sdc/fe/servlets/FeProxyServlet.java | 2 +- .../src/test/java/org/openecomp/sdc/servlets/FeProxyServletTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/FeProxyServlet.java b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/FeProxyServlet.java index 395b3073d8..729100a2e8 100644 --- a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/FeProxyServlet.java +++ b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/FeProxyServlet.java @@ -185,7 +185,7 @@ public class FeProxyServlet extends SSLProxyServlet { String workflowPluginURL = getPluginConfiguration(request).getPluginsList() .stream() .filter(plugin -> plugin.getPluginId().equalsIgnoreCase(PLUGIN_ID_WORKFLOW)) - .map(Plugin::getPluginSourceUrl) + .map(Plugin::getPluginDiscoveryUrl) .findFirst().orElse(null); java.net.URL workflowURL = new URL(workflowPluginURL); diff --git a/catalog-fe/src/test/java/org/openecomp/sdc/servlets/FeProxyServletTest.java b/catalog-fe/src/test/java/org/openecomp/sdc/servlets/FeProxyServletTest.java index d80e6f3d36..be782cd336 100644 --- a/catalog-fe/src/test/java/org/openecomp/sdc/servlets/FeProxyServletTest.java +++ b/catalog-fe/src/test/java/org/openecomp/sdc/servlets/FeProxyServletTest.java @@ -112,6 +112,7 @@ public class FeProxyServletTest { List pluginList = new ArrayList(); when(plugin.getPluginId()).thenReturn("WORKFLOW"); when(plugin.getPluginSourceUrl()).thenReturn(WF_PROTOCOL + "://" + WF_HOST + ":" + WF_PORT); + when(plugin.getPluginDiscoveryUrl()).thenReturn(WF_PROTOCOL + "://" + WF_HOST + ":" + WF_PORT); pluginList.add(plugin); when(configurationManager.getPluginsConfiguration()).thenReturn(pluginsConfiguration); when(pluginsConfiguration.getPluginsList()).thenReturn(pluginList); -- 2.16.6