From d139e09812ffbdb36a2058b514c51315c76b09f0 Mon Sep 17 00:00:00 2001
From: shrikantawachar <shrikant.awachar@amdocs.com>
Date: Wed, 16 Jan 2019 12:37:16 +0530
Subject: Allow custom plugins in SDC

Allow custom plugins in SDC

Change-Id: I09475a4f795734f7911e24652560f7d41ddb8d14
Issue-ID: SDC-2022
Signed-off-by: shrikantawachar <shrikant.awachar@amdocs.com>
---
 sdc-os-chef/environments/Template.json             | 16 +------------
 .../environments/plugins-configuration.yaml        | 28 ++++++++++++++++++++++
 sdc-os-chef/scripts/docker_run.sh                  |  2 +-
 3 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100644 sdc-os-chef/environments/plugins-configuration.yaml

(limited to 'sdc-os-chef')

diff --git a/sdc-os-chef/environments/Template.json b/sdc-os-chef/environments/Template.json
index c998d8bcfb..57834c474c 100644
--- a/sdc-os-chef/environments/Template.json
+++ b/sdc-os-chef/environments/Template.json
@@ -43,21 +43,7 @@
             ],
 	    "KB":            "yyy"
         },
-        "Plugins": {
-            "DCAE": {
-                "dcae_discovery_url": "http://yyy:8183/dcaed/#/demo",
-                "dcae_source_url": "http://yyy:8183/dcaed/#/demo"
-            },
-            "DCAE-TAB": {
-                "dcae_dt_discovery_url": "yyy",
-                "dcae_dt_source_url": "yyy"
-            },
-            "WORKFLOW": {
-                "workflow_discovery_url": "yyy",
-                "workflow_source_url": "yyy"
-            }
-        },
-           "VnfRepo": {
+        "VnfRepo": {
              "vnfRepoPort": "8702",
              "vnfRepoHost": "10.0.14.1"
            }
diff --git a/sdc-os-chef/environments/plugins-configuration.yaml b/sdc-os-chef/environments/plugins-configuration.yaml
new file mode 100644
index 0000000000..21de74636f
--- /dev/null
+++ b/sdc-os-chef/environments/plugins-configuration.yaml
@@ -0,0 +1,28 @@
+pluginsList:
+   - pluginId: DCAED
+     pluginDiscoveryUrl: <%= @dcae_discovery_url %>
+     pluginSourceUrl: <%= @dcae_source_url %>
+     pluginStateUrl: "dcaed"
+     pluginDisplayOptions:
+        context:
+            displayName: "Monitoring"
+            displayContext: ["SERVICE"]
+            displayRoles: ["DESIGNER"]
+   - pluginId: DCAE-DS
+     pluginDiscoveryUrl: <%= @dcae_dt_discovery_url %>
+     pluginSourceUrl: <%= @dcae_dt_source_url %>
+     pluginStateUrl: "dcae-ds"
+     pluginDisplayOptions:
+       tab:
+           displayName: "DCAE-DS"
+           displayRoles: ["DESIGNER"]
+   - pluginId: WORKFLOW
+     pluginDiscoveryUrl: <%= @workflow_discovery_url %>
+     pluginSourceUrl: <%= @workflow_source_url %>
+     pluginStateUrl: "workflowDesigner"
+     pluginDisplayOptions:
+        tab:
+            displayName: "WORKFLOW"
+            displayRoles: ["DESIGNER", "TESTER"]
+
+connectionTimeout: 1000
\ No newline at end of file
diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh
index caee91e171..184c4f00a8 100755
--- a/sdc-os-chef/scripts/docker_run.sh
+++ b/sdc-os-chef/scripts/docker_run.sh
@@ -444,7 +444,7 @@ function sdc-FE {
     else
         ADDITIONAL_ARGUMENTS=${FE_DEBUG_PORT}
     fi
-    docker run --detach --name ${DOCKER_NAME} --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env JAVA_OPTIONS="${FE_JAVA_OPTIONS}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD}  --volume ${WORKSPACE}/data/logs/FE/:/var/lib/jetty/logs --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 9443:9443 --publish 8181:8181 ${ADDITIONAL_ARGUMENTS} ${PREFIX}/sdc-frontend:${RELEASE}
+    docker run --detach --name ${DOCKER_NAME} --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env JAVA_OPTIONS="${FE_JAVA_OPTIONS}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD}  --volume ${WORKSPACE}/data/logs/FE/:/var/lib/jetty/logs --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --volume ${WORKSPACE}/data/environments/plugins-configuration.yaml:${JETTY_BASE}/config/catalog-fe/plugins-configuration.yaml --publish 9443:9443 --publish 8181:8181 ${ADDITIONAL_ARGUMENTS} ${PREFIX}/sdc-frontend:${RELEASE}
     command_exit_status $? ${DOCKER_NAME}
     echo "please wait while FE is starting....."
     monitor_docker ${DOCKER_NAME}
-- 
cgit 1.2.3-korg