summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpriyanshu <pagarwal@amdocs.com>2018-11-01 16:25:31 +0200
committerIdan Amit <idan.amit@intl.att.com>2018-11-02 07:20:35 +0000
commitc5f4d83f7841a6937346da80a35b608e6624d54b (patch)
tree4334d52381b772d599b993de9842910850085ce7
parent2da911f8ba408fbbf3d7639796208078fac28e32 (diff)
Access workflow from SDC in Portal1.3.2
Access workflow from SDC in Portal Change-Id: I6c0b64d2ed009f1a51567d4b3f9053cde8116eac Issue-ID: SDC-1887 Signed-off-by: priyanshu <pagarwal@amdocs.com>
-rw-r--r--catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/FeProxyServlet.java2
-rw-r--r--catalog-fe/src/test/java/org/openecomp/sdc/servlets/FeProxyServletTest.java1
2 files changed, 2 insertions, 1 deletions
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<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);