From 7d05e16f0ab24ba8918bd4466d50a9fb77571552 Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Wed, 10 Oct 2018 14:52:54 +0300 Subject: update sdc portal integration Change-Id: I6e17434f753c2eaa562da80c1eade8688601f510 Issue-ID: SDC-1749 Signed-off-by: Tal Gitelman --- .../cookbooks/sdc-catalog-be/attributes/default.rb | 7 +- .../BE_6_setup_portal_and_key_properties.rb | 24 +++++++ .../recipes/BE_6_setup_portal_properties.rb | 17 ----- .../templates/default/BE-key.properties.erb | 41 +++++++++++ .../templates/default/BE-portal.properties.erb | 81 ++++++++++++++++------ 5 files changed, 129 insertions(+), 41 deletions(-) create mode 100644 catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_6_setup_portal_and_key_properties.rb delete mode 100644 catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_6_setup_portal_properties.rb create mode 100644 catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-key.properties.erb (limited to 'catalog-be/sdc-backend/chef-repo') diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb index 49ac86aaec..d1d6f642fd 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb @@ -35,4 +35,9 @@ default['UEB']['SecretKey'] = "4ZRPzNJfEUK0sSNBvccd2m7X" default['Pair_EnvName'] = "" #DmaapConsumer -default['DMAAP']['active'] = false \ No newline at end of file +default['DMAAP']['active'] = false + +#Portal +default['ECompP']['cipher_key'] = "AGLDdG4D04BKm2IxIWEr8o==" +default['ECompP']['portal_user'] = "Ipwxi2oLvDxctMA1royaRw1W0jhucLx+grHzci3ePIA=" +default['ECompP']['portal_pass'] = "j85yNhyIs7zKYbR1VlwEfNhS6b7Om4l0Gx5O8931sCI=" \ No newline at end of file diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_6_setup_portal_and_key_properties.rb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_6_setup_portal_and_key_properties.rb new file mode 100644 index 0000000000..bf724ded5f --- /dev/null +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_6_setup_portal_and_key_properties.rb @@ -0,0 +1,24 @@ +template "template portal.properties" do + path "#{ENV['JETTY_BASE']}/resources/portal.properties" + source "BE-portal.properties.erb" + owner "jetty" + group "jetty" + mode "0755" + variables ({ + :ecomp_rest_url => node['ECompP']['ecomp_rest_url'], + :ecomp_redirect_url => node['ECompP']['ecomp_redirect_url'], + :ecomp_portal_user => node['ECompP']['portal_user'], + :ecomp_portal_pass => node['ECompP']['portal_pass'] + }) +end + +template "template key.properties" do + path "#{ENV['JETTY_BASE']}/resources/key.properties" + source "BE-key.properties.erb" + owner "jetty" + group "jetty" + mode "0755" + variables ({ + :cipher_key => node['ECompP']['cipher_key'] + }) +end \ No newline at end of file diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_6_setup_portal_properties.rb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_6_setup_portal_properties.rb deleted file mode 100644 index 912ddf7dc0..0000000000 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_6_setup_portal_properties.rb +++ /dev/null @@ -1,17 +0,0 @@ -template "template portal.properties" do - path "#{ENV['JETTY_BASE']}/resources/portal.properties" - source "BE-portal.properties.erb" - owner "jetty" - group "jetty" - mode "0755" - variables ({ - :ecomp_rest_url => node['ECompP']['ecomp_rest_url'], - :ecomp_redirect_url => node['ECompP']['ecomp_redirect_url'], - :ueb_url_list => node['ECompP']['ueb_url_list'], - :inbox_name => node['ECompP']['inbox_name'], - :app_key => node['ECompP']['app_key'], - :app_secret => node['ECompP']['app_secret'], - :app_topic_name => node['ECompP']['app_topic_name'], - :decrypt_key => node['ECompP']['decryption_key'] - }) -end diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-key.properties.erb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-key.properties.erb new file mode 100644 index 0000000000..007a36e350 --- /dev/null +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-key.properties.erb @@ -0,0 +1,41 @@ +### +# ============LICENSE_START========================================== +# ONAP Portal SDK +# =================================================================== +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the “License”); +# you may not use this software except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Unless otherwise specified, all documentation contained herein is licensed +# under the Creative Commons License, Attribution 4.0 Intl. (the “License”); +# you may not use this documentation except in compliance with the License. +# You may obtain a copy of the License at +# +# https://creativecommons.org/licenses/by/4.0/ +# +# Unless required by applicable law or agreed to in writing, documentation +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ============LICENSE_END============================================ +# +# +### + +# Properties read by the ECOMP Framework library (epsdk-fw) + +cipher.enc.key = <%= @cipher_key %> \ No newline at end of file diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-portal.properties.erb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-portal.properties.erb index 4f23cb827f..bf58f77d9f 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-portal.properties.erb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-portal.properties.erb @@ -1,32 +1,67 @@ -# Portal REST URL, ends "/auxapi" -ecomp_rest_url = <%= @ecomp_rest_url %> - -# Java implementation of interface -portal.api.impl.class = org.openecomp.sdc.be.ecomp.EcompIntImpl +### +# ============LICENSE_START========================================== +# ONAP Portal SDK +# =================================================================== +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the “License”); +# you may not use this software except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Unless otherwise specified, all documentation contained herein is licensed +# under the Creative Commons License, Attribution 4.0 Intl. (the “License”); +# you may not use this documentation except in compliance with the License. +# You may obtain a copy of the License at +# +# https://creativecommons.org/licenses/by/4.0/ +# +# Unless required by applicable law or agreed to in writing, documentation +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ============LICENSE_END============================================ +# +# +### +# Properties read by ECOMP Framework library, ecompFW.jar -# CSP-SSO URL - -ecomp_redirect_url = <%= @ecomp_redirect_url %> +########################################################################## +# The following properties should NOT be changed by partner applications. +########################################################################## -# Comma-separated list of UEB server names +portal.api.prefix = /api +max.idle.time = 5 +user.attribute.name = user_attribute -ueb_url_list = <%= @ueb_url_list %> +#Use REST API instead of UEB to fetch the functional menu data +use_rest_for_functional_menu=true -# UEB topic where Portal listens -ecomp_portal_inbox_name = <%= @inbox_name %> -# UEB key generated while on-boarding -ueb_app_key = <%= @app_key %> +########################################################################## +# The following properties MUST be changed by partner applications. +########################################################################## -# UEB secret generated while on-boarding -ueb_app_secret = <%= @app_secret %> - -# UEB topic where App listens -ueb_app_mailbox_name = <%= @app_topic_name %> +# Name of java class that implements the OnBoardingApiService interface. +portal.api.impl.class = org.openecomp.sdc.be.ecomp.EcompIntImpl -# Consumer group name; most Apps should use {UUID} -ueb_app_consumer_group_name = {UUID} +# URL of the Portal where this app is onboarded +ecomp_redirect_url = <%= @ecomp_redirect_url %> -ueb_listeners_enable = true +# URL of the ECOMP Portal REST API +ecomp_rest_url = <%= @ecomp_rest_url %> +#Portal user & key +portal_user = <%= @ecomp_portal_user %> +portal_pass = <%= @ecomp_portal_pass %> -decryption_key = <%= @decrypt_key %> -- cgit 1.2.3-korg