summaryrefslogtreecommitdiffstats
path: root/catalog-fe
diff options
context:
space:
mode:
Diffstat (limited to 'catalog-fe')
-rw-r--r--catalog-fe/src/main/resources/config/designers-configuration.yaml21
-rw-r--r--catalog-fe/src/test/java/org/openecomp/sdc/fe/servlets/DesignerStatusBLTest.java4
2 files changed, 15 insertions, 10 deletions
diff --git a/catalog-fe/src/main/resources/config/designers-configuration.yaml b/catalog-fe/src/main/resources/config/designers-configuration.yaml
index 7064619878..abdf9ea5cd 100644
--- a/catalog-fe/src/main/resources/config/designers-configuration.yaml
+++ b/catalog-fe/src/main/resources/config/designers-configuration.yaml
@@ -1,17 +1,22 @@
designersList:
- - displayName: DCAE
- designerHost: 192.168.50.5
+ - designerId: DCAE
+ designerHost: localhost
designerPort: 8080
designerPath: "/dcae"
designerStateUrl: "dcae"
designerProtocol: http
- buttonLocation: ["top", "tab"]
- tabPresentation: ["VF", "SERVICE"]
- - displayName: WORKFLOW
- designerHost: 192.168.50.5
+ designerDisplayOptions:
+ tab:
+ displayName: "monitor"
+ validResourceTypes: ["VF", "SERVICE"]
+ top:
+ displayName: "DCAE"
+ - designerId: WORKFLOW
+ designerHost: localhost
designerPort: 9527
designerPath: "/"
designerStateUrl: "workflowDesigner"
designerProtocol: http
- buttonLocation: ["top"]
- tabPresentation: [] \ No newline at end of file
+ designerDisplayOptions:
+ top:
+ displayName: "Workflow Designer" \ No newline at end of file
diff --git a/catalog-fe/src/test/java/org/openecomp/sdc/fe/servlets/DesignerStatusBLTest.java b/catalog-fe/src/test/java/org/openecomp/sdc/fe/servlets/DesignerStatusBLTest.java
index 00c2d206d5..0b5b9cd613 100644
--- a/catalog-fe/src/test/java/org/openecomp/sdc/fe/servlets/DesignerStatusBLTest.java
+++ b/catalog-fe/src/test/java/org/openecomp/sdc/fe/servlets/DesignerStatusBLTest.java
@@ -54,7 +54,7 @@ public class DesignerStatusBLTest {
ConfigurationManager.setTestInstance(configurationManager);
when(configurationManager.getDesignersConfiguration()).thenReturn(designersConfiguration);
- offlineDesigner.setDisplayName(offlineDesignerDisplayName);
+ offlineDesigner.setDesignerId(offlineDesignerDisplayName);
offlineDesigner.setDesignerHost(offlineDesignerHost);
offlineDesigner.setDesignerPort(offlineDesignerPort);
offlineDesigner.setDesignerPath(offlineDesignerPath);
@@ -64,7 +64,7 @@ public class DesignerStatusBLTest {
offlineRequestString.append(offlineDesignerProtocol).append("://").append(onlineDesignerHost).append(":")
.append(offlineDesignerPort).append(offlineDesignerPath);
- onlineDesigner.setDisplayName(onlineDesignerDisplayName);
+ onlineDesigner.setDesignerId(onlineDesignerDisplayName);
onlineDesigner.setDesignerHost(onlineDesignerHost);
onlineDesigner.setDesignerPort(onlineDesignerPort);
onlineDesigner.setDesignerPath(onlineDesignerPath);