diff options
| author |   Idan Amit <ia096e@intl.att.com> | 2018-01-31 18:57:31 +0200 |
|---|---|---|
| committer |   Michael Lando <ml636r@att.com> | 2018-02-01 08:15:25 +0000 |
| commit | 162f50777e13eebe3b27ec8364ee892be628f7b0 (patch) | |
| tree | ebce6947b372a61827745e9985eef0ac3f144af2 /catalog-fe/src/main | |
| parent | 3c9f4df71b978e92a6eeb6f22bc7535e749d11c2 (diff) | |
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 <ia096e@intl.att.com>
Diffstat (limited to 'catalog-fe/src/main')
| -rw-r--r-- | catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/PluginStatusBL.java | 7 | ||||
| -rw-r--r-- | catalog-fe/src/main/resources/config/plugins-configuration.yaml | 21 |
2 files changed, 11 insertions, 17 deletions
diff --git a/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/PluginStatusBL.java b/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/PluginStatusBL.java index dcd5eef491..55e779078d 100644 --- a/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/PluginStatusBL.java +++ b/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/PluginStatusBL.java @@ -57,14 +57,9 @@ public class PluginStatusBL { } private boolean checkPluginAvailability(Plugin plugin) { - - StringBuilder requestString = new StringBuilder(); boolean result = false; - requestString.append(plugin.getPluginProtocol()).append("://").append(plugin.getPluginHost()).append(":") - .append(plugin.getPluginPort()).append(plugin.getPluginPath()); - - HttpHead head = new HttpHead(requestString.toString()); + HttpHead head = new HttpHead(plugin.getPluginDiscoveryUrl()); try (CloseableHttpResponse response = this.client.execute(head)) { result = response != null && response.getStatusLine().getStatusCode() == 200; diff --git a/catalog-fe/src/main/resources/config/plugins-configuration.yaml b/catalog-fe/src/main/resources/config/plugins-configuration.yaml index 4193b506d2..69598e0ebe 100644 --- a/catalog-fe/src/main/resources/config/plugins-configuration.yaml +++ b/catalog-fe/src/main/resources/config/plugins-configuration.yaml @@ -1,22 +1,21 @@ pluginsList: - pluginId: DCAE - pluginHost: localhost - pluginPort: 8080 - pluginPath: "/dcae" + pluginDiscoveryUrl: http://localhost:8702/dcae + pluginSourceUrl: http://localhost:8702/dcae pluginStateUrl: "dcae" - pluginProtocol: http pluginDisplayOptions: context: displayName: "Monitor" displayContext: ["VF", "SERVICE"] - top: - displayName: "DCAE" + displayRoles: ["DESIGNER"] - pluginId: WORKFLOW - pluginHost: localhost - pluginPort: 9527 - pluginPath: "/" + pluginDiscoveryUrl: http://localhost:9527/ + pluginSourceUrl: http://localhost:9527/ pluginStateUrl: "workflowDesigner" - pluginProtocol: http pluginDisplayOptions: top: - displayName: "WORKFLOW"
\ No newline at end of file + displayName: "WORKFLOW" + context: + displayName: "Workflow Designer" + displayContext: ["VF"] + displayRoles: ["DESIGNER", "TESTER"]
\ No newline at end of file |