Access workflow from SDC in Portal

Access workflow from SDC in Portal

Change-Id: I6c0b64d2ed009f1a51567d4b3f9053cde8116eac
Issue-ID: SDC-1887
Signed-off-by: priyanshu <pagarwal@amdocs.com>

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 395b307..729100a 100644 (file)
--- 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 d80e6f3..be782cd 100644 (file)
--- 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<PluginsConfiguration.Plugin> pluginList = new ArrayList<PluginsConfiguration.Plugin>();
                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);