From 162f50777e13eebe3b27ec8364ee892be628f7b0 Mon Sep 17 00:00:00 2001 From: Idan Amit Date: Wed, 31 Jan 2018 18:57:31 +0200 Subject: Align configuration for new design Aligned the designers configuration according to the new design addition and changes Change-Id: Id08942b5a8adbac10bbe76bdd8a2a6f093ec8b46 Issue-ID: SDC-975 Signed-off-by: Idan Amit --- .../sdc/fe/servlets/PluginStatusBLTest.java | 28 ++++------------------ 1 file changed, 4 insertions(+), 24 deletions(-) (limited to 'catalog-fe/src/test/java') diff --git a/catalog-fe/src/test/java/org/openecomp/sdc/fe/servlets/PluginStatusBLTest.java b/catalog-fe/src/test/java/org/openecomp/sdc/fe/servlets/PluginStatusBLTest.java index 8a796a4993..baef6858a3 100644 --- a/catalog-fe/src/test/java/org/openecomp/sdc/fe/servlets/PluginStatusBLTest.java +++ b/catalog-fe/src/test/java/org/openecomp/sdc/fe/servlets/PluginStatusBLTest.java @@ -38,16 +38,10 @@ public class PluginStatusBLTest { final static List testPluginsList = new ArrayList<>(); final static String offlinePluginsDisplayName = "offlinePlugin"; - final static String offlinePluginHost = "192.168.10.1"; - final static String offlinePluginPort = "1000"; - final static String offlinePluginPath = "/offline"; - final static String offlinePluginProtocol = "http"; + final static String offlinePluginDiscoveryPath = "http://192.168.10.1:1000/offline"; final static String onlinePluginDisplayName = "onlinePlugin"; - final static String onlinePluginHost = "192.168.20.2"; - final static String onlinePluginPort = "2000"; - final static String onlinePluginPath = "/online"; - final static String onlinePluginProtocol = "http"; + final static String onlinePluginDiscoveryPath = "http://192.168.10.1:2000/online"; @BeforeClass public static void beforeClass() { @@ -55,24 +49,10 @@ public class PluginStatusBLTest { when(configurationManager.getPluginsConfiguration()).thenReturn(pluginsConfiguration); offlinePlugin.setPluginId(offlinePluginsDisplayName); - offlinePlugin.setPluginHost(offlinePluginHost); - offlinePlugin.setPluginPort(offlinePluginPort); - offlinePlugin.setPluginPath(offlinePluginPath); - offlinePlugin.setPluginProtocol(offlinePluginProtocol); - - StringBuilder offlineRequestString = new StringBuilder(); - offlineRequestString.append(offlinePluginProtocol).append("://").append(onlinePluginHost).append(":") - .append(offlinePluginPort).append(offlinePluginPath); + offlinePlugin.setPluginDiscoveryUrl(offlinePluginDiscoveryPath); onlinePlugin.setPluginId(onlinePluginDisplayName); - onlinePlugin.setPluginHost(onlinePluginHost); - onlinePlugin.setPluginPort(onlinePluginPort); - onlinePlugin.setPluginPath(onlinePluginPath); - onlinePlugin.setPluginProtocol(onlinePluginProtocol); - - StringBuilder onlineRequestString = new StringBuilder(); - onlineRequestString.append(onlinePluginProtocol).append("://").append(onlinePluginHost).append(":") - .append(offlinePluginPort).append(offlinePluginPath); + onlinePlugin.setPluginDiscoveryUrl(onlinePluginDiscoveryPath); } -- cgit 1.2.3-korg