diff options
368 files changed, 1851 insertions, 4812 deletions
diff --git a/asdctool/pom.xml b/asdctool/pom.xml index f3a0440941..542124e0e7 100644 --- a/asdctool/pom.xml +++ b/asdctool/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>sdc-main</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <properties> @@ -703,7 +703,7 @@ <files> <file> <path> - ${project.basedir}\sdc-cassandra-init\chef-repo\cookbooks\cassandra-actions\attributes\version.rb + ${project.basedir}\sdc-cassandra-init\version.sh </path> <lines> <line> @@ -802,7 +802,7 @@ <configuration> <filesets> <fileset> - <directory>${basedir}/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/files/default</directory> + <directory>${basedir}/sdc-cassandra-init</directory> <includes> <include>sdctool.tar</include> </includes> @@ -824,7 +824,7 @@ </goals> <configuration> <outputDirectory> - ${basedir}/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/files/default + ${basedir}/sdc-cassandra-init </outputDirectory> <overwrite>true</overwrite> <resources> diff --git a/asdctool/sdc-cassandra-init/Dockerfile b/asdctool/sdc-cassandra-init/Dockerfile index 6266e28f67..dd31cc5f4c 100644 --- a/asdctool/sdc-cassandra-init/Dockerfile +++ b/asdctool/sdc-cassandra-init/Dockerfile @@ -1,43 +1,55 @@ -FROM onap/policy-jdk-alpine:2.4.4 +FROM onap/policy-jdk-debian:2.0.2 + +# Create a new group and user +RUN addgroup sdc && \ + adduser --gecos "sdc sdc,1,1,1" --disabled-password --ingroup sdc --shell /bin/sh sdc -USER root -RUN addgroup sdc -RUN adduser --gecos "sdc sdc,1,1,1" --disabled-password --ingroup sdc --shell /bin/sh sdc USER sdc -RUN mkdir ~/.cassandra/ && \ - echo '[cql]' > ~/.cassandra/cqlshrc && \ - echo 'version=3.4.4' >> ~/.cassandra/cqlshrc + +# Create Cassandra configuration directory and file +RUN mkdir -p ~/.cassandra/ && \ + echo '[cql]' > ~/.cassandra/cqlshrc && \ + echo 'version=3.4.4' >> ~/.cassandra/cqlshrc + USER root -RUN apk update && \ +# Update package list and install necessary packages +RUN apt-get update --allow-releaseinfo-change && \ + apt-get purge python* -y && \ + apt-get install -y python3-pip && \ python3 -m pip install --upgrade pip && \ pip3 install cqlsh==6.1.0 && \ - mkdir ~/.cassandra/ && \ - echo '[cql]' > ~/.cassandra/cqlshrc && \ - echo 'version=3.4.4' >> ~/.cassandra/cqlshrc && \ - set -ex && \ - apk add --no-cache \ - wget \ - build-base \ - ruby \ - ruby-dev \ - libffi-dev \ - libressl-dev \ - libxml2-dev && \ - gem install --no-update-sources \ - rspec-its:1.3.0 hitimes:1.3.1 public_suffix:5.1.1 multipart-post:2.4.1 etc:1.4.3 bundler:2.4.22 chef:14.15.6 \ - faraday:2.8.1 minitar:0.12.1 berkshelf:7.0.10 \ - io-console:0.7.2 \ - webrick \ - json \ - --no-document && \ - gem cleanup + mkdir -p ~/.cassandra/ && \ + echo '[cql]' > ~/.cassandra/cqlshrc && \ + echo 'version=3.4.4' >> ~/.cassandra/cqlshrc && \ + apt-get install -y \ + libffi-dev \ + libxml2-dev && \ + apt-get clean + +# Remove bash only if absolutely necessary +RUN apt-get remove bash -y --allow-remove-essential || true USER sdc -COPY --chown=sdc:sdc chef-solo /home/sdc/chef-solo/ -COPY --chown=sdc:sdc chef-repo/cookbooks /home/sdc/chef-solo/cookbooks/ -COPY --chown=sdc:sdc startup.sh /home/sdc/ -RUN chmod 770 /home/sdc/startup.sh +# Copy sdctool tar and startup +COPY --chown=sdc:sdc sdctool.tar /home/sdc/sdctool.tar +COPY --chown=sdc:sdc scripts /home/sdc/scripts +COPY --chown=sdc:sdc startup.sh /home/sdc + +# Extract and prepare sdctool +RUN tar -xvf /home/sdc/sdctool.tar -C /home/sdc && \ + rm /home/sdc/sdctool.tar && \ + mkdir -p /home/sdc/tools && \ + cp -pr /home/sdc/sdctool/tools/* /home/sdc/tools && \ + chmod +x /home/sdc/sdctool/scripts/* && \ + chmod +x /home/sdc/tools/build/scripts/* && \ + chmod +x /home/sdc/tools/scripts/* && \ + chown -R sdc:sdc /home/sdc/tools/build/scripts/* && \ + chmod +x /home/sdc/startup.sh && \ + chmod +x /home/sdc/scripts/* && \ + cp -r /home/sdc/scripts/janusgraph.properties /home/sdc/sdctool/config && \ + cp -r /home/sdc/scripts/configuration.yaml /home/sdc/sdctool/config -ENTRYPOINT [ "/home/sdc/startup.sh" ] +# Define entrypoint +ENTRYPOINT [ "sh", "-c", "/home/sdc/startup.sh" ] diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/01-createCsUser.rb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/01-createCsUser.rb deleted file mode 100644 index 3c67715922..0000000000 --- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/01-createCsUser.rb +++ /dev/null @@ -1,18 +0,0 @@ -template "/tmp/create_cassandra_user.sh" do - source "create_cassandra_user.sh.erb" - sensitive true - mode 0755 - variables({ - :cassandra_ip => node['Nodes']['CS'].first, - :cassandra_port => node['cassandra']['cassandra_port'], - :cassandra_pwd => ENV['CS_PASSWORD'], - :sdc_usr => ENV['SDC_USER'], - :sdc_pwd => ENV['SDC_PASSWORD'] - }) -end - -execute "create-sdc-user" do - command "/tmp/create_cassandra_user.sh" - cwd "/tmp/" - action :run -end
\ No newline at end of file diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/02-createDoxKeyspace.rb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/02-createDoxKeyspace.rb deleted file mode 100644 index 5f740a8909..0000000000 --- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/02-createDoxKeyspace.rb +++ /dev/null @@ -1,34 +0,0 @@ -template "/tmp/create_dox_keyspace.sh" do - source "create_dox_keyspace.sh.erb" - sensitive true - mode 0755 - variables({ - :cassandra_ip => node['Nodes']['CS'].first, - :cassandra_port => node['cassandra'][:cassandra_port], - :DC_NAME => node['cassandra']['datacenter_name'], - :cassandra_pwd => node['cassandra'][:cassandra_password], - :cassandra_usr => node['cassandra'][:cassandra_user] - }) -end - - -remote_directory '/tmp/tools' do - source 'tools' - mode '0755' - files_mode '0755' - action :create -end - -execute "onboard-db-schema-creation" do - ignore_failure true - command "chmod +x onboard-db-schema-creation.sh && sh -x /tmp/tools/build/scripts/onboard-db-schema-creation.sh" - cwd "/tmp/tools/build/scripts" - action :run -end - -execute "create-DOX-schema" do - ignore_failure true - command "chmod +x /tmp/create_dox_keyspace.sh && /tmp/create_dox_keyspace.sh" - cwd "/tmp" - action :run -end
\ No newline at end of file diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb deleted file mode 100644 index e60740fb3d..0000000000 --- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb +++ /dev/null @@ -1,58 +0,0 @@ -cookbook_file "/tmp/sdctool.tar" do - source "sdctool.tar" - mode 0755 -end - -execute "install tar" do - command "/bin/tar xf /tmp/sdctool.tar -C /tmp" - cwd "/tmp" - action :run -end - -template "janusgraph.properties" do - sensitive true - path "/tmp/sdctool/config/janusgraph.properties" - source "janusgraph.properties.erb" - mode "0755" - variables({ - :DC_NAME => node['cassandra']['datacenter_name'], - :cassandra_ip => node['Nodes']['CS'].first, - :cassandra_port_num => node['cassandra'][:cassandra_port], - :janus_connection_timeout => node['cassandra'][:janusgraph_connection_timeout], - :cassandra_pwd => node['cassandra'][:cassandra_password], - :cassandra_usr => node['cassandra'][:cassandra_user], - :replication_factor => node['cassandra']['replication_factor'] - }) -end - - -template "/tmp/sdctool/config/configuration.yaml" do - sensitive true - source "configuration.yaml.erb" - mode 0755 - variables({ - :host_ip => node['Nodes']['BE'], - :catalog_port => node['BE'][:http_port], - :ssl_port => node['BE'][:https_port], - :cassandra_ip => node['Nodes']['CS'].first, - :cassandra_port => node['cassandra']['cassandra_port'], - :rep_factor => node['cassandra']['replication_factor'], - :DC_NAME => node['cassandra']['datacenter_name'], - :janusgraph_Path => "/tmp/sdctool/config/", - :socket_connect_timeout => node['cassandra']['socket_connect_timeout'], - :socket_read_timeout => node['cassandra']['socket_read_timeout'], - :cassandra_pwd => node['cassandra'][:cassandra_password], - :cassandra_usr => node['cassandra'][:cassandra_user] - }) -end - -execute "executing-schema-creation" do - command "chmod +x /tmp/sdctool/scripts/schemaCreation.sh && /tmp/sdctool/scripts/schemaCreation.sh /tmp/sdctool/config" - cwd "/tmp" - action :run -end - -execute "executing-janusGraphSchemaCreation.sh" do - command "chmod +x /tmp/sdctool/scripts/janusGraphSchemaCreation.sh && /tmp/sdctool/scripts/janusGraphSchemaCreation.sh /tmp/sdctool/config" - action :run -end
\ No newline at end of file diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/04-importConformance.rb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/04-importConformance.rb deleted file mode 100644 index 8c2ee505be..0000000000 --- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/04-importConformance.rb +++ /dev/null @@ -1,9 +0,0 @@ -working_directory = "/tmp" -cl_release=node['version'].split('.')[0..2].join('.').split('-')[0] -printf("\033[33mcl_release=[%s]\n\033[0m", cl_release) - -execute "import-Conformance" do - command "conf_dir=/tmp/sdctool/config && tosca_dir=/tmp/sdctool/tosca && cl_version=`grep 'toscaConformanceLevel:' $conf_dir/configuration.yaml |awk '{print $2}'` && cd /tmp/sdctool/scripts && /bin/chmod +x sdcSchemaFileImport.sh && echo \"execute /tmp/sdctool/scripts/sdcSchemaFileImport.sh ${tosca_dir} #{cl_release} ${cl_version} ${conf_dir} onap\" && ./sdcSchemaFileImport.sh ${tosca_dir} #{cl_release} ${cl_version} ${conf_dir} onap" - cwd "#{working_directory}" - action :run -end
\ No newline at end of file diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/create_cassandra_user.sh.erb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/create_cassandra_user.sh.erb deleted file mode 100644 index 9fa3130542..0000000000 --- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/create_cassandra_user.sh.erb +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -CASSANDRA_IP=<%= @cassandra_ip %> -CASSANDRA_PORT=<%= @cassandra_port %> -CS_PASSWORD=<%= @cassandra_pwd %> -SDC_USER=<%= @sdc_usr %> -SDC_PASSWORD=<%= @sdc_pwd %> - - -pass_changed=99 -retry_num=1 -is_up=0 -while [ $is_up -eq 0 -a $retry_num -le 100 ]; do - - echo "exit" | cqlsh -u cassandra -p $CS_PASSWORD $CASSANDRA_IP $CASSANDRA_PORT - res1=$? - - if [ $res1 -eq 0 ]; then - echo "`date` --- cqlsh is able to connect." - is_up=1 - else - echo "`date` --- cqlsh is NOT able to connect yet. sleep 5" - sleep 5 - fi - retry_num=$((retry_num+1)) -done - -cassandra_user_exist=`echo "list users;" | cqlsh -u cassandra -p $CS_PASSWORD $CASSANDRA_IP $CASSANDRA_PORT | grep -c $SDC_USER` - if [ $cassandra_user_exist -eq 1 ] ; then - echo "cassandra user $SDC_USER already exist" - else - echo "Going to create $SDC_USER" - echo "create user $SDC_USER with password '$SDC_PASSWORD' nosuperuser;" | cqlsh -u cassandra -p $CS_PASSWORD $CASSANDRA_IP $CASSANDRA_PORT - fi
\ No newline at end of file diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/create_dox_keyspace.sh.erb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/create_dox_keyspace.sh.erb deleted file mode 100644 index 9b20c6f15c..0000000000 --- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/create_dox_keyspace.sh.erb +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -CASSANDRA_USER='<%= @cassandra_usr %>' -CASSANDRA_PASS='<%= @cassandra_pwd %>' -CASSANDRA_IP='<%= @cassandra_ip %>' -CASSANDRA_PORT=<%= @cassandra_port %> - -KEYSPACE="CREATE KEYSPACE IF NOT EXISTS dox WITH REPLICATION = { 'class' : 'NetworkTopologyStrategy', '<%= @DC_NAME %>': '1'};" -KEYSPACE1="CREATE KEYSPACE IF NOT EXISTS zusammen_dox WITH REPLICATION = { 'class' : 'NetworkTopologyStrategy', '<%= @DC_NAME %>': '1'};" - -echo "run create_dox_keyspace.cql" -echo -e "$KEYSPACE\n$KEYSPACE1" > /tmp/create_dox_keyspace.cql - -chmod 755 /tmp/create_dox_keyspace.cql -cqlsh -u $CASSANDRA_USER -p $CASSANDRA_PASS $CASSANDRA_IP $CASSANDRA_PORT -f /tmp/create_dox_keyspace.cql > /dev/null 2>&1 - - -res=`echo "select keyspace_name from system.schema_keyspaces ;" | cqlsh -u $CASSANDRA_USER -p $CASSANDRA_PASS $CASSANDRA_IP $CASSANDRA_PORT |grep -c dox 2>/dev/null` - -if [ $res -gt 0 ]; then - echo "`date` --- dox keyspace was created " -else - echo "`date` --- Failed to create dox keyspace" -fi - - -echo "run create_dox_db.cql" -chmod 755 /tmp/tools/build/scripts/create_dox_db.cql -cqlsh -u $CASSANDRA_USER -p $CASSANDRA_PASS $CASSANDRA_IP $CASSANDRA_PORT -f /tmp/tools/build/scripts/create_dox_db.cql > /dev/null 2>&1 - -sleep 10 - -echo "run alter_dox_db.cql" -chmod 755 /tmp/tools/build/scripts/alter_dox_db.cql -cqlsh -u $CASSANDRA_USER -p $CASSANDRA_PASS $CASSANDRA_IP $CASSANDRA_PORT -f /tmp/tools/build/scripts/alter_dox_db.cql > /dev/null 2>&1 - diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/janusgraph.properties.erb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/janusgraph.properties.erb deleted file mode 100644 index 9b1ebdd5a4..0000000000 --- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/janusgraph.properties.erb +++ /dev/null @@ -1,25 +0,0 @@ -storage.backend=cql -storage.hostname=<%= @cassandra_ip %> -storage.port=<%= @cassandra_port_num %> -storage.username=<%= @cassandra_usr %> -storage.password=<%= @cassandra_pwd %> -storage.connection-timeout=<%= @janus_connection_timeout %> -storage.cql.keyspace=sdctitan - -storage.cql.ssl.enabled=false -storage.cql.ssl.truststore.location=<%= @cassandra_truststore_path %> -storage.cql.ssl.truststore.password=<%= @cassandra_truststore_password %> - -storage.cql.read-consistency-level=LOCAL_QUORUM -storage.cql.write-consistency-level=LOCAL_QUORUM -storage.cql.replication-strategy-class=NetworkTopologyStrategy -storage.cql.replication-strategy-options=<%= @DC_NAME %>,<%= @replication_factor %> -storage.cql.local-datacenter=<%= @DC_NAME %> - -cache.db-cache = false -cache.db-cache-clean-wait = 20 -cache.db-cache-time = 180000 -cache.db-cache-size = 0.5 - -cache.tx-cache-size = 1000000 -storage.lock.wait-time=500
\ No newline at end of file diff --git a/asdctool/sdc-cassandra-init/chef-solo/LICENSE b/asdctool/sdc-cassandra-init/chef-solo/LICENSE deleted file mode 100644 index 11069edd79..0000000000 --- a/asdctool/sdc-cassandra-init/chef-solo/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file 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. diff --git a/asdctool/sdc-cassandra-init/chef-solo/README.md b/asdctool/sdc-cassandra-init/chef-solo/README.md deleted file mode 100644 index ddb0fda830..0000000000 --- a/asdctool/sdc-cassandra-init/chef-solo/README.md +++ /dev/null @@ -1,37 +0,0 @@ -Deprecated -========== - -Use of this repository is deprecated. We recommend using the `chef generate repo` command that comes with [ChefDK](http://downloads.chef.io/chef-dk/). - -Overview -======== - -Every Chef installation needs a Chef Repository. This is the place where cookbooks, roles, config files and other artifacts for managing systems with Chef will live. We strongly recommend storing this repository in a version control system such as Git and treat it like source code. - -While we prefer Git, and make this repository available via GitHub, you are welcome to download a tar or zip archive and use your favorite version control system to manage the code. - -Repository Directories -====================== - -This repository contains several directories, and each directory contains a README file that describes what it is for in greater detail, and how to use it for managing your systems with Chef. - -* `cookbooks/` - Cookbooks you download or create. -* `data_bags/` - Store data bags and items in .json in the repository. -* `roles/` - Store roles in .rb or .json in the repository. -* `environments/` - Store environments in .rb or .json in the repository. - -Configuration -============= - -The repository contains a knife configuration file. - -* .chef/knife.rb - -The knife configuration file `.chef/knife.rb` is a repository specific configuration file for knife. If you're using Hosted Chef, you can download one for your organization from the management console. If you're using the Open Source Chef Server, you can generate a new one with `knife configure`. For more information about configuring Knife, see the Knife documentation. - -https://docs.chef.io/knife.html - -Next Steps -========== - -Read the README file in each of the subdirectories for more information about what goes in those directories. diff --git a/asdctool/sdc-cassandra-init/chef-solo/chefignore b/asdctool/sdc-cassandra-init/chef-solo/chefignore deleted file mode 100644 index ba30af6cff..0000000000 --- a/asdctool/sdc-cassandra-init/chef-solo/chefignore +++ /dev/null @@ -1,11 +0,0 @@ -# Put files/directories that should be ignored in this file. -# Lines that start with '# ' are comments. - -# emacs -*~ - -# vim -*.sw[a-z] - -# subversion -*/.svn/* diff --git a/asdctool/sdc-cassandra-init/chef-solo/cookbooks/README.md b/asdctool/sdc-cassandra-init/chef-solo/cookbooks/README.md deleted file mode 100644 index 86ea46bfbb..0000000000 --- a/asdctool/sdc-cassandra-init/chef-solo/cookbooks/README.md +++ /dev/null @@ -1,54 +0,0 @@ -This directory contains the cookbooks used to configure systems in your infrastructure with Chef. - -Knife needs to be configured to know where the cookbooks are located with the `cookbook_path` setting. If this is not set, then several cookbook operations will fail to work properly. - - cookbook_path ["./cookbooks"] - -This setting tells knife to look for the cookbooks directory in the present working directory. This means the knife cookbook subcommands need to be run in the `chef-repo` directory itself. To make sure that the cookbooks can be found elsewhere inside the repository, use an absolute path. This is a Ruby file, so something like the following can be used: - - current_dir = File.dirname(__FILE__) - cookbook_path ["#{current_dir}/../cookbooks"] - -Which will set `current_dir` to the location of the knife.rb file itself (e.g. `~/chef-repo/.chef/knife.rb`). - -Configure knife to use your preferred copyright holder, email contact and license. Add the following lines to `.chef/knife.rb`. - - cookbook_copyright "Example, Com." - cookbook_email "cookbooks@example.com" - cookbook_license "apachev2" - -Supported values for `cookbook_license` are "apachev2", "mit","gplv2","gplv3", or "none". These settings are used to prefill comments in the default recipe, and the corresponding values in the metadata.rb. You are free to change the the comments in those files. - -Create new cookbooks in this directory with Knife. - - knife cookbook create COOKBOOK - -This will create all the cookbook directory components. You don't need to use them all, and can delete the ones you don't need. It also creates a README file, metadata.rb and default recipe. - -You can also download cookbooks directly from the Opscode Cookbook Site. There are two subcommands to help with this depending on what your preference is. - -The first and recommended method is to use a vendor branch if you're using Git. This is automatically handled with Knife. - - knife cookbook site install COOKBOOK - -This will: - -* Download the cookbook tarball from cookbooks.opscode.com. -* Ensure its on the git master branch. -* Checks for an existing vendor branch, and creates if it doesn't. -* Checks out the vendor branch (chef-vendor-COOKBOOK). -* Removes the existing (old) version. -* Untars the cookbook tarball it downloaded in the first step. -* Adds the cookbook files to the git index and commits. -* Creates a tag for the version downloaded. -* Checks out the master branch again. -* Merges the cookbook into master. -* Repeats the above for all the cookbooks dependencies, downloading them from the community site - -The last step will ensure that any local changes or modifications you have made to the cookbook are preserved, so you can keep your changes through upstream updates. - -If you're not using Git, use the site download subcommand to download the tarball. - - knife cookbook site download COOKBOOK - -This creates the COOKBOOK.tar.gz from in the current directory (e.g., `~/chef-repo`). We recommend following a workflow similar to the above for your version control tool. diff --git a/asdctool/sdc-cassandra-init/chef-solo/data_bags/README.md b/asdctool/sdc-cassandra-init/chef-solo/data_bags/README.md deleted file mode 100644 index 0c15a391fa..0000000000 --- a/asdctool/sdc-cassandra-init/chef-solo/data_bags/README.md +++ /dev/null @@ -1,63 +0,0 @@ -Data Bags ---------- - -This directory contains directories of the various data bags you create for your infrastructure. Each subdirectory corresponds to a data bag on the Chef Server, and contains JSON files of the items that go in the bag. - -First, create a directory for the data bag. - - mkdir data_bags/BAG - -Then create the JSON files for items that will go into that bag. - - $EDITOR data_bags/BAG/ITEM.json - -The JSON for the ITEM must contain a key named "id" with a value equal to "ITEM". For example, - - { - "id": "foo" - } - -Next, create the data bag on the Chef Server. - - knife data bag create BAG - -Then upload the items in the data bag's directory to the Chef Server. - - knife data bag from file BAG ITEM.json - - -Encrypted Data Bags -------------------- - -Added in Chef 0.10, encrypted data bags allow you to encrypt the contents of your data bags. The content of attributes will no longer be searchable. To use encrypted data bags, first you must have or create a secret key. - - openssl rand -base64 512 > secret_key - -You may use this secret_key to add items to a data bag during a create. - - knife data bag create --secret-file secret_key passwords mysql - -You may also use it when adding ITEMs from files, - - knife data bag create passwords - knife data bag from file passwords data_bags/passwords/mysql.json --secret-file secret_key - -The JSON for the ITEM must contain a key named "id" with a value equal to "ITEM" and the contents will be encrypted when uploaded. For example, - - { - "id": "mysql", - "password": "abc123" - } - -Without the secret_key, the contents are encrypted. - - knife data bag show passwords mysql - id: mysql - password: 2I0XUUve1TXEojEyeGsjhw== - -Use the secret_key to view the contents. - - knife data bag show passwords mysql --secret-file secret_key - id: mysql - password: abc123 - diff --git a/asdctool/sdc-cassandra-init/chef-solo/environments/README.md b/asdctool/sdc-cassandra-init/chef-solo/environments/README.md deleted file mode 100644 index 50ac48db2b..0000000000 --- a/asdctool/sdc-cassandra-init/chef-solo/environments/README.md +++ /dev/null @@ -1,5 +0,0 @@ -Requires Chef 0.10.0+. - -This directory is for Ruby DSL and JSON files for environments. For more information see the Chef wiki page: - -http://docs.chef.io/environments.html diff --git a/asdctool/sdc-cassandra-init/chef-solo/roles/README.md b/asdctool/sdc-cassandra-init/chef-solo/roles/README.md deleted file mode 100644 index b0ee0b4d21..0000000000 --- a/asdctool/sdc-cassandra-init/chef-solo/roles/README.md +++ /dev/null @@ -1,16 +0,0 @@ -Create roles here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install roles on the server, use knife. - -For example, create `roles/base_example.rb`: - - name "base_example" - description "Example base role applied to all nodes." - # List of recipes and roles to apply. Requires Chef 0.8, earlier versions use 'recipes()'. - #run_list() - # Attributes applied if the node doesn't have it set already. - #default_attributes() - # Attributes applied no matter what the node has set already. - #override_attributes() - -Then upload it to the Chef Server: - - knife role from file roles/base_example.rb diff --git a/asdctool/sdc-cassandra-init/chef-solo/roles/cassandra-actions.json b/asdctool/sdc-cassandra-init/chef-solo/roles/cassandra-actions.json deleted file mode 100644 index 5104d1fcb9..0000000000 --- a/asdctool/sdc-cassandra-init/chef-solo/roles/cassandra-actions.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "cassandra-actions", - "description": "cassandra-actions", - "json_class": "Chef::Role", - "default_attributes": { - - }, - "override_attributes": { - - }, - "chef_type": "role", - "run_list": [ - "recipe[cassandra-actions::01-createCsUser]", - "recipe[cassandra-actions::03-schemaCreation]", - "recipe[cassandra-actions::04-importConformance]" - ], - - "env_run_lists": { - - } -} - - diff --git a/asdctool/sdc-cassandra-init/chef-solo/solo.json b/asdctool/sdc-cassandra-init/chef-solo/solo.json deleted file mode 100644 index 97b1efe282..0000000000 --- a/asdctool/sdc-cassandra-init/chef-solo/solo.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "run_list": [ - "role[cassandra-actions]" - ] -} - diff --git a/asdctool/sdc-cassandra-init/chef-solo/solo.rb b/asdctool/sdc-cassandra-init/chef-solo/solo.rb deleted file mode 100644 index 06c1af4592..0000000000 --- a/asdctool/sdc-cassandra-init/chef-solo/solo.rb +++ /dev/null @@ -1,16 +0,0 @@ -root = File.absolute_path(File.dirname(__FILE__)) -file_cache_path root -cookbook_path root + '/cookbooks' -json_attribs root + '/solo.json' -checksum_path root + '/checksums' -data_bag_path root + '/data_bags' -environment_path root + '/environments' -file_backup_path root + '/backup' -file_cache_path root + '/cache' -log_level :info -log_location STDOUT -rest_timeout 300 -role_path root + '/roles' -syntax_check_cache_path -umask 0022 -verbose_logging nil diff --git a/asdctool/sdc-cassandra-init/scripts/cassandra-env.sh b/asdctool/sdc-cassandra-init/scripts/cassandra-env.sh new file mode 100644 index 0000000000..bb4856a217 --- /dev/null +++ b/asdctool/sdc-cassandra-init/scripts/cassandra-env.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +# Export other necessary variables +export CASSANDRA_IP="SDC-CS" +export CS_PORT=9042 +export SDC_USER="asdc_user" +export SDC_PASSWORD="Aa1234%^!" +export CASSANDRA_PASS=${CS_PASSWORD:-"onap123#@!"} +export DC_NAME="SDC-CS-integration-test" +export cqlversion="3.4.4" +export DISABLE_HTTP="false" diff --git a/asdctool/sdc-cassandra-init/scripts/change_cassandra_user.sh b/asdctool/sdc-cassandra-init/scripts/change_cassandra_user.sh new file mode 100644 index 0000000000..7d579eb620 --- /dev/null +++ b/asdctool/sdc-cassandra-init/scripts/change_cassandra_user.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +# Source the environment file +. /home/sdc/scripts/cassandra-env.sh # Replace with the actual path to your env file + +pass_changed=99 +retry_num=1 +is_up=0 +while [ $is_up -eq 0 -a $retry_num -le 100 ]; do + echo "exit" | cqlsh -u cassandra -p $CS_PASSWORD $CASSANDRA_IP $CASSANDRA_PORT --cqlversion="$cqlversion" + res1=$? + if [ $res1 -eq 0 ]; then + echo "`date` --- cqlsh is able to connect." + is_up=1 + else + echo "`date` --- cqlsh is NOT able to connect yet. sleep 5" + sleep 5 + fi + retry_num=$((retry_num+1)) +done + +cassandra_user_exist=$(echo "list users;" | cqlsh -u cassandra -p $CS_PASSWORD $CASSANDRA_IP $CASSANDRA_PORT --cqlversion="$cqlversion" | grep -c $SDC_USER) +if [ $cassandra_user_exist -eq 1 ]; then + echo "Cassandra user $SDC_USER already exists" +else + echo "Going to create $SDC_USER" + echo "create user $SDC_USER with password '$SDC_PASSWORD' nosuperuser;" | cqlsh -u cassandra -p $CS_PASSWORD $CASSANDRA_IP $CASSANDRA_PORT --cqlversion="$cqlversion" +fi diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb b/asdctool/sdc-cassandra-init/scripts/configuration.yaml index 070db787ed..11fa5b9dfb 100644 --- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb +++ b/asdctool/sdc-cassandra-init/scripts/configuration.yaml @@ -7,29 +7,25 @@ identificationHeaderFields: # catalog backend hostname -beFqdn: <%= @host_ip %> +beFqdn: sdc-BE # catalog backend http port -beHttpPort: <%= @catalog_port %> +beHttpPort: 8080 # catalog backend http context beContext: /sdc/rest/config/get # catalog backend protocol -<% if node[:disableHttp] -%> -beProtocol: https -<% else %> beProtocol: http -<% end -%> # catalog backend ssl port -beSslPort: <%= @ssl_port %> +beSslPort: 8443 version: 1.0 released: 2012-11-30 toscaConformanceLevel: 11.0 minToscaConformanceLevel: 3.0 -janusGraphCfgFile: <%= @janusgraph_Path %>/janusgraph.properties +janusGraphCfgFile: /home/sdc/sdctool/config/janusgraph.properties janusGraphInMemoryGraph: false janusGraphLockTimeout: 1800 # The interval to try and reconnect to JanusGraph DB when it is down during ASDC startup: @@ -71,12 +67,12 @@ users: cassandraConfig: - cassandraHosts: [<%= @cassandra_ip %>] - cassandraPort: <%= @cassandra_port %> - localDataCenter: <%= @DC_NAME %> + cassandraHosts: [sdc-cs] + cassandraPort: 9042 + localDataCenter: SDC-CS-integration-test reconnectTimeout : 30000 - socketReadTimeout: <%= @socket_read_timeout %> - socketConnectTimeout: <%= @socket_connect_timeout %> + socketReadTimeout: 40000 + socketConnectTimeout: 40000 authenticate: true username: asdc_user password: Aa1234%^! @@ -85,11 +81,11 @@ cassandraConfig: truststorePassword : Aa123456 maxWaitSeconds: 120 keySpaces: - - { name: dox, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @DC_NAME %>','<%= @rep_factor %>']} - - { name: sdcaudit, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @DC_NAME %>','<%= @rep_factor %>']} - - { name: sdcartifact, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @DC_NAME %>','<%= @rep_factor %>']} - - { name: sdccomponent, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @DC_NAME %>','<%= @rep_factor %>']} - - { name: sdcrepository, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @DC_NAME %>','<%= @rep_factor %>']} + - { name: dox, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['SDC-CS-integration-test','1']} + - { name: sdcaudit, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['SDC-CS-integration-test','1']} + - { name: sdcartifact, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['SDC-CS-integration-test','1']} + - { name: sdccomponent, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['SDC-CS-integration-test','1']} + - { name: sdcrepository, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['SDC-CS-integration-test','1']} licenseTypes: - User diff --git a/asdctool/sdc-cassandra-init/scripts/create-alter-dox-db.sh b/asdctool/sdc-cassandra-init/scripts/create-alter-dox-db.sh new file mode 100644 index 0000000000..4a1aed95ab --- /dev/null +++ b/asdctool/sdc-cassandra-init/scripts/create-alter-dox-db.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +# Source the environment file +. /home/sdc/scripts/cassandra-env.sh # Replace with the actual path to your env file + + +if [ -z "$CASSANDRA_IP" ] || [ -z "$CS_PORT" ] || [ -z "$CASSANDRA_PASS" ] || [ -z "$SDC_USER" ] || [ -z "$SDC_PASSWORD" ]; then + echo "One or more required environment variables are missing!" + exit 1 +fi + +CASSANDRA_PORT=$CS_PORT + +CASSANDRA_COMMAND="cqlsh -u $SDC_USER -p $SDC_PASSWORD $CASSANDRA_IP $CASSANDRA_PORT --cqlversion=$cqlversion" + +echo "Running create_dox_db.cql" +chmod 755 /home/sdc/tools/build/scripts/create_dox_db.cql +$CASSANDRA_COMMAND -f /home/sdc/tools/build/scripts/create_dox_db.cql > /dev/null 2>&1 + +sleep 10 + +echo "Running alter_dox_db.cql" +chmod 755 /home/sdc/tools/build/scripts/alter_dox_db.cql +$CASSANDRA_COMMAND -f /home/sdc/tools/build/scripts/alter_dox_db.cql > /dev/null 2>&1 diff --git a/asdctool/sdc-cassandra-init/scripts/create_dox_keyspace.sh b/asdctool/sdc-cassandra-init/scripts/create_dox_keyspace.sh new file mode 100644 index 0000000000..18ef3b044c --- /dev/null +++ b/asdctool/sdc-cassandra-init/scripts/create_dox_keyspace.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +# Source the environment file +. /home/sdc/scripts/cassandra-env.sh + +if [ -z "$CASSANDRA_IP" ] || [ -z "$CS_PORT" ] || [ -z "$CASSANDRA_PASS" ] || [ -z "$SDC_USER" ] || [ -z "$SDC_PASSWORD" ]; then + echo "One or more required environment variables are missing!" + exit 1 +fi + +CASSANDRA_PORT=$CS_PORT + +CASSANDRA_COMMAND="cqlsh -u $SDC_USER -p $SDC_PASSWORD $CASSANDRA_IP $CS_PORT --cqlversion=$cqlversion" + +KEYSPACE="CREATE KEYSPACE IF NOT EXISTS dox WITH REPLICATION = { 'class' : 'NetworkTopologyStrategy', '$DC_NAME': '1'};" +KEYSPACE1="CREATE KEYSPACE IF NOT EXISTS zusammen_dox WITH REPLICATION = { 'class' : 'NetworkTopologyStrategy', '$DC_NAME': '1'};" + +echo "run create_dox_keyspace.cql" +echo "$KEYSPACE" > /tmp/config/create_dox_keyspace.cql +echo "$KEYSPACE1" >> /tmp/config/create_dox_keyspace.cql +chmod 555 /tmp/config/create_dox_keyspace.cql +$CASSANDRA_COMMAND -f /tmp/config/create_dox_keyspace.cql > /dev/null 2>&1 +res=$(echo "select keyspace_name from system_schema.keyspaces;" | $CASSANDRA_COMMAND | grep -c dox 2>/dev/null) + +if [ $res -gt 0 ]; then + echo "$(date) --- dox keyspace was created" +else + echo "$(date) --- Failed to create dox keyspace" +fi diff --git a/asdctool/sdc-cassandra-init/scripts/importconformance.sh b/asdctool/sdc-cassandra-init/scripts/importconformance.sh new file mode 100644 index 0000000000..c92cb2b462 --- /dev/null +++ b/asdctool/sdc-cassandra-init/scripts/importconformance.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +# Set the working directory +working_directory="/home/sdc" + +# Extract the cl_release version +version="1.13.9" +cl_release=$(echo $version | cut -d. -f1-3 | cut -d- -f1) +echo -e "\033[33mcl_release=[$cl_release]\033[0m" + +# Execute the import-Conformance command +conf_dir="/home/sdc/sdctool/config" +tosca_dir="/home/sdc/sdctool/tosca" +cl_version=$(grep 'toscaConformanceLevel:' $conf_dir/configuration.yaml | awk '{print $2}') + +cd /home/sdc/sdctool/scripts +chmod +x sdcSchemaFileImport.sh + +echo "execute /home/sdc/sdctool/scripts/sdcSchemaFileImport.sh ${tosca_dir} ${cl_release} ${cl_version} ${conf_dir} onap" +./sdcSchemaFileImport.sh ${tosca_dir} ${cl_release} ${cl_version} ${conf_dir} onap diff --git a/asdctool/sdc-cassandra-init/scripts/janusgraph.properties b/asdctool/sdc-cassandra-init/scripts/janusgraph.properties new file mode 100644 index 0000000000..6123a855be --- /dev/null +++ b/asdctool/sdc-cassandra-init/scripts/janusgraph.properties @@ -0,0 +1,25 @@ +storage.backend=cql +storage.hostname=sdc-cs +storage.port=9042 +storage.username=asdc_user +storage.password=Aa1234%^! +storage.connection-timeout=20000 +storage.cql.keyspace=sdctitan + +storage.cql.ssl.enabled=false +storage.cql.ssl.truststore.location= +storage.cql.ssl.truststore.password= + +storage.cql.read-consistency-level=LOCAL_QUORUM +storage.cql.write-consistency-level=LOCAL_QUORUM +storage.cql.replication-strategy-class=NetworkTopologyStrategy +storage.cql.replication-strategy-options=SDC-CS-integration-test,1 +storage.cql.local-datacenter=SDC-CS-integration-test + +cache.db-cache = false +cache.db-cache-clean-wait = 20 +cache.db-cache-time = 180000 +cache.db-cache-size = 0.5 + +cache.tx-cache-size = 1000000 +storage.lock.wait-time=500
\ No newline at end of file diff --git a/asdctool/sdc-cassandra-init/startup.sh b/asdctool/sdc-cassandra-init/startup.sh index d48456a355..2bdf00e9da 100644 --- a/asdctool/sdc-cassandra-init/startup.sh +++ b/asdctool/sdc-cassandra-init/startup.sh @@ -1,6 +1,16 @@ #!/bin/sh -cd /home/sdc/chef-solo -chef-solo -c solo.rb -E ${ENVNAME} -rc=$? -if [ $rc -ne 0 ]; then exit $rc; fi
\ No newline at end of file +cd /home/sdc/scripts +sh -x conditional_test.sh +sh -x /home/sdc/scripts/change_cassandra_user.sh +mkdir -p /tmp/config +sh -x /home/sdc/scripts/create_dox_keyspace.sh +cd /home/sdc/tools/build/scripts +sh -x /home/sdc/tools/build/scripts/onboard-db-schema-creation.sh +cd /home/sdc/scripts +sh -x /home/sdc/scripts/create-alter-dox-db.sh +cd /home/sdc/sdctool/scripts +sh -x /home/sdc/sdctool/scripts/schemaCreation.sh /home/sdc/sdctool/config +sh -x /home/sdc/sdctool/scripts/janusGraphSchemaCreation.sh /home/sdc/sdctool/config +cd /home/sdc/scripts +sh -x /home/sdc/scripts/importconformance.sh
\ No newline at end of file diff --git a/asdctool/tarball.xml b/asdctool/tarball.xml index 07346584fc..e5fc2ecb71 100644 --- a/asdctool/tarball.xml +++ b/asdctool/tarball.xml @@ -26,5 +26,9 @@ <directory>tosca</directory> <outputDirectory>tosca</outputDirectory> </fileSet> + <fileSet> + <directory>${project.parent.basedir}/openecomp-be/tools</directory> + <outputDirectory>tools</outputDirectory> + </fileSet> </fileSets> </assembly>
\ No newline at end of file diff --git a/catalog-be-plugins/backend-all-plugins/pom.xml b/catalog-be-plugins/backend-all-plugins/pom.xml index eea42a23dc..a33025a420 100644 --- a/catalog-be-plugins/backend-all-plugins/pom.xml +++ b/catalog-be-plugins/backend-all-plugins/pom.xml @@ -25,7 +25,7 @@ limitations under the License. <parent> <artifactId>catalog-be-plugins</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <packaging>pom</packaging> diff --git a/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/pom.xml b/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/pom.xml index c2105b2b5e..6f4a59f46d 100644 --- a/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/pom.xml +++ b/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>catalog-be-plugins</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/catalog-be-plugins/pom.xml b/catalog-be-plugins/pom.xml index 256ffbf85f..826ee3443e 100644 --- a/catalog-be-plugins/pom.xml +++ b/catalog-be-plugins/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>sdc-main</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>catalog-be-plugins</artifactId> @@ -42,6 +42,21 @@ <version>${project.version}</version> <type>war</type> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> </project> diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index 227fb75072..812efc4328 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>sdc-main</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <properties> @@ -1232,7 +1232,7 @@ <filesets> <fileset> <directory> - sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default + sdc-backend-init </directory> <followSymlinks>false</followSymlinks> <includes> @@ -1386,7 +1386,7 @@ </goals> <configuration> <outputDirectory> - sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default + sdc-backend-init </outputDirectory> <resources> <resource> diff --git a/catalog-be/sdc-backend-init/Dockerfile b/catalog-be/sdc-backend-init/Dockerfile index 9681734268..8f3f37da73 100644 --- a/catalog-be/sdc-backend-init/Dockerfile +++ b/catalog-be/sdc-backend-init/Dockerfile @@ -9,11 +9,9 @@ ENV PYCURL_SSL_LIBRARY=openssl RUN apk update && \ apk add binutils jq libpng && \ apk add --no-cache \ - libcurl \ - ruby && \ + libcurl && \ apk add --no-cache --virtual .build-dependencies \ libressl-dev \ - ruby-dev \ libffi-dev \ libxml2-dev \ build-base \ @@ -21,15 +19,7 @@ RUN apk update && \ # needed libcurl to install correctly \ python -m pip install --upgrade pip && \ pip install 'pycurl==7.44.1' && \ - set -ex && \ - gem install --no-update-sources \ - rspec-its:1.3.0 hitimes:1.3.1 public_suffix:4.0.7 multipart-post:2.2.0 etc:1.3.0 bundler:2.3.26 chef:13.8.5 \ - berkshelf:6.3.1 \ - io-console:0.4.6 \ - webrick \ - --no-document && \ - apk del .build-dependencies && \ - gem cleanup + apk del .build-dependencies ENV ONAP_LOG=/home/onap/logs RUN mkdir $ONAP_LOG && chown onap:onap $ONAP_LOG @@ -48,12 +38,18 @@ RUN chmod 770 -R /home/onap/scripts && \ ENV PATH=$PATH:/home/onap/.local/bin -COPY --chown=onap:onap chef-solo /home/onap/chef-solo/ -COPY --chown=onap:onap chef-repo/cookbooks /home/onap/chef-solo/cookbooks/ +COPY --chown=onap:onap normatives.tar.gz /home/onap/ +COPY --chown=onap:onap custom-scripts/create_consumer_and_user.sh /home/onap/create_consumer_and_user.sh +RUN chmod +x /home/onap/create_consumer_and_user.sh; +COPY --chown=onap:onap custom-scripts/check_backend.sh /home/onap/check_backend.sh +RUN chmod +x /home/onap/check_backend.sh +COPY --chown=onap:onap custom-scripts/import_normatives.sh /home/onap/import_normatives.sh +RUN chmod +x /home/onap/import_normatives.sh + COPY --chown=onap:onap startup.sh /home/onap/ RUN chmod 770 /home/onap/startup.sh WORKDIR /home/onap/ -ENTRYPOINT /home/${user}/startup.sh +ENTRYPOINT [ "/home/onap/startup.sh" ] diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/attributes/default.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/attributes/default.rb deleted file mode 100644 index 682885312e..0000000000 --- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/attributes/default.rb +++ /dev/null @@ -1,5 +0,0 @@ -#BasicAuth -default['basic_auth']['enabled'] = true -default['basic_auth'][:user_name] = "testName" -default['basic_auth'][:user_pass] = "testPass" - diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb deleted file mode 100644 index 5de3453bf0..0000000000 --- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb +++ /dev/null @@ -1,48 +0,0 @@ -require 'base64' -if node['disableHttp'] - protocol = "https" - https_flag = "--https" - be_port = node['BE']['https_port'] - if node['BE-init']['tls_cert'] && node['BE-init']['tls_key'] - tls_key = "--tls_key " + node['BE-init']['tls_key'] - tls_cert = "--tls_cert " + node['BE-init']['tls_cert'] - if node['BE-init']['tls_password'] - tls_key_pw = "--tls_key_pw " + node['BE-init']['tls_password'] - end - end - if node['BE-init']['ca_cert'] - ca_cert = "--ca_cert " + node['BE-init']['ca_cert'] - end -else - protocol = "http" - https_flag = "" - be_port = node['BE']['http_port'] -end - -if node['BE']['user_conf'] - user_conf_dir = "--conf " + node['BE']['user_conf'] -else - # set default user configuration file - user_conf_dir = "" -end - -if node['basic_auth'] - basic_auth_enabled = node['basic_auth']['enabled'] - basic_auth_user = node['basic_auth']['user_name'] - basic_auth_pass = node['basic_auth']['user_pass'] - if basic_auth_enabled - basic_auth_config = "--header " + Base64.strict_encode64(basic_auth_user + ":" + basic_auth_pass) - else - # set default user configuration file - basic_auth_config = "" - end -end - -execute "executing-create_users" do - command "sdcuserinit -i #{node['Nodes']['BE']} -p #{be_port} #{basic_auth_config} #{user_conf_dir} #{https_flag} #{tls_cert} #{tls_key} #{tls_key_pw} #{ca_cert}" - action :run -end -execute "executing-create_consumers" do - command "sdcconsumerinit -i #{node['Nodes']['BE']} -p #{be_port} #{basic_auth_config} #{https_flag} #{tls_cert} #{tls_key} #{tls_key_pw} #{ca_cert}" - action :run -end diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb deleted file mode 100644 index 72686111f5..0000000000 --- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb +++ /dev/null @@ -1,37 +0,0 @@ -require 'base64' -if node['disableHttp'] - protocol = "https" - https_flag = "--https" - be_port = node['BE']['https_port'] - if node['BE-init']['tls_cert'] && node['BE-init']['tls_key'] - tls_key = "--tls_key " + node['BE-init']['tls_key'] - tls_cert = "--tls_cert " + node['BE-init']['tls_cert'] - if node['BE-init']['tls_password'] - tls_key_pw = "--tls_key_pw " + node['BE-init']['tls_password'] - end - end - if node['BE-init']['ca_cert'] - ca_cert = "--ca_cert " + node['BE-init']['ca_cert'] - end -else - protocol = "http" - https_flag = "" - be_port = node['BE']['http_port'] -end - -if node['basic_auth'] - basic_auth_enabled = node['basic_auth']['enabled'] - basic_auth_user = node['basic_auth']['user_name'] - basic_auth_pass = node['basic_auth']['user_pass'] - if basic_auth_enabled - basic_auth_config = "--header " + Base64.strict_encode64(basic_auth_user + ":" + basic_auth_pass) - else - # set default user configuration file - basic_auth_config = "" - end -end - -execute "executing-check_backend_health" do - command "sdccheckbackend -i #{node['Nodes']['BE']} -p #{be_port} #{basic_auth_config} #{https_flag} #{tls_cert} #{tls_key} #{tls_key_pw} #{ca_cert}" - action :run -end diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb deleted file mode 100644 index cb36ffdc3d..0000000000 --- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb +++ /dev/null @@ -1,43 +0,0 @@ -require 'base64' -be_ip=node['Nodes'][:BE] - -if node['disableHttp'] - protocol = "https" - be_port = node['BE']['https_port'] - param="-i #{be_ip} -p #{be_port} --https" - if node['BE-init']['tls_cert'] && node['BE-init']['tls_key'] - tls_key = "--tls_key " + node['BE-init']['tls_key'] - tls_cert = "--tls_cert " + node['BE-init']['tls_cert'] - if node['BE-init']['tls_password'] - tls_key_pw = "--tls_key_pw " + node['BE-init']['tls_password'] - end - end - if node['BE-init']['ca_cert'] - ca_cert = "--ca_cert " + node['BE-init']['ca_cert'] - end -else - protocol = "http" - be_port = node['BE']['http_port'] - param="-i #{be_ip} -p #{be_port}" -end - -if node['basic_auth'] - basic_auth_enabled = node['basic_auth']['enabled'] - basic_auth_user = node['basic_auth']['user_name'] - basic_auth_pass = node['basic_auth']['user_pass'] - if basic_auth_enabled - basic_auth_config = "--header " + Base64.strict_encode64(basic_auth_user + ":" + basic_auth_pass) - else - # set default user configuration file - basic_auth_config = "" - end -end -cookbook_file "/var/tmp/normatives.tar.gz" do - source "normatives.tar.gz" -end - -execute "create-jetty-modules" do - command "set -ex && tar -xvf normatives.tar.gz && cd /var/tmp/normatives/import/tosca && sdcinit #{param} #{basic_auth_config} #{tls_cert} #{tls_key} #{tls_key_pw} #{ca_cert} > #{ENV['ONAP_LOG']}/init.log" - cwd "/var/tmp/" - action :run -end diff --git a/catalog-be/sdc-backend-init/chef-solo/LICENSE b/catalog-be/sdc-backend-init/chef-solo/LICENSE deleted file mode 100644 index 11069edd79..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file 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. diff --git a/catalog-be/sdc-backend-init/chef-solo/README.md b/catalog-be/sdc-backend-init/chef-solo/README.md deleted file mode 100644 index ddb0fda830..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/README.md +++ /dev/null @@ -1,37 +0,0 @@ -Deprecated -========== - -Use of this repository is deprecated. We recommend using the `chef generate repo` command that comes with [ChefDK](http://downloads.chef.io/chef-dk/). - -Overview -======== - -Every Chef installation needs a Chef Repository. This is the place where cookbooks, roles, config files and other artifacts for managing systems with Chef will live. We strongly recommend storing this repository in a version control system such as Git and treat it like source code. - -While we prefer Git, and make this repository available via GitHub, you are welcome to download a tar or zip archive and use your favorite version control system to manage the code. - -Repository Directories -====================== - -This repository contains several directories, and each directory contains a README file that describes what it is for in greater detail, and how to use it for managing your systems with Chef. - -* `cookbooks/` - Cookbooks you download or create. -* `data_bags/` - Store data bags and items in .json in the repository. -* `roles/` - Store roles in .rb or .json in the repository. -* `environments/` - Store environments in .rb or .json in the repository. - -Configuration -============= - -The repository contains a knife configuration file. - -* .chef/knife.rb - -The knife configuration file `.chef/knife.rb` is a repository specific configuration file for knife. If you're using Hosted Chef, you can download one for your organization from the management console. If you're using the Open Source Chef Server, you can generate a new one with `knife configure`. For more information about configuring Knife, see the Knife documentation. - -https://docs.chef.io/knife.html - -Next Steps -========== - -Read the README file in each of the subdirectories for more information about what goes in those directories. diff --git a/catalog-be/sdc-backend-init/chef-solo/chefignore b/catalog-be/sdc-backend-init/chef-solo/chefignore deleted file mode 100644 index ba30af6cff..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/chefignore +++ /dev/null @@ -1,11 +0,0 @@ -# Put files/directories that should be ignored in this file. -# Lines that start with '# ' are comments. - -# emacs -*~ - -# vim -*.sw[a-z] - -# subversion -*/.svn/* diff --git a/catalog-be/sdc-backend-init/chef-solo/cookbooks/README.md b/catalog-be/sdc-backend-init/chef-solo/cookbooks/README.md deleted file mode 100644 index 86ea46bfbb..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/cookbooks/README.md +++ /dev/null @@ -1,54 +0,0 @@ -This directory contains the cookbooks used to configure systems in your infrastructure with Chef. - -Knife needs to be configured to know where the cookbooks are located with the `cookbook_path` setting. If this is not set, then several cookbook operations will fail to work properly. - - cookbook_path ["./cookbooks"] - -This setting tells knife to look for the cookbooks directory in the present working directory. This means the knife cookbook subcommands need to be run in the `chef-repo` directory itself. To make sure that the cookbooks can be found elsewhere inside the repository, use an absolute path. This is a Ruby file, so something like the following can be used: - - current_dir = File.dirname(__FILE__) - cookbook_path ["#{current_dir}/../cookbooks"] - -Which will set `current_dir` to the location of the knife.rb file itself (e.g. `~/chef-repo/.chef/knife.rb`). - -Configure knife to use your preferred copyright holder, email contact and license. Add the following lines to `.chef/knife.rb`. - - cookbook_copyright "Example, Com." - cookbook_email "cookbooks@example.com" - cookbook_license "apachev2" - -Supported values for `cookbook_license` are "apachev2", "mit","gplv2","gplv3", or "none". These settings are used to prefill comments in the default recipe, and the corresponding values in the metadata.rb. You are free to change the the comments in those files. - -Create new cookbooks in this directory with Knife. - - knife cookbook create COOKBOOK - -This will create all the cookbook directory components. You don't need to use them all, and can delete the ones you don't need. It also creates a README file, metadata.rb and default recipe. - -You can also download cookbooks directly from the Opscode Cookbook Site. There are two subcommands to help with this depending on what your preference is. - -The first and recommended method is to use a vendor branch if you're using Git. This is automatically handled with Knife. - - knife cookbook site install COOKBOOK - -This will: - -* Download the cookbook tarball from cookbooks.opscode.com. -* Ensure its on the git master branch. -* Checks for an existing vendor branch, and creates if it doesn't. -* Checks out the vendor branch (chef-vendor-COOKBOOK). -* Removes the existing (old) version. -* Untars the cookbook tarball it downloaded in the first step. -* Adds the cookbook files to the git index and commits. -* Creates a tag for the version downloaded. -* Checks out the master branch again. -* Merges the cookbook into master. -* Repeats the above for all the cookbooks dependencies, downloading them from the community site - -The last step will ensure that any local changes or modifications you have made to the cookbook are preserved, so you can keep your changes through upstream updates. - -If you're not using Git, use the site download subcommand to download the tarball. - - knife cookbook site download COOKBOOK - -This creates the COOKBOOK.tar.gz from in the current directory (e.g., `~/chef-repo`). We recommend following a workflow similar to the above for your version control tool. diff --git a/catalog-be/sdc-backend-init/chef-solo/data_bags/README.md b/catalog-be/sdc-backend-init/chef-solo/data_bags/README.md deleted file mode 100644 index 0c15a391fa..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/data_bags/README.md +++ /dev/null @@ -1,63 +0,0 @@ -Data Bags ---------- - -This directory contains directories of the various data bags you create for your infrastructure. Each subdirectory corresponds to a data bag on the Chef Server, and contains JSON files of the items that go in the bag. - -First, create a directory for the data bag. - - mkdir data_bags/BAG - -Then create the JSON files for items that will go into that bag. - - $EDITOR data_bags/BAG/ITEM.json - -The JSON for the ITEM must contain a key named "id" with a value equal to "ITEM". For example, - - { - "id": "foo" - } - -Next, create the data bag on the Chef Server. - - knife data bag create BAG - -Then upload the items in the data bag's directory to the Chef Server. - - knife data bag from file BAG ITEM.json - - -Encrypted Data Bags -------------------- - -Added in Chef 0.10, encrypted data bags allow you to encrypt the contents of your data bags. The content of attributes will no longer be searchable. To use encrypted data bags, first you must have or create a secret key. - - openssl rand -base64 512 > secret_key - -You may use this secret_key to add items to a data bag during a create. - - knife data bag create --secret-file secret_key passwords mysql - -You may also use it when adding ITEMs from files, - - knife data bag create passwords - knife data bag from file passwords data_bags/passwords/mysql.json --secret-file secret_key - -The JSON for the ITEM must contain a key named "id" with a value equal to "ITEM" and the contents will be encrypted when uploaded. For example, - - { - "id": "mysql", - "password": "abc123" - } - -Without the secret_key, the contents are encrypted. - - knife data bag show passwords mysql - id: mysql - password: 2I0XUUve1TXEojEyeGsjhw== - -Use the secret_key to view the contents. - - knife data bag show passwords mysql --secret-file secret_key - id: mysql - password: abc123 - diff --git a/catalog-be/sdc-backend-init/chef-solo/environments/README.md b/catalog-be/sdc-backend-init/chef-solo/environments/README.md deleted file mode 100644 index 50ac48db2b..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/environments/README.md +++ /dev/null @@ -1,5 +0,0 @@ -Requires Chef 0.10.0+. - -This directory is for Ruby DSL and JSON files for environments. For more information see the Chef wiki page: - -http://docs.chef.io/environments.html diff --git a/catalog-be/sdc-backend-init/chef-solo/importNormatives.json b/catalog-be/sdc-backend-init/chef-solo/importNormatives.json deleted file mode 100644 index f5c9276e2e..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/importNormatives.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "run_list": [ "recipe[sdc-normatives::import_Normatives]" ] -} - diff --git a/catalog-be/sdc-backend-init/chef-solo/importNormatives.rb b/catalog-be/sdc-backend-init/chef-solo/importNormatives.rb deleted file mode 100644 index 2693926c4b..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/importNormatives.rb +++ /dev/null @@ -1,16 +0,0 @@ -root = File.absolute_path(File.dirname(__FILE__)) -file_cache_path root -cookbook_path root + '/cookbooks' -json_attribs root + '/importNormatives.json' -checksum_path root + '/checksums' -data_bag_path root + '/data_bags' -environment_path root + '/environments' -file_backup_path root + '/backup' -file_cache_path root + '/cache' -log_level :info -log_location STDOUT -rest_timeout 300 -role_path root + '/roles' -syntax_check_cache_path -umask 0022 -verbose_logging nil diff --git a/catalog-be/sdc-backend-init/chef-solo/roles/README.md b/catalog-be/sdc-backend-init/chef-solo/roles/README.md deleted file mode 100644 index b0ee0b4d21..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/roles/README.md +++ /dev/null @@ -1,16 +0,0 @@ -Create roles here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install roles on the server, use knife. - -For example, create `roles/base_example.rb`: - - name "base_example" - description "Example base role applied to all nodes." - # List of recipes and roles to apply. Requires Chef 0.8, earlier versions use 'recipes()'. - #run_list() - # Attributes applied if the node doesn't have it set already. - #default_attributes() - # Attributes applied no matter what the node has set already. - #override_attributes() - -Then upload it to the Chef Server: - - knife role from file roles/base_example.rb diff --git a/catalog-be/sdc-backend-init/chef-solo/roles/catalog-be-setup.json b/catalog-be/sdc-backend-init/chef-solo/roles/catalog-be-setup.json deleted file mode 100644 index 8a8e12da9d..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/roles/catalog-be-setup.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "catalog-be", - "description": "Installation application - catalogBE", - "json_class": "Chef::Role", - "default_attributes": { - - }, - "override_attributes": { - - }, - "chef_type": "role", - "run_list": [ - "recipe[sdc-catalog-be-setup::1_create_consumer_and_user]", - "recipe[sdc-catalog-be-setup::2_check_Backend]", - "recipe[sdc-catalog-be-setup::3_import_Normatives]" - - ], - "env_run_lists": { - } -} - diff --git a/catalog-be/sdc-backend-init/chef-solo/solo.json b/catalog-be/sdc-backend-init/chef-solo/solo.json deleted file mode 100644 index 3ae51db12d..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/solo.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "run_list": [ "role[catalog-be-setup]" ] -} - diff --git a/catalog-be/sdc-backend-init/chef-solo/solo.rb b/catalog-be/sdc-backend-init/chef-solo/solo.rb deleted file mode 100644 index 06c1af4592..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/solo.rb +++ /dev/null @@ -1,16 +0,0 @@ -root = File.absolute_path(File.dirname(__FILE__)) -file_cache_path root -cookbook_path root + '/cookbooks' -json_attribs root + '/solo.json' -checksum_path root + '/checksums' -data_bag_path root + '/data_bags' -environment_path root + '/environments' -file_backup_path root + '/backup' -file_cache_path root + '/cache' -log_level :info -log_location STDOUT -rest_timeout 300 -role_path root + '/roles' -syntax_check_cache_path -umask 0022 -verbose_logging nil diff --git a/catalog-be/sdc-backend-init/chef-solo/upgradeNormatives.json b/catalog-be/sdc-backend-init/chef-solo/upgradeNormatives.json deleted file mode 100644 index f05c767f7c..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/upgradeNormatives.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "run_list": [ "recipe[sdc-normatives::upgrade_Normatives]" ] -} - diff --git a/catalog-be/sdc-backend-init/chef-solo/upgradeNormatives.rb b/catalog-be/sdc-backend-init/chef-solo/upgradeNormatives.rb deleted file mode 100644 index 4172431c8b..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/upgradeNormatives.rb +++ /dev/null @@ -1,16 +0,0 @@ -root = File.absolute_path(File.dirname(__FILE__)) -file_cache_path root -cookbook_path root + '/cookbooks' -json_attribs root + '/upgradeNormatives.json' -checksum_path root + '/checksums' -data_bag_path root + '/data_bags' -environment_path root + '/environments' -file_backup_path root + '/backup' -file_cache_path root + '/cache' -log_level :info -log_location STDOUT -rest_timeout 300 -role_path root + '/roles' -syntax_check_cache_path -umask 0022 -verbose_logging nil diff --git a/catalog-be/sdc-backend-init/custom-scripts/check_backend.sh b/catalog-be/sdc-backend-init/custom-scripts/check_backend.sh new file mode 100644 index 0000000000..cf7d6e4053 --- /dev/null +++ b/catalog-be/sdc-backend-init/custom-scripts/check_backend.sh @@ -0,0 +1,48 @@ +#!/bin/sh + + +# Set protocol and port based on the HTTP setting +if [ "$DISABLE_HTTP" = "true" ]; then + protocol="https" + https_flag="--https" + be_port=$BE_HTTPS_PORT +else + protocol="http" + https_flag="" + be_port=$BE_HTTP_PORT +fi + +# Initialize optional flags as empty strings +tls_cert="" +tls_key="" +tls_key_pw="" +ca_cert="" +basic_auth_config="" + +# Set TLS configuration flags if using HTTPS +if [ "$protocol" = "https" ]; then + [ -n "$TLS_CERT" ] && tls_cert="--tls_cert $TLS_CERT" + [ -n "$TLS_KEY" ] && tls_key="--tls_key $TLS_KEY" + [ -n "$TLS_KEY_PW" ] && tls_key_pw="--tls_key_pw $TLS_KEY_PW" + [ -n "$CA_CERT" ] && ca_cert="--ca_cert $CA_CERT" +fi + + +# Check if both username and password are provided +if [ -n "$BASIC_AUTH_USER" ] && [ -n "$BASIC_AUTH_PASS" ]; then + # Create just the Base64-encoded value of "username:password" + basic_auth_config="--header $(echo -n "$BASIC_AUTH_USER:$BASIC_AUTH_PASS" | base64)" +fi + +start_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$start_time] Starting sdccheckbackend..." + +sdccheckbackend -i $BE_IP -p $be_port $basic_auth_config $https_flag $tls_cert $tls_key $tls_key_pw $ca_cert + +end_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$end_time] Finished sdccheckbackend." + +start_ts=$(date -d "$start_time" +%s) +end_ts=$(date -d "$end_time" +%s) +elapsed=$((end_ts - start_ts)) +echo "Elapsed time: $elapsed seconds" diff --git a/catalog-be/sdc-backend-init/custom-scripts/create_consumer_and_user.sh b/catalog-be/sdc-backend-init/custom-scripts/create_consumer_and_user.sh new file mode 100644 index 0000000000..3b7267c356 --- /dev/null +++ b/catalog-be/sdc-backend-init/custom-scripts/create_consumer_and_user.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +# Set protocol and port based on the HTTP setting +if [ "$DISABLE_HTTP" = "true" ]; then + protocol="https" + https_flag="--https" + be_port=$BE_HTTPS_PORT +else + protocol="http" + https_flag="" + be_port=$BE_HTTP_PORT +fi + +basic_auth_config="" + +# Check if both username and password are provided +if [ -n "$BASIC_AUTH_USER" ] && [ -n "$BASIC_AUTH_PASS" ]; then + # Create just the Base64-encoded value of "username:password" + basic_auth_config="--header $(echo -n "$BASIC_AUTH_USER:$BASIC_AUTH_PASS" | base64)" +fi + + +tls_cert="" +tls_key="" +tls_key_pw="" +ca_cert="" + +if [ "$protocol" = "https" ]; then + if [ -n "$TLS_CERT" ]; then + tls_cert="--tls_cert $TLS_CERT" + fi + if [ -n "$TLS_KEY" ]; then + tls_key="--tls_key $TLS_KEY" + fi + if [ -n "$TLS_KEY_PW" ]; then + tls_key_pw="--tls_key_pw $TLS_KEY_PW" + fi + if [ -n "$CA_CERT" ]; then + ca_cert="--ca_cert $CA_CERT" + fi +fi + +# Execute sdcuserinit command +start_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$start_time] Starting sdcuserinit..." + +sdcuserinit -i $BE_IP -p $be_port $basic_auth_config $user_conf_dir $https_flag $tls_cert $tls_key $tls_key_pw $ca_cert +echo "sdcuserinit executed successfully." + +start_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$start_time] Starting sdcconsumerinit..." +sdcconsumerinit -i $BE_IP -p $be_port $basic_auth_config $https_flag $tls_cert $tls_key $tls_key_pw $ca_cert + +end_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$end_time] Finished sdcuserinit and sdcconsumerinit." + +start_ts=$(date -d "$start_time" +%s) +end_ts=$(date -d "$end_time" +%s) +elapsed=$((end_ts - start_ts)) +echo "Elapsed time: $elapsed seconds" diff --git a/catalog-be/sdc-backend-init/custom-scripts/import_normatives.sh b/catalog-be/sdc-backend-init/custom-scripts/import_normatives.sh new file mode 100644 index 0000000000..e21e1b01b0 --- /dev/null +++ b/catalog-be/sdc-backend-init/custom-scripts/import_normatives.sh @@ -0,0 +1,65 @@ +#!/bin/sh + + +# Set protocol and port based on DISABLE_HTTP +if [ "$DISABLE_HTTP" = "true" ]; then + protocol="https" + be_port=$BE_HTTPS_PORT + param="-i $BE_IP -p $be_port --https" + + # Set TLS flags if certificates are provided + if [ -n "$TLS_CERT" ]; then + tls_cert="--tls_cert $TLS_CERT" + fi + if [ -n "$TLS_KEY" ]; then + tls_key="--tls_key $TLS_KEY" + fi + if [ -n "$TLS_KEY_PW" ]; then + tls_key_pw="--tls_key_pw $TLS_KEY_PW" + fi + if [ -n "$CA_CERT" ]; then + ca_cert="--ca_cert $CA_CERT" + fi +else + protocol="http" + be_port="$BE_HTTP_PORT" + param="-i $BE_IP -p $be_port" +fi + +# Set basic authentication if enabled +if [ "$BASIC_AUTH_ENABLED" = "true" ]; then + basic_auth_user="${BASIC_AUTH_USER:-}" + basic_auth_pass="${BASIC_AUTH_PASS:-}" + + if [ -n "$basic_auth_user" ] && [ -n "$basic_auth_pass" ]; then + basic_auth_config="--header $(echo -n "$basic_auth_user:$basic_auth_pass" | base64)" + else + basic_auth_config="" + fi +else + basic_auth_config="" +fi + +# Extract normatives tarball and run the initialization command +echo "Extracting normatives.tar.gz and initializing SDC..." +cd /var/tmp/ || exit 1 +cp /home/onap/normatives.tar.gz /var/tmp/ +tar -xvf /var/tmp/normatives.tar.gz + +start_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$start_time] Starting sdcinit..." + +# Run sdcinit command with the constructed parameters +cd /var/tmp/normatives/import/tosca || exit 1 +sdcinit $param $basic_auth_config $tls_cert $tls_key $tls_key_pw $ca_cert > "/home/onap/logs/init.log" 2>&1 + +end_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$end_time] Done sdcinit." + +start_ts=$(date -d "$start_time" +%s) +end_ts=$(date -d "$end_time" +%s) +elapsed=$((end_ts - start_ts)) +echo "Elapsed time: $elapsed seconds" + +echo "SDC initialization Done. Logs can be found at ${ONAP_LOG}/init.log" + diff --git a/catalog-be/sdc-backend-init/startup.sh b/catalog-be/sdc-backend-init/startup.sh index e216341882..e35bab3aad 100644 --- a/catalog-be/sdc-backend-init/startup.sh +++ b/catalog-be/sdc-backend-init/startup.sh @@ -1,4 +1,16 @@ #!/bin/sh -cd /home/"${user}"/chef-solo || exit $? -chef-solo -c solo.rb -E "${ENVNAME}"
\ No newline at end of file +set -e + + +log_script() { + script_name=$1 + sh "$script_name" 2>&1 | sed "s|^|[$script_name] |" || \ + echo "$script_name failed. Continuing with other scripts..." >&2 +} + +log_script "/home/onap/create_consumer_and_user.sh" +log_script "/home/onap/check_backend.sh" +log_script "/home/onap/import_normatives.sh" + +echo "Done" diff --git a/catalog-be/src/main/docker/backend/Dockerfile b/catalog-be/src/main/docker/backend/Dockerfile index e1647c0321..4980b892d1 100644 --- a/catalog-be/src/main/docker/backend/Dockerfile +++ b/catalog-be/src/main/docker/backend/Dockerfile @@ -3,24 +3,6 @@ FROM onap/integration-java11:10.0.0 USER root ARG JETTY_FOLDER=/app/jetty -# Install Chef -RUN set -ex && \ - apk update && \ - apk add --no-cache \ - wget \ - build-base \ - ruby \ - ruby-dev \ - libffi-dev \ - libxml2-dev && \ - gem install --no-update-sources \ - rspec-its:1.3.0 hitimes:1.3.1 public_suffix:4.0.7 multipart-post:2.2.0 etc:1.3.0 bundler:2.3.26 chef:13.8.5 \ - berkshelf:6.3.1 \ - io-console:0.4.6 \ - webrick \ - --no-document && \ - gem cleanup - ENV JETTY_HOME=$JETTY_FOLDER ENV JETTY_BASE=$JETTY_FOLDER ENV JETTY_USER=onap @@ -37,12 +19,21 @@ RUN wget -q https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/ RUN sed -i 's/"jetty"/"onap"/g' $JETTY_FOLDER/etc/jetty-setuid.xml -COPY --chown=onap:onap chef-solo $JETTY_FOLDER/chef-solo/ -COPY --chown=onap:onap chef-repo/cookbooks $JETTY_FOLDER/chef-solo/cookbooks/ COPY --chown=onap:onap onap-sdc-backend/catalog-be.war $JETTY_FOLDER/webappwar/ COPY --chown=onap:onap context.xml $JETTY_FOLDER/webapps/ +COPY --chown=onap:onap files/rewrite-root-to-swagger-ui.xml $JETTY_FOLDER/etc/rewrite-root-to-swagger-ui.xml + COPY --chown=onap:onap startup.sh $JETTY_FOLDER/ +COPY --chown=onap:onap files/create_directories.sh $JETTY_FOLDER/ +COPY --chown=onap:onap files/create_jetty_modules.sh $JETTY_FOLDER/ +COPY --chown=onap:onap files/logback.xml $JETTY_FOLDER/config/catalog-be/ +COPY --chown=onap:onap files/ecomp-error-configuration.yaml $JETTY_FOLDER/config/catalog-be/ecomp-error-configuration.yaml +COPY --chown=onap:onap files/error-configuration.yaml $JETTY_FOLDER/config/catalog-be/error-configuration.yaml +COPY --chown=onap:onap files/BE_3_setup_key_and_trust_store.sh $JETTY_FOLDER/ +RUN chmod +x /app/jetty/BE_3_setup_key_and_trust_store.sh RUN chmod 770 $JETTY_FOLDER/startup.sh +RUN chmod +x $JETTY_FOLDER/create_directories.sh && $JETTY_FOLDER/create_directories.sh +RUN chmod +x $JETTY_FOLDER/create_jetty_modules.sh && $JETTY_FOLDER/create_jetty_modules.sh ENTRYPOINT [ "sh", "-c", "${JETTY_HOME}/startup.sh"] diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb deleted file mode 100644 index 787a764262..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb +++ /dev/null @@ -1,73 +0,0 @@ -# -default['BE'][:http_port] = 8080 -default['BE'][:https_port] = 8443 -default['FE'][:http_port] = 8181 -default['FE'][:https_port] = 9443 -default['disableHttp'] = true - - -#+----------------------------------+ -#| | -#| Jetty | -#| | -#+----------------------------------+ - -#BasicAuth -default['basic_auth']['enabled'] = false -default['basic_auth'][:user_name] = "testName" -default['basic_auth'][:user_pass] = "testPass" -default['basic_auth']['excludedUrls'] = "/sdc2/rest/healthCheck" - -#Cassandra -default['cassandra']['cassandra_port'] = 9042 -default['cassandra']['datacenter_name'] = "DC-" -default['cassandra']['cluster_name'] = "SDC-CS-" -default['cassandra']['socket_read_timeout'] = 20000 -default['cassandra']['socket_connect_timeout'] = 20000 -default['cassandra']['janusgraph_connection_timeout'] = 10000 -default['cassandra']['janusgraph_config_file'] = "#{ENV['JETTY_BASE']}/config/catalog-be/janusgraph.properties" -default['cassandra'][:db_cache] = true -default['cassandra'][:read_consistency_level] = "ONE" -default['cassandra'][:write_consistency_level] = "ALL" - - -#Onboard -default['ONBOARDING_BE'][:http_port] = 8081 -default['ONBOARDING_BE'][:https_port] = 8445 - -#UEB -default['UEB']['PublicKey'] = "sSJc5qiBnKy2qrlc" -default['UEB']['SecretKey'] = "4ZRPzNJfEUK0sSNBvccd2m7X" - -default['Pair_EnvName'] = "" - -#+----------------------------------+ -#| | -#| Portal | -#| | -#+----------------------------------+ -default['ECompP']['cipher_key'] = "AGLDdG4D04BKm2IxIWEr8o==" -default['ECompP']['portal_user'] = "Ipwxi2oLvDxctMA1royaRw1W0jhucLx+grHzci3ePIA=" -default['ECompP']['portal_pass'] = "j85yNhyIs7zKYbR1VlwEfNhS6b7Om4l0Gx5O8931sCI=" -default['ECompP']['portal_app_name'] = "Ipwxi2oLvDxctMA1royaRw1W0jhucLx+grHzci3ePIA=" - - -#+----------------------------------+ -#| | -#| DMAAP Consumer | -#| | -#+----------------------------------+ -default['DMAAP']['active'] = false -default['DMAAP']['consumer']['aftEnvironment'] = "AFTUAT" -default['DMAAP']['consumer']['consumerGroup'] = "ccd_onap" -default['DMAAP']['consumer']['consumerId'] = "ccd_onap" -default['DMAAP']['consumer']['dme2preferredRouterFilePath'] = "DME2preferredRouter.txt" -default['DMAAP']['consumer']['environment'] = "TEST" -default['DMAAP']['consumer']['host'] = "dmaap.onap.com" -default['DMAAP']['consumer']['password'] = "password" -default['DMAAP']['consumer']['port'] = 3905 -default['DMAAP']['consumer']['serviceName'] = "dmaap-v1.dev.dmaap.dt.saat.acsi.onap.com/events" -default['DMAAP']['consumer']['topic'] = "com.onap.ccd.CCD-CatalogManagement-v1" -default['DMAAP']['consumer']['username'] = "user" -default['DMAAP']['partitioncount'] = "3" -default['DMAAP']['replicationcount'] = "3" diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/Artifact-Generator.properties b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/Artifact-Generator.properties deleted file mode 100644 index 1d7e5fa01a..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/Artifact-Generator.properties +++ /dev/null @@ -1,264 +0,0 @@ -#action widget details -AAI.model-version-id.action=fd7fb09e-d930-41b9-b83f-cfde9df48640 -AAI.model-invariant-id.action=af593b4b-490e-4665-ad74-2f6351c0a7ce -#action-data widget details -AAI.model-invariant-id.action-data=9551346c-7d8b-4daf-9926-b93e96e2344a -AAI.model-version-id.action-data=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd -#allotted-resource widget details -AAI.model-invariant-id.allotted-resource=f6d6a23d-a1a9-48ff-8419-b6530da2d381 -AAI.model-version-id.allotted-resource=7ad0915f-25c0-4a70-b9bc-185a75f87564 -#availability-zone widget details -AAI.model-version-id.availability-zone=6c092fb1-21b2-456b-9e01-67fb4de1896e -AAI.model-invariant-id.availability-zone=61b88c01-d819-41c0-8e21-7fd7ba47148e -#az-and-dvs-switches widget details -AAI.model-version-id.az-and-dvs-switches=b2dea88d-78a0-49bf-95c9-5819df08e966 -AAI.model-invariant-id.az-and-dvs-switches=53dc00d4-e6d9-48ec-b6cc-3d3797e9b896 -#class-of-service widget details -AAI.model-version-id.class-of-service=d2fb27cc-15eb-4c4e-828e-71d41aaecc5b -AAI.model-invariant-id.class-of-service=18094b19-d16d-4822-8acf-e92c6aefa178 -#cloud-region widget details -AAI.model-version-id.cloud-region=2a160989-b202-47dd-874b-4a0f275998f7 -AAI.model-invariant-id.cloud-region=425b2158-e51d-4509-9945-dad4556474a3 -#complex widget details -AAI.model-invariant-id.complex=af91c2f7-35fc-43cf-a13d-443f385b2353 -AAI.model-version-id.complex=3a8ab1ee-9220-4fe8-b89c-9251d160ddc2 -#connector widget details -AAI.model-version-id.connector=22104c9f-29fd-462f-be07-96cd6b46dd33 -AAI.model-invariant-id.connector=4c01c948-7607-4d66-8a6c-99c2c2717936 -#constrained-element-set widget details -AAI.model-invariant-id.constrained-element-set=c0292b4f-ee97-40cc-8c2e-f967c48f5701 -AAI.model-version-id.constrained-element-set=01102126-9c04-4a89-945b-b131e61e95d7 -#ctag-assignment widget details -AAI.model-version-id.ctag-assignment=44e5cb1f-0938-41aa-b766-d4595109fe89 -AAI.model-invariant-id.ctag-assignment=fcb8d46b-b656-4ad6-8fa4-22cef74b443f -#ctag-pool widget details -AAI.model-invariant-id.ctag-pool=46c51d4e-d67e-4a9c-b1f5-49b1e9c6fcaa -AAI.model-version-id.ctag-pool=2056c41f-23b9-4de7-9f50-819adad37d76 -#customer widget details -AAI.model-invariant-id.customer=c1d4305f-cdbd-4bbe-9069-a2f4978fd89e -AAI.model-version-id.customer=d4df5c27-98a1-4812-a8aa-c17f055b7a3f -#cvlan-tag-entry widget details -AAI.model-version-id.cvlan-tag-entry=c3878ffb-8d85-4114-bee6-e4074a9db10b -AAI.model-invariant-id.cvlan-tag-entry=245cf4b0-7cc5-4eea-bbd9-753e939adcab -#dvs-switch widget details -AAI.model-invariant-id.dvs-switch=98fbb471-1f86-428e-bd8a-c8a25de6fa23 -AAI.model-version-id.dvs-switch=4cb44ae8-e3ab-452a-9f95-bcc8a44c55ea -#edge-prop-names widget details -AAI.model-invariant-id.edge-prop-names=7a08cad4-8759-46a5-8245-095d1ba57ac6 -AAI.model-version-id.edge-prop-names=f0442326-8201-4d0e-857c-74b4ddcbfc9f -#element-choice-set widget details -AAI.model-invariant-id.element-choice-set=9a011958-7165-47a3-b872-00951d1f09ae -AAI.model-version-id.element-choice-set=af27fbfd-598d-44da-aeae-0f9d3a5fcd6a -#entitlement widget details -AAI.model-version-id.entitlement=7e27ba2e-b7db-4e13-9fae-d142152ef98a -AAI.model-invariant-id.entitlement=ae75b5a0-d5e1-4f3a-b8fb-37626a753da3 -#flavor widget details -AAI.model-invariant-id.flavor=bace8d1c-a261-4041-9e37-823117415d0f -AAI.model-version-id.flavor=36200fb5-f251-4f5d-a520-7c5ad5c2cd4b -#generic-vnf widget details -AAI.model-version-id.generic-vnf=93a6166f-b3d5-4f06-b4ba-aed48d009ad9 -AAI.model-invariant-id.generic-vnf=acc6edd8-a8d4-4b93-afaa-0994068be14c -#group-assignment widget details -AAI.model-invariant-id.group-assignment=7cc05f25-7ba2-42b7-a237-c5662a1689e1 -AAI.model-version-id.group-assignment=fe578080-ce19-4604-8760-fc264fbb2565 -#image widget details -AAI.model-version-id.image=f6a038c2-820c-42ba-8c2b-375e24e8f932 -AAI.model-invariant-id.image=3f4c7204-739b-4bbb-87a7-8a6856439c90 -#include-node-filter widget details -AAI.model-invariant-id.include-node-filter=2a2d8ad2-af0a-4e1f-9982-0c899e7dc827 -AAI.model-version-id.include-node-filter=f05f804d-7057-4ffe-bdc5-39f2f0c9c9fd -#instance-group widget details -AAI.model-version-id.instance-group=8e6ee9dc-9017-444a-83b3-219edb018128 -AAI.model-invariant-id.instance-group=3bf1e610-45f7-4ad6-b833-ca4c5ee6a3fd -#inventory-item widget details -AAI.model-invariant-id.inventory-item=cd57d844-9017-4078-aa19-926935a3d77c -AAI.model-version-id.inventory-item=69957f4a-2155-4b95-8d72-d6dd9b88b27b -#inventory-item-data widget details -AAI.model-version-id.inventory-item-data=0e54bb87-bd6e-4a2b-ad1c-6d935b87ae51 -AAI.model-invariant-id.inventory-item-data=87a383ae-cf03-432e-a9de-04e6a622d0fd -#ipsec-configuration widget details -AAI.model-invariant-id.ipsec-configuration=aca4c310-cb45-42bd-9f88-73e40ba7b962 -AAI.model-version-id.ipsec-configuration=d949fd10-36bf-408a-ac7a-cad5004d2e0d -#key-data widget details -AAI.model-version-id.key-data=c23ea04d-1a3b-453d-bc49-a6c783a5e92b -AAI.model-invariant-id.key-data=f5faa464-c2f2-4cc3-89d2-a90452dc3a07 -#l3-interface-ipv4-address-list widget details -AAI.model-version-id.l3-interface-ipv4-address-list=41e76b6f-1e06-4fd4-82cd-81c50fc4574b -AAI.model-invariant-id.l3-interface-ipv4-address-list=aad85df2-09be-40fa-b867-16415e4e10e2 -#l3-interface-ipv6-address-list widget details -AAI.model-invariant-id.l3-interface-ipv6-address-list=82966045-43ee-4982-8307-7e9610866140 -AAI.model-version-id.l3-interface-ipv6-address-list=d040621d-541a-477b-bb1b-a2b61b14e295 -#l3-network widget details -AAI.model-version-id.l3-network=9111f20f-e680-4001-b83f-19a2fc23bfc1 -AAI.model-invariant-id.l3-network=3d560d81-57d0-438b-a2a1-5334dba0651a -#lag-interface widget details -AAI.model-version-id.lag-interface=ce95f7c3-b61b-4758-ae9e-7e943b1c103d -AAI.model-invariant-id.lag-interface=e0ee9bde-c1fc-4651-a95d-8e0597bf7d70 -#lag-link widget details -AAI.model-version-id.lag-link=d29a087a-af59-4053-a3f8-0f95a92faa75 -AAI.model-invariant-id.lag-link=86ffe6e5-4d0e-4cec-80b5-5c38aa3eff98 -#license widget details -AAI.model-invariant-id.license=b9a9b337-1f86-42d3-b9f9-f987a089507c -AAI.model-version-id.license=6889274b-a1dc-40ab-9090-93677e13e2e6 -#license-key-resource widget details -AAI.model-invariant-id.license-key-resource=9022ebfe-b54f-4911-a6b2-8c3f5ec189b7 -AAI.model-version-id.license-key-resource=24b25f8c-b8bd-4c62-9421-87c12667aac9 -#l-interface widget details -AAI.model-version-id.l-interface=a32613fd-18b9-459e-aab8-fffb3912966a -AAI.model-invariant-id.l-interface=cea0a982-8d55-4093-921e-418fbccf7060 -#logical-link widget details -AAI.model-version-id.logical-link=a1481a38-f8ba-4ae4-bdf1-06c2c6af4c54 -AAI.model-invariant-id.logical-link=fe012535-2c31-4a39-a739-612374c638a0 -#metadatum widget details -AAI.model-invariant-id.metadatum=86dbb63a-265e-4614-993f-6771c30b56a5 -AAI.model-version-id.metadatum=6bae950e-8939-41d3-a6a7-251b03e4c1fc -#model widget details -AAI.model-invariant-id.model=06d1418a-5faa-452d-a94b-a2829df5f67b -AAI.model-version-id.model=1f51c05c-b164-4c27-9c03-5cbb239fd6be -#model-constraint widget details -AAI.model-invariant-id.model-constraint=c28966f3-e758-4483-b37b-a90b05d3dd33 -AAI.model-version-id.model-constraint=ad70dd19-f156-4fb5-a865-97b5563b0d37 -#model-element widget details -AAI.model-invariant-id.model-element=2076e726-3577-477a-a300-7fa65cd4df11 -AAI.model-version-id.model-element=753e813a-ba9e-4a1d-ab34-b2f6dc6eec0c -#multicast-configuration widget details -AAI.model-invariant-id.multicast-configuration=ea78c9e3-514d-4a0a-9162-13837fa54c35 -AAI.model-version-id.multicast-configuration=666a06ee-4b57-46df-bacf-908da8f10c3f -#named-query widget details -AAI.model-version-id.named-query=5c3b7c33-afa3-4be5-8da7-1a5ac6f99896 -AAI.model-invariant-id.named-query=80b712fd-0ad3-4180-a99c-8c995cf1cc32 -#named-query-element widget details -AAI.model-version-id.named-query-element=204c641a-3494-48c8-979a-86856f5fd32a -AAI.model-invariant-id.named-query-element=3c504d40-b847-424c-9d25-4fb7e0a3e994 -#network-policy widget details -AAI.model-invariant-id.network-policy=6aa05779-94d7-4d8b-9bee-59ef2ab0c246 -AAI.model-version-id.network-policy=a0ccd9dc-7062-4940-9bcc-e91dd28af510 -#network-profile widget details -AAI.model-version-id.network-profile=01f45471-4240-498c-a9e1-235dc0b8b4a6 -AAI.model-invariant-id.network-profile=2734b44a-b8a2-40f6-957d-6256589e5d00 -#newvce widget details -AAI.model-version-id.newvce=7c79e11f-a408-4593-aa86-ba948a1236af -AAI.model-invariant-id.newvce=4b05ec9c-c55d-4987-83ff-e08d6ddb694f -#oam-network widget details -AAI.model-invariant-id.oam-network=2851cf01-9c40-4064-87d4-6184a6fcff35 -AAI.model-version-id.oam-network=f4fb34f3-fd6e-4a8f-a3fb-4ab61a343b79 -#physical-link widget details -AAI.model-invariant-id.physical-link=c822d81f-822f-4304-9623-1025b53da568 -AAI.model-version-id.physical-link=9c523936-95b4-4d7f-9f53-6bdfe0cf2c05 -#p-interface widget details -AAI.model-invariant-id.p-interface=94043c37-4e73-439c-a790-0fdd697924cd -AAI.model-version-id.p-interface=d2cdb2d0-fc1f-4a57-a89e-591b1c4e3754 -#pnf widget details -AAI.model-version-id.pnf=e9f1fa7d-c839-418a-9601-03dc0d2ad687 -AAI.model-invariant-id.pnf=862b25a1-262a-4961-bdaa-cdc55d69785a -#port-group widget details -AAI.model-version-id.port-group=03e8bb6b-b48a-46ae-b5d4-e5af577e6844 -AAI.model-invariant-id.port-group=8ce940fb-55d7-4230-9e7f-a56cc2741f77 -#property-constraint widget details -AAI.model-version-id.property-constraint=81706bbd-981e-4362-ae20-995cbcb2d995 -AAI.model-invariant-id.property-constraint=f4a863c3-6886-470a-a6ae-05723837ea45 -#pserver widget details -AAI.model-invariant-id.pserver=6d932c8f-463b-4e76-83fb-87acfbaa2e2d -AAI.model-version-id.pserver=72f0d495-bc27-4653-9e1a-eef76bd34bc9 -#related-lookup widget details -AAI.model-invariant-id.related-lookup=468f6f5b-2996-41bb-b2a3-7cf9613ebb9b -AAI.model-version-id.related-lookup=0988bab5-bf4f-4938-a419-ab249867d12a -#reserved-prop-names widget details -AAI.model-invariant-id.reserved-prop-names=0c3e0ba3-618c-498d-9127-c8d42b00170f -AAI.model-version-id.reserved-prop-names=ac49d26d-9163-430e-934a-13b738a04f5c -#result-data widget details -AAI.model-version-id.result-data=4e9b50aa-5227-4f6f-b489-62e6bbc03c79 -AAI.model-invariant-id.result-data=ff656f23-6185-406f-9006-4b26834f3e1c -#route-table-reference widget details -AAI.model-version-id.route-table-reference=fed7e326-03a7-45ff-a3f2-471470d268c4 -AAI.model-invariant-id.route-table-reference=a8614b63-2636-4c4f-98df-fd448c4241db -#routing-instance widget details -AAI.model-invariant-id.routing-instance=1c2ded4f-8b01-4193-829c-966847dfec3e -AAI.model-version-id.routing-instance=3ccbcbc7-d19e-44d5-a52f-7e18aa8d69fa -#secondary-filter widget details -AAI.model-version-id.secondary-filter=1380619d-dd1a-4cec-b755-c6407833e065 -AAI.model-invariant-id.secondary-filter=738ff299-6290-4c00-8998-bd0e96a07b93 -#segmentation-assignment widget details -AAI.model-invariant-id.segmentation-assignment=6e814aee-46e1-4583-a9d4-0049bfd2b59b -AAI.model-version-id.segmentation-assignment=c5171ae0-44fb-4c04-b482-d56702241a44 -#service widget details -AAI.model-version-id.service=ecce2c42-3957-4ae0-9442-54bc6afe27b6 -AAI.model-invariant-id.service=07a3a60b-1b6c-4367-8173-8014386f89e3 -#service-capability widget details -AAI.model-invariant-id.service-capability=b1a7cc05-d19d-443b-a5d1-733e325c4232 -AAI.model-version-id.service-capability=f9cfec1b-18da-4bba-bd83-4b26cca115cd -#service-instance widget details -AAI.model-invariant-id.service-instance=82194af1-3c2c-485a-8f44-420e22a9eaa4 -AAI.model-version-id.service-instance=46b92144-923a-4d20-b85a-3cbd847668a9 -#service-subscription widget details -AAI.model-invariant-id.service-subscription=2e1a602a-acd8-4f78-94ff-618b802a303b -AAI.model-version-id.service-subscription=5e68299a-79f2-4bfb-8fbc-2bae877a2459 -#site-pair widget details -AAI.model-version-id.site-pair=7106bc02-6552-4fc3-8a56-4f3df9034531 -AAI.model-invariant-id.site-pair=db63f3e6-f8d1-484e-8d5e-191600b7914b -#site-pair-set widget details -AAI.model-invariant-id.site-pair-set=5d4dae3e-b402-4bfd-909e-ece12ff75d26 -AAI.model-version-id.site-pair-set=a5c6c1bc-dc38-468e-9459-bb08f87247df -#snapshot widget details -AAI.model-version-id.snapshot=962a7c8b-687f-4d32-a775-fe098e214bcd -AAI.model-invariant-id.snapshot=24de00ef-aead-4b52-995b-0adf8d4bd90d -#sriov-vf widget details -AAI.model-version-id.sriov-vf=1e8b331f-3d4a-4160-b7aa-f4d5a8916625 -AAI.model-invariant-id.sriov-vf=04b2935f-33c4-40a9-8af0-8b52690042dc -#start-node-filter widget details -AAI.model-version-id.start-node-filter=aad96fd3-e75f-42fc-9777-3450c36f1168 -AAI.model-invariant-id.start-node-filter=083093a3-e407-447a-ba5d-7583e4d23e1d -#subnet widget details -AAI.model-version-id.subnet=f902a6bc-6be4-4fe5-8458-a6ec0056b374 -AAI.model-invariant-id.subnet=1b2c9ba7-e449-4831-ba15-3073672f5ef2 -#tagged-inventory-item-list widget details -AAI.model-invariant-id.tagged-inventory-item-list=e78a7eaa-f65d-4919-9c2b-5b258c8c4d7e -AAI.model-version-id.tagged-inventory-item-list=c246f6e2-e3a1-4697-94c0-5672a7fbbf04 -#tenant widget details -AAI.model-invariant-id.tenant=97c26c99-6870-44c1-8a07-1d900d3f4ce6 -AAI.model-version-id.tenant=abcc54bc-bb74-49dc-9043-7f7171707545 -#tunnel-xconnect widget details -AAI.model-invariant-id.tunnel-xconnect=50b9e2fa-005c-4bbe-b651-3251dece4cd8 -AAI.model-version-id.tunnel-xconnect=e7cb4ca8-e1a5-4487-a716-4ae0bcd8aef5 -#update-node-key widget details -AAI.model-version-id.update-node-key=6004cfa6-eb6d-4062-971f-b1fde6b74aa0 -AAI.model-invariant-id.update-node-key=fe81c801-f65d-408a-b2b7-a729a18f8154 -#vce widget details -AAI.model-version-id.vce=b6cf54b5-ec45-43e1-be64-97b4e1513333 -AAI.model-invariant-id.vce=bab6dceb-e7e6-4301-a5e0-a7399b48d792 -#vf-module widget details -AAI.model-invariant-id.vf-module=ef86f9c5-2165-44f3-8fc3-96018b609ea5 -AAI.model-version-id.vf-module=c00563ae-812b-4e62-8330-7c4d0f47088a -#vig-server widget details -AAI.model-version-id.vig-server=8e8c22f1-fbdf-48ea-844c-8bdeb44e7b16 -AAI.model-invariant-id.vig-server=bed7c3b7-35d0-4cd9-abde-41b20e68b28e -#virtual-data-center widget details -AAI.model-invariant-id.virtual-data-center=5150abcf-0c5f-4593-9afe-a19c48fc4824 -AAI.model-version-id.virtual-data-center=6dd43ced-d789-47af-a759-d3abc14e3ac1 -#vlan widget details -AAI.model-version-id.vlan=257d88a5-a269-4c35-944f-aca04fbdb791 -AAI.model-invariant-id.vlan=d2b1eaf1-ae59-4116-9ee4-aa0179faa4f8 -#vnfc widget details -AAI.model-invariant-id.vnfc=96129eb9-f0de-4e05-8af2-73146473f766 -AAI.model-version-id.vnfc=5761e0a7-c6df-4d8a-9ebd-b8f445054dec -#vnf-image widget details -AAI.model-invariant-id.vnf-image=f9a628ff-7aa0-40e2-a93d-02d91c950982 -AAI.model-version-id.vnf-image=c4d3e747-ba4a-4b17-9896-94c6f18c19d3 -#volume widget details -AAI.model-version-id.volume=0fbe2e8f-4d91-4415-a772-88387049b38d -AAI.model-invariant-id.volume=ddd739b4-2b25-46c4-affc-41a32af5cc42 -#volume-group widget details -AAI.model-invariant-id.volume-group=fcec1b02-b2d0-4834-aef8-d71be04717dd -AAI.model-version-id.volume-group=99d44c90-1f61-4418-b9a6-56586bf38c79 -#vpe widget details -AAI.model-invariant-id.vpe=053ec3a7-5b72-492d-b54d-123805a9b967 -AAI.model-version-id.vpe=203817d3-829c-42d4-942d-2a935478e993 -#vpls-pe widget details -AAI.model-version-id.vpls-pe=b1566228-6785-4ce1-aea2-053736f80341 -AAI.model-invariant-id.vpls-pe=457ba89b-334c-4fbd-acc4-160ac0e0cdc0 -#vpn-binding widget details -AAI.model-invariant-id.vpn-binding=9e23b675-db2b-488b-b459-57aa9857baa0 -AAI.model-version-id.vpn-binding=21a146e5-9901-448c-9197-723076770119 -#vserver widget details -AAI.model-invariant-id.vserver=ff69d4e0-a8e8-4108-bdb0-dd63217e63c7 -AAI.model-version-id.vserver=8ecb2c5d-7176-4317-a255-26274edfdd53
\ No newline at end of file diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_1_cleanup_jettydir.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_1_cleanup_jettydir.rb deleted file mode 100644 index 620fa2ec4d..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_1_cleanup_jettydir.rb +++ /dev/null @@ -1,29 +0,0 @@ -unless Dir.exist? "#{ENV['JETTY_BASE']}/temp" - directory "BE_tempdir_creation" do - path "#{ENV['JETTY_BASE']}/temp" - owner "#{ENV['JETTY_USER']}" - owner "#{ENV['JETTY_GROUP']}" - mode '0755' - action :create - end -end - -unless Dir.exist? "#{ENV['JETTY_BASE']}/config" - directory "BE_create_config_dir" do - path "#{ENV['JETTY_BASE']}/config" - owner "#{ENV['JETTY_USER']}" - owner "#{ENV['JETTY_GROUP']}" - mode '0755' - action :create - end -end - -unless Dir.exist? "#{ENV['JETTY_BASE']}/config/catalog-be" - directory "BE_create_catalog-be" do - path "#{ENV['JETTY_BASE']}/config/catalog-be" - owner "#{ENV['JETTY_USER']}" - owner "#{ENV['JETTY_GROUP']}" - mode '0755' - action :create - end -end diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb deleted file mode 100644 index d2ec242f05..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb +++ /dev/null @@ -1,81 +0,0 @@ -# Set the cassandra replica number -replication_factor = node['cassandra']['replication_factor'] - -if node['Pair_EnvName'] == "" - janusgraph_dcname_with_rep = node['cassandra']['datacenter_name'] + "," + replication_factor.to_s - conf_dcname_with_rep = node['cassandra']['datacenter_name'] + "','" + replication_factor.to_s -else - janusgraph_dcname_with_rep = node['cassandra']['datacenter_name'] + "," + replication_factor.to_s + "," + node['cassandra']['cluster_name'] + node['Pair_EnvName'] + "," + replication_factor.to_s - conf_dcname_with_rep = node['cassandra']['datacenter_name'] + "','" + replication_factor.to_s + "','" + node['cassandra']['cluster_name'] + node['Pair_EnvName'] + "','" + replication_factor.to_s -end - -#Set random ID for DMaap configuration -if node['DMAAP']['random_id'].nil? - node.default['DMAAP']['random_id'] = Time.now.getutc.to_i -end - -template "janusgraph.properties" do - path "#{ENV['JETTY_BASE']}/config/catalog-be/janusgraph.properties" - source "BE-janusgraph.properties.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0644" - action :create_if_missing - variables({ - :cassandra_ip => node['Nodes']['CS'].join(",").gsub(/[|]/, ''), - :cassandra_cql_port => node['cassandra'][:cassandra_port], - :cassandra_pwd => node['cassandra'][:cassandra_password], - :cassandra_usr => node['cassandra'][:cassandra_user], - :rep_factor => replication_factor, - :DC_NAME => node['cassandra']['datacenter_name'], - :DC_NAME_WITH_REP => janusgraph_dcname_with_rep, - :janus_connection_timeout => node['cassandra']['janusgraph_connection_timeout'], - :cassandra_keystore_path => node['cassandra'][:cassandra_keystore_path], - :cassandra_keystore_password => node['cassandra'][:cassandra_keystore_password], - :cassandra_truststore_path => node['cassandra'][:cassandra_truststore_path], - :cassandra_truststore_password => node['cassandra'][:cassandra_truststore_password], - :cassandra_ssl_enabled => "#{ENV['cassandra_ssl_enabled']}", - :cassandra_read_consistency_level => node['cassandra'][:read_consistency_level], - :cassandra_write_consistency_level => node['cassandra'][:write_consistency_level], - :cassandra_db_cache => node['cassandra'][:db_cache] - }) -end - -template "catalog-be-config" do - path "#{ENV['JETTY_BASE']}/config/catalog-be/configuration.yaml" - source "BE-configuration.yaml.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0644" - action :create_if_missing - variables({ - :catalog_ip => node['Nodes']['BE'], - :catalog_port => node['BE'][:http_port], - :ssl_port => node['BE'][:https_port], - :basic_auth_flag => node['basic_auth']['enabled'], - :user_name => node['basic_auth'][:user_name], - :user_pass => node['basic_auth'][:user_pass], - :cassandra_ip => node['Nodes']['CS'].join(",").gsub(/[|]/, ''), - :cassandra_port => node['cassandra']['cassandra_port'], - :rep_factor => replication_factor, - :DC_NAME => node['cassandra']['datacenter_name'], - :REP_STRING => conf_dcname_with_rep, - :janusgraph_Path => "#{ENV['JETTY_BASE']}/config/catalog-be/", - :socket_connect_timeout => node['cassandra']['socket_connect_timeout'], - :socket_read_timeout => node['cassandra']['socket_read_timeout'], - :cassandra_pwd => node['cassandra'][:cassandra_password], - :cassandra_usr => node['cassandra'][:cassandra_user], - :cassandra_ssl_enabled => "#{ENV['cassandra_ssl_enabled']}", - :permittedAncestors => "#{ENV['permittedAncestors']}", - :dmaap_active => node['DMAAP']['active'] - }) -end - -template "distribution-engine-configuration" do - path "#{ENV['JETTY_BASE']}/config/catalog-be/distribution-engine-configuration.yaml" - source "BE-distribution-engine-configuration.yaml.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0644" - action :create_if_missing -end diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_3_setup_key_and_trust_store.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_3_setup_key_and_trust_store.rb deleted file mode 100644 index 66562d8ba9..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_3_setup_key_and_trust_store.rb +++ /dev/null @@ -1,21 +0,0 @@ -#Set the http module option -if node['BE'][:tls_cert] - execute "generate-keystore" do - command "openssl pkcs12 -inkey #{node['BE'][:tls_key]} -in #{node['BE'][:tls_cert]} -export -out /tmp/keystore.pkcs12 -passin pass:#{node['BE'][:tls_password]} -passout pass:#{node['BE'][:tls_password]}" - end - - execute "import-keystore" do - command "keytool -importkeystore -srcstoretype PKCS12 -srckeystore /tmp/keystore.pkcs12 -srcstorepass #{node['BE'][:tls_password]} -destkeystore #{ENV['JETTY_BASE']}/#{node['BE'][:keystore_path]} -deststorepass #{node['BE'][:keystore_password]} -noprompt" - end -end - -if node['BE'][:ca_cert] - execute "delete-existing-ca-alias" do - command "keytool -delete -alias sdc-be -storepass #{node['BE'][:truststore_password]} -keystore #{ENV['JETTY_BASE']}/#{node['BE'][:truststore_path]}" - returns [0, 1] - end - - execute "generate-truststore" do - command "keytool -import -alias sdc-be -file #{node['BE'][:ca_cert]} -storetype JKS -keystore #{ENV['JETTY_BASE']}/#{node['BE'][:truststore_path]} -storepass #{node['BE'][:truststore_password]} -noprompt" - end -end diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_jetty_Modules.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_jetty_Modules.rb deleted file mode 100644 index 172888c773..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_jetty_Modules.rb +++ /dev/null @@ -1,59 +0,0 @@ -#Set the http module option -if node['disableHttp'] - http_option = "#--module=http" -else - http_option = "--module=http" -end - -execute "create-jetty-modules" do - command "java -jar #{ENV['JETTY_HOME']}/start.jar --add-to-start=deploy && java -jar #{ENV['JETTY_HOME']}/start.jar --create-startd --add-to-start=http,https,setuid,rewrite" - cwd "#{ENV['JETTY_BASE']}" - action :run -end - -template "http-ini" do - path "#{ENV['JETTY_BASE']}/start.d/http.ini" - source "http-ini.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" - variables ({ - :http_option => http_option , - :http_port => "#{node['BE'][:http_port]}" - }) - -end - -template "jetty-rewrite" do - path "#{ENV['JETTY_BASE']}/etc/rewrite-root-to-swagger-ui.xml" - source "BE-jetty-rewrite.yaml.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0644" -end - - -template "https-ini" do - path "#{ENV['JETTY_BASE']}/start.d/https.ini" - source "https-ini.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" - variables :https_port => "#{node['BE'][:https_port]}" -end - -template "ssl-ini" do - path "#{ENV['JETTY_BASE']}/start.d/ssl.ini" - source "ssl-ini.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" - variables ({ - :https_port => "#{node['BE'][:https_port]}" , - :keystore_path => "#{node['BE'][:keystore_path]}" , - :keystore_password => "#{node['BE'][:keystore_password]}" , - :truststore_path => "#{node['BE'][:truststore_path]}" , - :truststore_password => "#{node['BE'][:truststore_password]}" - }) -end - diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_5_setup_elasticsearch.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_5_setup_elasticsearch.rb deleted file mode 100644 index 44e96f3477..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_5_setup_elasticsearch.rb +++ /dev/null @@ -1,21 +0,0 @@ -clusterName = node['elasticsearch'][:cluster_name]+node.chef_environment - -elasticsearch_list = '' - -node['Nodes']['ES'].each do |item| - elasticsearch_list += "- " + item + ":9300\n" -end - - - -template "elasticsearch.yml-config" do - path "#{ENV['JETTY_BASE']}/config/elasticsearch.yml" - source "BE-elasticsearch.yml.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" - variables ({ - :cluster_name => "#{clusterName}", - :es_host_ip => "#{elasticsearch_list}" - }) -end diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_6_setup_portal_and_key_properties.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_6_setup_portal_and_key_properties.rb deleted file mode 100644 index 5e37c29bf8..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_6_setup_portal_and_key_properties.rb +++ /dev/null @@ -1,25 +0,0 @@ -template "template portal.properties" do - path "#{ENV['JETTY_BASE']}/resources/portal.properties" - source "BE-portal.properties.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - 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'], - :portal_app_name => node['ECompP']['portal_app_name'], - }) -end - -template "template key.properties" do - path "#{ENV['JETTY_BASE']}/resources/key.properties" - source "BE-key.properties.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" - variables ({ - :cipher_key => node['ECompP']['cipher_key'] - }) -end
\ No newline at end of file diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_7_logback.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_7_logback.rb deleted file mode 100644 index 8dbebbb633..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_7_logback.rb +++ /dev/null @@ -1,8 +0,0 @@ -cookbook_file "#{ENV['JETTY_BASE']}/config/catalog-be/logback.xml" do - source "logback.xml" - mode 0644 - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - action :create_if_missing -end - diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_8_errors_config.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_8_errors_config.rb deleted file mode 100644 index cc059b4e06..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_8_errors_config.rb +++ /dev/null @@ -1,16 +0,0 @@ -cookbook_file "#{ENV['JETTY_BASE']}/config/catalog-be/ecomp-error-configuration.yaml" do - source "ecomp-error-configuration.yaml" - mode 0644 - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - action :create_if_missing -end - -cookbook_file "#{ENV['JETTY_BASE']}/config/catalog-be/error-configuration.yaml" do - source "error-configuration.yaml" - mode 0644 - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - action :create_if_missing -end - diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_9_prepareProbeFile.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_9_prepareProbeFile.rb deleted file mode 100644 index 51e69ae7a9..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_9_prepareProbeFile.rb +++ /dev/null @@ -1,17 +0,0 @@ -if node[:disableHttp] - protocol = "https" - port = "#{node['BE'][:https_port]}" -else - protocol = "http" - port = "#{node['BE'][:http_port]}" -end - -template "#{ENV['JETTY_BASE']}/ready-probe.sh" do - source "ready-probe.sh.erb" - sensitive true - mode 0755 - variables({ - :protocol => protocol, - :port => port - }) -end diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-janusgraph.properties.erb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-janusgraph.properties.erb deleted file mode 100644 index 4c894b4106..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-janusgraph.properties.erb +++ /dev/null @@ -1,30 +0,0 @@ -storage.backend=cql -storage.hostname=<%= @cassandra_ip %> -storage.port=<%= @cassandra_cql_port %> -storage.username=<%= @cassandra_usr %> -storage.password=<%= @cassandra_pwd %> -storage.connection-timeout=<%= @janus_connection_timeout %> -storage.cql.keyspace=sdctitan - -storage.cql.ssl.enabled=<%= @cassandra_ssl_enabled %> -storage.cql.ssl.keystore.location=<%= @cassandra_keystore_path %> -storage.cql.ssl.keystore.password=<%= @cassandra_keystore_password %> -storage.cql.ssl.truststore.location=<%= @cassandra_truststore_path %> -storage.cql.ssl.truststore.password=<%= @cassandra_truststore_password %> - -storage.cql.read-consistency-level=<%= @cassandra_read_consistency_level %> -storage.cql.write-consistency-level=<%= @cassandra_write_consistency_level %> -storage.cql.replication-strategy-class=NetworkTopologyStrategy -storage.cql.replication-strategy-options=<%= @DC_NAME_WITH_REP %> -storage.cql.local-datacenter=<%= @DC_NAME %> - - -cache.db-cache = <%= @cassandra_db_cache %> -cache.db-cache-clean-wait = 20 -cache.db-cache-time = 180000 -cache.db-cache-size = 0.5 - -cache.tx-cache-size = 1000000 - -storage.lock.retries=5 -graph.replace-instance-if-exists=true diff --git a/catalog-be/src/main/docker/backend/chef-solo/LICENSE b/catalog-be/src/main/docker/backend/chef-solo/LICENSE deleted file mode 100644 index 11069edd79..0000000000 --- a/catalog-be/src/main/docker/backend/chef-solo/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file 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. diff --git a/catalog-be/src/main/docker/backend/chef-solo/README.md b/catalog-be/src/main/docker/backend/chef-solo/README.md deleted file mode 100644 index ddb0fda830..0000000000 --- a/catalog-be/src/main/docker/backend/chef-solo/README.md +++ /dev/null @@ -1,37 +0,0 @@ -Deprecated -========== - -Use of this repository is deprecated. We recommend using the `chef generate repo` command that comes with [ChefDK](http://downloads.chef.io/chef-dk/). - -Overview -======== - -Every Chef installation needs a Chef Repository. This is the place where cookbooks, roles, config files and other artifacts for managing systems with Chef will live. We strongly recommend storing this repository in a version control system such as Git and treat it like source code. - -While we prefer Git, and make this repository available via GitHub, you are welcome to download a tar or zip archive and use your favorite version control system to manage the code. - -Repository Directories -====================== - -This repository contains several directories, and each directory contains a README file that describes what it is for in greater detail, and how to use it for managing your systems with Chef. - -* `cookbooks/` - Cookbooks you download or create. -* `data_bags/` - Store data bags and items in .json in the repository. -* `roles/` - Store roles in .rb or .json in the repository. -* `environments/` - Store environments in .rb or .json in the repository. - -Configuration -============= - -The repository contains a knife configuration file. - -* .chef/knife.rb - -The knife configuration file `.chef/knife.rb` is a repository specific configuration file for knife. If you're using Hosted Chef, you can download one for your organization from the management console. If you're using the Open Source Chef Server, you can generate a new one with `knife configure`. For more information about configuring Knife, see the Knife documentation. - -https://docs.chef.io/knife.html - -Next Steps -========== - -Read the README file in each of the subdirectories for more information about what goes in those directories. diff --git a/catalog-be/src/main/docker/backend/chef-solo/chefignore b/catalog-be/src/main/docker/backend/chef-solo/chefignore deleted file mode 100644 index ba30af6cff..0000000000 --- a/catalog-be/src/main/docker/backend/chef-solo/chefignore +++ /dev/null @@ -1,11 +0,0 @@ -# Put files/directories that should be ignored in this file. -# Lines that start with '# ' are comments. - -# emacs -*~ - -# vim -*.sw[a-z] - -# subversion -*/.svn/* diff --git a/catalog-be/src/main/docker/backend/chef-solo/cookbooks/README.md b/catalog-be/src/main/docker/backend/chef-solo/cookbooks/README.md deleted file mode 100644 index 86ea46bfbb..0000000000 --- a/catalog-be/src/main/docker/backend/chef-solo/cookbooks/README.md +++ /dev/null @@ -1,54 +0,0 @@ -This directory contains the cookbooks used to configure systems in your infrastructure with Chef. - -Knife needs to be configured to know where the cookbooks are located with the `cookbook_path` setting. If this is not set, then several cookbook operations will fail to work properly. - - cookbook_path ["./cookbooks"] - -This setting tells knife to look for the cookbooks directory in the present working directory. This means the knife cookbook subcommands need to be run in the `chef-repo` directory itself. To make sure that the cookbooks can be found elsewhere inside the repository, use an absolute path. This is a Ruby file, so something like the following can be used: - - current_dir = File.dirname(__FILE__) - cookbook_path ["#{current_dir}/../cookbooks"] - -Which will set `current_dir` to the location of the knife.rb file itself (e.g. `~/chef-repo/.chef/knife.rb`). - -Configure knife to use your preferred copyright holder, email contact and license. Add the following lines to `.chef/knife.rb`. - - cookbook_copyright "Example, Com." - cookbook_email "cookbooks@example.com" - cookbook_license "apachev2" - -Supported values for `cookbook_license` are "apachev2", "mit","gplv2","gplv3", or "none". These settings are used to prefill comments in the default recipe, and the corresponding values in the metadata.rb. You are free to change the the comments in those files. - -Create new cookbooks in this directory with Knife. - - knife cookbook create COOKBOOK - -This will create all the cookbook directory components. You don't need to use them all, and can delete the ones you don't need. It also creates a README file, metadata.rb and default recipe. - -You can also download cookbooks directly from the Opscode Cookbook Site. There are two subcommands to help with this depending on what your preference is. - -The first and recommended method is to use a vendor branch if you're using Git. This is automatically handled with Knife. - - knife cookbook site install COOKBOOK - -This will: - -* Download the cookbook tarball from cookbooks.opscode.com. -* Ensure its on the git master branch. -* Checks for an existing vendor branch, and creates if it doesn't. -* Checks out the vendor branch (chef-vendor-COOKBOOK). -* Removes the existing (old) version. -* Untars the cookbook tarball it downloaded in the first step. -* Adds the cookbook files to the git index and commits. -* Creates a tag for the version downloaded. -* Checks out the master branch again. -* Merges the cookbook into master. -* Repeats the above for all the cookbooks dependencies, downloading them from the community site - -The last step will ensure that any local changes or modifications you have made to the cookbook are preserved, so you can keep your changes through upstream updates. - -If you're not using Git, use the site download subcommand to download the tarball. - - knife cookbook site download COOKBOOK - -This creates the COOKBOOK.tar.gz from in the current directory (e.g., `~/chef-repo`). We recommend following a workflow similar to the above for your version control tool. diff --git a/catalog-be/src/main/docker/backend/chef-solo/data_bags/README.md b/catalog-be/src/main/docker/backend/chef-solo/data_bags/README.md deleted file mode 100644 index 0c15a391fa..0000000000 --- a/catalog-be/src/main/docker/backend/chef-solo/data_bags/README.md +++ /dev/null @@ -1,63 +0,0 @@ -Data Bags ---------- - -This directory contains directories of the various data bags you create for your infrastructure. Each subdirectory corresponds to a data bag on the Chef Server, and contains JSON files of the items that go in the bag. - -First, create a directory for the data bag. - - mkdir data_bags/BAG - -Then create the JSON files for items that will go into that bag. - - $EDITOR data_bags/BAG/ITEM.json - -The JSON for the ITEM must contain a key named "id" with a value equal to "ITEM". For example, - - { - "id": "foo" - } - -Next, create the data bag on the Chef Server. - - knife data bag create BAG - -Then upload the items in the data bag's directory to the Chef Server. - - knife data bag from file BAG ITEM.json - - -Encrypted Data Bags -------------------- - -Added in Chef 0.10, encrypted data bags allow you to encrypt the contents of your data bags. The content of attributes will no longer be searchable. To use encrypted data bags, first you must have or create a secret key. - - openssl rand -base64 512 > secret_key - -You may use this secret_key to add items to a data bag during a create. - - knife data bag create --secret-file secret_key passwords mysql - -You may also use it when adding ITEMs from files, - - knife data bag create passwords - knife data bag from file passwords data_bags/passwords/mysql.json --secret-file secret_key - -The JSON for the ITEM must contain a key named "id" with a value equal to "ITEM" and the contents will be encrypted when uploaded. For example, - - { - "id": "mysql", - "password": "abc123" - } - -Without the secret_key, the contents are encrypted. - - knife data bag show passwords mysql - id: mysql - password: 2I0XUUve1TXEojEyeGsjhw== - -Use the secret_key to view the contents. - - knife data bag show passwords mysql --secret-file secret_key - id: mysql - password: abc123 - diff --git a/catalog-be/src/main/docker/backend/chef-solo/environments/README.md b/catalog-be/src/main/docker/backend/chef-solo/environments/README.md deleted file mode 100644 index 50ac48db2b..0000000000 --- a/catalog-be/src/main/docker/backend/chef-solo/environments/README.md +++ /dev/null @@ -1,5 +0,0 @@ -Requires Chef 0.10.0+. - -This directory is for Ruby DSL and JSON files for environments. For more information see the Chef wiki page: - -http://docs.chef.io/environments.html diff --git a/catalog-be/src/main/docker/backend/chef-solo/roles/README.md b/catalog-be/src/main/docker/backend/chef-solo/roles/README.md deleted file mode 100644 index b0ee0b4d21..0000000000 --- a/catalog-be/src/main/docker/backend/chef-solo/roles/README.md +++ /dev/null @@ -1,16 +0,0 @@ -Create roles here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install roles on the server, use knife. - -For example, create `roles/base_example.rb`: - - name "base_example" - description "Example base role applied to all nodes." - # List of recipes and roles to apply. Requires Chef 0.8, earlier versions use 'recipes()'. - #run_list() - # Attributes applied if the node doesn't have it set already. - #default_attributes() - # Attributes applied no matter what the node has set already. - #override_attributes() - -Then upload it to the Chef Server: - - knife role from file roles/base_example.rb diff --git a/catalog-be/src/main/docker/backend/chef-solo/roles/catalog-be.json b/catalog-be/src/main/docker/backend/chef-solo/roles/catalog-be.json deleted file mode 100644 index 7dbd72a1ad..0000000000 --- a/catalog-be/src/main/docker/backend/chef-solo/roles/catalog-be.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "catalog-be", - "description": "Installation application - catalogBE", - "json_class": "Chef::Role", - "default_attributes": { - - }, - "override_attributes": { - - }, - "chef_type": "role", - "run_list": [ - "recipe[sdc-catalog-be::BE_1_cleanup_jettydir]", - "recipe[sdc-catalog-be::BE_2_setup_configuration]", - "recipe[sdc-catalog-be::BE_3_setup_key_and_trust_store]", - "recipe[sdc-catalog-be::BE_4_jetty_Modules]", - "recipe[sdc-catalog-be::BE_6_setup_portal_and_key_properties]", - "recipe[sdc-catalog-be::BE_7_logback]", - "recipe[sdc-catalog-be::BE_8_errors_config]", - "recipe[sdc-catalog-be::BE_9_prepareProbeFile]" - ], - "env_run_lists": { - } -} - diff --git a/catalog-be/src/main/docker/backend/chef-solo/solo.json b/catalog-be/src/main/docker/backend/chef-solo/solo.json deleted file mode 100644 index ce096b3931..0000000000 --- a/catalog-be/src/main/docker/backend/chef-solo/solo.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "run_list": [ "role[catalog-be]" ] -} - diff --git a/catalog-be/src/main/docker/backend/chef-solo/solo.rb b/catalog-be/src/main/docker/backend/chef-solo/solo.rb deleted file mode 100644 index 06c1af4592..0000000000 --- a/catalog-be/src/main/docker/backend/chef-solo/solo.rb +++ /dev/null @@ -1,16 +0,0 @@ -root = File.absolute_path(File.dirname(__FILE__)) -file_cache_path root -cookbook_path root + '/cookbooks' -json_attribs root + '/solo.json' -checksum_path root + '/checksums' -data_bag_path root + '/data_bags' -environment_path root + '/environments' -file_backup_path root + '/backup' -file_cache_path root + '/cache' -log_level :info -log_location STDOUT -rest_timeout 300 -role_path root + '/roles' -syntax_check_cache_path -umask 0022 -verbose_logging nil diff --git a/catalog-be/src/main/docker/backend/files/BE_3_setup_key_and_trust_store.sh b/catalog-be/src/main/docker/backend/files/BE_3_setup_key_and_trust_store.sh new file mode 100644 index 0000000000..7e02143ebf --- /dev/null +++ b/catalog-be/src/main/docker/backend/files/BE_3_setup_key_and_trust_store.sh @@ -0,0 +1,48 @@ +#!/bin/sh + +# Extract values from environment variables +TLS_CERT=${TLS_CERT} +TLS_KEY=${TLS_KEY} +TLS_PASSWORD=${TLS_PASSWORD} +KEYSTORE_PATH=${KEYSTORE_PATH} +KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD} +CA_CERT=${CA_CERT} +TRUSTSTORE_PATH=${TRUSTSTORE_PATH} +TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD} +JETTY_BASE=${JETTY_BASE:-"/app/jetty"} + +# Print extracted values +echo "Extracted environment variables:" +echo " TLS_CERT: $TLS_CERT" +echo " TLS_KEY: $TLS_KEY" +echo " TLS_PASSWORD: $TLS_PASSWORD" +echo " KEYSTORE_PATH: $KEYSTORE_PATH" +echo " KEYSTORE_PASSWORD: $KEYSTORE_PASSWORD" +echo " CA_CERT: $CA_CERT" +echo " TRUSTSTORE_PATH: $TRUSTSTORE_PATH" +echo " TRUSTSTORE_PASSWORD: $TRUSTSTORE_PASSWORD" +echo " JETTY_BASE: $JETTY_BASE" + +# Main logic to generate keystore and truststore +if [ -n $TLS_CERT ]; then + echo "Generating keystore..." + openssl pkcs12 -inkey $TLS_KEY -in $TLS_CERT -export \ + -out /tmp/keystore.pkcs12 -passin pass:$TLS_PASSWORD -passout pass:$TLS_PASSWORD + + echo "Importing keystore..." + keytool -importkeystore -srcstoretype PKCS12 \ + -srckeystore /tmp/keystore.pkcs12 -srcstorepass $TLS_PASSWORD \ + -destkeystore $JETTY_BASE/$KEYSTORE_PATH -deststorepass $KEYSTORE_PASSWORD -noprompt +fi + +if [ -n $CA_CERT ]; then + echo "Deleting existing CA alias..." + keytool -delete -alias sdc-be \ + -storepass $TRUSTSTORE_PASSWORD -keystore $JETTY_BASE/$TRUSTSTORE_PATH || true + + echo "Generating truststore..." + keytool -import -alias sdc-be -file $CA_CERT -storetype JKS \ + -keystore $JETTY_BASE/$TRUSTSTORE_PATH -storepass $TRUSTSTORE_PASSWORD -noprompt +fi + +echo "Setup completed successfully." diff --git a/catalog-be/src/main/docker/backend/files/create_directories.sh b/catalog-be/src/main/docker/backend/files/create_directories.sh new file mode 100644 index 0000000000..3ff15428a1 --- /dev/null +++ b/catalog-be/src/main/docker/backend/files/create_directories.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +# Set environment variables (replace with actual values) +JETTY_BASE="/app/jetty" +#JETTY_USER="onap" # Replace with actual user +#JETTY_GROUP="onap" # Replace with actual group + +# Create the temp directory if it doesn't exist +if [ ! -d "$JETTY_BASE/temp" ]; then + mkdir -p "$JETTY_BASE/temp" + chown "$JETTY_USER:$JETTY_GROUP" "$JETTY_BASE/temp" + chmod 755 "$JETTY_BASE/temp" + echo "Created $JETTY_BASE/temp directory." +fi + +# Create the config directory if it doesn't exist +if [ ! -d "$JETTY_BASE/config" ]; then + mkdir -p "$JETTY_BASE/config" + chown "$JETTY_USER:$JETTY_GROUP" "$JETTY_BASE/config" + chmod 755 "$JETTY_BASE/config" + echo "Created $JETTY_BASE/config directory." +fi + +# Create the config/catalog-be directory if it doesn't exist +if [ ! -d "$JETTY_BASE/config/catalog-be" ]; then + mkdir -p "$JETTY_BASE/config/catalog-be" + chown "$JETTY_USER:$JETTY_GROUP" "$JETTY_BASE/config/catalog-be" + chmod 755 "$JETTY_BASE/config/catalog-be" + echo "Created $JETTY_BASE/config/catalog-be directory." +fi + diff --git a/catalog-be/src/main/docker/backend/files/create_jetty_modules.sh b/catalog-be/src/main/docker/backend/files/create_jetty_modules.sh new file mode 100644 index 0000000000..414bcab6e7 --- /dev/null +++ b/catalog-be/src/main/docker/backend/files/create_jetty_modules.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +# Define environment variables +export JETTY_HOME="/app/jetty/" # Replace with your Jetty home directory +export JETTY_BASE="/app/jetty/" # Replace with your Jetty base directory + +# Navigate to the Jetty base directory +cd "$JETTY_BASE" + +# Run the Jetty start-up jar with deploy module added +java -jar $JETTY_HOME/start.jar --add-to-start=deploy + +# Create startd configuration and add http, https, setuid modules +java -jar $JETTY_HOME/start.jar --create-startd --add-to-start=http,https,setuid,rewrite diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/ecomp-error-configuration.yaml b/catalog-be/src/main/docker/backend/files/ecomp-error-configuration.yaml index 9d7cd74a2b..9d7cd74a2b 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/ecomp-error-configuration.yaml +++ b/catalog-be/src/main/docker/backend/files/ecomp-error-configuration.yaml diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/error-configuration.yaml b/catalog-be/src/main/docker/backend/files/error-configuration.yaml index 1b4a9b1224..1b4a9b1224 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/error-configuration.yaml +++ b/catalog-be/src/main/docker/backend/files/error-configuration.yaml diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/logback.xml b/catalog-be/src/main/docker/backend/files/logback.xml index 20a00ad528..20a00ad528 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/logback.xml +++ b/catalog-be/src/main/docker/backend/files/logback.xml diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-jetty-rewrite.yaml.erb b/catalog-be/src/main/docker/backend/files/rewrite-root-to-swagger-ui.xml index ea0e9aa57c..ea0e9aa57c 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-jetty-rewrite.yaml.erb +++ b/catalog-be/src/main/docker/backend/files/rewrite-root-to-swagger-ui.xml diff --git a/catalog-be/src/main/docker/backend/startup.sh b/catalog-be/src/main/docker/backend/startup.sh index 0f778a315e..18b19b9563 100644 --- a/catalog-be/src/main/docker/backend/startup.sh +++ b/catalog-be/src/main/docker/backend/startup.sh @@ -10,9 +10,6 @@ export JAVA_OPTIONS="$JAVA_OPTIONS -Dconfig.home=$JETTY_BASE/config \ -Djavax.net.ssl.trustStore=$JETTY_BASE/etc/org.onap.sdc.trust.jks \ -Djavax.net.ssl.trustStorePassword=z+KEj;t+,KN^iimSiS89e#p0" -cd $JETTY_BASE/chef-solo -chef-solo -c solo.rb -E ${ENVNAME} - # Execute Jetty cd $JETTY_HOME echo "jetty.httpConfig.sendServerVersion=false" >> $JETTY_HOME/start.d/start.ini diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml index e329cf6ee5..55f812b5bb 100644 --- a/catalog-dao/pom.xml +++ b/catalog-dao/pom.xml @@ -30,7 +30,7 @@ Modifications copyright (c) 2018 Nokia <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>sdc-main</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <properties> diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index 50e4fc87b4..468a7682db 100644 --- a/catalog-fe/pom.xml +++ b/catalog-fe/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>sdc-main</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/catalog-fe/sdc-frontend/Dockerfile b/catalog-fe/sdc-frontend/Dockerfile index 9fdfd78c0b..ed5d55e2ea 100644 --- a/catalog-fe/sdc-frontend/Dockerfile +++ b/catalog-fe/sdc-frontend/Dockerfile @@ -3,47 +3,61 @@ FROM onap/integration-java11:10.0.0 USER root ARG JETTY_FOLDER=/app/jetty -# Install Chef -RUN set -ex && \ - apk update && \ - apk add --no-cache \ - wget \ - build-base \ - ruby \ - ruby-dev \ - libffi-dev \ - libxml2-dev && \ - gem install --no-update-sources \ - rspec-its:1.3.0 hitimes:1.3.1 public_suffix:4.0.7 multipart-post:2.2.0 etc:1.3.0 bundler:2.3.26 chef:13.8.5 \ - faraday:2.8.1 minitar:0.12.1 berkshelf:6.3.1 \ - io-console:0.4.6 \ - webrick \ - json \ - --no-document && \ - gem cleanup +# Install curl for Alpine +RUN apk update && apk add curl && apk add gettext + +# Create the Jetty folder and necessary config directories +RUN mkdir -p $JETTY_FOLDER/ && chown onap:onap $JETTY_FOLDER ENV JETTY_HOME=$JETTY_FOLDER ENV JETTY_BASE=$JETTY_FOLDER ENV JETTY_USER=onap ENV JETTY_GROUP=onap -RUN mkdir $JETTY_FOLDER && chown onap:onap $JETTY_FOLDER - -USER onap - #Download jetty RUN wget -q https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty-distribution.version}/jetty-distribution-${jetty-distribution.version}.tar.gz --tries=3 -O $JETTY_FOLDER/jetty.tar.gz && \ tar xz -C $JETTY_FOLDER -f $JETTY_FOLDER/jetty.tar.gz --strip 1 && \ rm -rf $JETTY_FOLDER/jetty.tar.gz RUN sed -i 's/"jetty"/"onap"/g' $JETTY_FOLDER/etc/jetty-setuid.xml -RUN mkdir -p $JETTY_FOLDER/config/catalog-fe -COPY --chown=onap:onap chef-solo $JETTY_FOLDER/chef-solo/ -COPY --chown=onap:onap chef-repo/cookbooks $JETTY_FOLDER/chef-solo/cookbooks/ +# Add WAR files ADD --chown=onap:onap onboarding*.war $JETTY_FOLDER/webapps/ ADD --chown=onap:onap catalog-fe-*.war $JETTY_FOLDER/webapps/ -COPY --chown=onap:onap startup.sh $JETTY_FOLDER -RUN chmod 770 $JETTY_FOLDER/startup.sh +# Add scripts and configuration files +COPY --chown=onap:onap artifacts/scripts/cleanup_jettydir.sh $JETTY_FOLDER/ +COPY --chown=onap:onap artifacts/scripts/set-http-module.sh $JETTY_FOLDER/ +COPY --chown=onap:onap startup.sh $JETTY_FOLDER/ +COPY --chown=onap:onap artifacts/scripts/setup-keystore-truststore.sh $JETTY_FOLDER/ +COPY --chown=onap:onap artifacts/scripts/ready-probe.sh $JETTY_FOLDER/ +COPY --chown=onap:onap artifacts/files/catalog-fe/* $JETTY_FOLDER/config/catalog-fe/ +COPY --chown=onap:onap artifacts/files/fe_etc/* $JETTY_FOLDER/etc/ +COPY --chown=onap:onap artifacts/files/logging /tmp/logback.xml +COPY --chown=onap:onap artifacts/files/onboardingfe/* $JETTY_FOLDER/config/onboarding-fe/ +COPY --chown=onap:onap artifacts/files/startdConfig/* $JETTY_FOLDER/start.d/ +COPY --chown=onap:onap artifacts/scripts/env_variables.sh $JETTY_FOLDER/ + +# Add keystore and truststore files +COPY --chown=onap:onap artifacts/files/org.onap.sdc.p12 $JETTY_FOLDER/etc/ +COPY --chown=onap:onap artifacts/files/org.onap.sdc.trust.jks $JETTY_FOLDER/etc/ + +# Set permissions +RUN chown -R onap:onap $JETTY_FOLDER/* && \ + chmod 770 $JETTY_FOLDER/startup.sh && \ + chmod 770 $JETTY_FOLDER/set-http-module.sh && $JETTY_FOLDER/set-http-module.sh && \ + chmod 755 $JETTY_FOLDER/setup-keystore-truststore.sh && \ + chmod 755 $JETTY_FOLDER/ready-probe.sh && \ + chmod 755 $JETTY_FOLDER/config/catalog-fe/* && \ + chmod 644 $JETTY_FOLDER/etc/* && \ + chmod 770 /tmp/logback.xml && \ + chmod 755 $JETTY_FOLDER/config/onboarding-fe/* && \ + chmod 755 $JETTY_FOLDER/start.d/* + +# Add Jetty rewrite and configuration settings +RUN echo "etc/rewrite-root-to-sdc1.xml" >> "$JETTY_FOLDER/start.d/rewrite.ini" && \ +echo "jetty.httpConfig.sendServerVersion=false" >> "$JETTY_FOLDER/start.d/start.ini" + +USER onap +WORKDIR $JETTY_FOLDER ENTRYPOINT [ "sh", "-c", "${JETTY_HOME}/startup.sh"] diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb b/catalog-fe/sdc-frontend/artifacts/files/catalog-fe/configuration.yaml index 1b10845aaa..8a0f332c94 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb +++ b/catalog-fe/sdc-frontend/artifacts/files/catalog-fe/configuration.yaml @@ -1,24 +1,20 @@ # Needed for logging purposes. To be populated by DevOps - currently dummy -feFqdn: <%= @fe_host_ip %> +feFqdn: sdc-FE # catalog backend hostname -beHost: <%= @be_host_ip %> +beHost: sdc-BE # catalog backend http port -beHttpPort: <%= @catalog_port %> +beHttpPort: 8080 # catalog backend http context beContext: /sdc2/rest/v1/catalog/upload/resources # catalog backend protocol -<% if node[:disableHttp] -%> -beProtocol: https -<% else %> beProtocol: http -<% end -%> # catalog backend ssl port -beSslPort: <%= @ssl_port %> +beSslPort: 8443 # threadpool size for handling requests threadpoolSize: 50 @@ -29,8 +25,8 @@ requestTimeout: 1200 # catalog ms (the host-port values need to be changed once it is deployed) catalogFacadeMs: protocol: http - host: <%= node['FACADE_VIP'] %> - port: <%= @facade_port %> + host: + port: healthCheckUri: "/healthCheck" path: "/uicache" @@ -40,28 +36,18 @@ healthCheckSocketTimeoutInMs: 5000 healthCheckIntervalInSeconds: 5 basicAuth: - enabled: <%= @basic_auth_flag %> - userName: <%= @user_name %> - userPass: <%= @user_pass %> + enabled: true + userName: testName + userPass: testPass onboarding: - hostFe: <%= @fe_host_ip %> - <% if node[:disableHttp] -%> - protocolFe: https - portFe: <%= node['FE'][:https_port] %> - <% else %> + hostFe: sdc-FE protocolFe: http - portFe: <%= node['FE'][:http_port] %> - <% end -%> + portFe: 8181 healthCheckUriFe: "/onboarding/v1.0/healthcheck" - hostBe: <%= node['ONBOARDING_BE_VIP'] %> - <% if node[:disableHttp] -%> - protocolBe: https - portBe: <%= node['ONBOARDING_BE'][:https_port] %> - <% else %> + hostBe: sdc-onboard-BE protocolBe: http - portBe: <%= node['ONBOARDING_BE'][:http_port] %> - <% end -%> + portBe: 8081 identificationHeaderFields: - @@ -96,7 +82,7 @@ authCookie: cookieName: "AuthenticationCookie" path: / domain: "" - securityKey: <%= node['access_restriction_key'] %> + securityKey: # Connection parameters @@ -126,4 +112,4 @@ healthStatusExclude: - External API #Space separated list of permitted ancestors -permittedAncestors: <%= @permittedAncestors %> +permittedAncestors: diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-ecomp-error-configuration.yaml b/catalog-fe/sdc-frontend/artifacts/files/catalog-fe/ecomp-error-configuration.yaml index 8982b2424f..8982b2424f 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-ecomp-error-configuration.yaml +++ b/catalog-fe/sdc-frontend/artifacts/files/catalog-fe/ecomp-error-configuration.yaml diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/key.properties b/catalog-fe/sdc-frontend/artifacts/files/catalog-fe/key.properties index 0315075e53..0315075e53 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/key.properties +++ b/catalog-fe/sdc-frontend/artifacts/files/catalog-fe/key.properties diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-logback.xml b/catalog-fe/sdc-frontend/artifacts/files/catalog-fe/logback.xml index 7249e84b2a..7249e84b2a 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-logback.xml +++ b/catalog-fe/sdc-frontend/artifacts/files/catalog-fe/logback.xml diff --git a/catalog-fe/sdc-frontend/artifacts/files/catalog-fe/plugins-configuration.yaml b/catalog-fe/sdc-frontend/artifacts/files/catalog-fe/plugins-configuration.yaml new file mode 100644 index 0000000000..3dfa143b4f --- /dev/null +++ b/catalog-fe/sdc-frontend/artifacts/files/catalog-fe/plugins-configuration.yaml @@ -0,0 +1,32 @@ +pluginsList: + - pluginId: POLICY + pluginDiscoveryUrl: http://192.168.86.21:9090/policy/ + pluginSourceUrl: http://192.168.86.21:9090/policy/ + pluginStateUrl: "policy" + pluginDisplayOptions: + tab: + displayName: "POLICY" + displayRoles: ["DESIGNER"] + - pluginId: POLICY_LIST + pluginDiscoveryUrl: http://192.168.86.21:8095/artifact + pluginSourceUrl: http://192.168.86.21:8095/artifact + pluginStateUrl: "policy_list" + pluginDisplayOptions: + context: + displayName: "Apex policy" + displayContext: ["SERVICE"] + displayRoles: ["DESIGNER"] + - pluginId: WORKFLOW + pluginDiscoveryUrl: http://192.168.86.21:8184/workflows + pluginSourceUrl: http://192.168.86.21:8184/workflows + pluginStateUrl: "workflowDesigner" + pluginDisplayOptions: + tab: + displayName: "WORKFLOW" + displayRoles: ["DESIGNER", "TESTER"] + context: + displayName: "Workflow Designer" + displayContext: ["VF"] + displayRoles: ["DESIGNER", "TESTER"] + +connectionTimeout: 1000 diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-rest-configuration.yaml b/catalog-fe/sdc-frontend/artifacts/files/catalog-fe/rest-configuration.yaml index ecedafea56..ecedafea56 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-rest-configuration.yaml +++ b/catalog-fe/sdc-frontend/artifacts/files/catalog-fe/rest-configuration.yaml diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-workspace-configuration.yaml b/catalog-fe/sdc-frontend/artifacts/files/catalog-fe/workspace-configuration.yaml index f05b28c58e..f05b28c58e 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-workspace-configuration.yaml +++ b/catalog-fe/sdc-frontend/artifacts/files/catalog-fe/workspace-configuration.yaml diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-jetty-rewrite.yaml.erb b/catalog-fe/sdc-frontend/artifacts/files/fe_etc/rewrite-root-to-sdc1.xml index e0862a5bfd..e0862a5bfd 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-jetty-rewrite.yaml.erb +++ b/catalog-fe/sdc-frontend/artifacts/files/fe_etc/rewrite-root-to-sdc1.xml diff --git a/catalog-fe/sdc-frontend/artifacts/files/logging/logback.xml b/catalog-fe/sdc-frontend/artifacts/files/logging/logback.xml new file mode 100644 index 0000000000..5ee7e23960 --- /dev/null +++ b/catalog-fe/sdc-frontend/artifacts/files/logging/logback.xml @@ -0,0 +1,226 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +# Copyright © 2018 Amdocs, Bell Canada, AT&T, ZTE +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file 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. +--> + +<configuration scan="true" scanPeriod="3 seconds"> + <property name="logDir" value="/var/log/onap"/> + <property name="componentName" scope="system" value="sdc"/> + <property name="subComponentName" scope="system" value="sdc-fe"/> + <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}"/> + <property file="${config.home}/catalog-fe/configuration.yaml"/> + <property name="enable-all-log" scope="context" value="false"/> + <!-- log file names --> + <property name="errorLogName" value="error"/> + <property name="metricsLogName" value="metrics"/> + <property name="auditLogName" value="audit"/> + <property name="debugLogName" value="debug"/> + <property name="transactionLogName" value="transaction"/> + <property name="allLogName" value="all"/> + <property name="queueSize" value="256"/> + <property name="maxFileSize" value="50MB"/> + <property name="maxHistory" value="30"/> + <property name="totalSizeCap" value="10GB"/> + <property name="pattern" + value="%d{"yyyy-MM-dd'T'HH:mm:ss.SSSXXX", UTC}\t[%thread]\t%-5level\t%logger{36}\t%replace(%replace(%replace(%mdc){'\t','\\\\t'}){', ','\t'}){'\n', '\\\\n'}\t%replace(%replace(%msg){'\n', '\\\\n'}){'\t','\\\\t'}%n"/> + + <!-- STDOUT --> + <appender class="ch.qos.logback.core.ConsoleAppender" name="STDOUT"> + <encoder> + <pattern>${pattern}</pattern> + </encoder> + </appender> + + <!-- STDERR --> + <appender class="ch.qos.logback.core.ConsoleAppender" name="STDERR"> + <filter class="ch.qos.logback.classic.filter.LevelFilter"> + <level>ERROR</level> + <onMatch>ACCEPT</onMatch> + <onMismatch>DENY</onMismatch> + </filter> + <encoder> + <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern> + </encoder> + </appender> + + <!-- All log --> + <if condition='property("enable-all-log").equalsIgnoreCase("true")'> + <then> + <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="ALL_ROLLING"> + <file>${logDirectory}/${allLogName}.log</file> + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> + <fileNamePattern>${logDirectory}/${allLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern> + <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> + <maxFileSize>${maxFileSize}</maxFileSize> + </timeBasedFileNamingAndTriggeringPolicy> + <maxHistory>${maxHistory}</maxHistory> + <totalSizeCap>${totalSizeCap}</totalSizeCap> + </rollingPolicy> + <encoder> + <pattern>${pattern}</pattern> + </encoder> + </appender> + <appender class="ch.qos.logback.classic.AsyncAppender" name="ASYNC_ALL"> + <appender-ref ref="ALL_ROLLING"/> + </appender> + </then> + </if> + <!-- Error log --> + <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="ERROR_ROLLING"> + <file>${logDirectory}/${errorLogName}.log</file> + <!-- Audit messages filter - deny audit messages --> + <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> + <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator"> + <marker>AUDIT_MARKER</marker> + </evaluator> + <onMismatch>NEUTRAL</onMismatch> + <onMatch>DENY</onMatch> + </filter> + <!-- Transaction messages filter - deny Transaction messages --> + <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> + <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator"> + <marker>TRANSACTION_MARKER</marker> + </evaluator> + <onMismatch>NEUTRAL</onMismatch> + <onMatch>DENY</onMatch> + </filter> + <!-- deny all events with a level below INFO, that is TRACE and DEBUG --> + <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> + <level>INFO</level> + </filter> + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> + <fileNamePattern>${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern> + <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> + <maxFileSize>${maxFileSize}</maxFileSize> + </timeBasedFileNamingAndTriggeringPolicy> + <maxHistory>${maxHistory}</maxHistory> + <totalSizeCap>${totalSizeCap}</totalSizeCap> + </rollingPolicy> + <encoder> + <pattern>${pattern}</pattern> + </encoder> + </appender> + <!-- Debug log --> + <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="DEBUG_ROLLING"> + <file>${logDirectory}/${debugLogName}.log</file> + <!-- No need to deny audit messages - they are INFO only, will be denied + anyway --> + <!-- Transaction messages filter - deny Transaction messages, there are + some DEBUG level messages among them --> + <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> + <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator"> + <marker>TRANSACTION_MARKER</marker> + </evaluator> + <onMismatch>NEUTRAL</onMismatch> + <onMatch>DENY</onMatch> + </filter> + <!-- accept DEBUG and TRACE level --> + <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> + <evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator"> + <expression>e.level.toInt() <= DEBUG.toInt()</expression> + </evaluator> + <OnMismatch>DENY</OnMismatch> + <OnMatch>NEUTRAL</OnMatch> + </filter> + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> + <fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern> + <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> + <maxFileSize>${maxFileSize}</maxFileSize> + </timeBasedFileNamingAndTriggeringPolicy> + <maxHistory>${maxHistory}</maxHistory> + <totalSizeCap>${totalSizeCap}</totalSizeCap> + </rollingPolicy> + <encoder> + <pattern>${pattern}</pattern> + </encoder> + </appender> + <!-- Audit log --> + <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="AUDIT_ROLLING"> + <file>${logDirectory}/${auditLogName}.log</file> + <!-- Audit messages filter - accept audit messages --> + <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> + <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator"> + <marker>AUDIT_MARKER</marker> + </evaluator> + <onMismatch>DENY</onMismatch> + <onMatch>ACCEPT</onMatch> + </filter> + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> + <fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern> + <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> + <maxFileSize>${maxFileSize}</maxFileSize> + </timeBasedFileNamingAndTriggeringPolicy> + <maxHistory>${maxHistory}</maxHistory> + <totalSizeCap>${totalSizeCap}</totalSizeCap> + </rollingPolicy> + <encoder> + <pattern>${pattern}</pattern> + </encoder> + </appender> + <!-- SdncTransaction log --> + <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="TRANSACTION_ROLLING"> + <file>${logDirectory}/${transactionLogName}.log</file> + <!-- Transaction messages filter - accept audit messages --> + <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> + <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator"> + <marker>TRANSACTION_MARKER</marker> + </evaluator> + <onMismatch>DENY</onMismatch> + <onMatch>ACCEPT</onMatch> + </filter> + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> + <fileNamePattern>${logDirectory}/${transactionLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern> + <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> + <maxFileSize>${maxFileSize}</maxFileSize> + </timeBasedFileNamingAndTriggeringPolicy> + <maxHistory>${maxHistory}</maxHistory> + <totalSizeCap>${totalSizeCap}</totalSizeCap> + </rollingPolicy> + <encoder> + <pattern>${pattern}</pattern> + </encoder> + </appender> + <!-- Asynchronicity Configurations --> + <appender class="ch.qos.logback.classic.AsyncAppender" name="ASYNC_DEBUG"> + <queueSize>${queueSize}</queueSize> + <appender-ref ref="DEBUG_ROLLING"/> + </appender> + <appender class="ch.qos.logback.classic.AsyncAppender" name="ASYNC_TRANSACTION"> + <queueSize>${queueSize}</queueSize> + <appender-ref ref="TRANSACTION_ROLLING"/> + </appender> + <appender class="ch.qos.logback.classic.AsyncAppender" name="ASYNC_ERROR"> + <queueSize>${queueSize}</queueSize> + <appender-ref ref="ERROR_ROLLING"/> + </appender> + <appender class="ch.qos.logback.classic.AsyncAppender" name="ASYNC_AUDIT"> + <queueSize>${queueSize}</queueSize> + <appender-ref ref="AUDIT_ROLLING"/> + </appender> + <root level="INFO"> + <appender-ref ref="ASYNC_ERROR"/> + <appender-ref ref="ASYNC_DEBUG"/> + <appender-ref ref="ASYNC_AUDIT"/> + <appender-ref ref="ASYNC_TRANSACTION"/> + <if condition='property("enable-all-log").equalsIgnoreCase("true")'> + <then> + <appender-ref ref="ALL_ROLLING"/> + </then> + </if> + <appender-ref ref="STDOUT"/> + <appender-ref ref="STDERR"/> + </root> + <logger level="INFO" name="org.openecomp.sdc"/> +</configuration> diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-onboarding-configuration.yaml.erb b/catalog-fe/sdc-frontend/artifacts/files/onboardingfe/onboarding_configuration.yaml index 4646661dfb..b789e0b559 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-onboarding-configuration.yaml.erb +++ b/catalog-fe/sdc-frontend/artifacts/files/onboardingfe/onboarding_configuration.yaml @@ -1,5 +1,6 @@ notifications: pollingIntervalMsec: 2000 selectionSize: 100 - beHost: <%= @catalog_ip %> - beHttpPort: <%= @catalog_port %>
\ No newline at end of file + beHost: sdc-onboard-BE + beHttpPort: 8081 +
\ No newline at end of file diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/org.onap.sdc.p12 b/catalog-fe/sdc-frontend/artifacts/files/org.onap.sdc.p12 Binary files differindex 446856071b..446856071b 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/org.onap.sdc.p12 +++ b/catalog-fe/sdc-frontend/artifacts/files/org.onap.sdc.p12 diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/org.onap.sdc.trust.jks b/catalog-fe/sdc-frontend/artifacts/files/org.onap.sdc.trust.jks Binary files differindex e6686cc08c..e6686cc08c 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/org.onap.sdc.trust.jks +++ b/catalog-fe/sdc-frontend/artifacts/files/org.onap.sdc.trust.jks diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/http-ini.erb b/catalog-fe/sdc-frontend/artifacts/files/startdConfig/http.ini index 8f2669032b..5ee6ea8127 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/http-ini.erb +++ b/catalog-fe/sdc-frontend/artifacts/files/startdConfig/http.ini @@ -1,6 +1,6 @@ # --------------------------------------- # Module: http -<%= @http_option %> +--module=http ### HTTP Connector Configuration @@ -8,7 +8,7 @@ # jetty.http.host=0.0.0.0 ## Connector port to listen on -jetty.http.port=<%= @http_port %> +jetty.http.port=8181 ## Connector idle timeout in milliseconds jetty.http.idleTimeout=30000 diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/https-ini.erb b/catalog-fe/sdc-frontend/artifacts/files/startdConfig/https.ini index 9999a4109b..b4505d4d86 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/https-ini.erb +++ b/catalog-fe/sdc-frontend/artifacts/files/startdConfig/https.ini @@ -8,7 +8,7 @@ # jetty.https.host=0.0.0.0 ## Connector port to listen on -jetty.https.port=<%= @https_port %> +jetty.https.port=9443 ## Connector idle timeout in milliseconds jetty.https.idleTimeout=30000 diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ssl-ini.erb b/catalog-fe/sdc-frontend/artifacts/files/startdConfig/ssl.ini index d3c8bc187c..d9077201db 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ssl-ini.erb +++ b/catalog-fe/sdc-frontend/artifacts/files/startdConfig/ssl.ini @@ -8,7 +8,7 @@ # jetty.ssl.host=0.0.0.0 ## Connector port to listen on -jetty.ssl.port=<%= @https_port %> +jetty.ssl.port=9443 ## Connector idle timeout in milliseconds # jetty.ssl.idleTimeout=30000 @@ -42,42 +42,27 @@ jetty.ssl.port=<%= @https_port %> ## See http://www.eclipse.org/jetty/documentation/current/configuring-security-secure-passwords.html ## Keystore file path (relative to $jetty.base) -<% unless @keystore_path.nil? || @keystore_path.strip.empty? -%> -jetty.sslContext.keyStorePath=<%= @keystore_path %> -<% end -%> ## Truststore file path (relative to $jetty.base) -<% unless @truststore_path.nil? || @truststore_path.strip.empty? -%> -jetty.sslContext.trustStorePath=<%= @truststore_path %> -<% end -%> ## Keystore password -<% unless @keystore_password.nil? || @keystore_password.strip.empty? -%> -jetty.sslContext.keyStorePassword=<%= @keystore_password %> -<% end -%> ## Keystore type and provider # jetty.sslContext.keyStoreType=JKS # jetty.sslContext.keyStoreProvider= ## KeyManager password -<% unless @keystore_password.nil? || @keystore_password.strip.empty? -%> -jetty.sslContext.keyManagerPassword=<%= @keystore_password %> -<% end -%> ## Truststore password -# tp<%= @truststore_password %>end -# kp<%= @keystore_password %>end -<% unless @truststore_password.nil? || @truststore_password.strip.empty? -%> -jetty.sslContext.trustStorePassword=<%= @truststore_password %> -<% end -%> +# tpend +# kpend ## Truststore type and provider # jetty.sslContext.trustStoreType=JKS # jetty.sslContext.trustStoreProvider= ## whether client certificate authentication is required -jetty.sslContext.needClientAuth=<%= !@truststore_password.nil? && !@truststore_password.strip.empty? %> +jetty.sslContext.needClientAuth=false ## Whether client certificate authentication is desired # jetty.sslContext.wantClientAuth=false diff --git a/catalog-fe/sdc-frontend/artifacts/scripts/cleanup_jettydir.sh b/catalog-fe/sdc-frontend/artifacts/scripts/cleanup_jettydir.sh new file mode 100644 index 0000000000..7324de44ad --- /dev/null +++ b/catalog-fe/sdc-frontend/artifacts/scripts/cleanup_jettydir.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +#Create temp directory +mkdir -p "$JETTY_BASE/temp" +chown "$JETTY_USER:$JETTY_GROUP" "$JETTY_BASE/temp" +chmod 0755 "$JETTY_BASE/temp" + +# Create config directory +mkdir -p "$JETTY_BASE/config" +chown "$JETTY_USER:$JETTY_GROUP" "$JETTY_BASE/config" +chmod 0755 "$JETTY_BASE/config" + +# Create onboarding-be directory +mkdir -p "$JETTY_BASE/config/onboarding-fe" +chown -R "$JETTY_USER:$JETTY_GROUP" "$JETTY_BASE/config/onboarding-fe" +chmod -R 0755 "$JETTY_BASE/config/onboarding-fe" + +# Create onboarding-be directory +mkdir -p "$JETTY_BASE/config/catalog-fe" +chown -R "$JETTY_USER:$JETTY_GROUP" "$JETTY_BASE/config/catalog-fe" +chmod -R 0755 "$JETTY_BASE/config/catalog-fe" diff --git a/catalog-fe/sdc-frontend/artifacts/scripts/env_variables.sh b/catalog-fe/sdc-frontend/artifacts/scripts/env_variables.sh new file mode 100644 index 0000000000..283bc5289b --- /dev/null +++ b/catalog-fe/sdc-frontend/artifacts/scripts/env_variables.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +# Environment variables +export behttpport=8080 +export permittedAncestors= +export fe_conf_https_port=9443 +export fe_conf_onboard_http_port=8181 +export onboarding_be_http_port=8081 +export onboarding_be_https_port=8445 +export conf_http_port=8181 +export conf_https_port=9443 +export keystore_path= +export keystore_password= +export truststore_path= +export truststore_password= +export CATALOG_FACADE_HOST= +export CATALOG_FACADE_PORT= +export BASIC_AUTH_USERNAME=testName +export BASIC_AUTH_PASSWORD=testPass +export SECURITY_KEY= +########### Apply env variables to the existing files ########### + +# Apply environment variables to .yaml files in /app/jetty/config directory +for file in /app/jetty/config/*/*.yaml; do + envsubst < "$file" > "$file.tmp" && mv -f "$file.tmp" "$file" +done diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ready-probe.sh.erb b/catalog-fe/sdc-frontend/artifacts/scripts/ready-probe.sh index eb69f2e8c0..65434716a1 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ready-probe.sh.erb +++ b/catalog-fe/sdc-frontend/artifacts/scripts/ready-probe.sh @@ -1,9 +1,8 @@ #!/bin/sh -health_check_http_code=$(curl -k --max-time 5 -o /dev/null -w '%{http_code}' <%= @protocol %>://127.0.0.1:<%= @port %>/sdc1/rest/healthCheck) - +health_check_http_code=$(curl -k --max-time 5 -o /dev/null -w '%{http_code}' -X GET --header "Accept: application/json" "http://127.0.0.1:8181//sdc1/rest/healthCheck") if [ "$health_check_http_code" -eq 200 ]; then exit 0 else echo "Health check http status: $health_check_http_code" exit 1 -fi +fi
\ No newline at end of file diff --git a/catalog-fe/sdc-frontend/artifacts/scripts/set-http-module.sh b/catalog-fe/sdc-frontend/artifacts/scripts/set-http-module.sh new file mode 100644 index 0000000000..414bcab6e7 --- /dev/null +++ b/catalog-fe/sdc-frontend/artifacts/scripts/set-http-module.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +# Define environment variables +export JETTY_HOME="/app/jetty/" # Replace with your Jetty home directory +export JETTY_BASE="/app/jetty/" # Replace with your Jetty base directory + +# Navigate to the Jetty base directory +cd "$JETTY_BASE" + +# Run the Jetty start-up jar with deploy module added +java -jar $JETTY_HOME/start.jar --add-to-start=deploy + +# Create startd configuration and add http, https, setuid modules +java -jar $JETTY_HOME/start.jar --create-startd --add-to-start=http,https,setuid,rewrite diff --git a/catalog-fe/sdc-frontend/artifacts/scripts/setup-keystore-truststore.sh b/catalog-fe/sdc-frontend/artifacts/scripts/setup-keystore-truststore.sh new file mode 100644 index 0000000000..692fdbd11e --- /dev/null +++ b/catalog-fe/sdc-frontend/artifacts/scripts/setup-keystore-truststore.sh @@ -0,0 +1,10 @@ +#!/bin/sh +if [ -n "${FE_TLS_CERT}" ]; then + openssl pkcs12 -inkey ${FE_TLS_KEY} -in ${FE_TLS_CERT} -export -out /tmp/keystore.pkcs12 -passin pass:${FE_TLS_PASSWORD} -passout pass:${FE_TLS_PASSWORD} + keytool -importkeystore -srcstoretype PKCS12 -srckeystore /tmp/keystore.pkcs12 -srcstorepass ${FE_TLS_PASSWORD} -destkeystore ${JETTY_BASE}/${FE_KEYSTORE_PATH} -deststorepass ${FE_KEYSTORE_PASSWORD} -noprompt +fi + +if [ -n "${FE_CA_CERT}" ]; then + keytool -delete -alias sdc-be -storepass ${FE_TRUSTSTORE_PASSWORD} -keystore ${JETTY_BASE}/${FE_TRUSTSTORE_PATH} || true + keytool -import -alias sdc-be -file ${FE_CA_CERT} -storetype JKS -keystore ${JETTY_BASE}/${FE_TRUSTSTORE_PATH} -storepass ${FE_TRUSTSTORE_PASSWORD} -noprompt +fi diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb deleted file mode 100644 index 9fbb363bf9..0000000000 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb +++ /dev/null @@ -1,20 +0,0 @@ -# -default['BE'][:http_port] = 8080 -default['BE'][:https_port] = 8443 -default['FE'][:http_port] = 8181 -default['FE'][:https_port] = 9443 -default['disableHttp'] = true -default['jetty'][:keystore_pwd] = "?(kP!Yur![*!Y5!E^f(ZKc31" -default['jetty'][:keymanager_pwd] = "?(kP!Yur![*!Y5!E^f(ZKc31" -# TO CHANGE THE TRUSTSTORE CERT THE JVM CONFIGURATION -# MUST BE ALSO CHANGE IN THE startup.sh FILE -default['jetty'][:truststore_pwd] = "z+KEj;t+,KN^iimSiS89e#p0" - -#Onboard -default['ONBOARDING_BE'][:http_port] = 8081 -default['ONBOARDING_BE'][:https_port] = 8445 - -#BasicAuth -default['basic_auth']['enabled'] = true -default['basic_auth'][:user_name] = "testName" -default['basic_auth'][:user_pass] = "testPass"
\ No newline at end of file diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_1_cleanup_jettydir.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_1_cleanup_jettydir.rb deleted file mode 100644 index cdd6b19b24..0000000000 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_1_cleanup_jettydir.rb +++ /dev/null @@ -1,33 +0,0 @@ -directory "FE_tempdir_creation" do - path "#{ENV['JETTY_BASE']}/temp" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode '0755' - action :create -end - -directory "FE_create_config_dir" do - path "#{ENV['JETTY_BASE']}/config" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode '0755' - action :create -end - - -directory "FE_create_catalog-fe" do - path "#{ENV['JETTY_BASE']}/config/catalog-fe" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode '0755' - action :create -end - - -directory "FE_create_catalog-fe" do - path "#{ENV['JETTY_BASE']}/config/onboarding-fe" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode '0755' - action :create -end 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 deleted file mode 100644 index 73176ed1c3..0000000000 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb +++ /dev/null @@ -1,36 +0,0 @@ -template "catalog-fe-config" do - path "#{ENV['JETTY_BASE']}/config/catalog-fe/configuration.yaml" - source "FE-configuration.yaml.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" - variables({ - :fe_host_ip => node['FE_VIP'], - :be_host_ip => node['BE_VIP'], - :kb_host_ip => node['Nodes']['KB'], - :catalog_port => node['BE'][:http_port], - :ssl_port => node['BE'][:https_port], - :basic_auth_flag => node['basic_auth']['enabled'], - :user_name => node['basic_auth'][:user_name], - :user_pass => node['basic_auth'][:user_pass], - :permittedAncestors => "#{ENV['permittedAncestors']}", - :dcae_fe_vip => node['DCAE_FE_VIP'] - }) -end - -cookbook_file "#{ENV['JETTY_BASE']}/config/catalog-fe/workspace-configuration.yaml" do - source "FE-workspace-configuration.yaml" - mode 0755 - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" -end - - - -template "onboarding-fe-config" do - path "#{ENV['JETTY_BASE']}/config/onboarding-fe/onboarding_configuration.yaml" - source "FE-onboarding-configuration.yaml.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" -end diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_3_errors_config.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_3_errors_config.rb deleted file mode 100644 index aa8087960b..0000000000 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_3_errors_config.rb +++ /dev/null @@ -1,7 +0,0 @@ -cookbook_file "#{ENV['JETTY_BASE']}/config/catalog-fe/ecomp-error-configuration.yaml" do - source "FE-ecomp-error-configuration.yaml" - mode 0755 - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" -end - diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_4_logback.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_4_logback.rb deleted file mode 100644 index 34c084e38d..0000000000 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_4_logback.rb +++ /dev/null @@ -1,6 +0,0 @@ -cookbook_file "#{ENV['JETTY_BASE']}/config/catalog-fe/logback.xml" do - source "FE-logback.xml" - mode 0755 - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" -end diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_5_rest_configuration.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_5_rest_configuration.rb deleted file mode 100644 index 388974e111..0000000000 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_5_rest_configuration.rb +++ /dev/null @@ -1,7 +0,0 @@ -cookbook_file "#{ENV['JETTY_BASE']}/config/catalog-fe/rest-configuration-info.yaml" do - source "FE-rest-configuration.yaml" - mode 0755 - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" -end - diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_6_setup_key_and_trust_store.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_6_setup_key_and_trust_store.rb deleted file mode 100644 index 2585d1b449..0000000000 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_6_setup_key_and_trust_store.rb +++ /dev/null @@ -1,21 +0,0 @@ -#Set the http module option -if node['FE'][:tls_cert] - execute "generate-keystore" do - command "openssl pkcs12 -inkey #{node['FE'][:tls_key]} -in #{node['FE'][:tls_cert]} -export -out /tmp/keystore.pkcs12 -passin pass:#{node['FE'][:tls_password]} -passout pass:#{node['FE'][:tls_password]}" - end - - execute "import-keystore" do - command "keytool -importkeystore -srcstoretype PKCS12 -srckeystore /tmp/keystore.pkcs12 -srcstorepass #{node['FE'][:tls_password]} -destkeystore #{ENV['JETTY_BASE']}/#{node['FE'][:keystore_path]} -deststorepass #{node['FE'][:keystore_password]} -noprompt" - end -end - -if node['FE'][:ca_cert] - execute "delete-existing-ca-alias" do - command "keytool -delete -alias sdc-be -storepass #{node['FE'][:truststore_password]} -keystore #{ENV['JETTY_BASE']}/#{node['FE'][:truststore_path]}" - returns [0, 1] - end - - execute "generate-truststore" do - command "keytool -import -alias sdc-be -file #{node['FE'][:ca_cert]} -storetype JKS -keystore #{ENV['JETTY_BASE']}/#{node['FE'][:truststore_path]} -storepass #{node['FE'][:truststore_password]} -noprompt" - end -end diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb deleted file mode 100644 index 3a7433e9df..0000000000 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb +++ /dev/null @@ -1,57 +0,0 @@ -# -#Set the http module option -if node['disableHttp'] - http_option = "#--module=http" -else - http_option = "--module=http" -end - -execute "create-jetty-modules" do - command "java -jar #{ENV['JETTY_HOME']}/start.jar --add-to-start=deploy && java -jar #{ENV['JETTY_HOME']}/start.jar --create-startd --add-to-start=http,https,setuid,rewrite" - cwd "#{ENV['JETTY_BASE']}" - action :run -end - -template "http-ini" do - path "#{ENV['JETTY_BASE']}/start.d/http.ini" - source "http-ini.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" - variables({ - :http_option => http_option , - :http_port => "#{node['FE'][:http_port]}" - }) -end - -template "https-ini" do - path "#{ENV['JETTY_BASE']}/start.d/https.ini" - source "https-ini.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" - variables :https_port => "#{node['FE'][:https_port]}" -end - -template "jetty-rewrite" do - path "#{ENV['JETTY_BASE']}/etc/rewrite-root-to-sdc1.xml" - source "FE-jetty-rewrite.yaml.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0644" -end - -template "ssl-ini" do - path "#{ENV['JETTY_BASE']}/start.d/ssl.ini" - source "ssl-ini.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" - variables({ - :https_port => "#{node['FE'][:https_port]}" , - :keystore_path => "#{node['FE'][:keystore_path]}" , - :keystore_password => "#{node['FE'][:keystore_password]}" , - :truststore_path => "#{node['FE'][:truststore_path]}" , - :truststore_password => "#{node['FE'][:truststore_password]}" - }) -end diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_8_prepareProbeFile.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_8_prepareProbeFile.rb deleted file mode 100644 index 46bc80a021..0000000000 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_8_prepareProbeFile.rb +++ /dev/null @@ -1,17 +0,0 @@ -if node[:disableHttp] - protocol = "https" - port = "#{node['FE'][:https_port]}" -else - protocol = "http" - port = "#{node['FE'][:http_port]}" -end - -template "#{ENV['JETTY_BASE']}/ready-probe.sh" do - source "ready-probe.sh.erb" - sensitive true - mode 0755 - variables({ - :protocol => protocol, - :port => port - }) -end diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-onboarding-configuration.yaml.erb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-onboarding-configuration.yaml.erb deleted file mode 100644 index beb774b4a9..0000000000 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-onboarding-configuration.yaml.erb +++ /dev/null @@ -1,9 +0,0 @@ -notifications: - pollingIntervalMsec: 2000 - selectionSize: 100 - beHost: <%= node['ONBOARDING_BE_VIP'] %> - <% if node[:disableHttp] -%> - beHttpPort: <%= node['ONBOARDING_BE'][:https_port] %> - <% else %> - beHttpPort: <%= node['ONBOARDING_BE'][:http_port] %> - <% end -%>
\ No newline at end of file diff --git a/catalog-fe/sdc-frontend/chef-solo/LICENSE b/catalog-fe/sdc-frontend/chef-solo/LICENSE deleted file mode 100644 index 11069edd79..0000000000 --- a/catalog-fe/sdc-frontend/chef-solo/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file 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. diff --git a/catalog-fe/sdc-frontend/chef-solo/README.md b/catalog-fe/sdc-frontend/chef-solo/README.md deleted file mode 100644 index ddb0fda830..0000000000 --- a/catalog-fe/sdc-frontend/chef-solo/README.md +++ /dev/null @@ -1,37 +0,0 @@ -Deprecated -========== - -Use of this repository is deprecated. We recommend using the `chef generate repo` command that comes with [ChefDK](http://downloads.chef.io/chef-dk/). - -Overview -======== - -Every Chef installation needs a Chef Repository. This is the place where cookbooks, roles, config files and other artifacts for managing systems with Chef will live. We strongly recommend storing this repository in a version control system such as Git and treat it like source code. - -While we prefer Git, and make this repository available via GitHub, you are welcome to download a tar or zip archive and use your favorite version control system to manage the code. - -Repository Directories -====================== - -This repository contains several directories, and each directory contains a README file that describes what it is for in greater detail, and how to use it for managing your systems with Chef. - -* `cookbooks/` - Cookbooks you download or create. -* `data_bags/` - Store data bags and items in .json in the repository. -* `roles/` - Store roles in .rb or .json in the repository. -* `environments/` - Store environments in .rb or .json in the repository. - -Configuration -============= - -The repository contains a knife configuration file. - -* .chef/knife.rb - -The knife configuration file `.chef/knife.rb` is a repository specific configuration file for knife. If you're using Hosted Chef, you can download one for your organization from the management console. If you're using the Open Source Chef Server, you can generate a new one with `knife configure`. For more information about configuring Knife, see the Knife documentation. - -https://docs.chef.io/knife.html - -Next Steps -========== - -Read the README file in each of the subdirectories for more information about what goes in those directories. diff --git a/catalog-fe/sdc-frontend/chef-solo/chefignore b/catalog-fe/sdc-frontend/chef-solo/chefignore deleted file mode 100644 index ba30af6cff..0000000000 --- a/catalog-fe/sdc-frontend/chef-solo/chefignore +++ /dev/null @@ -1,11 +0,0 @@ -# Put files/directories that should be ignored in this file. -# Lines that start with '# ' are comments. - -# emacs -*~ - -# vim -*.sw[a-z] - -# subversion -*/.svn/* diff --git a/catalog-fe/sdc-frontend/chef-solo/cookbooks/README.md b/catalog-fe/sdc-frontend/chef-solo/cookbooks/README.md deleted file mode 100644 index 86ea46bfbb..0000000000 --- a/catalog-fe/sdc-frontend/chef-solo/cookbooks/README.md +++ /dev/null @@ -1,54 +0,0 @@ -This directory contains the cookbooks used to configure systems in your infrastructure with Chef. - -Knife needs to be configured to know where the cookbooks are located with the `cookbook_path` setting. If this is not set, then several cookbook operations will fail to work properly. - - cookbook_path ["./cookbooks"] - -This setting tells knife to look for the cookbooks directory in the present working directory. This means the knife cookbook subcommands need to be run in the `chef-repo` directory itself. To make sure that the cookbooks can be found elsewhere inside the repository, use an absolute path. This is a Ruby file, so something like the following can be used: - - current_dir = File.dirname(__FILE__) - cookbook_path ["#{current_dir}/../cookbooks"] - -Which will set `current_dir` to the location of the knife.rb file itself (e.g. `~/chef-repo/.chef/knife.rb`). - -Configure knife to use your preferred copyright holder, email contact and license. Add the following lines to `.chef/knife.rb`. - - cookbook_copyright "Example, Com." - cookbook_email "cookbooks@example.com" - cookbook_license "apachev2" - -Supported values for `cookbook_license` are "apachev2", "mit","gplv2","gplv3", or "none". These settings are used to prefill comments in the default recipe, and the corresponding values in the metadata.rb. You are free to change the the comments in those files. - -Create new cookbooks in this directory with Knife. - - knife cookbook create COOKBOOK - -This will create all the cookbook directory components. You don't need to use them all, and can delete the ones you don't need. It also creates a README file, metadata.rb and default recipe. - -You can also download cookbooks directly from the Opscode Cookbook Site. There are two subcommands to help with this depending on what your preference is. - -The first and recommended method is to use a vendor branch if you're using Git. This is automatically handled with Knife. - - knife cookbook site install COOKBOOK - -This will: - -* Download the cookbook tarball from cookbooks.opscode.com. -* Ensure its on the git master branch. -* Checks for an existing vendor branch, and creates if it doesn't. -* Checks out the vendor branch (chef-vendor-COOKBOOK). -* Removes the existing (old) version. -* Untars the cookbook tarball it downloaded in the first step. -* Adds the cookbook files to the git index and commits. -* Creates a tag for the version downloaded. -* Checks out the master branch again. -* Merges the cookbook into master. -* Repeats the above for all the cookbooks dependencies, downloading them from the community site - -The last step will ensure that any local changes or modifications you have made to the cookbook are preserved, so you can keep your changes through upstream updates. - -If you're not using Git, use the site download subcommand to download the tarball. - - knife cookbook site download COOKBOOK - -This creates the COOKBOOK.tar.gz from in the current directory (e.g., `~/chef-repo`). We recommend following a workflow similar to the above for your version control tool. diff --git a/catalog-fe/sdc-frontend/chef-solo/data_bags/README.md b/catalog-fe/sdc-frontend/chef-solo/data_bags/README.md deleted file mode 100644 index 0c15a391fa..0000000000 --- a/catalog-fe/sdc-frontend/chef-solo/data_bags/README.md +++ /dev/null @@ -1,63 +0,0 @@ -Data Bags ---------- - -This directory contains directories of the various data bags you create for your infrastructure. Each subdirectory corresponds to a data bag on the Chef Server, and contains JSON files of the items that go in the bag. - -First, create a directory for the data bag. - - mkdir data_bags/BAG - -Then create the JSON files for items that will go into that bag. - - $EDITOR data_bags/BAG/ITEM.json - -The JSON for the ITEM must contain a key named "id" with a value equal to "ITEM". For example, - - { - "id": "foo" - } - -Next, create the data bag on the Chef Server. - - knife data bag create BAG - -Then upload the items in the data bag's directory to the Chef Server. - - knife data bag from file BAG ITEM.json - - -Encrypted Data Bags -------------------- - -Added in Chef 0.10, encrypted data bags allow you to encrypt the contents of your data bags. The content of attributes will no longer be searchable. To use encrypted data bags, first you must have or create a secret key. - - openssl rand -base64 512 > secret_key - -You may use this secret_key to add items to a data bag during a create. - - knife data bag create --secret-file secret_key passwords mysql - -You may also use it when adding ITEMs from files, - - knife data bag create passwords - knife data bag from file passwords data_bags/passwords/mysql.json --secret-file secret_key - -The JSON for the ITEM must contain a key named "id" with a value equal to "ITEM" and the contents will be encrypted when uploaded. For example, - - { - "id": "mysql", - "password": "abc123" - } - -Without the secret_key, the contents are encrypted. - - knife data bag show passwords mysql - id: mysql - password: 2I0XUUve1TXEojEyeGsjhw== - -Use the secret_key to view the contents. - - knife data bag show passwords mysql --secret-file secret_key - id: mysql - password: abc123 - diff --git a/catalog-fe/sdc-frontend/chef-solo/environments/README.md b/catalog-fe/sdc-frontend/chef-solo/environments/README.md deleted file mode 100644 index 50ac48db2b..0000000000 --- a/catalog-fe/sdc-frontend/chef-solo/environments/README.md +++ /dev/null @@ -1,5 +0,0 @@ -Requires Chef 0.10.0+. - -This directory is for Ruby DSL and JSON files for environments. For more information see the Chef wiki page: - -http://docs.chef.io/environments.html diff --git a/catalog-fe/sdc-frontend/chef-solo/roles/README.md b/catalog-fe/sdc-frontend/chef-solo/roles/README.md deleted file mode 100644 index b0ee0b4d21..0000000000 --- a/catalog-fe/sdc-frontend/chef-solo/roles/README.md +++ /dev/null @@ -1,16 +0,0 @@ -Create roles here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install roles on the server, use knife. - -For example, create `roles/base_example.rb`: - - name "base_example" - description "Example base role applied to all nodes." - # List of recipes and roles to apply. Requires Chef 0.8, earlier versions use 'recipes()'. - #run_list() - # Attributes applied if the node doesn't have it set already. - #default_attributes() - # Attributes applied no matter what the node has set already. - #override_attributes() - -Then upload it to the Chef Server: - - knife role from file roles/base_example.rb diff --git a/catalog-fe/sdc-frontend/chef-solo/roles/catalog-fe.json b/catalog-fe/sdc-frontend/chef-solo/roles/catalog-fe.json deleted file mode 100644 index 815a38c39a..0000000000 --- a/catalog-fe/sdc-frontend/chef-solo/roles/catalog-fe.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "catalog-be", - "description": "Installation application - catalogFE", - "json_class": "Chef::Role", - "default_attributes": { - - }, - "override_attributes": { - - }, - "chef_type": "role", - "run_list": [ - "recipe[sdc-catalog-fe::FE_1_cleanup_jettydir]", - "recipe[sdc-catalog-fe::FE_2_setup_configuration]", - "recipe[sdc-catalog-fe::FE_3_errors_config]", - "recipe[sdc-catalog-fe::FE_4_logback]", - "recipe[sdc-catalog-fe::FE_5_rest_configuration]", - "recipe[sdc-catalog-fe::FE_6_setup_key_and_trust_store]", - "recipe[sdc-catalog-fe::FE_7_create_jetty_modules]", - "recipe[sdc-catalog-fe::FE_8_prepareProbeFile]" - ], - "env_run_lists": { - } -} - diff --git a/catalog-fe/sdc-frontend/chef-solo/solo.json b/catalog-fe/sdc-frontend/chef-solo/solo.json deleted file mode 100644 index 09dd642e6f..0000000000 --- a/catalog-fe/sdc-frontend/chef-solo/solo.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "run_list": [ "role[catalog-fe]" ] -} - diff --git a/catalog-fe/sdc-frontend/chef-solo/solo.rb b/catalog-fe/sdc-frontend/chef-solo/solo.rb deleted file mode 100644 index 06c1af4592..0000000000 --- a/catalog-fe/sdc-frontend/chef-solo/solo.rb +++ /dev/null @@ -1,16 +0,0 @@ -root = File.absolute_path(File.dirname(__FILE__)) -file_cache_path root -cookbook_path root + '/cookbooks' -json_attribs root + '/solo.json' -checksum_path root + '/checksums' -data_bag_path root + '/data_bags' -environment_path root + '/environments' -file_backup_path root + '/backup' -file_cache_path root + '/cache' -log_level :info -log_location STDOUT -rest_timeout 300 -role_path root + '/roles' -syntax_check_cache_path -umask 0022 -verbose_logging nil diff --git a/catalog-fe/sdc-frontend/startup.sh b/catalog-fe/sdc-frontend/startup.sh index 68363efb10..c4b1d6efd9 100644 --- a/catalog-fe/sdc-frontend/startup.sh +++ b/catalog-fe/sdc-frontend/startup.sh @@ -9,11 +9,6 @@ JAVA_OPTIONS="$JAVA_OPTIONS \ -Djavax.net.ssl.trustStore=$JETTY_BASE/etc/org.onap.sdc.trust.jks \ -Djavax.net.ssl.trustStorePassword=z+KEj;t+,KN^iimSiS89e#p0" -cd $JETTY_BASE/chef-solo -chef-solo -c solo.rb -E ${ENVNAME} - cd $JETTY_HOME -echo "etc/rewrite-root-to-sdc1.xml" >> $JETTY_HOME/start.d/rewrite.ini -echo "jetty.httpConfig.sendServerVersion=false" >> $JETTY_HOME/start.d/start.ini java $JAVA_OPTIONS -jar "${JETTY_HOME}/start.jar" diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml index 9d29311d24..d23fc690f9 100644 --- a/catalog-model/pom.xml +++ b/catalog-model/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>sdc-main</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <properties> diff --git a/catalog-ui/pom.xml b/catalog-ui/pom.xml index 96f532a5fe..f5052effc0 100644 --- a/catalog-ui/pom.xml +++ b/catalog-ui/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>sdc-main</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <properties> diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml index f2022fe167..7d32001bf9 100644 --- a/common-app-api/pom.xml +++ b/common-app-api/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>sdc-main</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/common-app-logging/pom.xml b/common-app-logging/pom.xml index 42be52209d..48be65121a 100644 --- a/common-app-logging/pom.xml +++ b/common-app-logging/pom.xml @@ -9,11 +9,26 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>sdc-main</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>jakarta.ws.rs</groupId> <artifactId>jakarta.ws.rs-api</artifactId> <version>${ws.rs.version}</version> diff --git a/common-be-tests-utils/pom.xml b/common-be-tests-utils/pom.xml index 31d8678521..b1e4d0bc3d 100644 --- a/common-be-tests-utils/pom.xml +++ b/common-be-tests-utils/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>sdc-main</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/common-be/pom.xml b/common-be/pom.xml index fa3e596ee0..e864bc4878 100644 --- a/common-be/pom.xml +++ b/common-be/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>sdc-main</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml index fae482042b..94f8ab68f5 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml @@ -10,7 +10,7 @@ <parent> <artifactId>onap-common-configuration-management</artifactId> <groupId>org.onap.sdc.common</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> <dependency> diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml index ec22798123..3e50147c16 100755 --- a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml @@ -26,7 +26,7 @@ <parent> <artifactId>onap-common-configuration-management</artifactId> <groupId>org.onap.sdc.common</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/common/onap-common-configuration-management/pom.xml b/common/onap-common-configuration-management/pom.xml index af20df55ef..277af729f4 100755 --- a/common/onap-common-configuration-management/pom.xml +++ b/common/onap-common-configuration-management/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-common-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/common/onap-generic-artifact-browser/onap-generic-artifact-browser-component-tests/pom.xml b/common/onap-generic-artifact-browser/onap-generic-artifact-browser-component-tests/pom.xml index bd3e5615d2..6418f588ee 100644 --- a/common/onap-generic-artifact-browser/onap-generic-artifact-browser-component-tests/pom.xml +++ b/common/onap-generic-artifact-browser/onap-generic-artifact-browser-component-tests/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-generic-artifact-browser</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>onap-generic-artifact-browser-component-tests</artifactId> diff --git a/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml b/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml index e4408dac14..c8b027a3f3 100644 --- a/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml +++ b/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-generic-artifact-browser</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>onap-generic-artifact-browser-service</artifactId> diff --git a/common/onap-generic-artifact-browser/pom.xml b/common/onap-generic-artifact-browser/pom.xml index c61227161d..0c5c5d2d62 100644 --- a/common/onap-generic-artifact-browser/pom.xml +++ b/common/onap-generic-artifact-browser/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>onap-common-lib</artifactId> <groupId>org.onap.sdc.common</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/common/onap-tosca-datatype/pom.xml b/common/onap-tosca-datatype/pom.xml index a087da2c1a..7ef386cab8 100644 --- a/common/onap-tosca-datatype/pom.xml +++ b/common/onap-tosca-datatype/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>onap-common-lib</artifactId> <groupId>org.onap.sdc.common</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/common/pom.xml b/common/pom.xml index 30c0112e9d..019cadd593 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>sdc-onboarding</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> <relativePath>../onboarding/pom.xml</relativePath> </parent> diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/integration-tests/catalog-be-resources/catalog-be/configuration.yaml index 3f5ec422ad..3552acb8b6 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb +++ b/integration-tests/catalog-be-resources/catalog-be/configuration.yaml @@ -6,33 +6,29 @@ identificationHeaderFields: - HTTP_CSP_WSTYPE # catalog backend hostname -beFqdn: <%= @catalog_ip %> +beFqdn: sdc-BE # catalog backend http port -beHttpPort: <%= @catalog_port %> +beHttpPort: 8080 # catalog backend http context beContext: /sdc/rest/config/get # catalog backend protocol -<% if node[:disableHttp] -%> -beProtocol: https -<% else %> beProtocol: http -<% end -%> -tlsCert: <%= node['BE']['tls_cert'] %> -tlsKey: <%= node['BE']['tls_key'] %> -caCert: <%= node['BE']['ca_cert'] %> +tlsCert: +tlsKey: +caCert: # catalog backend ssl port -beSslPort: <%= @ssl_port %> +beSslPort: 8443 version: 1.1.0 released: 2012-11-30 toscaConformanceLevel: 11.0 minToscaConformanceLevel: 3.0 -janusGraphCfgFile: <%= node['cassandra']['janusgraph_config_file'] %> +janusGraphCfgFile: /app/jetty/config/catalog-be/janusgraph.properties janusGraphInMemoryGraph: false janusGraphLockTimeout: 1800 # The interval to try and reconnect to JanusGraph DB when it is down during ASDC startup: @@ -86,32 +82,32 @@ users: bob: passwd basicAuth: - enabled: <%= @basic_auth_flag %> - userName: <%= @user_name %> - userPass: <%= @user_pass %> + enabled: false + userName: testName + userPass: testPass excludedUrls: "/sdc2/rest/healthCheck" cassandraConfig: - cassandraHosts: [<%= @cassandra_ip %>] - cassandraPort: <%= @cassandra_port %> - localDataCenter: <%= @DC_NAME %> + cassandraHosts: [sdc-cs] + cassandraPort: 9042 + localDataCenter: SDC-CS-integration-test reconnectTimeout : 30000 - socketReadTimeout: <%= @socket_read_timeout %> - socketConnectTimeout: <%= @socket_connect_timeout %> + socketReadTimeout: 40000 + socketConnectTimeout: 40000 authenticate: true - username: <%= @cassandra_usr %> - password: <%= @cassandra_pwd %> - ssl: <%= @cassandra_ssl_enabled %> - keystorePath: <%= @cassandra_keystore_password %> - keystorePassword: <%= @cassandra_ssl_enabled %> - truststorePath: <%= @cassandra_truststore_path %> - truststorePassword: <%= @cassandra_truststore_password %> + username: asdc_user + password: Aa1234%^! + ssl: false + keystorePath: + keystorePassword: false + truststorePath: + truststorePassword: keySpaces: - - { name: dox, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @REP_STRING %>']} - - { name: sdcaudit, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @REP_STRING %>']} - - { name: sdcartifact, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @REP_STRING %>']} - - { name: sdccomponent, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @REP_STRING %>']} - - { name: sdcrepository, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @REP_STRING %>']} + - { name: dox, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['SDC-CS-integration-test','1']} + - { name: sdcaudit, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['SDC-CS-integration-test','1']} + - { name: sdcartifact, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['SDC-CS-integration-test','1']} + - { name: sdccomponent, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['SDC-CS-integration-test','1']} + - { name: sdcrepository, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['SDC-CS-integration-test','1']} licenseTypes: - User @@ -939,14 +935,9 @@ heatEnvArtifactHeader: "" heatEnvArtifactFooter: "" onboarding: - host: <%= node['ONBOARDING_BE_VIP'] %> - <% if node[:disableHttp] -%> - protocol: https - port: <%= node['ONBOARDING_BE'][:https_port] %> - <% else %> + host: sdc-onboard-BE protocol: http - port: <%= node['ONBOARDING_BE'][:http_port] %> - <% end -%> + port: 8081 getVspPackageUri: "/onboarding-api/v1.0/vendor-software-products/packages/%s?versionId=%s" # /onboarding-api/v1.0/vendor-software-products/packages/:vspId?versionId=:vspVersionId getLatestVspPackageUri: "/onboarding-api/v1.0/vendor-software-products/packages/%s" # /onboarding-api/v1.0/vendor-software-products/packages/:vspId getVspUri: "/onboarding-api/v1.0/vendor-software-products/%s/versions/%s" # /onboarding-api/v1.0/vendor-software-products/:vspId/versions/:vspVersionId @@ -1105,7 +1096,7 @@ gabConfig: searchable: false dmaapConsumerConfiguration: - active: <%= @dmaap_active %> + active: false hosts: localhost:3905 consumerGroup: sdc consumerId: mama @@ -1137,32 +1128,32 @@ dmaapConsumerConfiguration: dmaapProducerConfiguration: active: true - hosts: <%= node['DMAAP']['producer']['host']%> - consumerGroup: sdc-<%= node.chef_environment %>-<%= node['DMAAP']['random_id'] %> - consumerId: sdc-<%= node.chef_environment %>1-<%= node['DMAAP']['random_id'] %> + hosts: olsd004.com:3905 + consumerGroup: sdc-integration-test-1737011830 + consumerId: sdc-integration-test1-1737011830 timeoutMs: 15000 limit: 1 pollingInterval: 2 - topic: <%= node['DMAAP']['producer']['topic'] %> + topic: SDC-FACADE-NOTIF-v1 latitude: 32.109333 longitude: 34.855499 version: 1.0 - serviceName: <%= node['DMAAP']['producer']['serviceName'] %> - environment: <%= node['DMAAP']['producer']['environment'] %> + serviceName: dmaap.com:3905/events + environment: integration-test partner: BOT_R routeOffer: MR1 - protocol: <%= node['http_protocol'] %> + protocol: contenttype: application/json dme2TraceOn: true - aftEnvironment: <%= node['DMAAP']['producer']['aftEnvironment']%> + aftEnvironment: aftDme2ConnectionTimeoutMs: 15000 aftDme2RoundtripTimeoutMs: 240000 aftDme2ReadTimeoutMs: 50000 - dme2preferredRouterFilePath: <%= node['DMAAP']['producer']['dme2preferredRouterFilePath'] %> + dme2preferredRouterFilePath: timeLimitForNotificationHandleMs: 120000 credential: - username: <%= node['DMAAP']['producer']['username'] %> - password: <%= node['DMAAP']['producer']['password'] %> + username: user1@sdc.com + password: password== aftDme2SslEnable: true aftDme2ClientSslCertAlias: certman @@ -1212,7 +1203,7 @@ healthStatusExclude: #Auto Healing enableAutoHealing: false -appVersion: <%= @app_version %> +appVersion: artifactGeneratorConfig: Artifact-Generator.properties resourcesForUpgrade: @@ -1260,4 +1251,5 @@ componentInstanceCounterDelimiter: " " dataValidatorFilterExcludedUrls: "/healthCheck,/followed,/authorize" #Space separated list of permitted ancestors -permittedAncestors: <%= @permittedAncestors %> +permittedAncestors: + diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-distribution-engine-configuration.yaml.erb b/integration-tests/catalog-be-resources/catalog-be/distribution-engine-configuration.yaml index 0989def1f9..4fec28925d 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-distribution-engine-configuration.yaml.erb +++ b/integration-tests/catalog-be-resources/catalog-be/distribution-engine-configuration.yaml @@ -1,24 +1,15 @@ uebServers: - <% node['UEB']['fqdn'].each do |conn| -%> - - <%= conn %> - <% end -%> - -uebPublicKey: <%= node['UEB']['PublicKey'] %> -uebSecretKey: <%= node['UEB']['SecretKey'] %> - -<% if node.exist?('DistributionTopics','notificationTopicName') -%> -distributionNotifTopicName: <%= node['DistributionTopics']['notificationTopicName'] %> -<% else %> -distributionNotifTopicName: SDC-DISTR-NOTIF-TOPIC -<% end -%> - -<% if node.exist?('DistributionTopics','statusTopicName') -%> -distributionStatusTopicName: <%= node['DistributionTopics']['statusTopicName'] %> -<% else %> + - 10.0.11.1 + - 10.0.11.1 + +uebPublicKey: iPIxkpAMI8qTcQj8 +uebSecretKey: Ehq3WyT4bkif4zwgEbvshGal + +distributionNotifTopicName: SDC-DISTR-NOTIF-TOPIC-INT + distributionStatusTopicName: SDC-DISTR-STATUS-TOPIC -<% end -%> -kafkaBootStrapServers: <%= node['Kafka']['bootstrap'] %> +kafkaBootStrapServers: kafka-bootstrap-int:9092 initRetryIntervalSec: 5 initMaxIntervalSec: 60 @@ -33,13 +24,13 @@ distribNotifResourceArtifactTypes: - DG-XML environments: - - <%= node.chef_environment %> + - integration-test distributionStatusTopic: pollingIntervalSec: 60 fetchTimeSec: 15 - consumerGroup: sdc-<%= node.chef_environment %> - consumerId: sdc-<%= node.chef_environment %>1 + consumerGroup: sdc-integration-test + consumerId: sdc-integration-test1 distributionNotificationTopic: @@ -89,5 +80,4 @@ msoConfig: userName: asdc password: OTLEp5lfVhYdyw5EAtTUBQ== numOfRetries: 3 - -currentArtifactInstallationTimeout: 120 + diff --git a/integration-tests/catalog-be-resources/catalog-be/janusgraph.properties b/integration-tests/catalog-be-resources/catalog-be/janusgraph.properties new file mode 100644 index 0000000000..7361a3ccc4 --- /dev/null +++ b/integration-tests/catalog-be-resources/catalog-be/janusgraph.properties @@ -0,0 +1,30 @@ +storage.backend=cql +storage.hostname=sdc-cs +storage.port=9042 +storage.username=asdc_user +storage.password=Aa1234%^! +storage.connection-timeout=20000 +storage.cql.keyspace=sdctitan + +storage.cql.ssl.enabled=false +storage.cql.ssl.keystore.location= +storage.cql.ssl.keystore.password= +storage.cql.ssl.truststore.location= +storage.cql.ssl.truststore.password= + +storage.cql.read-consistency-level=ONE +storage.cql.write-consistency-level=ALL +storage.cql.replication-strategy-class=NetworkTopologyStrategy +storage.cql.replication-strategy-options=SDC-CS-integration-test,1 +storage.cql.local-datacenter=SDC-CS-integration-test + + +cache.db-cache = true +cache.db-cache-clean-wait = 20 +cache.db-cache-time = 180000 +cache.db-cache-size = 0.5 + +cache.tx-cache-size = 1000000 + +storage.lock.retries=5 +graph.replace-instance-if-exists=true diff --git a/integration-tests/catalog-be-resources/init-script/check_backend.sh b/integration-tests/catalog-be-resources/init-script/check_backend.sh new file mode 100644 index 0000000000..cf7d6e4053 --- /dev/null +++ b/integration-tests/catalog-be-resources/init-script/check_backend.sh @@ -0,0 +1,48 @@ +#!/bin/sh + + +# Set protocol and port based on the HTTP setting +if [ "$DISABLE_HTTP" = "true" ]; then + protocol="https" + https_flag="--https" + be_port=$BE_HTTPS_PORT +else + protocol="http" + https_flag="" + be_port=$BE_HTTP_PORT +fi + +# Initialize optional flags as empty strings +tls_cert="" +tls_key="" +tls_key_pw="" +ca_cert="" +basic_auth_config="" + +# Set TLS configuration flags if using HTTPS +if [ "$protocol" = "https" ]; then + [ -n "$TLS_CERT" ] && tls_cert="--tls_cert $TLS_CERT" + [ -n "$TLS_KEY" ] && tls_key="--tls_key $TLS_KEY" + [ -n "$TLS_KEY_PW" ] && tls_key_pw="--tls_key_pw $TLS_KEY_PW" + [ -n "$CA_CERT" ] && ca_cert="--ca_cert $CA_CERT" +fi + + +# Check if both username and password are provided +if [ -n "$BASIC_AUTH_USER" ] && [ -n "$BASIC_AUTH_PASS" ]; then + # Create just the Base64-encoded value of "username:password" + basic_auth_config="--header $(echo -n "$BASIC_AUTH_USER:$BASIC_AUTH_PASS" | base64)" +fi + +start_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$start_time] Starting sdccheckbackend..." + +sdccheckbackend -i $BE_IP -p $be_port $basic_auth_config $https_flag $tls_cert $tls_key $tls_key_pw $ca_cert + +end_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$end_time] Finished sdccheckbackend." + +start_ts=$(date -d "$start_time" +%s) +end_ts=$(date -d "$end_time" +%s) +elapsed=$((end_ts - start_ts)) +echo "Elapsed time: $elapsed seconds" diff --git a/integration-tests/catalog-be-resources/init-script/create_consumer_and_user.sh b/integration-tests/catalog-be-resources/init-script/create_consumer_and_user.sh new file mode 100644 index 0000000000..3b7267c356 --- /dev/null +++ b/integration-tests/catalog-be-resources/init-script/create_consumer_and_user.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +# Set protocol and port based on the HTTP setting +if [ "$DISABLE_HTTP" = "true" ]; then + protocol="https" + https_flag="--https" + be_port=$BE_HTTPS_PORT +else + protocol="http" + https_flag="" + be_port=$BE_HTTP_PORT +fi + +basic_auth_config="" + +# Check if both username and password are provided +if [ -n "$BASIC_AUTH_USER" ] && [ -n "$BASIC_AUTH_PASS" ]; then + # Create just the Base64-encoded value of "username:password" + basic_auth_config="--header $(echo -n "$BASIC_AUTH_USER:$BASIC_AUTH_PASS" | base64)" +fi + + +tls_cert="" +tls_key="" +tls_key_pw="" +ca_cert="" + +if [ "$protocol" = "https" ]; then + if [ -n "$TLS_CERT" ]; then + tls_cert="--tls_cert $TLS_CERT" + fi + if [ -n "$TLS_KEY" ]; then + tls_key="--tls_key $TLS_KEY" + fi + if [ -n "$TLS_KEY_PW" ]; then + tls_key_pw="--tls_key_pw $TLS_KEY_PW" + fi + if [ -n "$CA_CERT" ]; then + ca_cert="--ca_cert $CA_CERT" + fi +fi + +# Execute sdcuserinit command +start_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$start_time] Starting sdcuserinit..." + +sdcuserinit -i $BE_IP -p $be_port $basic_auth_config $user_conf_dir $https_flag $tls_cert $tls_key $tls_key_pw $ca_cert +echo "sdcuserinit executed successfully." + +start_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$start_time] Starting sdcconsumerinit..." +sdcconsumerinit -i $BE_IP -p $be_port $basic_auth_config $https_flag $tls_cert $tls_key $tls_key_pw $ca_cert + +end_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$end_time] Finished sdcuserinit and sdcconsumerinit." + +start_ts=$(date -d "$start_time" +%s) +end_ts=$(date -d "$end_time" +%s) +elapsed=$((end_ts - start_ts)) +echo "Elapsed time: $elapsed seconds" diff --git a/integration-tests/catalog-be-resources/init-script/import_normatives.sh b/integration-tests/catalog-be-resources/init-script/import_normatives.sh new file mode 100644 index 0000000000..e21e1b01b0 --- /dev/null +++ b/integration-tests/catalog-be-resources/init-script/import_normatives.sh @@ -0,0 +1,65 @@ +#!/bin/sh + + +# Set protocol and port based on DISABLE_HTTP +if [ "$DISABLE_HTTP" = "true" ]; then + protocol="https" + be_port=$BE_HTTPS_PORT + param="-i $BE_IP -p $be_port --https" + + # Set TLS flags if certificates are provided + if [ -n "$TLS_CERT" ]; then + tls_cert="--tls_cert $TLS_CERT" + fi + if [ -n "$TLS_KEY" ]; then + tls_key="--tls_key $TLS_KEY" + fi + if [ -n "$TLS_KEY_PW" ]; then + tls_key_pw="--tls_key_pw $TLS_KEY_PW" + fi + if [ -n "$CA_CERT" ]; then + ca_cert="--ca_cert $CA_CERT" + fi +else + protocol="http" + be_port="$BE_HTTP_PORT" + param="-i $BE_IP -p $be_port" +fi + +# Set basic authentication if enabled +if [ "$BASIC_AUTH_ENABLED" = "true" ]; then + basic_auth_user="${BASIC_AUTH_USER:-}" + basic_auth_pass="${BASIC_AUTH_PASS:-}" + + if [ -n "$basic_auth_user" ] && [ -n "$basic_auth_pass" ]; then + basic_auth_config="--header $(echo -n "$basic_auth_user:$basic_auth_pass" | base64)" + else + basic_auth_config="" + fi +else + basic_auth_config="" +fi + +# Extract normatives tarball and run the initialization command +echo "Extracting normatives.tar.gz and initializing SDC..." +cd /var/tmp/ || exit 1 +cp /home/onap/normatives.tar.gz /var/tmp/ +tar -xvf /var/tmp/normatives.tar.gz + +start_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$start_time] Starting sdcinit..." + +# Run sdcinit command with the constructed parameters +cd /var/tmp/normatives/import/tosca || exit 1 +sdcinit $param $basic_auth_config $tls_cert $tls_key $tls_key_pw $ca_cert > "/home/onap/logs/init.log" 2>&1 + +end_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$end_time] Done sdcinit." + +start_ts=$(date -d "$start_time" +%s) +end_ts=$(date -d "$end_time" +%s) +elapsed=$((end_ts - start_ts)) +echo "Elapsed time: $elapsed seconds" + +echo "SDC initialization Done. Logs can be found at ${ONAP_LOG}/init.log" + diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ready-probe.sh.erb b/integration-tests/catalog-be-resources/ready-probe.sh index 6592943b8f..bb730ab272 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ready-probe.sh.erb +++ b/integration-tests/catalog-be-resources/ready-probe.sh @@ -1,5 +1,5 @@ #!/bin/sh -health_check_http_code=$(curl -k --max-time 5 -o /dev/null -w '%{http_code}' <%= @protocol %>://127.0.0.1:<%= @port %>/sdc2/rest/healthCheck) +health_check_http_code=$(curl -k --max-time 5 -o /dev/null -w '%{http_code}' http://127.0.0.1:8080/sdc2/rest/healthCheck) if [ "$health_check_http_code" -eq 200 ]; then exit 0 diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-key.properties.erb b/integration-tests/catalog-be-resources/resource/key.properties index 007a36e350..b6bf4b7e91 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-key.properties.erb +++ b/integration-tests/catalog-be-resources/resource/key.properties @@ -33,9 +33,9 @@ # # ============LICENSE_END============================================ # -# +# ### # Properties read by the ECOMP Framework library (epsdk-fw) -cipher.enc.key = <%= @cipher_key %>
\ No newline at end of file +cipher.enc.key = AGLDdG4D04BKm2IxIWEr8o== diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-portal.properties.erb b/integration-tests/catalog-be-resources/resource/portal.properties index 159a6cce15..888ce76a68 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-portal.properties.erb +++ b/integration-tests/catalog-be-resources/resource/portal.properties @@ -64,10 +64,10 @@ role_access_centralized = remote csp_gate_keeper_prod_key = PROD # URL of the Portal where this app is onboarded -ecomp_redirect_url = <%= @ecomp_redirect_url %> +ecomp_redirect_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm # URL of the ECOMP Portal REST API -ecomp_rest_url = <%= @ecomp_rest_url %> +ecomp_rest_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi # Connection and Read timeout values ext_req_connection_timeout = 15000 @@ -77,9 +77,9 @@ ext_req_read_timeout = 20000 portal.api.impl.class = org.openecomp.sdc.be.ecomp.PortalRestApiCentralServiceImpl #Portal user & key -portal_app_name = <%= @portal_app_name %> -portal_pass = <%= @ecomp_portal_pass %> -portal_user = <%= @ecomp_portal_user %> +portal_app_name = Ipwxi2oLvDxctMA1royaRw1W0jhucLx+grHzci3ePIA= +portal_pass = j85yNhyIs7zKYbR1VlwEfNhS6b7Om4l0Gx5O8931sCI= +portal_user = Ipwxi2oLvDxctMA1royaRw1W0jhucLx+grHzci3ePIA= # UEB key generated while on-boarding diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/http-ini.erb b/integration-tests/catalog-be-resources/start.d/http.ini index 8f2669032b..555c1dd204 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/http-ini.erb +++ b/integration-tests/catalog-be-resources/start.d/http.ini @@ -1,6 +1,6 @@ # --------------------------------------- # Module: http -<%= @http_option %> +--module=http ### HTTP Connector Configuration @@ -8,7 +8,7 @@ # jetty.http.host=0.0.0.0 ## Connector port to listen on -jetty.http.port=<%= @http_port %> +jetty.http.port=8080 ## Connector idle timeout in milliseconds jetty.http.idleTimeout=30000 diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/https-ini.erb b/integration-tests/catalog-be-resources/start.d/https.ini index 9999a4109b..bafdfddaa2 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/https-ini.erb +++ b/integration-tests/catalog-be-resources/start.d/https.ini @@ -8,7 +8,7 @@ # jetty.https.host=0.0.0.0 ## Connector port to listen on -jetty.https.port=<%= @https_port %> +jetty.https.port=8443 ## Connector idle timeout in milliseconds jetty.https.idleTimeout=30000 diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ssl-ini.erb b/integration-tests/catalog-be-resources/start.d/ssl.ini index d3c8bc187c..46eb7f15c9 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ssl-ini.erb +++ b/integration-tests/catalog-be-resources/start.d/ssl.ini @@ -8,7 +8,7 @@ # jetty.ssl.host=0.0.0.0 ## Connector port to listen on -jetty.ssl.port=<%= @https_port %> +jetty.ssl.port=8443 ## Connector idle timeout in milliseconds # jetty.ssl.idleTimeout=30000 @@ -42,42 +42,27 @@ jetty.ssl.port=<%= @https_port %> ## See http://www.eclipse.org/jetty/documentation/current/configuring-security-secure-passwords.html ## Keystore file path (relative to $jetty.base) -<% unless @keystore_path.nil? || @keystore_path.strip.empty? -%> -jetty.sslContext.keyStorePath=<%= @keystore_path %> -<% end -%> ## Truststore file path (relative to $jetty.base) -<% unless @truststore_path.nil? || @truststore_path.strip.empty? -%> -jetty.sslContext.trustStorePath=<%= @truststore_path %> -<% end -%> ## Keystore password -<% unless @keystore_password.nil? || @keystore_password.strip.empty? -%> -jetty.sslContext.keyStorePassword=<%= @keystore_password %> -<% end -%> ## Keystore type and provider # jetty.sslContext.keyStoreType=JKS # jetty.sslContext.keyStoreProvider= ## KeyManager password -<% unless @keystore_password.nil? || @keystore_password.strip.empty? -%> -jetty.sslContext.keyManagerPassword=<%= @keystore_password %> -<% end -%> ## Truststore password -# tp<%= @truststore_password %>end -# kp<%= @keystore_password %>end -<% unless @truststore_password.nil? || @truststore_password.strip.empty? -%> -jetty.sslContext.trustStorePassword=<%= @truststore_password %> -<% end -%> +# tpend +# kpend ## Truststore type and provider # jetty.sslContext.trustStoreType=JKS # jetty.sslContext.trustStoreProvider= ## whether client certificate authentication is required -jetty.sslContext.needClientAuth=<%= !@truststore_password.nil? && !@truststore_password.strip.empty? %> +jetty.sslContext.needClientAuth=false ## Whether client certificate authentication is desired # jetty.sslContext.wantClientAuth=false diff --git a/integration-tests/integration-tests-init/Dockerfile b/integration-tests/integration-tests-init/Dockerfile index d3ba469c91..11a80cf556 100644 --- a/integration-tests/integration-tests-init/Dockerfile +++ b/integration-tests/integration-tests-init/Dockerfile @@ -19,7 +19,7 @@ RUN apk update && \ build-base \ curl-dev && \ # needed libcurl to install correctly \ - python -m pip install --upgrade pip \ + python -m pip install --upgrade pip && \ pip install 'pycurl==7.44.1' && \ set -ex && \ gem install --no-update-sources \ diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/http-ini.erb b/integration-tests/openecomp-be-config/jetty-config/http.ini index 8f2669032b..c5b62c1217 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/http-ini.erb +++ b/integration-tests/openecomp-be-config/jetty-config/http.ini @@ -1,6 +1,6 @@ # --------------------------------------- # Module: http -<%= @http_option %> +--module=http ### HTTP Connector Configuration @@ -8,7 +8,7 @@ # jetty.http.host=0.0.0.0 ## Connector port to listen on -jetty.http.port=<%= @http_port %> +jetty.http.port=8081 ## Connector idle timeout in milliseconds jetty.http.idleTimeout=30000 diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/https-ini.erb b/integration-tests/openecomp-be-config/jetty-config/https.ini index 9999a4109b..9cc18dd319 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/https-ini.erb +++ b/integration-tests/openecomp-be-config/jetty-config/https.ini @@ -8,7 +8,7 @@ # jetty.https.host=0.0.0.0 ## Connector port to listen on -jetty.https.port=<%= @https_port %> +jetty.https.port=8445 ## Connector idle timeout in milliseconds jetty.https.idleTimeout=30000 diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/ssl-ini.erb b/integration-tests/openecomp-be-config/jetty-config/ssl.ini index 278fdea2ae..eaeccca4aa 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/ssl-ini.erb +++ b/integration-tests/openecomp-be-config/jetty-config/ssl.ini @@ -8,7 +8,7 @@ # jetty.ssl.host=0.0.0.0 ## Connector port to listen on -jetty.ssl.port=<%= @https_port %> +jetty.ssl.port=8445 ## Connector idle timeout in milliseconds # jetty.ssl.idleTimeout=30000 @@ -49,7 +49,7 @@ jetty.sslContext.trustStorePath=etc/org.onap.sdc.trust.jks ## Keystore password # jetty.sslContext.keyStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 -jetty.sslContext.keyStorePassword=<%= @jetty_keystore_pwd %> +jetty.sslContext.keyStorePassword=?(kP!Yur![*!Y5!E^f(ZKc31 ## Keystore type and provider # jetty.sslContext.keyStoreType=JKS @@ -57,11 +57,11 @@ jetty.sslContext.keyStorePassword=<%= @jetty_keystore_pwd %> ## KeyManager password # jetty.sslContext.keyManagerPassword=OBF:1u2u1wml1z7s1z7a1wnl1u2g -jetty.sslContext.keyManagerPassword=<%= @jetty_keymanager_pwd %> +jetty.sslContext.keyManagerPassword=?(kP!Yur![*!Y5!E^f(ZKc31 ## Truststore password # jetty.sslContext.trustStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 -jetty.sslContext.trustStorePassword=<%= @jetty_truststore_pwd %> +jetty.sslContext.trustStorePassword=z+KEj;t+,KN^iimSiS89e#p0 ## Truststore type and provider # jetty.sslContext.trustStoreType=JKS diff --git a/integration-tests/openecomp-be-config/onboard-backend-config/config-helmvalidator.yaml b/integration-tests/openecomp-be-config/onboard-backend-config/config-helmvalidator.yaml new file mode 100644 index 0000000000..de6dfa1172 --- /dev/null +++ b/integration-tests/openecomp-be-config/onboard-backend-config/config-helmvalidator.yaml @@ -0,0 +1,7 @@ +hValidatorEnabled: true +hValidatorUrl: http://helm-validator:8080/validate +hValidatorVersion: v3 +hValidatorDeployable: true +hValidatorLintable: true +hValidatorStrictLintable: false + diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/vnfrepo-configuration.yaml.erb b/integration-tests/openecomp-be-config/onboard-backend-config/config-vnfrepo.yaml index 07e26629f0..07694adf16 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/vnfrepo-configuration.yaml.erb +++ b/integration-tests/openecomp-be-config/onboard-backend-config/config-vnfrepo.yaml @@ -1,4 +1,5 @@ -vnfRepoPort: <%= @VNFREPO_PORT %> -vnfRepoHost: <%= @VNFREPO_IP %> +vnfRepoPort: 8702 +vnfRepoHost: 10.0.14.1 getVnfUri: /onapapi/vnfsdk-marketplace/v1/PackageResource/csars -downloadVnfUri: /onapapi/vnfsdk-marketplace/v1/PackageResource/csars/%s/files
\ No newline at end of file +downloadVnfUri: /onapapi/vnfsdk-marketplace/v1/PackageResource/csars/%s/files + diff --git a/integration-tests/openecomp-be-config/onboard-backend-config/externaltesting-configuration.yaml b/integration-tests/openecomp-be-config/onboard-backend-config/externaltesting-configuration.yaml new file mode 100644 index 0000000000..9bea6fc50e --- /dev/null +++ b/integration-tests/openecomp-be-config/onboard-backend-config/externaltesting-configuration.yaml @@ -0,0 +1,6 @@ +client: + enabled: true +endpoints: + - vtp,VTP,true,http://refrepo:8702/onapapi/vnfsdk-marketplace,onap.* + - repository,Repository,false,,.* + diff --git a/integration-tests/openecomp-be-config/onboard-backend-config/features.properties b/integration-tests/openecomp-be-config/onboard-backend-config/features.properties new file mode 100644 index 0000000000..27390ed706 --- /dev/null +++ b/integration-tests/openecomp-be-config/onboard-backend-config/features.properties @@ -0,0 +1,2 @@ +EXTERNAL_LICENSE=true + diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/configuration.yaml.erb b/integration-tests/openecomp-be-config/onboard-backend-config/onboarding_configuration.yaml index 142977c078..88fa84cb64 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/configuration.yaml.erb +++ b/integration-tests/openecomp-be-config/onboard-backend-config/onboarding_configuration.yaml @@ -1,37 +1,32 @@ catalogNotificationsConfig: # catalog backend protocol - <% if node[:disableHttp] -%> - catalogBeProtocol: https - <% else %> catalogBeProtocol: http - <% end -%> - catalogBeHttpPort: <%= @catalog_be_http_port %> - catalogBeSslPort: <%= @catalog_be_ssl_port %> - catalogBeFqdn: <%= @catalog_be_fqdn %> + catalogBeHttpPort: 8080 + catalogBeSslPort: 8443 + catalogBeFqdn: sdc-BE # do not remove the "" from catalog_notification_url. it is escaping % characters coming from AUTO.json - catalogNotificationUrl: "<%= @catalog_notification_url %>" + catalogNotificationUrl: "%s://%s:%s/sdc2/rest/v1/catalog/notif/vsp/" notifications: pollingIntervalMsec: 2000 selectionSize: 100 - beHost: <%= @onboard_ip %> - beHttpPort: <%= @onboard_port %> + beHost: sdc-onboard-BE + beHttpPort: 8081 cassandraConfig: - cassandraHosts: [ <%= @cassandra_ip %> ] - cassandraPort: <%= @cassandra_port %> - localDataCenter: <%= @DC_NAME %> + cassandraHosts: [ sdc-cs ] + cassandraPort: 9042 + localDataCenter: SDC-CS-integration-test reconnectTimeout: 30000 - socketReadTimeout: <%= @socket_read_timeout %> - socketConnectTimeout: <%= @socket_connect_timeout %> + socketReadTimeout: 40000 + socketConnectTimeout: 40000 authenticate: true - username: <%= @cassandra_usr %> - password: <%= @cassandra_pwd %> - ssl: <%= @cassandra_ssl_enabled %> - truststorePath: <%= node['jetty']['truststore_path'] %> - truststorePassword: <%= @cassandra_truststore_password %> + username: asdc_user + password: Aa1234%^! + ssl: false + truststorePath: /app/jetty/etc/truststore + truststorePassword: Aa123456 -# access restriction authCookie: securityKey: MlB1WHFpSHNVTWdJZU1PcQ== maxSessionTimeOut: 86400000 @@ -46,9 +41,9 @@ authCookie: onboardingExcludedUrls: [ '/.*' ] basicAuth: - enabled: <%= @basic_auth_enabled %> - userName: <%= @basic_auth_username %> - userPass: <%= @basic_auth_password %> + enabled: true + userName: testName + userPass: testPass excludedUrls: "/v1.0/healthcheck" zipValidation: @@ -71,7 +66,8 @@ externalCsarStore: uploadPartSize: 200000000 #Space separated list of permitted ancestors -permittedAncestors: <%= @permittedAncestors %> +permittedAncestors: # Comma separated list of excluded URLs by the DataValidatorFilter dataValidatorFilterExcludedUrls: "/healthCheck,/followed,/authorize" + diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/ready-probe.sh.erb b/integration-tests/openecomp-be-config/ready-probe.sh index 4ca281cee3..ad97abf27b 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/ready-probe.sh.erb +++ b/integration-tests/openecomp-be-config/ready-probe.sh @@ -1,8 +1,9 @@ #!/bin/sh -health_check_http_code=$(curl -k --max-time 5 -o /dev/null -w '%{http_code}' -X GET --header "Accept: application/json" "<%= @protocol %>://127.0.0.1:<%= @port %>/onboarding-api/v1.0/healthcheck") +health_check_http_code=$(curl -k --max-time 5 -o /dev/null -w '%{http_code}' -X GET --header "Accept: application/json" "http://127.0.0.1:8081/onboarding-api/v1.0/healthcheck") if [ "$health_check_http_code" -eq 200 ]; then exit 0 else echo "Health check http status: $health_check_http_code" exit 1 fi + diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 62b3f620e7..0e16b3b705 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -32,7 +32,7 @@ limitations under the License. <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>sdc-main</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <properties> @@ -47,6 +47,10 @@ limitations under the License. <it.sdc.user>asdc_user</it.sdc.user> <it.sdc.password>Aa1234%^!</it.sdc.password> <it.chef.config>${project.build.directory}/chef-config</it.chef.config> + <it.catalog.resource>${project.build.directory}/catalog-be-resources</it.catalog.resource> + <it.sdc-onboard.probe>${project.build.directory}/openecomp-be-config</it.sdc-onboard.probe> + <it.sdc-onboard.config>${project.build.directory}/openecomp-be-config/onboard-backend-config</it.sdc-onboard.config> + <it.sdc-onboard.jetty>${project.build.directory}/openecomp-be-config/jetty-config</it.sdc-onboard.jetty> <it.sdc-be.plugins>${project.build.directory}/plugins/sdc-be</it.sdc-be.plugins> <it.shared.volume>/tmp/sdc-integration-tests</it.shared.volume> <it.docker.version>latest</it.docker.version> @@ -421,10 +425,82 @@ limitations under the License. <version>${functionaljava.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> <build> <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>3.3.1</version> + <executions> + <execution> + <id>copy-resources</id> + <phase>prepare-package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${it.catalog.resource}</outputDirectory> + <resources> + <resource> + <directory>catalog-be-resources</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + + <!-- Set executable permissions for the scripts --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>3.1.0</version> + <executions> + <execution> + <id>set-executable-permissions</id> + <phase>prepare-package</phase> + <configuration> + <target> + + + <chmod file="${it.catalog.resource}/resource/portal.properties" perm="755" /> + <chmod file="${it.catalog.resource}/resource/key.properties" perm="755" /> + <chmod file="${it.catalog.resource}/start.d/http.ini" perm="755" /> + <chmod file="${it.catalog.resource}/start.d/https.ini" perm="755" /> + <chmod file="${it.catalog.resource}/start.d/ssl.ini" perm="755" /> + + + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <!-- Section for Integration tests --> <plugin> <artifactId>maven-resources-plugin</artifactId> @@ -455,6 +531,65 @@ limitations under the License. </resources> </configuration> </execution> + + <execution> + <id>copy-onboard-backend-config</id> + <phase>pre-integration-test</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${it.sdc-onboard.config}</outputDirectory> + <resources> + <resource> + <directory>openecomp-be-config/onboard-backend-config/</directory> + <filtering>false</filtering> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-onboard-backend-http-config</id> + <phase>pre-integration-test</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${it.sdc-onboard.jetty}</outputDirectory> + <resources> + <resource> + <directory>openecomp-be-config/jetty-config</directory> + <filtering>false</filtering> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-onboard-backend-probe</id> + <phase>pre-integration-test</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${it.sdc-onboard.probe}</outputDirectory> + <resources> + <resource> + <directory>openecomp-be-config</directory> + <filtering>false</filtering> + <includes> + <include>ready-probe.sh</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + <execution> <id>copy-sdc-be-plugins</id> <phase>pre-integration-test</phase> @@ -545,6 +680,10 @@ limitations under the License. </execution> </executions> </plugin> + + + + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>wagon-maven-plugin</artifactId> @@ -713,12 +852,6 @@ limitations under the License. <HEAP_NEWSIZE>512M</HEAP_NEWSIZE> </env> <hostname>sdc-cs</hostname> - <volumes> - <bind> - <volume>${it.chef.config}:/root/chef-solo/environments - </volume> - </bind> - </volumes> <ulimits> <ulimit> <name>memlock</name> @@ -766,13 +899,6 @@ limitations under the License. <ENVNAME>${it.env.name}</ENVNAME> </env> <hostname>sdc-cs-init</hostname> - <volumes> - <bind> - <volume>${it.chef.config}:/home/sdc/chef-solo/environments - </volume> - - </bind> - </volumes> <wait> <time>400000</time> <log>SdcSchemaFileImport successfully completed</log> @@ -784,6 +910,7 @@ limitations under the License. </network> </run> </image> + <image> <name>${docker.namespace}/sdc-onboard-cassandra-init:${it.docker.version}</name> <alias>sdc-cassandra-onboard-init</alias> @@ -818,6 +945,7 @@ limitations under the License. </network> </run> </image> + <image> <name>${docker.namespace}/sdc-onboard-backend:${it.docker.version}</name> <alias>sdc-onboard-backend</alias> @@ -831,7 +959,6 @@ limitations under the License. <SDC_CLUSTER_NAME>${it.sdc.cluster.name}</SDC_CLUSTER_NAME> <SDC_USER>${it.sdc.user}</SDC_USER> <SDC_PASSWORD>${it.sdc.password}</SDC_PASSWORD> - <ENVNAME>${it.env.name}</ENVNAME> <SDC_CERT_DIR>onap/cert</SDC_CERT_DIR> <JAVA_OPTIONS> -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:4001 @@ -840,8 +967,16 @@ limitations under the License. </env> <hostname>sdc-onboard-BE</hostname> <volumes> - <bind> - <volume>${it.chef.config}:/app/jetty/chef-solo/environments</volume> + <bind> + <volume>${it.sdc-onboard.config}/config-vnfrepo.yaml:/app/jetty/config/onboarding-be/config-vnfrepo.yaml</volume> + <volume>${it.sdc-onboard.config}/onboarding_configuration.yaml:/app/jetty/config/onboarding-be/onboarding_configuration.yaml</volume> + <volume>${it.sdc-onboard.config}/config-helmvalidator.yaml:/app/jetty/config/onboarding-be/config-helmvalidator.yaml</volume> + <volume>${it.sdc-onboard.config}/externaltesting-configuration.yaml:/app/jetty/config/onboarding-be/externaltesting-configuration.yaml</volume> + <volume>${it.sdc-onboard.config}/features.properties:/app/jetty/config/onboarding-be/features.properties</volume> + <volume>${it.sdc-onboard.jetty}/http.ini:/app/jetty/start.d/http.ini</volume> + <volume>${it.sdc-onboard.jetty}/https.ini:/app/jetty/start.d/https.ini</volume> + <volume>${it.sdc-onboard.jetty}/ssl.ini:/app/jetty/start.d/ssl.ini</volume> + <volume>${it.sdc-onboard.probe}/ready-probe.sh:/app/jetty/ready.probe.sh</volume> <volume>${project.basedir}/src/test/resources/cert/onboarding-be:/app/jetty/onap/cert </volume> <volume>${it.shared.volume}:/app/jetty/logs</volume> @@ -871,6 +1006,7 @@ limitations under the License. </network> </run> </image> + <image> <name>${docker.namespace}/sdc-backend-all-plugins:${it.docker.version}</name> <alias>sdc-backend</alias> @@ -892,14 +1028,24 @@ limitations under the License. <hostname>sdc-BE</hostname> <volumes> <bind> - <volume> - ${project.basedir}/integration-tests-init/BE-configuration.yaml.erb:/app/jetty/chef-solo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb - </volume> - <volume>${it.chef.config}:/app/jetty/chef-solo/environments</volume> + + + + <volume>${it.catalog.resource}/catalog-be/configuration.yaml:/app/jetty/config/catalog-be/configuration.yaml</volume> + <volume>${it.catalog.resource}/catalog-be/distribution-engine-configuration.yaml:/app/jetty/config/catalog-be/distribution-engine-configuration.yaml</volume> + <volume>${it.catalog.resource}/catalog-be/janusgraph.properties:/app/jetty/config/catalog-be/janusgraph.properties</volume> + <volume>${it.catalog.resource}/resource/key.properties:/app/jetty/resources/key.properties</volume> + <volume>${it.catalog.resource}/resource/portal.properties:/app/jetty/resources/portal.properties</volume> + <volume>${it.catalog.resource}/start.d/http.ini:/app/jetty/start.d/http.ini</volume> + <volume>${it.catalog.resource}/start.d/https.ini:/app/jetty/start.d/https.ini</volume> + <volume>${it.catalog.resource}/start.d/ssl.ini:/app/jetty/start.d/ssl.ini</volume> + <volume>${it.catalog.resource}/ready-probe.sh:/app/jetty/ready-probe.sh</volume> <volume>${it.shared.volume}:/app/jetty/logs</volume> - <volume> + + <volume> ${project.basedir}/src/test/resources/cert/catalog-be:/app/jetty/onap/cert </volume> + </bind> </volumes> <wait> @@ -926,28 +1072,44 @@ limitations under the License. </network> </run> </image> + <image> <name>${docker.namespace}/sdc-backend-init:${it.docker.version}</name> <alias>sdc-backend-init</alias> + <build> + <dockerFileDir>${project.basedir}/../catalog-be/sdc-backend-init</dockerFileDir> + </build> <run> <dependsOn> <container>sdc-backend</container> </dependsOn> <env> <ENVNAME>${it.env.name}</ENVNAME> + <DISABLE_HTTP>false</DISABLE_HTTP> + <BE_HTTP_PORT>8080</BE_HTTP_PORT> + <BE_HTTPS_PORT>8443</BE_HTTPS_PORT> + <BE_IP>sdc-BE</BE_IP> + <BASIC_AUTH_ENABLED>true</BASIC_AUTH_ENABLED> + <BASIC_AUTH_USER>testName</BASIC_AUTH_USER> + <BASIC_AUTH_PASS>testPass</BASIC_AUTH_PASS> + <TLS_CERT>""</TLS_CERT> + <TLS_KEY>""</TLS_KEY> + <TLS_KEY_PW>""</TLS_KEY_PW> + <CA_CERT>""</CA_CERT> </env> <hostname>sdc-BE-init</hostname> <volumes> <bind> - <volume> - ${it.chef.config}:/home/onap/chef-solo/environments - </volume> <volume>${it.shared.volume}:/home/onap/logs</volume> </bind> </volumes> + <cmd>/bin/sh -c "/home/onap/check_backend.sh"</cmd> + <cmd>/bin/sh -c "/home/onap/create_consumer_and_user.sh"</cmd> + <cmd>/bin/sh -c "/home/onap/import_normatives.sh"</cmd> + <wait> <time>660000</time> - <log>Chef Client finished</log> + <log>Done</log> </wait> <network> <mode>custom</mode> @@ -956,7 +1118,9 @@ limitations under the License. </network> </run> </image> - <image> + + + <image> <name>${docker.namespace}/sdc-frontend:${it.docker.version}</name> <alias>sdc-frontend</alias> <run> @@ -970,7 +1134,6 @@ limitations under the License. <hostname>sdc-FE</hostname> <volumes> <bind> - <volume>${it.chef.config}:/app/jetty/chef-solo/environments</volume> <volume>${it.shared.volume}:/app/jetty/logs</volume> <volume> ${it.chef.config}/plugins-configuration.yaml:/app/jetty/config/catalog-fe/plugins-configuration.yaml @@ -979,7 +1142,7 @@ limitations under the License. </bind> </volumes> <wait> - <time>360000</time> + <time>60000</time> <tcp> <host>sdc-FE</host> <mode>direct</mode> @@ -1049,7 +1212,7 @@ limitations under the License. <run> <hostname>firefox-standalone</hostname> <wait> - <time>20000</time> + <time>30000</time> <tcp> <host>firefox-standalone</host> <mode>direct</mode> @@ -1157,6 +1320,7 @@ limitations under the License. </network> </run> </image> + </images> </configuration> <executions> @@ -1331,3 +1495,4 @@ limitations under the License. </profile> </profiles> </project> + diff --git a/onboarding/pom.xml b/onboarding/pom.xml index 3d41b0bd23..bac9104d1e 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>sdc-main</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml index a64e246311..06deaa6d6b 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.openecomp.sdc.onboarding</groupId> <artifactId>action-library-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-types/pom.xml index 1406420062..8fac173509 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-types/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.openecomp.sdc.onboarding</groupId> <artifactId>action-library-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/pom.xml index ed574ac70a..0f6a14bf9d 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/pom.xml @@ -11,7 +11,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-rest-webapp</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> <module>/action-library-rest-services</module> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml index 91b7425f98..053c9e240b 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>application-config-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-types/pom.xml index a8bcebec3f..3466657983 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-types/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>application-config-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/pom.xml index c86fab0093..1b217dc768 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/pom.xml @@ -11,7 +11,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-rest-webapp</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml index c15853fee5..4cbe63fab4 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>conflict-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>conflict-rest-services</artifactId> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/pom.xml index 9105126c1c..ff52e13d6f 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>conflict-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>conflict-rest-types</artifactId> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/pom.xml index 8a4ccf408c..37c416a646 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-rest-webapp</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>conflict-rest</artifactId> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/externaltesting-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/externaltesting-rest-services/pom.xml index ac2be49bde..f199270323 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/externaltesting-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/externaltesting-rest-services/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.openecomp.sdc.onboarding</groupId> <artifactId>externaltesting-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/pom.xml index a211d57ed5..2988a65489 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/pom.xml @@ -11,7 +11,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-rest-webapp</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml index ae3af3351e..56fe4211d3 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>healthcheck-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>healthcheck-rest-services</artifactId> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/pom.xml index 25b403f04f..e26c1ced30 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>healthcheck-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>healthcheck-rest-types</artifactId> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/pom.xml index e9a234686a..710d77e6da 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-rest-webapp</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>healthcheck-rest</artifactId> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-services/pom.xml index c1afc016b7..3d11e223e5 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-services/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>item-permissions-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>item-permissions-rest-services</artifactId> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-types/pom.xml index cc0bfce3b0..330c0c1d21 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-types/pom.xml @@ -14,7 +14,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>item-permissions-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>item-permissions-rest-types</artifactId> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/pom.xml index abe879e20f..5a3181d8f7 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-rest-webapp</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>item-permissions-rest</artifactId> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml index 4cf0abd493..b520edea94 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>item-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>item-rest-services</artifactId> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-types/pom.xml index 4dd9cb46cb..68eec8da13 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-types/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>item-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>item-rest-types</artifactId> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/pom.xml index 64ead02598..56d25a556e 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-rest-webapp</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>item-rest</artifactId> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/metrics-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/metrics-rest/pom.xml index 5fe9f49aab..365f594555 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/metrics-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/metrics-rest/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-rest-webapp</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml index 886540828f..de23dfe0f9 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml @@ -11,7 +11,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-rest-webapp</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <properties> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/pom.xml index 291432554c..5ec5fdbcb5 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>notifications-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>notifications-rest-services</artifactId> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/pom.xml index 203cf6924d..7683a51024 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/pom.xml @@ -14,7 +14,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>notifications-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>notifications-rest-types</artifactId> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/pom.xml index 173c154ce5..9ba22270c2 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-rest-webapp</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <groupId>org.openecomp.sdc</groupId> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml index b4632dbc46..de0e772578 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml @@ -11,7 +11,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-rest-webapp</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml index fa043ab591..3e7df56200 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-rest-webapp</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <properties> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/pom.xml index 1e382378ce..8642d79078 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-api</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/pom.xml index adc3bffe2b..acf3045dda 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-rest-webapp</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>togglz-rest</artifactId> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml index 92f47c4e2c..6f593bf93b 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>togglz-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>togglz-rest-services</artifactId> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-types/pom.xml index cb347e77e7..3293ed6af3 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-types/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>togglz-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>togglz-rest-types</artifactId> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/pom.xml index 3b14ab85fb..2d41c143d9 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-rest-webapp</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>unique-type-rest</artifactId> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml index be806ed9f4..0cf047f24c 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>unique-type-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>unique-type-rest-services</artifactId> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-types/pom.xml index 61039e675c..47405d2161 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-types/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>unique-type-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>unique-type-rest-types</artifactId> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/pom.xml index 4c94cbf641..18451965b2 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/pom.xml @@ -11,7 +11,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-rest-webapp</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml index a608cb3f78..1cc524afd7 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.openecomp.sdc.onboarding</groupId> <artifactId>validation-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-types/pom.xml index fe63d5044d..e9c0e3d489 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-types/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.openecomp.sdc.onboarding</groupId> <artifactId>validation-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/pom.xml index 828fe281ef..98b03d5442 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-rest-webapp</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml index 15965f4840..636bd31c3a 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.openecomp.sdc.onboarding</groupId> <artifactId>vendor-license-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <properties> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/pom.xml index ee3b504508..4a2f2de233 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc.onboarding</groupId> <artifactId>vendor-license-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/pom.xml index b95c3ccaae..306251d5e4 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/pom.xml @@ -11,7 +11,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-rest-webapp</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml index 0e4cc05261..b4bdea332e 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc.onboarding</groupId> <artifactId>vendor-software-products-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/pom.xml index 0b4b2ba2e0..3066f6c9a3 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.openecomp.sdc.onboarding</groupId> <artifactId>vendor-software-products-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml index d0caef2af4..31a8629af7 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.openecomp.sdc.onboarding</groupId> <artifactId>vendor-software-products-rest</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/api/pom.xml b/openecomp-be/api/pom.xml index 2122f1372c..961f54a899 100644 --- a/openecomp-be/api/pom.xml +++ b/openecomp-be/api/pom.xml @@ -11,7 +11,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/backend/openecomp-sdc-action-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-action-manager/pom.xml index 2d9c371924..313cf06629 100644 --- a/openecomp-be/backend/openecomp-sdc-action-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-action-manager/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>backend</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> diff --git a/openecomp-be/backend/openecomp-sdc-activity-log-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-activity-log-manager/pom.xml index a7b39bc98e..83f305c3fb 100644 --- a/openecomp-be/backend/openecomp-sdc-activity-log-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-activity-log-manager/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>backend</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml index c7c6b2f5d1..b3dafd3d4b 100644 --- a/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>backend</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/backend/openecomp-sdc-conflict-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-conflict-manager/pom.xml index 4993c4cfe5..d9700fc42f 100644 --- a/openecomp-be/backend/openecomp-sdc-conflict-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-conflict-manager/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>backend</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>openecomp-sdc-conflict-manager</artifactId> diff --git a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml index e9c348e8cb..cc513896e8 100644 --- a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>backend</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>openecomp-sdc-healthcheck-manager</artifactId> diff --git a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml index 1474019305..4ad5e57412 100644 --- a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>backend</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>openecomp-sdc-item-permissions-manager</artifactId> diff --git a/openecomp-be/backend/openecomp-sdc-security-util/pom.xml b/openecomp-be/backend/openecomp-sdc-security-util/pom.xml index 837e91d21f..9d7bc9ed1c 100644 --- a/openecomp-be/backend/openecomp-sdc-security-util/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-security-util/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>backend</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/openecomp-be/backend/openecomp-sdc-validation-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-validation-manager/pom.xml index 482cd6454e..eaf0409193 100644 --- a/openecomp-be/backend/openecomp-sdc-validation-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-validation-manager/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>backend</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml index 7d1cdd4cf6..230c66ac67 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>backend</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml index babd77bcd0..d6eae29fcf 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>backend</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/backend/pom.xml b/openecomp-be/backend/pom.xml index 604d7e2353..4a57cc592b 100644 --- a/openecomp-be/backend/pom.xml +++ b/openecomp-be/backend/pom.xml @@ -10,7 +10,7 @@ <parent> <artifactId>openecomp-sdc</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/dist/pom.xml b/openecomp-be/dist/pom.xml index f5db41e0ce..8c9048d915 100644 --- a/openecomp-be/dist/pom.xml +++ b/openecomp-be/dist/pom.xml @@ -11,7 +11,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile index fc809b5afe..ac49e854db 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile @@ -1,26 +1,19 @@ FROM onap/integration-java11:10.0.0 +# Switch to root user for system installations USER root ARG JETTY_FOLDER=/app/jetty -# Install Chef +# Install necessary packages and dependencies RUN set -ex && \ apk update && \ apk add --no-cache \ wget \ build-base \ - ruby \ - ruby-dev \ libffi-dev \ - libxml2-dev && \ - gem install --no-update-sources \ - rspec-its:1.3.0 hitimes:1.3.1 public_suffix:4.0.7 multipart-post:2.2.0 etc:1.3.0 bundler:2.3.26 chef:13.8.5 \ - faraday:2.8.1 minitar:0.12.1 berkshelf:6.3.1 \ - io-console:0.4.6 \ - webrick \ - json \ - --no-document && \ - gem cleanup + libxml2-dev \ + libressl-dev && \ + apk update ENV JETTY_HOME=$JETTY_FOLDER ENV JETTY_BASE=$JETTY_FOLDER @@ -37,12 +30,19 @@ RUN wget -q https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/ rm -rf $JETTY_FOLDER/jetty.tar.gz RUN sed -i 's/"jetty"/"onap"/g' $JETTY_FOLDER/etc/jetty-setuid.xml -COPY --chown=onap:onap chef-solo $JETTY_FOLDER/chef-solo/ -COPY --chown=onap:onap chef-repo/cookbooks $JETTY_FOLDER/chef-solo/cookbooks/ -ADD --chown=onap:onap onboarding-be-*.war $JETTY_FOLDER/webapps/ -ADD --chown=onap:onap api-docs.war $JETTY_FOLDER/webapps/ +ADD --chown=onap:onap onboarding-be-*.war $JETTY_FOLDER/webapps/ +ADD --chown=onap:onap api-docs.war $JETTY_FOLDER/webapps/ COPY --chown=onap:onap startup.sh $JETTY_FOLDER/ - +COPY --chown=onap:onap scripts/cleanup_jettydir.sh $JETTY_FOLDER/ +COPY --chown=onap:onap scripts/create_jetty_modules.sh $JETTY_FOLDER/ +# Set executable permissions on the startup script RUN chmod 770 $JETTY_FOLDER/startup.sh - +RUN chmod 770 $JETTY_FOLDER/cleanup_jettydir.sh && $JETTY_FOLDER/cleanup_jettydir.sh +RUN chmod +x $JETTY_FOLDER/create_jetty_modules.sh && $JETTY_FOLDER/create_jetty_modules.sh + +COPY --chown=onap:onap files/logback.xml $JETTY_FOLDER/config/onboarding-be/ +COPY --chown=onap:onap files/org.onap.sdc.p12 $JETTY_FOLDER/etc/ +COPY --chown=onap:onap files/org.onap.sdc.trust.jks $JETTY_FOLDER/etc/ +COPY --chown=onap:onap files/base_template.yaml $JETTY_BASE/resources/ +COPY --chown=onap:onap files/base_template.env $JETTY_BASE/resources/ ENTRYPOINT [ "sh", "-c", "${JETTY_HOME}/startup.sh"] diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/attributes/default.rb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/attributes/default.rb deleted file mode 100644 index 074584a6e8..0000000000 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/attributes/default.rb +++ /dev/null @@ -1,32 +0,0 @@ -# -default['ONBOARDING_BE'][:http_port] = 8081 -default['ONBOARDING_BE'][:https_port] = 8445 -default['FE'][:http_port] = 8181 -default['FE'][:https_port] = 9443 -default['disableHttp'] = true -default['cassandra'][:truststore_password] = "Aa123456" -default['jetty'][:keystore_pwd] = "?(kP!Yur![*!Y5!E^f(ZKc31" -default['jetty'][:keymanager_pwd] = "?(kP!Yur![*!Y5!E^f(ZKc31" -default['jetty'][:truststore_pwd] = "z+KEj;t+,KN^iimSiS89e#p0" -default['jetty']['truststore_path'] = "#{ENV['JETTY_BASE']}/etc/truststore" - -default['VnfRepo']['vnfRepoPort'] = 8702 -default['VnfRepo']['vnfRepoHost'] = "refrepo" - -#Cassandra -default['cassandra']['cassandra_port'] = 9042 -default['cassandra']['datacenter_name'] = "DC-" -default['cassandra']['cluster_name'] = "SDC-CS-" -default['cassandra']['socket_read_timeout'] = 20000 -default['cassandra']['socket_connect_timeout'] = 20000 -default['cassandra']['janusgraph_connection_timeout'] = 10000 - -#Basicauth -default['basic_auth']['enabled'] = true -default['basic_auth'][:user_name] = "testName" -default['basic_auth'][:user_pass] = "testPass" -default['basic_auth']['excludedUrls'] = "/v1.0/healthcheck" - -#ExternalTesting -default['EXTTEST']['ep1_config'] = "vtp,VTP,true,http://refrepo:8702/onapapi/vnfsdk-marketplace,onap.*" -default['EXTTEST']['ep2_config'] = "repository,Repository,false,,.*" diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_1_cleanup_jettydir.rb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_1_cleanup_jettydir.rb deleted file mode 100644 index 305ff2384b..0000000000 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_1_cleanup_jettydir.rb +++ /dev/null @@ -1,23 +0,0 @@ -directory "tempdir_creation" do - path "#{ENV['JETTY_BASE']}/temp" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode '0755' - action :create -end - -directory "create_config_dir" do - path "#{ENV['JETTY_BASE']}/config" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode '0755' - action :create -end - -directory "onboarding-be" do - path "#{ENV['JETTY_BASE']}/config/onboarding-be" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode '0755' - action :create -end diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_2_locate_keystore.rb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_2_locate_keystore.rb deleted file mode 100644 index 1a678397d8..0000000000 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_2_locate_keystore.rb +++ /dev/null @@ -1,22 +0,0 @@ -directory "Jetty_etcdir_creation" do - path "#{ENV['JETTY_BASE']}/etc" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode '0755' - action :create -end - -cookbook_file "#{ENV['JETTY_BASE']}/etc/org.onap.sdc.p12" do - source "org.onap.sdc.p12" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode 0755 -end - -cookbook_file "#{ENV['JETTY_BASE']}/etc/org.onap.sdc.trust.jks" do - source "org.onap.sdc.trust.jks" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode 0755 -end - diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_3_logback.rb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_3_logback.rb deleted file mode 100644 index 0d97645420..0000000000 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_3_logback.rb +++ /dev/null @@ -1,7 +0,0 @@ -cookbook_file "#{ENV['JETTY_BASE']}/config/onboarding-be/logback.xml" do - source "logback.xml" - mode 0755 - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" -end - diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_4_setup_jetty_modules.rb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_4_setup_jetty_modules.rb deleted file mode 100644 index 6b2b79b49c..0000000000 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_4_setup_jetty_modules.rb +++ /dev/null @@ -1,50 +0,0 @@ -#Set the http module option -if node['disableHttp'] - http_option = "#--module=http" -else - http_option = "--module=http" -end - -execute "create-jetty-modules" do - command "java -jar #{ENV['JETTY_HOME']}/start.jar --add-to-start=deploy && java -jar #{ENV['JETTY_HOME']}/start.jar --create-startd --add-to-start=http,https,setuid" - cwd "#{ENV['JETTY_BASE']}" - action :run -end - -template "http-ini" do - path "#{ENV['JETTY_BASE']}/start.d/http.ini" - source "http-ini.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" - variables ({ - :http_option => http_option , - :http_port => "#{node['ONBOARDING_BE'][:http_port]}" - }) - -end - - -template "https-ini" do - path "#{ENV['JETTY_BASE']}/start.d/https.ini" - source "https-ini.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" - variables :https_port => "#{node['ONBOARDING_BE'][:https_port]}" -end - - -template "ssl-ini" do - path "#{ENV['JETTY_BASE']}/start.d/ssl.ini" - source "ssl-ini.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" - variables ({ - :https_port => "#{node['ONBOARDING_BE'][:https_port]}" , - :jetty_keystore_pwd => "#{node['jetty'][:keystore_pwd]}" , - :jetty_keymanager_pwd => "#{node['jetty'][:keymanager_pwd]}" , - :jetty_truststore_pwd => "#{node['jetty'][:truststore_pwd]}" - }) -end diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_5_setup_configuration.rb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_5_setup_configuration.rb deleted file mode 100644 index 526f2dd4b4..0000000000 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_5_setup_configuration.rb +++ /dev/null @@ -1,77 +0,0 @@ -template "onboard-be-config" do - path "#{ENV['JETTY_BASE']}/config/onboarding-be/onboarding_configuration.yaml" - source "configuration.yaml.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" - variables({ - :onboard_ip => node['ONBOARDING_BE_VIP'], - :onboard_port => node['ONBOARDING_BE'][:http_port], - :ssl_port => node['ONBOARDING_BE'][:https_port], - :cassandra_ip => node['Nodes']['CS'].join(",").gsub(/[|]/,''), - :cassandra_port => node['cassandra']['cassandra_port'], - :DC_NAME => node['cassandra']['datacenter_name'], - :socket_connect_timeout => node['cassandra']['socket_connect_timeout'], - :socket_read_timeout => node['cassandra']['socket_read_timeout'], - :cassandra_pwd => node['cassandra'][:cassandra_password], - :cassandra_usr => node['cassandra'][:cassandra_user], - :cassandra_truststore_password => node['cassandra'][:truststore_password], - :cassandra_ssl_enabled => "#{ENV['cassandra_ssl_enabled']}", - :basic_auth_enabled => node['basic_auth']['enabled'], - :basic_auth_username => node['basic_auth'][:user_name], - :basic_auth_password => node['basic_auth'][:user_pass], - :catalog_notification_url => node['ONBOARDING_BE']['catalog_notification_url'], - :catalog_be_http_port => node['BE'][:http_port], - :catalog_be_ssl_port => node['BE'][:https_port], - :permittedAncestors => "#{ENV['permittedAncestors']}", - :catalog_be_fqdn => node['Nodes']['BE'] - }) -end - -template "VnfrepoConfiguration" do - path "#{ENV['JETTY_BASE']}/config/onboarding-be/config-vnfrepo.yaml" - source "vnfrepo-configuration.yaml.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" - variables({ - :VNFREPO_IP => node['VnfRepo']['vnfRepoHost'], - :VNFREPO_PORT => node['VnfRepo']['vnfRepoPort'] - }) -end - -template "HelmValidatorConfiguration" do - path "#{ENV['JETTY_BASE']}/config/onboarding-be/config-helmvalidator.yaml" - source "helmvalidator-configuration.yaml.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" - variables({ - :HVALIDATOR_ENABLED => node['HelmValidator']['validator_enabled'], - :HVALIDATOR_URL => node['HelmValidator']['validator_url'], - :HVALIDATOR_HELM_VERSION => node['HelmValidator']['helm_version'], - :HVALIDATOR_DEPLOYABLE => node['HelmValidator']['deployable'], - :HVALIDATOR_LINTABLE => node['HelmValidator']['lintable'], - :HVALIDATOR_STRICT_LINTABLE => node['HelmValidator']['strict_lintable'] - }) -end - -template "ExternalTestingConfiguration" do - path "#{ENV['JETTY_BASE']}/config/onboarding-be/externaltesting-configuration.yaml" - source "externaltesting-configuration.yaml.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" - variables({ - :EP1_CONFIG => node['EXTTEST']['ep1_config'], - :EP2_CONFIG => node['EXTTEST']['ep2_config'] - }) -end - -template "FeaturesProperties" do - path "#{ENV['JETTY_BASE']}/config/onboarding-be/features.properties" - source "features.properties.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" -end diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_6_prepareProbeFile.rb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_6_prepareProbeFile.rb deleted file mode 100644 index 6351be35b2..0000000000 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_6_prepareProbeFile.rb +++ /dev/null @@ -1,17 +0,0 @@ -if node[:disableHttp] - protocol = "https" - port = "#{node['ONBOARDING_BE'][:https_port]}" -else - protocol = "http" - port = "#{node['ONBOARDING_BE'][:http_port]}" -end - -template "#{ENV['JETTY_BASE']}/ready-probe.sh" do - source "ready-probe.sh.erb" - sensitive true - mode 0755 - variables({ - :protocol => protocol, - :port => port - }) -end diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_7_setup_base_template.rb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_7_setup_base_template.rb deleted file mode 100644 index 2660eb0e6d..0000000000 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_7_setup_base_template.rb +++ /dev/null @@ -1,13 +0,0 @@ -cookbook_file "#{ENV['JETTY_BASE']}/resources/base_template.yaml" do - source "base_template.yaml" - mode 0644 - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" -end - -cookbook_file "#{ENV['JETTY_BASE']}/resources/base_template.env" do - source "base_template.env" - mode 0644 - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" -end
\ No newline at end of file diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/externaltesting-configuration.yaml.erb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/externaltesting-configuration.yaml.erb deleted file mode 100644 index 599b5d40f7..0000000000 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/externaltesting-configuration.yaml.erb +++ /dev/null @@ -1,5 +0,0 @@ -client: - enabled: true -endpoints: - - <%= @EP1_CONFIG %> - - <%= @EP2_CONFIG %> diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/features.properties.erb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/features.properties.erb deleted file mode 100644 index 1f87ee24d4..0000000000 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/features.properties.erb +++ /dev/null @@ -1 +0,0 @@ -EXTERNAL_LICENSE=true
\ No newline at end of file diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/helmvalidator-configuration.yaml.erb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/helmvalidator-configuration.yaml.erb deleted file mode 100644 index 37021c7a9a..0000000000 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/helmvalidator-configuration.yaml.erb +++ /dev/null @@ -1,6 +0,0 @@ -hValidatorEnabled: <%= @HVALIDATOR_ENABLED %> -hValidatorUrl: <%= @HVALIDATOR_URL %> -hValidatorVersion: <%= @HVALIDATOR_HELM_VERSION %> -hValidatorDeployable: <%= @HVALIDATOR_DEPLOYABLE %> -hValidatorLintable: <%= @HVALIDATOR_LINTABLE %> -hValidatorStrictLintable: <%= @HVALIDATOR_STRICT_LINTABLE %> diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/LICENSE b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/LICENSE deleted file mode 100644 index 11069edd79..0000000000 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file 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. diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/README.md b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/README.md deleted file mode 100644 index ddb0fda830..0000000000 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/README.md +++ /dev/null @@ -1,37 +0,0 @@ -Deprecated -========== - -Use of this repository is deprecated. We recommend using the `chef generate repo` command that comes with [ChefDK](http://downloads.chef.io/chef-dk/). - -Overview -======== - -Every Chef installation needs a Chef Repository. This is the place where cookbooks, roles, config files and other artifacts for managing systems with Chef will live. We strongly recommend storing this repository in a version control system such as Git and treat it like source code. - -While we prefer Git, and make this repository available via GitHub, you are welcome to download a tar or zip archive and use your favorite version control system to manage the code. - -Repository Directories -====================== - -This repository contains several directories, and each directory contains a README file that describes what it is for in greater detail, and how to use it for managing your systems with Chef. - -* `cookbooks/` - Cookbooks you download or create. -* `data_bags/` - Store data bags and items in .json in the repository. -* `roles/` - Store roles in .rb or .json in the repository. -* `environments/` - Store environments in .rb or .json in the repository. - -Configuration -============= - -The repository contains a knife configuration file. - -* .chef/knife.rb - -The knife configuration file `.chef/knife.rb` is a repository specific configuration file for knife. If you're using Hosted Chef, you can download one for your organization from the management console. If you're using the Open Source Chef Server, you can generate a new one with `knife configure`. For more information about configuring Knife, see the Knife documentation. - -https://docs.chef.io/knife.html - -Next Steps -========== - -Read the README file in each of the subdirectories for more information about what goes in those directories. diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/chefignore b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/chefignore deleted file mode 100644 index ba30af6cff..0000000000 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/chefignore +++ /dev/null @@ -1,11 +0,0 @@ -# Put files/directories that should be ignored in this file. -# Lines that start with '# ' are comments. - -# emacs -*~ - -# vim -*.sw[a-z] - -# subversion -*/.svn/* diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/cookbooks/README.md b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/cookbooks/README.md deleted file mode 100644 index 86ea46bfbb..0000000000 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/cookbooks/README.md +++ /dev/null @@ -1,54 +0,0 @@ -This directory contains the cookbooks used to configure systems in your infrastructure with Chef. - -Knife needs to be configured to know where the cookbooks are located with the `cookbook_path` setting. If this is not set, then several cookbook operations will fail to work properly. - - cookbook_path ["./cookbooks"] - -This setting tells knife to look for the cookbooks directory in the present working directory. This means the knife cookbook subcommands need to be run in the `chef-repo` directory itself. To make sure that the cookbooks can be found elsewhere inside the repository, use an absolute path. This is a Ruby file, so something like the following can be used: - - current_dir = File.dirname(__FILE__) - cookbook_path ["#{current_dir}/../cookbooks"] - -Which will set `current_dir` to the location of the knife.rb file itself (e.g. `~/chef-repo/.chef/knife.rb`). - -Configure knife to use your preferred copyright holder, email contact and license. Add the following lines to `.chef/knife.rb`. - - cookbook_copyright "Example, Com." - cookbook_email "cookbooks@example.com" - cookbook_license "apachev2" - -Supported values for `cookbook_license` are "apachev2", "mit","gplv2","gplv3", or "none". These settings are used to prefill comments in the default recipe, and the corresponding values in the metadata.rb. You are free to change the the comments in those files. - -Create new cookbooks in this directory with Knife. - - knife cookbook create COOKBOOK - -This will create all the cookbook directory components. You don't need to use them all, and can delete the ones you don't need. It also creates a README file, metadata.rb and default recipe. - -You can also download cookbooks directly from the Opscode Cookbook Site. There are two subcommands to help with this depending on what your preference is. - -The first and recommended method is to use a vendor branch if you're using Git. This is automatically handled with Knife. - - knife cookbook site install COOKBOOK - -This will: - -* Download the cookbook tarball from cookbooks.opscode.com. -* Ensure its on the git master branch. -* Checks for an existing vendor branch, and creates if it doesn't. -* Checks out the vendor branch (chef-vendor-COOKBOOK). -* Removes the existing (old) version. -* Untars the cookbook tarball it downloaded in the first step. -* Adds the cookbook files to the git index and commits. -* Creates a tag for the version downloaded. -* Checks out the master branch again. -* Merges the cookbook into master. -* Repeats the above for all the cookbooks dependencies, downloading them from the community site - -The last step will ensure that any local changes or modifications you have made to the cookbook are preserved, so you can keep your changes through upstream updates. - -If you're not using Git, use the site download subcommand to download the tarball. - - knife cookbook site download COOKBOOK - -This creates the COOKBOOK.tar.gz from in the current directory (e.g., `~/chef-repo`). We recommend following a workflow similar to the above for your version control tool. diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/data_bags/README.md b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/data_bags/README.md deleted file mode 100644 index 0c15a391fa..0000000000 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/data_bags/README.md +++ /dev/null @@ -1,63 +0,0 @@ -Data Bags ---------- - -This directory contains directories of the various data bags you create for your infrastructure. Each subdirectory corresponds to a data bag on the Chef Server, and contains JSON files of the items that go in the bag. - -First, create a directory for the data bag. - - mkdir data_bags/BAG - -Then create the JSON files for items that will go into that bag. - - $EDITOR data_bags/BAG/ITEM.json - -The JSON for the ITEM must contain a key named "id" with a value equal to "ITEM". For example, - - { - "id": "foo" - } - -Next, create the data bag on the Chef Server. - - knife data bag create BAG - -Then upload the items in the data bag's directory to the Chef Server. - - knife data bag from file BAG ITEM.json - - -Encrypted Data Bags -------------------- - -Added in Chef 0.10, encrypted data bags allow you to encrypt the contents of your data bags. The content of attributes will no longer be searchable. To use encrypted data bags, first you must have or create a secret key. - - openssl rand -base64 512 > secret_key - -You may use this secret_key to add items to a data bag during a create. - - knife data bag create --secret-file secret_key passwords mysql - -You may also use it when adding ITEMs from files, - - knife data bag create passwords - knife data bag from file passwords data_bags/passwords/mysql.json --secret-file secret_key - -The JSON for the ITEM must contain a key named "id" with a value equal to "ITEM" and the contents will be encrypted when uploaded. For example, - - { - "id": "mysql", - "password": "abc123" - } - -Without the secret_key, the contents are encrypted. - - knife data bag show passwords mysql - id: mysql - password: 2I0XUUve1TXEojEyeGsjhw== - -Use the secret_key to view the contents. - - knife data bag show passwords mysql --secret-file secret_key - id: mysql - password: abc123 - diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/environments/README.md b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/environments/README.md deleted file mode 100644 index 50ac48db2b..0000000000 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/environments/README.md +++ /dev/null @@ -1,5 +0,0 @@ -Requires Chef 0.10.0+. - -This directory is for Ruby DSL and JSON files for environments. For more information see the Chef wiki page: - -http://docs.chef.io/environments.html diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/roles/README.md b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/roles/README.md deleted file mode 100644 index b0ee0b4d21..0000000000 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/roles/README.md +++ /dev/null @@ -1,16 +0,0 @@ -Create roles here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install roles on the server, use knife. - -For example, create `roles/base_example.rb`: - - name "base_example" - description "Example base role applied to all nodes." - # List of recipes and roles to apply. Requires Chef 0.8, earlier versions use 'recipes()'. - #run_list() - # Attributes applied if the node doesn't have it set already. - #default_attributes() - # Attributes applied no matter what the node has set already. - #override_attributes() - -Then upload it to the Chef Server: - - knife role from file roles/base_example.rb diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/roles/sdc-onboard-backend.json b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/roles/sdc-onboard-backend.json deleted file mode 100644 index 5fdf89b882..0000000000 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/roles/sdc-onboard-backend.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "sdc-onboard-backend", - "description": "Installation application - SDC_Onboard_Backend", - "json_class": "Chef::Role", - "default_attributes": { - - }, - "override_attributes": { - - }, - "chef_type": "role", - "run_list": [ - "recipe[sdc-onboard-backend::ON_1_cleanup_jettydir]", - "recipe[sdc-onboard-backend::ON_2_locate_keystore]", - "recipe[sdc-onboard-backend::ON_3_logback]", - "recipe[sdc-onboard-backend::ON_4_setup_jetty_modules]", - "recipe[sdc-onboard-backend::ON_5_setup_configuration]", - "recipe[sdc-onboard-backend::ON_6_prepareProbeFile]", - "recipe[sdc-onboard-backend::ON_7_setup_base_template]" - ], - "env_run_lists": { - } -} - diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/solo.json b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/solo.json deleted file mode 100644 index 0b032da81e..0000000000 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/solo.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "run_list": [ "role[sdc-onboard-backend]" ] -} - diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/solo.rb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/solo.rb deleted file mode 100644 index 06c1af4592..0000000000 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-solo/solo.rb +++ /dev/null @@ -1,16 +0,0 @@ -root = File.absolute_path(File.dirname(__FILE__)) -file_cache_path root -cookbook_path root + '/cookbooks' -json_attribs root + '/solo.json' -checksum_path root + '/checksums' -data_bag_path root + '/data_bags' -environment_path root + '/environments' -file_backup_path root + '/backup' -file_cache_path root + '/cache' -log_level :info -log_location STDOUT -rest_timeout 300 -role_path root + '/roles' -syntax_check_cache_path -umask 0022 -verbose_logging nil diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/base_template.env b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/files/base_template.env index 1b96230a96..e4d92fffce 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/base_template.env +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/files/base_template.env @@ -1,4 +1,4 @@ parameters: vnf_name: demo_vnf_ignore vnf_id: demo_app - vf_module_id: demo_module_id
\ No newline at end of file + vf_module_id: demo_module_id diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/base_template.yaml b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/files/base_template.yaml index eb6962b95e..eb6962b95e 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/base_template.yaml +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/files/base_template.yaml diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/logback.xml b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/files/logback.xml index 5b11824969..5b11824969 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/logback.xml +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/files/logback.xml diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/files/org.onap.sdc.p12 b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/files/org.onap.sdc.p12 Binary files differnew file mode 100644 index 0000000000..446856071b --- /dev/null +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/files/org.onap.sdc.p12 diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/files/org.onap.sdc.trust.jks b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/files/org.onap.sdc.trust.jks Binary files differnew file mode 100644 index 0000000000..e6686cc08c --- /dev/null +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/files/org.onap.sdc.trust.jks diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/scripts/cleanup_jettydir.sh b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/scripts/cleanup_jettydir.sh new file mode 100644 index 0000000000..fdb4befb1c --- /dev/null +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/scripts/cleanup_jettydir.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +#Create temp directory +mkdir -p "$JETTY_BASE/temp" +chown "$JETTY_USER:$JETTY_GROUP" "$JETTY_BASE/temp" +chmod 0755 "$JETTY_BASE/temp" + +# Create config directory +mkdir -p "$JETTY_BASE/config" +chown "$JETTY_USER:$JETTY_GROUP" "$JETTY_BASE/config" +chmod 0755 "$JETTY_BASE/config" + +# Create onboarding-be directory +mkdir -p "$JETTY_BASE/config/onboarding-be" +chown -R "$JETTY_USER:$JETTY_GROUP" "$JETTY_BASE/config/onboarding-be" +chmod -R 0755 "$JETTY_BASE/config/onboarding-be" + +#Create etc directory +mkdir -p "$JETTY_BASE/etc" +chown -R "$JETTY_USER:$JETTY_GROUP" "$JETTY_BASE/etc" +chmod -R 0755 "$JETTY_BASE/etc" diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/scripts/create_jetty_modules.sh b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/scripts/create_jetty_modules.sh new file mode 100644 index 0000000000..306a8d3314 --- /dev/null +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/scripts/create_jetty_modules.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# Define environment variables +export JETTY_HOME="/app/jetty/" # Replace with your Jetty home directory +export JETTY_BASE="/app/jetty/" # Replace with your Jetty base directory + +# Navigate to the Jetty base directory +cd "$JETTY_BASE" + +# Run the Jetty start-up jar with deploy module added +java -Duser.dir="$JETTY_BASE" -jar $JETTY_HOME/start.jar --add-to-start=deploy + +# Create startd configuration and add http, https, setuid modules +java -Duser.dir="$JETTY_BASE" -jar $JETTY_HOME/start.jar --create-startd --add-to-start=http,https,setuid + diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh index 43aad8726a..e08d61a09e 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh @@ -3,6 +3,7 @@ JAVA_OPTIONS="$JAVA_OPTIONS \ -Dcom.datastax.driver.USE_NATIVE_CLOCK=false \ -Dconfig.home=$JETTY_BASE/config \ + -Duser.dir=$JETTY_BASE \ -Dlog.home=$JETTY_BASE/logs \ -Dlogback.configurationFile=$JETTY_BASE/config/onboarding-be/logback.xml \ -Dconfiguration.yaml=$JETTY_BASE/config/onboarding-be/onboarding_configuration.yaml \ @@ -10,11 +11,6 @@ JAVA_OPTIONS="$JAVA_OPTIONS \ -XX:+HeapDumpOnOutOfMemoryError \ -Dconfig.location=$JETTY_BASE/config/onboarding-be/." -cd $JETTY_BASE - -cd $JETTY_BASE/chef-solo -chef-solo -c solo.rb -E ${ENVNAME} - cd $JETTY_HOME echo "jetty.httpConfig.sendServerVersion=false" >> $JETTY_HOME/start.d/start.ini diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml b/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml index 3fe26a286c..1dbd0e4a93 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml +++ b/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-docker-dist</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <properties> diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile index 6560e7f2a6..c467acf5cf 100644 --- a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile +++ b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile @@ -42,3 +42,4 @@ COPY --chown=sdc:sdc startup.sh /home/sdc/ RUN chmod 770 /home/sdc/startup.sh ENTRYPOINT [ "/home/sdc/startup.sh" ] + diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml b/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml index 6fec1e5c8d..ef878c3cd9 100644 --- a/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml +++ b/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml @@ -11,7 +11,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-docker-dist</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> diff --git a/openecomp-be/lib/openecomp-common-lib/pom.xml b/openecomp-be/lib/openecomp-common-lib/pom.xml index 8438cfb6d4..51fd2c3120 100644 --- a/openecomp-be/lib/openecomp-common-lib/pom.xml +++ b/openecomp-be/lib/openecomp-common-lib/pom.xml @@ -11,7 +11,7 @@ <parent> <artifactId>openecomp-sdc-lib</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/pom.xml b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/pom.xml index a3bf74b6c6..93cdb5d2ad 100644 --- a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/pom.xml +++ b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-conflict-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>openecomp-conflict-api</artifactId> diff --git a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/pom.xml b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/pom.xml index 27acd8e4ac..2bd9738934 100644 --- a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/pom.xml +++ b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-conflict-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <properties> diff --git a/openecomp-be/lib/openecomp-conflict-lib/pom.xml b/openecomp-be/lib/openecomp-conflict-lib/pom.xml index d1cfd4992a..23711035c4 100644 --- a/openecomp-be/lib/openecomp-conflict-lib/pom.xml +++ b/openecomp-be/lib/openecomp-conflict-lib/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>openecomp-conflict-lib</artifactId> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml index 7aee24c0e8..14f7cb3eed 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.openecomp.sdc.core</groupId> <artifactId>openecomp-core-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/pom.xml index 2adc19f1ac..45e256698b 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.openecomp.sdc.core</groupId> <artifactId>openecomp-facade-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-core/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-core/pom.xml index 97efc7b510..67bdd0fe0e 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-core/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-core/pom.xml @@ -8,7 +8,7 @@ <parent> <artifactId>openecomp-facade-lib</artifactId> <groupId>org.openecomp.sdc.core</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/pom.xml index 1ee654d1eb..4953bb55cb 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>openecomp-core-lib</artifactId> <groupId>org.openecomp.sdc.core</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml index fd6670e97b..7d92e4e93b 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>openecomp-nosqldb-lib</artifactId> <groupId>org.openecomp.sdc.core</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml index 8ce4181662..b0ed2c5553 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>openecomp-nosqldb-lib</artifactId> <groupId>org.openecomp.sdc.core</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/pom.xml index 6648d7309c..86dbbbbf56 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>openecomp-core-lib</artifactId> <groupId>org.openecomp.sdc.core</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/pom.xml index 49575326c1..b77634d8a4 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.openecomp.sdc.core</groupId> <artifactId>openecomp-core-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>openecomp-session-lib</artifactId> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml index 89cdaaaa0a..6ff3175c2d 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>openecomp-core-lib</artifactId> <groupId>org.openecomp.sdc.core</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/pom.xml index 9ade32ba53..7a80a39577 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.openecomp.sdc.core</groupId> <artifactId>openecomp-zusammen-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml index 4c100befe8..7c9218cdf2 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc.core</groupId> <artifactId>openecomp-zusammen-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/pom.xml index c0a2920cba..9c43332c97 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc.core</groupId> <artifactId>openecomp-core-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/lib/openecomp-core-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/pom.xml index b8db19dc40..51a533c0e1 100644 --- a/openecomp-be/lib/openecomp-core-lib/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/pom.xml @@ -10,7 +10,7 @@ <parent> <artifactId>openecomp-sdc-lib</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/pom.xml b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/pom.xml index 672eb0484c..8c6e38ce55 100644 --- a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/pom.xml +++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-healing-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-core/pom.xml b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-core/pom.xml index 31dacc1883..f837a4f353 100644 --- a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-core/pom.xml +++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-core/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-healing-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/pom.xml b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/pom.xml index 41f7cb3f59..aa1eb48150 100644 --- a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/pom.xml +++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-healing-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-healing-lib/pom.xml b/openecomp-be/lib/openecomp-healing-lib/pom.xml index 42ca1e2df1..85de19ce83 100644 --- a/openecomp-be/lib/openecomp-healing-lib/pom.xml +++ b/openecomp-be/lib/openecomp-healing-lib/pom.xml @@ -11,7 +11,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/lib/openecomp-heat-lib/pom.xml b/openecomp-be/lib/openecomp-heat-lib/pom.xml index 6fb7e5d642..dae0ae8d85 100644 --- a/openecomp-be/lib/openecomp-heat-lib/pom.xml +++ b/openecomp-be/lib/openecomp-heat-lib/pom.xml @@ -26,7 +26,7 @@ <parent> <artifactId>openecomp-sdc-lib</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-api/pom.xml b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-api/pom.xml index a77847155a..f21a6d0011 100644 --- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-api/pom.xml +++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-api/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-item-permissions-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>openecomp-item-permissions-api</artifactId> diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml index 6b33f2263a..2fb02e7ed0 100644 --- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml +++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-item-permissions-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>openecomp-item-permissions-core</artifactId> diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-impl/pom.xml b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-impl/pom.xml index 45d99fef63..dd67f859d9 100644 --- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-impl/pom.xml +++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-impl/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-item-permissions-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>openecomp-item-permissions-impl</artifactId> <dependencies> diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/pom.xml b/openecomp-be/lib/openecomp-item-permissions-lib/pom.xml index ffa0cddfcf..8cf7ca22e4 100644 --- a/openecomp-be/lib/openecomp-item-permissions-lib/pom.xml +++ b/openecomp-be/lib/openecomp-item-permissions-lib/pom.xml @@ -7,7 +7,7 @@ <parent> <artifactId>openecomp-sdc-lib</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>openecomp-item-permissions-lib</artifactId> diff --git a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml index 0987806088..79e24dce85 100644 --- a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-action-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-core/pom.xml b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-core/pom.xml index 5e37100287..4a744b779e 100644 --- a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-core/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-action-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-action-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-action-lib/pom.xml index 3ab89d6e8c..f7343a0725 100644 --- a/openecomp-be/lib/openecomp-sdc-action-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-action-lib/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/pom.xml b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/pom.xml index 5f4085cbad..25e34a0f0d 100644 --- a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-activity-log-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/pom.xml b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/pom.xml index 96b8d779c0..dba0530537 100644 --- a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-activity-log-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-activity-log-lib/pom.xml index 8393460361..d3dfbc6d3b 100644 --- a/openecomp-be/lib/openecomp-sdc-activity-log-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml index 1b5feeba20..cc2496a394 100644 --- a/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>openecomp-sdc-lib</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/pom.xml index 226c50c0a8..d5a9a495dd 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-enrichment-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml index 0cb6e48e85..33c44d0baa 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-enrichment-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml index 129d68883e..287163d830 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-enrichment-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/pom.xml index adbbd541dc..2aaa0ce89c 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/pom.xml @@ -10,7 +10,7 @@ <parent> <artifactId>openecomp-sdc-lib</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/pom.xml b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/pom.xml index 9bcb782999..6dd8691256 100644 --- a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-externaltesting-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/pom.xml index 2f29214a6b..e0edd77ad0 100644 --- a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-externaltesting-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/pom.xml index 785de9f1e5..a955265e25 100644 --- a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/pom.xml @@ -10,7 +10,7 @@ <parent> <artifactId>openecomp-sdc-lib</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml index b7b963f356..3b1840daea 100644 --- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-logging-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml index 78448420be..e59c1c673d 100644 --- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-logging-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/pom.xml b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/pom.xml index b35e5ab97a..31a8d4745a 100644 --- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>openecomp-sdc-logging-lib</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-logging-lib/pom.xml index ceb8c43ca4..ee49ab2c39 100644 --- a/openecomp-be/lib/openecomp-sdc-logging-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-logging-lib/pom.xml @@ -11,7 +11,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/pom.xml b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/pom.xml index 54ccc227c9..aacea4a361 100644 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-model-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml index 615e163e4e..35830e4255 100644 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-model-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-model-lib/pom.xml index b3ea1e01da..b268684f22 100644 --- a/openecomp-be/lib/openecomp-sdc-model-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-model-lib/pom.xml @@ -10,7 +10,7 @@ <parent> <artifactId>openecomp-sdc-lib</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-api/pom.xml b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-api/pom.xml index 5bab4e68c7..a9a00023e9 100644 --- a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-api/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-notification-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> <dependency> diff --git a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/pom.xml b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/pom.xml index 24ec2b1b23..0a2876a842 100644 --- a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-notification-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> <dependency> diff --git a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-websocket/pom.xml b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-websocket/pom.xml index 4cf97b517a..b98461a617 100644 --- a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-websocket/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-websocket/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-notification-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml index 2172ede92d..f00f5f16a7 100644 --- a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-notification-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-notification-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-notification-lib/pom.xml index 9b73949e0d..1c34bbeba1 100644 --- a/openecomp-be/lib/openecomp-sdc-notification-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-notification-lib/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>openecomp-sdc-lib</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/pom.xml b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/pom.xml index b9f567b444..e313ee9867 100644 --- a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-tosca-generator-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/pom.xml b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/pom.xml index 42be536d1b..e9cca89ebb 100644 --- a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-tosca-generator-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/pom.xml index 8698b2af74..ae11288d44 100644 --- a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>openecomp-sdc-lib</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-api/pom.xml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-api/pom.xml index 67e147e8d3..460be8245a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-api/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-translator-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml index 87b8eb48ce..fc55a550c1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-translator-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-translator-lib/pom.xml index 0cf5518d9b..1154445c05 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/pom.xml @@ -10,7 +10,7 @@ <parent> <artifactId>openecomp-sdc-lib</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/pom.xml index 407b5066bf..9cc20374e3 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-validation-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml index 4b384a6adf..bb7718b1cf 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-validation-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml index 58334a4714..bb0412b28c 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-validation-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml index 356f60ca92..ad7190fb25 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-validation-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/pom.xml index be3c1b2e27..70bf2024a5 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/pom.xml @@ -10,7 +10,7 @@ <parent> <artifactId>openecomp-sdc-lib</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/pom.xml b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/pom.xml index f2a0f95507..7c587a0221 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-vendor-license-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/pom.xml b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/pom.xml index 3330f3ec9a..35dd618589 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-vendor-license-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/pom.xml index 857440f4db..69ef10903a 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>openecomp-sdc-lib</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/pom.xml b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/pom.xml index a2bb06ccb5..3334945cb9 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-vendor-software-product-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>openecomp-sdc-vendor-software-product-api</artifactId> diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml index 7b0e0ea511..cba9218c00 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-vendor-software-product-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/pom.xml index bdbb258880..5d84fc7c51 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-api/pom.xml b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-api/pom.xml index 2586516554..91a9362409 100644 --- a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-api/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-versioning-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/pom.xml b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/pom.xml index 5f9d8df472..e96356932a 100644 --- a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-versioning-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-versioning-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-versioning-lib/pom.xml index d3bc47f6ed..cfcf8d1229 100644 --- a/openecomp-be/lib/openecomp-sdc-versioning-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-versioning-lib/pom.xml @@ -10,7 +10,7 @@ <parent> <artifactId>openecomp-sdc-lib</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/pom.xml b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/pom.xml index 774580be45..344f30092d 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/pom.xml @@ -14,7 +14,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-tosca-converter-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>openecomp-tosca-converter-api</artifactId> diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml index 80fbd9d790..b28ccf354d 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml @@ -56,7 +56,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-tosca-converter-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>openecomp-tosca-converter-core</artifactId> diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/pom.xml b/openecomp-be/lib/openecomp-tosca-converter-lib/pom.xml index be082e47ed..3bf75127c8 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-lib</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <artifactId>openecomp-tosca-converter-lib</artifactId> diff --git a/openecomp-be/lib/openecomp-tosca-lib/pom.xml b/openecomp-be/lib/openecomp-tosca-lib/pom.xml index f6c243f811..a394008b67 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-lib/pom.xml @@ -26,7 +26,7 @@ <parent> <artifactId>openecomp-sdc-lib</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/pom.xml b/openecomp-be/lib/pom.xml index c3720b88f8..c7100a172f 100644 --- a/openecomp-be/lib/pom.xml +++ b/openecomp-be/lib/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>openecomp-sdc</artifactId> <groupId>org.openecomp.sdc</groupId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/pom.xml b/openecomp-be/pom.xml index c5acd3ef40..5b62bdf726 100644 --- a/openecomp-be/pom.xml +++ b/openecomp-be/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>sdc-onboarding</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> <relativePath>../onboarding/pom.xml</relativePath> </parent> diff --git a/openecomp-be/readMe.txt b/openecomp-be/readMe.txt index 3d5054c16e..e1ce660758 100644 --- a/openecomp-be/readMe.txt +++ b/openecomp-be/readMe.txt @@ -1,8 +1,6 @@ # OpenECOMP SDC Onboarding(back-end) - --- --- - # Introduction SDC is the component within the design time environment that provides multiple organizations the ability to create and manage OPENECOMP assets in terms of “models”. SDC asset models are generally categorized into four object types: Resource, Service, Product and Offer. diff --git a/openecomp-be/tools/swagger-ui/pom.xml b/openecomp-be/tools/swagger-ui/pom.xml index 0d6aaca650..80d1493f0e 100644 --- a/openecomp-be/tools/swagger-ui/pom.xml +++ b/openecomp-be/tools/swagger-ui/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <dependencies> diff --git a/openecomp-be/tools/zusammen-tools/pom.xml b/openecomp-be/tools/zusammen-tools/pom.xml index eefbd82476..8b035a886d 100644 --- a/openecomp-be/tools/zusammen-tools/pom.xml +++ b/openecomp-be/tools/zusammen-tools/pom.xml @@ -27,7 +27,7 @@ <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-lib</artifactId> <relativePath>../../lib</relativePath> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> <properties> diff --git a/openecomp-ui/pom.xml b/openecomp-ui/pom.xml index e94a0d6abd..7dce1255c9 100644 --- a/openecomp-ui/pom.xml +++ b/openecomp-ui/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>sdc-onboarding</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> <relativePath>../onboarding</relativePath> </parent> @@ -26,7 +26,7 @@ Modifications copyright (c) 2018-2019 Nokia <groupId>org.openecomp.sdc</groupId> <artifactId>sdc-main</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> <packaging>pom</packaging> <name>sdc</name> @@ -67,7 +67,7 @@ Modifications copyright (c) 2018-2019 Nokia <onap.logging.version>1.6.1</onap.logging.version> <apache-commons-text.version>1.10.0</apache-commons-text.version> <jaxb-api.version>2.3.1</jaxb-api.version> - <io.vavr.version>0.10.3</io.vavr.version> + <io.vavr.version>0.9.0</io.vavr.version> <groovy.version>4.0.13</groovy.version> <swagger-core-mvn-plugin.version>2.1.7</swagger-core-mvn-plugin.version> <maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version> @@ -411,6 +411,36 @@ Modifications copyright (c) 2018-2019 Nokia <groupId>org.springframework.security</groupId> <artifactId>spring-security-core</artifactId> <version>5.6.3</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${spring.version}</version> </dependency> </dependencies> diff --git a/releases/1.13.9-container.yaml b/releases/1.13.9-container.yaml new file mode 100644 index 0000000000..eb723dd96e --- /dev/null +++ b/releases/1.13.9-container.yaml @@ -0,0 +1,24 @@ +distribution_type: 'container' +container_release_tag: '1.13.9' +project: 'sdc' +log_dir: 'sdc-maven-docker-stage-master/1440/' +ref: 110909a23b78884a58710d4d304ab51ef1233095 +containers: + - name: 'sdc-backend' + version: '1.13-20250124T060923Z' + - name: 'sdc-backend-init' + version: '1.13-20250124T060923Z' + - name: 'sdc-backend-all-plugins' + version: '1.13-20250124T060923Z' + - name: 'sdc-cassandra' + version: '1.13-20250124T060923Z' + - name: 'sdc-cassandra-init' + version: '1.13-20250124T060923Z' + - name: 'sdc-frontend' + version: '1.13-20250124T060923Z' + - name: 'sdc-onboard-backend' + version: '1.13-20250124T060923Z' + - name: 'sdc-onboard-cassandra-init' + version: '1.13-20250124T060923Z' + + diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml index 324c3ceaad..94e8f77b6e 100644 --- a/sdc-os-chef/pom.xml +++ b/sdc-os-chef/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>sdc-main</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> </parent> diff --git a/sdc-os-chef/sdc-cassandra/Dockerfile b/sdc-os-chef/sdc-cassandra/Dockerfile index 30c593393b..aa6460c71c 100644 --- a/sdc-os-chef/sdc-cassandra/Dockerfile +++ b/sdc-os-chef/sdc-cassandra/Dockerfile @@ -1,5 +1,6 @@ FROM cassandra:3.11.15 +# Install necessary packages RUN apt-get -o Acquire::Check-Valid-Until=false update && \ apt-get -y --no-install-recommends install \ apt-transport-https \ @@ -11,13 +12,20 @@ RUN apt-get -o Acquire::Check-Valid-Until=false update && \ ntp && \ apt-get -y autoremove && \ pip3 install cqlsh==6.1.0 && \ - rm -rf "/opt/cassandra/bin/cqlsh*" && \ - curl -L https://omnitruck.chef.io/install.sh | bash -s -- -v 13.12.14 + rm -rf "/opt/cassandra/bin/cqlsh*" -COPY chef-solo /root/chef-solo/ -COPY chef-repo/cookbooks /root/chef-solo/cookbooks/ +# Copy scripts or configuration files +RUN mkdir /root/scripts +COPY scripts /root/scripts +RUN chmod +x /root/scripts/* +RUN cp -pr /root/scripts/ready_probe.sh /var/lib/ready_probe.sh +RUN chmod +x /var/lib/ready_probe.sh + +# Copy startup script COPY startup.sh /root/ +# Set executable permissions for the startup script RUN chmod 770 /root/startup.sh -ENTRYPOINT [ "/root/startup.sh" ]
\ No newline at end of file +# Define the entrypoint for the container +ENTRYPOINT [ "/root/startup.sh" ] diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb deleted file mode 100644 index 0fef120430..0000000000 --- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb +++ /dev/null @@ -1,2 +0,0 @@ -#Cassandra -default['cassandra']['cassandra_port'] = 9042
\ No newline at end of file diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/01-configureCassandra.rb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/01-configureCassandra.rb deleted file mode 100644 index 21d43b18ef..0000000000 --- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/01-configureCassandra.rb +++ /dev/null @@ -1,51 +0,0 @@ -cluster_name = '' -cluster_name = node['cassandra'][:cluster_name] - -cas_ips='' -cas_ips=node['Nodes'][:CS] - -interface = node['interfaces']['application'] -application_host = '' -node['network']['interfaces'][interface][:addresses].each do | addr , details | - if details['family'] == ('inet') - application_host = addr - end -end - - -template "cassandra-yaml-config" do - path "/etc/cassandra/cassandra.yaml" - source "cassandra.yaml.erb" - sensitive true - owner "cassandra" - group "cassandra" - mode "0755" - variables({ - :cassandra_port => node['cassandra']['cassandra_port'], - :cassandra_cluster => cluster_name, - :cassandra_data_dir => node['cassandra'][:data_dir], - :cassandra_commitlog_dir => node['cassandra'][:commitlog_dir], - :cassandra_cache_dir => node['cassandra'][:cache_dir], - :seeds_address => cas_ips, - :listen_address => application_host, - :broadcast_address => application_host, - :broadcast_rpc_address => application_host, - :rpc_address => "0.0.0.0", - :num_tokens => node['cassandra'][:num_tokens], - :internode_encryption => "none", - :cassandra_truststore_dir => "/etc/cassandra/cs_trust" - }) -end - -rackNum=1 -template "cassandra-rackdc.properties" do - path "/etc/cassandra/cassandra-rackdc.properties" - source "cassandra-rackdc.properties.erb" - owner "cassandra" - group "cassandra" - mode "0755" - variables({ - :dc => node['cassandra']['datacenter_name'], - :rack => "Rack"+"#{rackNum}" - }) -end diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/02-changeCSpass.rb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/02-changeCSpass.rb deleted file mode 100644 index 8ebdeef7dd..0000000000 --- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/02-changeCSpass.rb +++ /dev/null @@ -1,25 +0,0 @@ -interface = node['interfaces']['application'] -application_host = '' -node['network']['interfaces'][interface][:addresses].each do | addr , details | - if details['family'] == ('inet') - application_host = addr - end -end - -template "/tmp/change_cassandra_pass.sh" do - source "change_cassandra_pass.sh.erb" - sensitive true - mode 0755 - variables({ - :cassandra_ip => application_host, - :cassandra_pwd => ENV['CS_PASSWORD'], - :cassandra_port => node['cassandra']['cassandra_port'] - }) -end - - -bash "change-cassandra-pass" do - code <<-EOH - cd /tmp ; /tmp/change_cassandra_pass.sh - EOH -end
\ No newline at end of file diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/03-prepareProbeFile.rb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/03-prepareProbeFile.rb deleted file mode 100644 index 0165d36ef1..0000000000 --- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/03-prepareProbeFile.rb +++ /dev/null @@ -1,18 +0,0 @@ -interface = node['interfaces']['application'] -application_host = '' -node['network']['interfaces'][interface][:addresses].each do | addr , details | - if details['family'] == ('inet') - application_host = addr - end -end - -template "/var/lib/ready-probe.sh" do - source "ready-probe.sh.erb" - sensitive true - mode 0755 - variables({ - :cassandra_ip => application_host, - :cassandra_pwd => ENV['CS_PASSWORD'], - :cassandra_port => node['cassandra']['cassandra_port'] - }) -end
\ No newline at end of file diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/change_cassandra_pass.sh.erb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/change_cassandra_pass.sh.erb deleted file mode 100644 index d3f5da6b12..0000000000 --- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/change_cassandra_pass.sh.erb +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -CASSANDRA_PASS=<%= @cassandra_pwd %> -CASSANDRA_IP=<%= @cassandra_ip %> -CASSANDRA_PORT=<%= @cassandra_port %> - -pass_changed=99 -retry_num=1 -is_up=0 -while [ $is_up -eq 0 -a $retry_num -le 100 ]; do - echo "exit" | cqlsh -u cassandra -p cassandra $CASSANDRA_IP $CASSANDRA_PORT - res1=$? - echo "exit" | cqlsh -u cassandra -p $CASSANDRA_PASS $CASSANDRA_IP $CASSANDRA_PORT - res2=$? - - if [ $res1 -eq 0 -o $res2 -eq 0 ]; then - echo "`date` --- cqlsh is able to connect." - is_up=1 - else - echo "`date` --- cqlsh is NOT able to connect yet. sleep 5" - sleep 5 - fi - let "retry_num++" -done - -if [ $res1 -eq 0 -a $res2 -eq 1 -a $is_up -eq 1 ]; then - echo "Modify cassandra password" - echo "ALTER USER cassandra WITH PASSWORD '$CASSANDRA_PASS';" | cqlsh -u cassandra -p cassandra $CASSANDRA_IP $CASSANDRA_PORT -elif [ $res1 -eq 1 -a $res2 -eq 0 -a $is_up -eq 1 ]; then - echo "cassandra password already modified" -else exit 1 -fi
\ No newline at end of file diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/ready-probe.sh.erb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/ready-probe.sh.erb deleted file mode 100644 index b8d3cfe136..0000000000 --- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/ready-probe.sh.erb +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -CASSANDRA_PASS=<%= @cassandra_pwd %> -CASSANDRA_IP=<%= @cassandra_ip %> -CASSANDRA_PORT=<%= @cassandra_port %> - -if [[ $(nodetool status |tail -n2 | grep -Ev "^$"a) == *"UN"* ]]; then - echo "exit" | cqlsh -u cassandra -p $CASSANDRA_PASS $CASSANDRA_IP $CASSANDRA_PORT > /dev/null 2>&1 - rc=$? - if [[ $rc != 0 ]]; then exit $rc; fi - fi - exit 0; -else - echo "Not Up"; - exit 1; -fi - diff --git a/sdc-os-chef/sdc-cassandra/chef-solo/LICENSE b/sdc-os-chef/sdc-cassandra/chef-solo/LICENSE deleted file mode 100644 index 11069edd79..0000000000 --- a/sdc-os-chef/sdc-cassandra/chef-solo/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file 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. diff --git a/sdc-os-chef/sdc-cassandra/chef-solo/README.md b/sdc-os-chef/sdc-cassandra/chef-solo/README.md deleted file mode 100644 index ddb0fda830..0000000000 --- a/sdc-os-chef/sdc-cassandra/chef-solo/README.md +++ /dev/null @@ -1,37 +0,0 @@ -Deprecated -========== - -Use of this repository is deprecated. We recommend using the `chef generate repo` command that comes with [ChefDK](http://downloads.chef.io/chef-dk/). - -Overview -======== - -Every Chef installation needs a Chef Repository. This is the place where cookbooks, roles, config files and other artifacts for managing systems with Chef will live. We strongly recommend storing this repository in a version control system such as Git and treat it like source code. - -While we prefer Git, and make this repository available via GitHub, you are welcome to download a tar or zip archive and use your favorite version control system to manage the code. - -Repository Directories -====================== - -This repository contains several directories, and each directory contains a README file that describes what it is for in greater detail, and how to use it for managing your systems with Chef. - -* `cookbooks/` - Cookbooks you download or create. -* `data_bags/` - Store data bags and items in .json in the repository. -* `roles/` - Store roles in .rb or .json in the repository. -* `environments/` - Store environments in .rb or .json in the repository. - -Configuration -============= - -The repository contains a knife configuration file. - -* .chef/knife.rb - -The knife configuration file `.chef/knife.rb` is a repository specific configuration file for knife. If you're using Hosted Chef, you can download one for your organization from the management console. If you're using the Open Source Chef Server, you can generate a new one with `knife configure`. For more information about configuring Knife, see the Knife documentation. - -https://docs.chef.io/knife.html - -Next Steps -========== - -Read the README file in each of the subdirectories for more information about what goes in those directories. diff --git a/sdc-os-chef/sdc-cassandra/chef-solo/chefignore b/sdc-os-chef/sdc-cassandra/chef-solo/chefignore deleted file mode 100644 index ba30af6cff..0000000000 --- a/sdc-os-chef/sdc-cassandra/chef-solo/chefignore +++ /dev/null @@ -1,11 +0,0 @@ -# Put files/directories that should be ignored in this file. -# Lines that start with '# ' are comments. - -# emacs -*~ - -# vim -*.sw[a-z] - -# subversion -*/.svn/* diff --git a/sdc-os-chef/sdc-cassandra/chef-solo/cookbooks/README.md b/sdc-os-chef/sdc-cassandra/chef-solo/cookbooks/README.md deleted file mode 100644 index 86ea46bfbb..0000000000 --- a/sdc-os-chef/sdc-cassandra/chef-solo/cookbooks/README.md +++ /dev/null @@ -1,54 +0,0 @@ -This directory contains the cookbooks used to configure systems in your infrastructure with Chef. - -Knife needs to be configured to know where the cookbooks are located with the `cookbook_path` setting. If this is not set, then several cookbook operations will fail to work properly. - - cookbook_path ["./cookbooks"] - -This setting tells knife to look for the cookbooks directory in the present working directory. This means the knife cookbook subcommands need to be run in the `chef-repo` directory itself. To make sure that the cookbooks can be found elsewhere inside the repository, use an absolute path. This is a Ruby file, so something like the following can be used: - - current_dir = File.dirname(__FILE__) - cookbook_path ["#{current_dir}/../cookbooks"] - -Which will set `current_dir` to the location of the knife.rb file itself (e.g. `~/chef-repo/.chef/knife.rb`). - -Configure knife to use your preferred copyright holder, email contact and license. Add the following lines to `.chef/knife.rb`. - - cookbook_copyright "Example, Com." - cookbook_email "cookbooks@example.com" - cookbook_license "apachev2" - -Supported values for `cookbook_license` are "apachev2", "mit","gplv2","gplv3", or "none". These settings are used to prefill comments in the default recipe, and the corresponding values in the metadata.rb. You are free to change the the comments in those files. - -Create new cookbooks in this directory with Knife. - - knife cookbook create COOKBOOK - -This will create all the cookbook directory components. You don't need to use them all, and can delete the ones you don't need. It also creates a README file, metadata.rb and default recipe. - -You can also download cookbooks directly from the Opscode Cookbook Site. There are two subcommands to help with this depending on what your preference is. - -The first and recommended method is to use a vendor branch if you're using Git. This is automatically handled with Knife. - - knife cookbook site install COOKBOOK - -This will: - -* Download the cookbook tarball from cookbooks.opscode.com. -* Ensure its on the git master branch. -* Checks for an existing vendor branch, and creates if it doesn't. -* Checks out the vendor branch (chef-vendor-COOKBOOK). -* Removes the existing (old) version. -* Untars the cookbook tarball it downloaded in the first step. -* Adds the cookbook files to the git index and commits. -* Creates a tag for the version downloaded. -* Checks out the master branch again. -* Merges the cookbook into master. -* Repeats the above for all the cookbooks dependencies, downloading them from the community site - -The last step will ensure that any local changes or modifications you have made to the cookbook are preserved, so you can keep your changes through upstream updates. - -If you're not using Git, use the site download subcommand to download the tarball. - - knife cookbook site download COOKBOOK - -This creates the COOKBOOK.tar.gz from in the current directory (e.g., `~/chef-repo`). We recommend following a workflow similar to the above for your version control tool. diff --git a/sdc-os-chef/sdc-cassandra/chef-solo/data_bags/README.md b/sdc-os-chef/sdc-cassandra/chef-solo/data_bags/README.md deleted file mode 100644 index 0c15a391fa..0000000000 --- a/sdc-os-chef/sdc-cassandra/chef-solo/data_bags/README.md +++ /dev/null @@ -1,63 +0,0 @@ -Data Bags ---------- - -This directory contains directories of the various data bags you create for your infrastructure. Each subdirectory corresponds to a data bag on the Chef Server, and contains JSON files of the items that go in the bag. - -First, create a directory for the data bag. - - mkdir data_bags/BAG - -Then create the JSON files for items that will go into that bag. - - $EDITOR data_bags/BAG/ITEM.json - -The JSON for the ITEM must contain a key named "id" with a value equal to "ITEM". For example, - - { - "id": "foo" - } - -Next, create the data bag on the Chef Server. - - knife data bag create BAG - -Then upload the items in the data bag's directory to the Chef Server. - - knife data bag from file BAG ITEM.json - - -Encrypted Data Bags -------------------- - -Added in Chef 0.10, encrypted data bags allow you to encrypt the contents of your data bags. The content of attributes will no longer be searchable. To use encrypted data bags, first you must have or create a secret key. - - openssl rand -base64 512 > secret_key - -You may use this secret_key to add items to a data bag during a create. - - knife data bag create --secret-file secret_key passwords mysql - -You may also use it when adding ITEMs from files, - - knife data bag create passwords - knife data bag from file passwords data_bags/passwords/mysql.json --secret-file secret_key - -The JSON for the ITEM must contain a key named "id" with a value equal to "ITEM" and the contents will be encrypted when uploaded. For example, - - { - "id": "mysql", - "password": "abc123" - } - -Without the secret_key, the contents are encrypted. - - knife data bag show passwords mysql - id: mysql - password: 2I0XUUve1TXEojEyeGsjhw== - -Use the secret_key to view the contents. - - knife data bag show passwords mysql --secret-file secret_key - id: mysql - password: abc123 - diff --git a/sdc-os-chef/sdc-cassandra/chef-solo/environments/README.md b/sdc-os-chef/sdc-cassandra/chef-solo/environments/README.md deleted file mode 100644 index 50ac48db2b..0000000000 --- a/sdc-os-chef/sdc-cassandra/chef-solo/environments/README.md +++ /dev/null @@ -1,5 +0,0 @@ -Requires Chef 0.10.0+. - -This directory is for Ruby DSL and JSON files for environments. For more information see the Chef wiki page: - -http://docs.chef.io/environments.html diff --git a/sdc-os-chef/sdc-cassandra/chef-solo/roles/README.md b/sdc-os-chef/sdc-cassandra/chef-solo/roles/README.md deleted file mode 100644 index b0ee0b4d21..0000000000 --- a/sdc-os-chef/sdc-cassandra/chef-solo/roles/README.md +++ /dev/null @@ -1,16 +0,0 @@ -Create roles here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install roles on the server, use knife. - -For example, create `roles/base_example.rb`: - - name "base_example" - description "Example base role applied to all nodes." - # List of recipes and roles to apply. Requires Chef 0.8, earlier versions use 'recipes()'. - #run_list() - # Attributes applied if the node doesn't have it set already. - #default_attributes() - # Attributes applied no matter what the node has set already. - #override_attributes() - -Then upload it to the Chef Server: - - knife role from file roles/base_example.rb diff --git a/sdc-os-chef/sdc-cassandra/chef-solo/roles/cassandra-actions.json b/sdc-os-chef/sdc-cassandra/chef-solo/roles/cassandra-actions.json deleted file mode 100644 index cd8478c5ca..0000000000 --- a/sdc-os-chef/sdc-cassandra/chef-solo/roles/cassandra-actions.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "cassandra-actions", - "description": "cassandra-actions", - "json_class": "Chef::Role", - "default_attributes": { - - }, - "override_attributes": { - - }, - "chef_type": "role", - "run_list": [ - "recipe[cassandra-actions::02-changeCSpass]", - "recipe[cassandra-actions::03-prepareProbeFile]" - ], - - "env_run_lists": { - - } -} - - diff --git a/sdc-os-chef/sdc-cassandra/chef-solo/solo.json b/sdc-os-chef/sdc-cassandra/chef-solo/solo.json deleted file mode 100644 index 97b1efe282..0000000000 --- a/sdc-os-chef/sdc-cassandra/chef-solo/solo.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "run_list": [ - "role[cassandra-actions]" - ] -} - diff --git a/sdc-os-chef/sdc-cassandra/chef-solo/solo.rb b/sdc-os-chef/sdc-cassandra/chef-solo/solo.rb deleted file mode 100644 index 06c1af4592..0000000000 --- a/sdc-os-chef/sdc-cassandra/chef-solo/solo.rb +++ /dev/null @@ -1,16 +0,0 @@ -root = File.absolute_path(File.dirname(__FILE__)) -file_cache_path root -cookbook_path root + '/cookbooks' -json_attribs root + '/solo.json' -checksum_path root + '/checksums' -data_bag_path root + '/data_bags' -environment_path root + '/environments' -file_backup_path root + '/backup' -file_cache_path root + '/cache' -log_level :info -log_location STDOUT -rest_timeout 300 -role_path root + '/roles' -syntax_check_cache_path -umask 0022 -verbose_logging nil diff --git a/sdc-os-chef/sdc-cassandra/scripts/cassandra-env.sh b/sdc-os-chef/sdc-cassandra/scripts/cassandra-env.sh new file mode 100644 index 0000000000..e64843b1ec --- /dev/null +++ b/sdc-os-chef/sdc-cassandra/scripts/cassandra-env.sh @@ -0,0 +1,7 @@ +# cassandra-env.sh + +# Cassandra configuration +export CASSANDRA_IP=${CASSANDRA_HOST:-"127.0.0.1"} +export CASSANDRA_PASS=${CS_PASSWORD:-"onap123#@!"} +export CASSANDRA_PORT=${CS_PORT:-"9042"} # Correct default port for Cassandra +export cqlversion=${cqlversion:-"3.4.4"}
\ No newline at end of file diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/cassandra-rackdc.properties.erb b/sdc-os-chef/sdc-cassandra/scripts/cassandra-rackdc.properties index 23ddcdd545..5d3000a7f9 100644 --- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/cassandra-rackdc.properties.erb +++ b/sdc-os-chef/sdc-cassandra/scripts/cassandra-rackdc.properties @@ -16,12 +16,12 @@ # These properties are used with GossipingPropertyFileSnitch and will # indicate the rack and dc for this node -dc=<%= @dc %> -rack=<%= @rack %> +dc=SDC-CS-integration-test +rack=Rack1 # Add a suffix to a datacenter name. Used by the Ec2Snitch and Ec2MultiRegionSnitch # to append a string to the EC2 region name. #dc_suffix= # Uncomment the following line to make this snitch prefer the internal ip when possible, as the Ec2MultiRegionSnitch does. -# prefer_local=true +# prefer_local=true
\ No newline at end of file diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/cassandra.yaml.erb b/sdc-os-chef/sdc-cassandra/scripts/cassandra.yaml index 3884841122..0c658c69ad 100644 --- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/cassandra.yaml.erb +++ b/sdc-os-chef/sdc-cassandra/scripts/cassandra.yaml @@ -7,7 +7,7 @@ # The name of the cluster. This is mainly used to prevent machines in # one logical cluster from joining another. -cluster_name: '<%= @cassandra_cluster %>' +cluster_name: 'SDC-CS-integration-test' # This defines the number of tokens randomly assigned to this node on the ring # The more tokens, relative to other nodes, the larger the proportion of data @@ -22,7 +22,7 @@ cluster_name: '<%= @cassandra_cluster %>' # # If you already have a cluster with 1 token per node, and wish to migrate to # multiple tokens per node, see http://wiki.apache.org/cassandra/Operations -num_tokens: <%= @num_tokens %> +num_tokens: 256 # initial_token allows you to specify tokens manually. While you can use # it with # vnodes (num_tokens > 1, above) -- in which case you should provide a @@ -34,7 +34,7 @@ num_tokens: <%= @num_tokens %> # of data centers to enable per-datacenter. # hinted_handoff_enabled: DC1,DC2 # See http://wiki.apache.org/cassandra/HintedHandoff -hinted_handoff_enabled: <%= node['cassandra']['hinted_handoff_enabled'] %> +hinted_handoff_enabled: true # this defines the maximum amount of time a dead host will have hints # generated. After it has been dead this long, new hints for it will not be @@ -106,13 +106,13 @@ partitioner: org.apache.cassandra.dht.Murmur3Partitioner # will spread data evenly across them, subject to the granularity of # the configured compaction strategy. data_file_directories: - - <%= @cassandra_data_dir %> + - /var/lib/cassandra/data # commit log. when running on magnetic HDD, this should be a # separate spindle than the data directories. # If not set, the default directory is $CASSANDRA_HOME/data/commitlog. -commitlog_directory: <%= @cassandra_commitlog_dir %> +commitlog_directory: /var/lib/cassandra/commitlog # policy for data disk failures: # stop_paranoid: shut down gossip and Thrift even for single-sstable errors. @@ -271,7 +271,7 @@ seed_provider: parameters: # seeds is actually a comma-delimited list of addresses. # Ex: "<ip1>,<ip2>,<ip3>" - - seeds: "<%= @seeds_address %>" + - seeds: "172.18.0.5" # For workloads with more data than can fit in memory, Cassandra's # bottleneck will be reads that need to fetch data from @@ -284,8 +284,8 @@ seed_provider: # On the other hand, since writes are almost never IO bound, the ideal # number of "concurrent_writes" is dependent on the number of cores in # your system; (8 * number_of_cores) is a good rule of thumb. -concurrent_reads: <%= node['cassandra']['concurrent_reads'] %> -concurrent_writes: <%= node['cassandra']['concurrent_writes'] %> +concurrent_reads: 32 +concurrent_writes: 32 concurrent_counter_writes: 32 @@ -385,13 +385,13 @@ ssl_storage_port: 7001 # you can specify which should be chosen using listen_interface_prefer_ipv6. If false the first ipv4 # address will be used. If true the first ipv6 address will be used. Defaults to false preferring # ipv4. If there is only one address it will be selected regardless of ipv4/ipv6. -listen_address: <%= @listen_address %> +listen_address: 172.18.0.5 # listen_interface: eth0 # listen_interface_prefer_ipv6: false # Address to broadcast to other Cassandra nodes # Leaving this blank will set it to the same value as listen_address -broadcast_address: <%= @broadcast_address %> +broadcast_address: 172.18.0.5 # Internode authentication backend, implementing IInternodeAuthenticator; # used to allow/disallow connections from peer nodes. @@ -405,7 +405,7 @@ start_native_transport: true # For security reasons, you should not expose this port to the internet. Firewall it if needed. #Default value 9042 #native_transport_port: 9042 -native_transport_port: <%= @cassandra_port %> +native_transport_port: 9042 # The maximum threads for handling requests when the native transport is used. # This is similar to rpc_max_threads though the default differs slightly (and # there is no native_transport_min_threads, idle threads will always be stopped @@ -445,7 +445,7 @@ start_rpc: true # you can specify which should be chosen using rpc_interface_prefer_ipv6. If false the first ipv4 # address will be used. If true the first ipv6 address will be used. Defaults to false preferring # ipv4. If there is only one address it will be selected regardless of ipv4/ipv6. -rpc_address: <%= @rpc_address %> +rpc_address: 0.0.0.0 # rpc_interface: eth1 # rpc_interface_prefer_ipv6: false @@ -453,7 +453,7 @@ rpc_address: <%= @rpc_address %> # be set to 0.0.0.0. If left blank, this will be set to the value of # rpc_address. If rpc_address is set to 0.0.0.0, broadcast_rpc_address must # be set. -broadcast_rpc_address: <%= @broadcast_rpc_address %> +broadcast_rpc_address: 172.18.0.5 # enable or disable keepalive on rpc/native connections rpc_keepalive: true @@ -646,7 +646,7 @@ cross_node_timeout: false # phi value that must be reached for a host to be marked down. # most users should never need to adjust this. # phi_convict_threshold: 8 -phi_convict_threshold: <%= node['cassandra']['phi_convict_threshold'] %> +phi_convict_threshold: 8 # endpoint_snitch -- Set this to a class that implements # IEndpointSnitch. The snitch has two functions: @@ -778,9 +778,9 @@ request_scheduler: org.apache.cassandra.scheduler.NoScheduler # server_encryption_options: internode_encryption: none - keystore: <%= @cassandra_truststore_dir %>/.keystore + keystore: /etc/cassandra/cs_trust/.keystore keystore_password: Aa123456 - truststore: <%= @cassandra_truststore_dir %>/.truststore + truststore: /etc/cassandra/cs_trust/.truststore truststore_password: Aa123456 # More advanced defaults below: # protocol: TLS @@ -792,7 +792,7 @@ server_encryption_options: # enable or disable client/server encryption. client_encryption_options: enabled: false - keystore: <%= @cassandra_truststore_dir %>/.keystore + keystore: /etc/cassandra/cs_trust/.keystore keystore_password: Aa123456 # require_client_auth: false # Set trustore and truststore_password if require_client_auth is true diff --git a/sdc-os-chef/sdc-cassandra/scripts/change_cassandra_pass.sh b/sdc-os-chef/sdc-cassandra/scripts/change_cassandra_pass.sh new file mode 100644 index 0000000000..442f98bbd4 --- /dev/null +++ b/sdc-os-chef/sdc-cassandra/scripts/change_cassandra_pass.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +# Source the environment file +. /root/scripts/cassandra-env.sh + +echo "Changing Cassandra password..." + +pass_changed=99 +retry_num=1 +is_up=0 + +while [ $is_up -eq 0 ] && [ $retry_num -le 100 ]; do + echo "Checking if cqlsh can connect to Cassandra..." + + # Try connecting with default credentials + echo "exit" | cqlsh -u cassandra -p cassandra $CASSANDRA_IP $CASSANDRA_PORT --cqlversion="$cqlversion" >/dev/null 2>&1 + res1=$? + + # Try connecting with the provided password + echo "exit" | cqlsh -u cassandra -p "$CASSANDRA_PASS" $CASSANDRA_IP $CASSANDRA_PORT --cqlversion="$cqlversion" >/dev/null 2>&1 + res2=$? + + if [ $res1 -eq 0 ] || [ $res2 -eq 0 ]; then + echo "$(date) --- cqlsh is able to connect." + is_up=1 + else + echo "$(date) --- cqlsh is NOT able to connect yet. Sleeping for 5 seconds." + sleep 5 + fi + + retry_num=$((retry_num + 1)) +done + +if [ $res1 -eq 0 ] && [ $res2 -ne 0 ] && [ $is_up -eq 1 ]; then + echo "Modifying Cassandra password" + echo "ALTER USER cassandra WITH PASSWORD '$CASSANDRA_PASS';" | cqlsh -u cassandra -p cassandra $CASSANDRA_IP $CASSANDRA_PORT --cqlversion="$cqlversion" +elif [ $res1 -ne 0 ] && [ $res2 -eq 0 ] && [ $is_up -eq 1 ]; then + echo "Cassandra password already modified" +else + echo "Failed to connect to Cassandra after multiple retries. Exiting." + exit 1 +fi diff --git a/sdc-os-chef/sdc-cassandra/scripts/ready_probe.sh b/sdc-os-chef/sdc-cassandra/scripts/ready_probe.sh new file mode 100644 index 0000000000..f51ccdb570 --- /dev/null +++ b/sdc-os-chef/sdc-cassandra/scripts/ready_probe.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# Source the environment file +. /root/scripts/cassandra-env.sh + +if [ "$(nodetool status | tail -n2 | grep -Ev '^$')" != "" ]; then + if echo "exit" | cqlsh -u cassandra -p "$CASSANDRA_PASS" "$CASSANDRA_IP" "$CASSANDRA_PORT" > /dev/null 2>&1; then + exit 0 + else + exit 1 + fi +else + echo "Not Up" + exit 1 +fi diff --git a/sdc-os-chef/sdc-cassandra/startup.sh b/sdc-os-chef/sdc-cassandra/startup.sh index c779e3796d..aa8dbf8336 100755 --- a/sdc-os-chef/sdc-cassandra/startup.sh +++ b/sdc-os-chef/sdc-cassandra/startup.sh @@ -1,17 +1,19 @@ -#!/bin/bash +#!/bin/sh + +cd /root/scripts +cp -pr /root/scripts/cassandra.yaml /etc/cassandra/cassandra.yaml +cp -pr /root/scripts/cassandra-rackdc.properties /etc/cassandra/cassandra-rackdc.properties -cd /root/chef-solo -chef-solo -c solo.rb -o recipe[cassandra-actions::01-configureCassandra] -E ${ENVNAME} rc=$? if [[ $rc != 0 ]]; then exit $rc; fi echo "########### starting cassandra ###########" /docker-entrypoint.sh cassandra -f & +sleep 60 +sh -x /root/scripts/change_cassandra_pass.sh +sh -x /var/lib/ready_probe.sh -chef-solo -c solo.rb -E ${ENVNAME} rc=$? if [[ $rc != 0 ]]; then exit $rc; fi while true; do sleep 30; done - - diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml index 9c79bd790e..36e2fcd485 100644 --- a/utils/webseal-simulator/pom.xml +++ b/utils/webseal-simulator/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>sdc-main</artifactId> - <version>1.13.8-SNAPSHOT</version> + <version>1.13.9-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> diff --git a/version.properties b/version.properties index d19157a11f..e1af5b915c 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ major=1 minor=13 -patch=8 +patch=9 base_version=${major}.${minor}.${patch} |