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>

diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb
index 094317f..9df2ac9 100644 (file)
--- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb
+++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb
@@ -14,23 +14,6 @@ template "catalog-fe-config" do
    })
 end
 
-template "plugins-fe-config" do
-   path "#{ENV['JETTY_BASE']}/config/catalog-fe/plugins-configuration.yaml"
-   source "FE-plugins-configuration.yaml.erb"
-   owner "jetty"
-   group "jetty"
-   mode "0755"
-   variables({
-      :dcae_discovery_url     => node['Plugins']['DCAE']['dcae_discovery_url'],
-      :dcae_source_url        => node['Plugins']['DCAE']['dcae_source_url'],
-      :dcae_dt_discovery_url  => node['Plugins']['DCAE-TAB']['dcae_dt_discovery_url'],
-      :dcae_dt_source_url     => node['Plugins']['DCAE-TAB']['dcae_dt_source_url'],
-      :workflow_discovery_url => node['Plugins']['WORKFLOW']['workflow_discovery_url'],
-      :workflow_source_url    => node['Plugins']['WORKFLOW']['workflow_source_url']
-   })
-end
-
-
 template "onboarding-fe-config" do
     path "#{ENV['JETTY_BASE']}/config/onboarding-fe/onboarding_configuration.yaml"
     source "FE-onboarding-configuration.yaml.erb"

diff --git a/catalog-fe/src/main/resources/config/plugins-configuration.yaml b/catalog-fe/src/main/resources/config/plugins-configuration.yaml
deleted file mode 100644 (file)
index eb36945..0000000
--- a/catalog-fe/src/main/resources/config/plugins-configuration.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-pluginsList:
-   - pluginId: DCAE
-     pluginDiscoveryUrl: http://localhost:8702/dcae
-     pluginSourceUrl: http://localhost:8702/dcae
-     pluginStateUrl: "dcae"
-     pluginDisplayOptions:
-        context:
-            displayName: "Monitor"
-            displayContext: ["VF", "SERVICE"]
-            displayRoles: ["DESIGNER"]
-   - pluginId: WORKFLOW
-     pluginDiscoveryUrl: http://localhost:9527/
-     pluginSourceUrl: http://localhost:9527/
-     pluginStateUrl: "workflowDesigner"
-     pluginDisplayOptions:
-        top:
-            displayName: "WORKFLOW"
-        context:
-            displayName: "Workflow Designer"
-            displayContext: ["VF", "SERVICE"]
-            displayRoles: ["DESIGNER", "TESTER"]
-
-connectionTimeout: 1000
\ No newline at end of file

diff --git a/sdc-os-chef/environments/Template.json b/sdc-os-chef/environments/Template.json
index c998d8b..57834c4 100644 (file)
--- 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/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb b/sdc-os-chef/environments/plugins-configuration.yaml
similarity index 97%
rename from catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb
rename to sdc-os-chef/environments/plugins-configuration.yaml
index 338432d..21de746 100644 (file)
--- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb
+++ b/sdc-os-chef/environments/plugins-configuration.yaml
@@ -25,4 +25,4 @@ pluginsList:
             displayName: "WORKFLOW"
             displayRoles: ["DESIGNER", "TESTER"]
 
-connectionTimeout: 1000
+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 caee91e..184c4f0 100755 (executable)
--- 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}