diff options
416 files changed, 2804 insertions, 5762 deletions
@@ -34,7 +34,21 @@ There are four major components of SDC: * Certification Studio - Available in a future release, is used to test new assets at all levels. It will be used for sandbox experimentation, and will include support for automated testing. * Distribution Studio - Used to deploy certified assets. From the Distribution studio, new Product assets, including their underlying Resources and Services, are deployed into lab environments for testing purposes, and into production after certification is complete. In a future release, there will be a way to export Product information to external Business Support Systems for customer ordering and billing. -## Git Configuration +## Development + +The SDC repo is a monorepo with multiple modules. The naming of the modules does not match that of the deployed artifacts in Kubernetes. The following table provides a mapping between the component name [in the helm chart](https://git.onap.org/oom/tree/kubernetes/sdc/components) and the maven modules and repositories. + +| [Deployed Service](https://git.onap.org/oom/tree/kubernetes/sdc/components) | Module/Repo | +|------------------------------|---------------------------------| +| sdc-be | catalog-be | +| sdc-fe | catalog-fe | +| sdc-cs | asdctool | +| sdc-onboarding-be | openecomp-be | +| sdc-helm-validator | sdc-helm-validator ([repo](https://gerrit.onap.org/r/admin/repos/sdc/sdc-helm-validator)) | +| sdc-wfd-be | sdc-workflow-designer ([repo](https://gerrit.onap.org/r/admin/repos/sdc/sdc-workflow-designer)) | +| sdc-wfd-fe | sdc-workflow-designer ([repo](https://gerrit.onap.org/r/admin/repos/sdc/sdc-workflow-designer)) | + +### Git Configuration Note that if you're working on Windows, it's important to enable long paths for your machine; otherwise git won't be able to handle some files. @@ -42,38 +56,41 @@ In order to do so just add this section to your global git.config file under the longpaths = true -## Compiling the Project +### Compiling the Project SDC is built from several projects while the parent "sdc" contains the main pom.xml for all of them: -- asdctool - set of utilities used for scheme creation and data migration in SDC -- catalog-be - backend code -- catalog-fe - frontend java code (servlet, proxy) -- catalog-dao - database layer -- catalog-model - data model of the application -- catalog-ui - front end code (javascript, html, css) -- common - set of utilities used by the onboarding project -- common-app-api - common code for frontend and backend -- common-be - utilities, datatypes and enums -- security-utils - handle encryption/decryption of passwords -- onboarding-be - onboarding backend code -- onboarding-ui - onboarding frontend code -- integration-tests - The integration tests using the docker images to validate Backend API calls and FE with Selenium -- sdc-os-chef - chefs scripts used for docker creation and startup -- utils - set of dev utils used for working with the project locally - - -In order to build all the projects, as mentioned in the onap wiki https://wiki.onap.org/display/DW/Setting+Up+Your+Development+Environment, the settings.xml (https://git.onap.org/oparent/plain/settings.xml) from the oparent project must be installed in your ~/.m2 folder and referenced by your IDE. + +* asdctool - set of utilities used for scheme creation and data migration in SDC +* catalog-be - backend code +* catalog-fe - frontend java code (servlet, proxy) +* catalog-dao - database layer +* catalog-model - data model of the application +* catalog-ui - front end code (javascript, html, css) +* common - set of utilities used by the onboarding project +* common-app-api - common code for frontend and backend +* common-be - utilities, datatypes and enums +* security-utils - handle encryption/decryption of passwords +* onboarding-be - onboarding backend code +* onboarding-ui - onboarding frontend code +* integration-tests - The integration tests using the docker images to validate Backend API calls and FE with Selenium +* sdc-os-chef - chefs scripts used for docker creation and startup +* utils - set of dev utils used for working with the project locally + + +In order to build all the projects, as mentioned in the [ONAP wiki](https://wiki.onap.org/display/DW/Setting+Up+Your+Development+Environment), the [settings.xml](https://git.onap.org/oparent/plain/settings.xml) from the oparent project must be installed in your `~/.m2` folder and referenced by your IDE. Once maven is set up properly, go to sdc project and run the command: `mvn clean install` By default, the "all" maven profile will be executed but others exist: + * fast-build - A fast build skipping all tests and useless maven plugins (only builds the jars) -* start-sdc - Once docker containers have been build, triggering this profile starts SDC CS, BE, FE, simulator -* stop-sdc - Stop all SDC containers started by using the profile "start-sdc" +* start-sdc - Once docker containers have been build, triggering this profile starts SDC CS, BE, FE, simulator +* stop-sdc - Stop all SDC containers started by using the profile "start-sdc" * run-integration-tests - This runs only the integration tests against a running SDC started by using "start-sdc" profile. -* docker - This enables the docker images build for each SDC module +* docker - This enables the docker images build for each SDC module **Note: If you're working on Windows, you'll need to define an environment variable on your machine with key `DOCKER_HOST` and value: `tcp://<ip_address>:2375` in order to build and upload local dockers to a local environment.** More flags to use in the build process are: + * -DskipITs - Skips integration tests only * -DskipTests - Skips unit tests execution and integration tests * -DskipUICleanup=true - Skips deleting the UI folders @@ -107,26 +124,28 @@ The following table shows the SDC containers found after a maven "start-sdc": For further information and an image explaining the containers dependency map please refer to the following page: [SDC Docker Diagram](https://wiki.onap.org/display/DW/SDC+Troubleshooting) - ### Accessing the logs To access the logs, there are different options: -* Connect to the docker container you want to inspect by doing `docker exec -it -u root sdc-XXXXXXXX-1 sh` - * Then look at the logs generally in /var/lib/jetty/logs or /var/log/onap (that may differ !) + +* Connect to the docker container you want to inspect by doing `docker exec -it -u root sdc-XXXXXXXX-1 sh` + * Then look at the logs generally in /var/lib/jetty/logs or /var/log/onap (that may differ !) * A volume is shared between the BE, onboard-BE and FE containers, this volume is mapped to `/tmp/sdc-integration-tests`, - * In that folder you can obtain the logs of the different containers + * In that folder you can obtain the logs of the different containers ### Debugging SDC After having started SDC with the command `mvn clean install -P start-sdc`, different java remote debug ports are opened by default: -* Onboard Backend - 4001 (jetty) -* Backend - 4000 (jetty) -* Frontend - 6000 (jetty) + +* Onboard Backend - `4001` (jetty) +* Backend - `4000` (jetty) +* Frontend - `6000` (jetty) It's therefore possible to connect your IDE to those debug ports remotely to walk through the code and add some breakpoints. **Look at the pom.xml of the integration-tests module to have a better understanding of all the docker settings provided to start SDC.** ### Integration tests + The integration are composed of 2 parts, one to test the BE Apis and another one to test the FE with selenium. The selenium tests make use of the selenium/standalone-firefox:2.53.1 container. @@ -136,7 +155,7 @@ Onboarding E2E flow cover following SDC functionality: Onboard of VNF Create VF from VSP - Certify VF + Certify VF Create Service Add VF to service @@ -174,6 +193,7 @@ List of VNFs/PNFs that proceed by onboarding flow, located in `integration-tests Those tests execute the following There are 2 options to start them: + * After having started SDC with the command `mvn clean install -P start-sdc`, run the command `mvn clean install -P run-integration-tests` * If you want to debug them and run them from your IDE, you must start them from the testNG Suites files, otherwise this won't work. The test suites are located here: @@ -186,8 +206,10 @@ Those tests use container built externally in other ONAP repository: [sdc/sdc-he You can run those tests same as default integration tests by adding additional profile to maven commands: `integration-tests-with-helm-validator` + * To start SDC with Helm Validator run: `mvn clean install -P start-sdc,integration-tests-with-helm-validator` * To execute tests that use Helm Validator use: `mvn clean install -P run-integration-tests,integration-tests-with-helm-validator` + ## Accessing SDC UI in Dev Mode (Legacy way) In order to access the SDC UI from your dev environment you need to do the following: @@ -201,13 +223,14 @@ For more information regarding SDC on OOM please refer to the following page: [S ## Frontend Local Env - onboarding -### Steps: +### Steps Install nodejs & gulp + 1. download nodejs from here: https://nodejs.org/en/ (take the "current" version with latest features) & install it. 2. install gulp by running the following command: npm install --global gulp-cli -### Install DOX-UI a: +### Install DOX-UI a 1. pull for latest changes 2. go to folder dox-sequence-diagram-ui @@ -220,7 +243,7 @@ Install nodejs & gulp 9. after everything is successful, run gulp 10. after server is up, your favorite UI will wait for you at: http://localhost:9000/sdc1/proxy-designer1#/onboardVendor -### Troubleshooting: +### Troubleshooting | Problem | Why is this happening | Solution | |-------------------------------|-------------------------|--------------------------------------------------------------------------------------------| diff --git a/asdctool/README.md b/asdctool/README.md new file mode 100644 index 0000000000..7e6c68f75a --- /dev/null +++ b/asdctool/README.md @@ -0,0 +1,21 @@ +# sdc-cs + +This maven module is named `asdctool` but it's deployed service is called [sdc-cs](https://git.onap.org/oom/tree/kubernetes/sdc/components/sdc-cs). + +## Build images + +You can run `mvn clean install -P docker -Dcheckstyle.skip -DskipTests` to build the `sdc-cassandra-init` image. + +```sh +$ mvn clean install -P docker -Dcheckstyle.skip -DskipTests +... +[INFO] DOCKER> Tagging image onap/sdc-cassandra-init:latest successful! +[INFO] DOCKER> Tagging image onap/sdc-cassandra-init:1.14-STAGING-latest successful! +[INFO] DOCKER> Tagging image onap/sdc-cassandra-init:1.14-20250304T084735Z successful! +[INFO] ------------------------------------------------------------------------ +[INFO] BUILD SUCCESS +[INFO] ------------------------------------------------------------------------ +[INFO] Total time: 06:12 min +[INFO] Finished at: 2025-03-04T09:53:47+01:00 +[INFO] ------------------------------------------------------------------------ +``` diff --git a/asdctool/pom.xml b/asdctool/pom.xml index f3a0440941..21faaf2026 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.14.1-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..11c3e87bc7 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 eclipse-temurin:11-jre-jammy + +# 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 + pip3 install --no-cache-dir cqlsh==6.1.0 && \ + 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..6df34d828e --- /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.14.1" +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/src/main/java/org/openecomp/sdc/asdctool/main/ArtifactUUIDFixMenu.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/ArtifactUUIDFixMenu.java index 616717bf2f..2a6d8ab8cc 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/ArtifactUUIDFixMenu.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/ArtifactUUIDFixMenu.java @@ -46,7 +46,7 @@ public class ArtifactUUIDFixMenu { if (isSuccessful) { log.info("Fixing artifacts UUID for 1707 was finished successfully"); } else { - log.info("Fixing artifacts UUID for 1707 has failed"); + log.warn("Fixing artifacts UUID for 1707 has failed"); System.exit(2); } System.exit(0); diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/DataSchemaMenu.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/DataSchemaMenu.java index 4290c98784..cc03a51884 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/DataSchemaMenu.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/DataSchemaMenu.java @@ -52,7 +52,7 @@ public class DataSchemaMenu { log.debug("create cassandra keyspace, tables and indexes successfull"); System.exit(0); } else { - log.debug("create cassandra keyspace, tables and indexes failed"); + log.error("create cassandra keyspace, tables and indexes failed"); System.exit(2); } case "create-janusgraph-structures": @@ -62,7 +62,7 @@ public class DataSchemaMenu { log.debug("create janusgraph keyspace successfull"); System.exit(0); } else { - log.debug("create janusgraph keyspace failed"); + log.error("create janusgraph keyspace failed"); System.exit(2); } case "clean-cassndra": @@ -71,7 +71,7 @@ public class DataSchemaMenu { log.debug(" successfull"); System.exit(0); } else { - log.debug(" failed"); + log.error(" failed"); System.exit(2); } default: @@ -79,7 +79,7 @@ public class DataSchemaMenu { } } catch (Throwable t) { t.printStackTrace(); - log.debug("create cassandra keyspace, tables and indexes failed"); + log.error("create cassandra keyspace, tables and indexes failed"); System.exit(3); } } diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/ValidationTool.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/ValidationTool.java index dfeba63ddf..ee3645196e 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/ValidationTool.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/ValidationTool.java @@ -58,7 +58,7 @@ public class ValidationTool { log.info("Validation finished successfully"); System.exit(0); } else { - log.info("Validation finished with warnings"); + log.error("Validation finished with warnings"); System.exit(2); } } 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..f8e9b4f807 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.14.1-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..0dcae1d7dc 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.14.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/catalog-be-plugins/pom.xml b/catalog-be-plugins/pom.xml index 256ffbf85f..966565a97f 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.14.1-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/README.md b/catalog-be/README.md new file mode 100644 index 0000000000..de3bcdf69a --- /dev/null +++ b/catalog-be/README.md @@ -0,0 +1,26 @@ +# sdc-be + +This maven module is named `catalog-be` but it's deployed service is called [sdc-be](https://git.onap.org/oom/tree/kubernetes/sdc/components/sdc-be). + +## Build images + +You can run `mvn clean install -P docker -Dcheckstyle.skip -DskipTests` to build both the `sdc-backend-init` and `sdc-backend` images. + +```sh +$ mvn clean install -P docker -Dcheckstyle.skip -DskipTests +... +[INFO] DOCKER> Tagging image onap/sdc-backend:latest successful! +[INFO] DOCKER> Tagging image onap/sdc-backend:1.14-STAGING-latest successful! +[INFO] DOCKER> Tagging image onap/sdc-backend:1.14-20250304T083746Z successful! +[INFO] Building tar: /home/ubuntu/development/onap/sdc/sdc/catalog-be/target/docker/onap/sdc-backend-init/tmp/docker-build.tar +... +[INFO] DOCKER> Tagging image onap/sdc-backend-init:latest successful! +[INFO] DOCKER> Tagging image onap/sdc-backend-init:1.14-STAGING-latest successful! +[INFO] DOCKER> Tagging image onap/sdc-backend-init:1.14-20250304T083746Z successful! +[INFO] ------------------------------------------------------------------------ +[INFO] BUILD SUCCESS +[INFO] ------------------------------------------------------------------------ +[INFO] Total time: 01:54 min +[INFO] Finished at: 2025-03-04T09:39:41+01:00 +[INFO] ------------------------------------------------------------------------ +``` diff --git a/catalog-be/README.txt b/catalog-be/README.txt deleted file mode 100644 index 0fa113be2a..0000000000 --- a/catalog-be/README.txt +++ /dev/null @@ -1,41 +0,0 @@ -#open rpm -#install jetty -#run installJettyBase.sh -#copy jvm.properties to base -#export variables -#run startJetty.sh - -#Properties: - - STOP.PORT=[number] - The port to use to stop the running Jetty server. - Required along with STOP.KEY if you want to use the --stop option above. - - STOP.KEY=[alphanumeric] - The passphrase defined to stop the server. - Required along with STOP.PORT if you want to use the --stop option above. - - STOP.WAIT=[number] - The time (in seconds) to wait for confirmation that the running - Jetty server has stopped. If not specified, the stopper will wait - indefinitely. Use in conjunction with the --stop option. - - -#Upload Normative types: -# 1. create a zip file containing the yaml -# 2. create a json string (payloadName should be the yml file name): { -# "payloadName":"normative-types-new-root.yml", -# "userId":"adminid", -# "resourceName":"tosca.nodes.Root", -# "description":"Represents a generic software component that can be managed and run by a Compute Node Type.", -# "resourceIconPath":"defaulticon", -# "category":"Abstract", -# "tags":["Root"] -# } -# -# -# 3. run curl command: curl -v -F resourceMetadata=<json string> -F resourceZip=@<zip file location> <BE host:port>/sdc2/rest/v1/catalog/upload/multipart -# e.g.: -# curl -v -F resourceMetadata='{"payloadName":"normative-types-new-root.yml","userId":"adminid","resourceName":"tosca.nodes.Root","description":"Represents a generic software component that can be managed and run by a Compute Node Type.","resourceIconPath":"defaulticon","category":"Abstract","tags":["Root"]}' -F resourceZip=@/var/tmp/normative-types-new-root.zip localhost:8080/sdc2/rest/v1/catalog/upload/multipart - -# diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index 227fb75072..f52ebf3202 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.14.1-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-be/src/main/java/org/openecomp/sdc/be/components/impl/CassandraHealthCheck.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CassandraHealthCheck.java index 6ebdb9bfab..789be722c6 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CassandraHealthCheck.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CassandraHealthCheck.java @@ -80,20 +80,20 @@ public class CassandraHealthCheck { sdcSchemaUtils = new SdcSchemaUtils(); //Calculate the Formula of Health Check try { - log.info("creating cluster for Cassandra Health Check."); + log.debug("creating cluster for Cassandra Health Check."); //Create cluster from nodes in cassandra configuration Metadata metadata = sdcSchemaUtils.getMetadata(); if (metadata == null) { log.error("Failure get cassandra metadata."); return; } - log.info("Cluster Metadata: {}", metadata); + log.debug("Cluster Metadata: {}", metadata); List<KeyspaceMetadata> keyspaces = metadata.getKeyspaces(); List<Integer> replactionFactorList = new ArrayList<>(); //Collect the keyspaces Replication Factor of current localDataCenter for (KeyspaceMetadata keyspace : keyspaces) { if (sdcKeyspaces.contains(keyspace.getName())) { - log.info("keyspace : {} , replication: {}", keyspace.getName(), keyspace.getReplication()); + log.debug("keyspace : {} , replication: {}", keyspace.getName(), keyspace.getReplication()); Map<String, String> replicationOptions = keyspace.getReplication(); //In 1 site with one data center if (replicationOptions.containsKey("replication_factor")) { @@ -110,11 +110,11 @@ public class CassandraHealthCheck { return; } int maxReplicationFactor = Collections.max(replactionFactorList); - log.info("maxReplication Factor is: {}", maxReplicationFactor); + log.debug("maxReplication Factor is: {}", maxReplicationFactor); int localQuorum = maxReplicationFactor / 2 + 1; - log.info("localQuorum is: {}", localQuorum); + log.debug("localQuorum is: {}", localQuorum); HC_FormulaNumber = maxReplicationFactor - localQuorum; - log.info("Health Check formula : Replication Factor – Local_Quorum = {}", HC_FormulaNumber); + log.debug("Health Check formula : Replication Factor – Local_Quorum = {}", HC_FormulaNumber); } catch (Exception e) { log.error("create cassandra cluster failed with exception.", e); } @@ -126,8 +126,8 @@ public class CassandraHealthCheck { return false; } try (final Session session = sdcSchemaUtils.connect()) { - log.info("creating cluster for Cassandra for monitoring."); - log.info("The cassandra session is {}", session); + log.debug("creating cluster for Cassandra for monitoring."); + log.debug("The cassandra session is {}", session); if (session == null) { log.error("Failed to connect to cassandra "); return false; @@ -137,10 +137,14 @@ public class CassandraHealthCheck { log.error("Failure get cassandra metadata."); return false; } - log.info("The number of cassandra nodes is:{}", metadata.getAllHosts().size()); + log.debug("The number of cassandra nodes is:{}", metadata.getAllHosts().size()); //Count the number of data center nodes that are down Long downHostsNumber = metadata.getAllHosts().stream().filter(x -> x.getDatacenter().equals(localDataCenterName) && !x.isUp()).count(); - log.info("The cassandra down nodes number is {}", downHostsNumber); + if(downHostsNumber > 0) { + log.warn("{} cassandra nodes are down", downHostsNumber); + } else { + log.debug("The cassandra down nodes number is {}", downHostsNumber); + } return HC_FormulaNumber >= downHostsNumber; } catch (Exception e) { log.error("create cassandra cluster failed with exception.", e); diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml index e329cf6ee5..658156abd1 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.14.1-SNAPSHOT</version> </parent> <properties> @@ -293,6 +293,11 @@ Modifications copyright (c) 2018 Nokia </dependency> <dependency> <groupId>org.janusgraph</groupId> + <artifactId>janusgraph-inmemory</artifactId> + <version>${janusgraph.version}</version> + </dependency> + <dependency> + <groupId>org.janusgraph</groupId> <artifactId>janusgraph-core</artifactId> <version>${janusgraph.version}</version> <scope>provided</scope> diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtilsTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtilsTest.java index 47fa61fcc2..93230a8d26 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtilsTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtilsTest.java @@ -74,7 +74,7 @@ public class SdcSchemaUtilsTest { @Test public void testExecuteStatementsSessionFail() throws Exception { SdcSchemaUtils sdcSchemaUtils = new SdcSchemaUtils(); - final boolean result = sdcSchemaUtils.executeStatements(CassandraTestHelper::createClusterWithNoSession, MULTIPLE_STATEMENTS); + final boolean result = sdcSchemaUtils.executeStatements(() -> null, MULTIPLE_STATEMENTS); Assert.assertFalse(result); } diff --git a/catalog-fe/README.md b/catalog-fe/README.md index 7681ca74ec..c4a25797ba 100644 --- a/catalog-fe/README.md +++ b/catalog-fe/README.md @@ -1,4 +1,6 @@ -# catalog-fe +# sdc-fe + +This maven module is named `catalog-fe` but it's deployed service is called [sdc-fe](https://git.onap.org/oom/tree/kubernetes/sdc/components/sdc-fe). ## Run the project ``` bash @@ -9,5 +11,5 @@ mvn jetty:run \ ``` You can check the following urls to ensure that it is working -- http://localhost:8080/sdc1/rest/configmgr/get +- http://localhost:8080/sdc1/rest/configmgr/get - http://localhost:8080/sdc1/proxy diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index 50e4fc87b4..7e58e9f34a 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.14.1-SNAPSHOT</version> </parent> <dependencies> diff --git a/catalog-fe/sdc-frontend/Dockerfile b/catalog-fe/sdc-frontend/Dockerfile index 9fdfd78c0b..9b9338af67 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 jq 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..e65053965a 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.14.1-SNAPSHOT</version> </parent> <properties> @@ -303,7 +303,11 @@ </exclusion> </exclusions> </dependency> - + <dependency> + <groupId>org.janusgraph</groupId> + <artifactId>janusgraph-inmemory</artifactId> + <version>${janusgraph.version}</version> + </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> diff --git a/catalog-ui/pom.xml b/catalog-ui/pom.xml index 96f532a5fe..2dc278b15d 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.14.1-SNAPSHOT</version> </parent> <properties> @@ -89,7 +89,7 @@ </goals> <configuration> <!-- See https://nodejs.org/en/download/ for latest node and npm (lts) versions --> - <nodeVersion>v14.17.1</nodeVersion> + <nodeVersion>v16.20.0</nodeVersion> <npmVersion>6.14.13</npmVersion> </configuration> </execution> diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml index f2022fe167..89d8c4e0f5 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.14.1-SNAPSHOT</version> </parent> <dependencies> diff --git a/common-app-logging/pom.xml b/common-app-logging/pom.xml index 42be52209d..13e4b7386c 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.14.1-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..c57b52205b 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.14.1-SNAPSHOT</version> </parent> <dependencies> diff --git a/common-be/pom.xml b/common-be/pom.xml index fa3e596ee0..453627c8c3 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.14.1-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..4f7cd34dfe 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.14.1-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..e932a86e09 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.14.1-SNAPSHOT</version> </parent> <dependencies> diff --git a/common/onap-common-configuration-management/pom.xml b/common/onap-common-configuration-management/pom.xml index af20df55ef..e5a7dfa3a9 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.14.1-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..65ea85f2cd 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.14.1-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..325636fe30 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.14.1-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..4310da1e03 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.14.1-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..99e5ba0ea9 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.14.1-SNAPSHOT</version> </parent> <dependencies> diff --git a/common/pom.xml b/common/pom.xml index 30c0112e9d..21b0f38de6 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.14.1-SNAPSHOT</version> <relativePath>../onboarding/pom.xml</relativePath> </parent> diff --git a/cucumber-js-test-apis-ci/pom.xml b/cucumber-js-test-apis-ci/pom.xml index 4c883222fd..3e6e01dd00 100644 --- a/cucumber-js-test-apis-ci/pom.xml +++ b/cucumber-js-test-apis-ci/pom.xml @@ -83,7 +83,7 @@ </goals> <phase>generate-resources</phase> <configuration> - <nodeVersion>v14.17.1</nodeVersion> + <nodeVersion>v16.20.0</nodeVersion> <npmVersion>6.14.13</npmVersion> </configuration> </execution> diff --git a/cucumber-js-test-apis-ci/yarn.lock b/cucumber-js-test-apis-ci/yarn.lock index 6324af4df8..65bad5aec7 100644 --- a/cucumber-js-test-apis-ci/yarn.lock +++ b/cucumber-js-test-apis-ci/yarn.lock @@ -4,7 +4,8 @@ ajv@^5.1.0: version "5.5.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" + resolved "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz" + integrity sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw== dependencies: co "^4.6.0" fast-deep-equal "^1.0.0" @@ -13,49 +14,59 @@ ajv@^5.1.0: ansi-styles@^3.1.0, ansi-styles@^3.2.0: version "3.2.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88" + resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz" + integrity sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug== dependencies: color-convert "^1.9.0" any-promise@^1.0.0: version "1.3.0" - resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" + resolved "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz" + integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A== argparse@^1.0.7: version "1.0.9" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86" + resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz" + integrity sha512-iK7YPKV+GsvihPUTKcM3hh2gq47zSFCpVDv/Ay2O9mzuD7dfvLV4vhms4XcjZvv4VRgXuGLMEts51IlTjS11/A== dependencies: sprintf-js "~1.0.2" array-filter@~0.0.0: version "0.0.1" - resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec" + resolved "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz" + integrity sha512-VW0FpCIhjZdarWjIz8Vpva7U95fl2Jn+b+mmFFMLn8PIVscOQcAgEznwUzTEuUHuqZqIxwzRlcaN/urTFFQoiw== array-map@~0.0.0: version "0.0.0" - resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662" + resolved "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz" + integrity sha512-123XMszMB01QKVptpDQ7x1m1pP5NmJIG1kbl0JSPPRezvwQChxAN0Gvzo7rvR1IZ2tOL2tmiy7kY/KKgnpVVpg== array-reduce@~0.0.0: version "0.0.0" - resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b" + resolved "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz" + integrity sha512-8jR+StqaC636u7h3ye1co3lQRefgVVUQUhuAmRbDqIMeR2yuXzRvkCNQiQ5J/wbREmoBLNtp13dhaaVpZQDRUw== asn1@~0.2.3: version "0.2.3" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" + resolved "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz" + integrity sha512-6i37w/+EhlWlGUJff3T/Q8u1RGmP5wgbiwYnOnbOqvtrPxT63/sYFyP9RcpxtxGymtfA075IvmOnL7ycNOWl3w== -assert-plus@1.0.0, assert-plus@^1.0.0: +assert-plus@^1.0.0, assert-plus@1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + resolved "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" + integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== assert@^1.4.1: version "1.4.1" - resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91" + resolved "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz" + integrity sha512-N+aAxov+CKVS3JuhDIQFr24XvZvwE96Wlhk9dytTg/GmwWoghdOvR8dspx8MVz71O+Y0pA3UPqHF68D6iy8UvQ== dependencies: util "0.10.3" assertion-error-formatter@^2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/assertion-error-formatter/-/assertion-error-formatter-2.0.1.tgz#6bbdffaec8e2fa9e2b0eb158bfe353132d7c0a9b" + resolved "https://registry.npmjs.org/assertion-error-formatter/-/assertion-error-formatter-2.0.1.tgz" + integrity sha512-cjC3jUCh9spkroKue5PDSKH5RFQ/KNuZJhk3GwHYmB/8qqETxLOmMdLH+ohi/VukNzxDlMvIe7zScvLoOdhb6Q== dependencies: diff "^3.0.0" pad-right "^0.2.2" @@ -63,159 +74,205 @@ assertion-error-formatter@^2.0.1: asynckit@^0.4.0: version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz" + integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== aws-sign2@~0.7.0: version "0.7.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" + resolved "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz" + integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA== aws4@^1.6.0: version "1.6.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e" + resolved "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz" + integrity sha512-tkleq4Df8UWu/7xf/tfbo7t2vDa07bcONGnKhl0QXKQsh3fJ0yJ1M5wzpy8BtBSENQw/9VTsthMhLG+yXHfStQ== babel-runtime@^6.11.6: version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" + resolved "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz" + integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g== dependencies: core-js "^2.4.0" regenerator-runtime "^0.11.0" babylon@7.0.0-beta.19: version "7.0.0-beta.19" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.19.tgz#e928c7e807e970e0536b078ab3e0c48f9e052503" + resolved "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz" + integrity sha512-Vg0C9s/REX6/WIXN37UKpv5ZhRi6A4pjHlpkE34+8/a6c2W1Q692n3hmc+SZG5lKRnaExLUbxtJ1SVT+KaCQ/A== balanced-match@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz" + integrity sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg== bcrypt-pbkdf@^1.0.0: version "1.0.1" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d" + resolved "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz" + integrity sha512-vY4sOrSlpwNZXsinfJ0HpbSkFft4nhSVLeUrQ4j2ydGmBOiVY83aMJStJATBy0C3+XdaYa990kIA1qkC2mUq6g== dependencies: tweetnacl "^0.14.3" becke-ch--regex--s0-0-v1--base--pl--lib@^1.2.0: version "1.2.0" - resolved "https://registry.yarnpkg.com/becke-ch--regex--s0-0-v1--base--pl--lib/-/becke-ch--regex--s0-0-v1--base--pl--lib-1.2.0.tgz#2e73e9d21f2c2e6f5a5454045636f0ab93e46130" + resolved "https://registry.npmjs.org/becke-ch--regex--s0-0-v1--base--pl--lib/-/becke-ch--regex--s0-0-v1--base--pl--lib-1.2.0.tgz" + integrity sha512-FCZ7NyLOQGcrz4jCURY3KGEXnk1YbwXREF9b22RFCf1DUBO0OQ31LM7RpzNz2kEC8D7mM/6rH/HyAj31i7TbsQ== bluebird@^3.4.1, bluebird@~3.5.0: version "3.5.1" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9" + resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz" + integrity sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA== boom@4.x.x: version "4.3.1" - resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31" + resolved "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz" + integrity sha512-FA8ZqcHBLjyFCPns8EsFTWxARi8iKzLfl3vXS1n1O6mlUpZvjXg9E+0Ys8mh7k/s8mHVpROgeoUmz4HadhPhAQ== dependencies: hoek "4.x.x" boom@5.x.x: version "5.2.0" - resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02" + resolved "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz" + integrity sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw== dependencies: hoek "4.x.x" brace-expansion@^1.1.7: version "1.1.8" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292" + resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz" + integrity sha512-Dnfc9ROAPrkkeLIUweEbh7LFT9Mc53tO/bbM044rKjhgAEyIGKvKXg97PM/kRizZIfUHaROZIoeEaWao+Unzfw== dependencies: balanced-match "^1.0.0" concat-map "0.0.1" +btoa@^1.2.1: + version "1.2.1" + resolved "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz" + integrity sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g== + builtin-modules@^1.0.0: version "1.1.1" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" + resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz" + integrity sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ== caseless@~0.12.0: version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz" + integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw== catharsis@~0.8.9: version "0.8.9" - resolved "https://registry.yarnpkg.com/catharsis/-/catharsis-0.8.9.tgz#98cc890ca652dd2ef0e70b37925310ff9e90fc8b" + resolved "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz" + integrity sha512-2qrVMmSPlNNmcUytNiGJaiA218fj7wDAijSSWaqrP2Cyy2pzAxXAymAXl4J5TWOSGlHpiqjRZKLVhsTB1e2l6A== dependencies: underscore-contrib "~0.3.0" chalk@^2.1.0: version "2.3.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba" + resolved "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz" + integrity sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q== dependencies: ansi-styles "^3.1.0" escape-string-regexp "^1.0.5" supports-color "^4.0.0" +charenc@0.0.2: + version "0.0.2" + resolved "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz" + integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA== + cli-table@^0.3.1: version "0.3.1" - resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23" + resolved "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz" + integrity sha512-h/TzJrgwzVV+W6laITBZAxAWfBjX4T0x+LF5XJdS1AzDkXqmraMNnKQ/O/f3AHJKVR85fOglUEdS/B0P1wS7Aw== dependencies: colors "1.0.3" co@^4.6.0: version "4.6.0" - resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" + resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz" + integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== color-convert@^1.9.0: version "1.9.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed" + resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz" + integrity sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ== dependencies: color-name "^1.1.1" color-name@^1.1.1: version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - -colors@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" + resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" + integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== colors@^1.1.2: version "1.1.2" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" + resolved "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz" + integrity sha512-ENwblkFQpqqia6b++zLD/KUWafYlVY/UNnAp7oz7LY7E924wmpye416wBOmvv/HMWzl8gL1kJlfvId/1Dg176w== + +colors@1.0.3: + version "1.0.3" + resolved "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz" + integrity sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw== combined-stream@^1.0.5, combined-stream@~1.0.5: version "1.0.5" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009" + resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz" + integrity sha512-JgSRe4l4UzPwpJuxfcPWEK1SCrL4dxNjp1uqrQLMop3QZUVo+hDU8w9BJKA4JPbulTWI+UzrI2UA3tK12yQ6bg== dependencies: delayed-stream "~1.0.0" commander@^2.9.0: version "2.13.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c" + resolved "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz" + integrity sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA== concat-map@0.0.1: version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== core-js@^2.4.0: version "2.5.3" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e" + resolved "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz" + integrity sha512-1fhTiNuC8YWzCl567b1K2mQqRyHvQtRlEuNY31t837BFNd57oMvElJTsM5IrIooczeG/KvssBbJi2ZZASwyMIQ== core-util-is@1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" + integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== cross-spawn@^5.1.0: version "5.1.0" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" + resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz" + integrity sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A== dependencies: lru-cache "^4.0.1" shebang-command "^1.2.0" which "^1.2.9" +crypt@0.0.2: + version "0.0.2" + resolved "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz" + integrity sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow== + cryptiles@3.x.x: version "3.1.2" - resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe" + resolved "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz" + integrity sha512-XBDBQo47RxVcR5GNxNOI38Cac044AdfU60sJBGZsmWw5TDuG5BAby8W/soTp4SIKeCl37sCGwkbh9wGLEd0cLw== dependencies: boom "5.x.x" cucumber-expressions@^5.0.7: version "5.0.13" - resolved "https://registry.yarnpkg.com/cucumber-expressions/-/cucumber-expressions-5.0.13.tgz#f174597dae6d2f0121294ac2ea65443249cf1587" + resolved "https://registry.npmjs.org/cucumber-expressions/-/cucumber-expressions-5.0.13.tgz" + integrity sha512-lokwVcC9+mLF9ZsdcZ/+nbIe1lGOK/UA9xitBEBbp4+VfqEbfM/edlnC39z9TG/c03vWoO9bup59EBS2m/8/3w== dependencies: becke-ch--regex--s0-0-v1--base--pl--lib "^1.2.0" cucumber-html-reporter@^3.0.4: version "3.0.4" - resolved "https://registry.yarnpkg.com/cucumber-html-reporter/-/cucumber-html-reporter-3.0.4.tgz#1be0dee83f30a2f4719207859a5440ce082ffadd" + resolved "https://registry.npmjs.org/cucumber-html-reporter/-/cucumber-html-reporter-3.0.4.tgz" + integrity sha512-uit68jymdI8Z6m+kJ5YnJPeHf5IdYXt2j52l5xLwgpcLBQRhCvr1peV9UODaCN5nLnRN9nqh1qaw4iNp1rTpvQ== dependencies: find "^0.2.7" fs-extra "^3.0.1" @@ -226,11 +283,13 @@ cucumber-html-reporter@^3.0.4: cucumber-tag-expressions@^1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/cucumber-tag-expressions/-/cucumber-tag-expressions-1.1.1.tgz#7f5c7b70009bc2b666591bfe64854578bedee85a" + resolved "https://registry.npmjs.org/cucumber-tag-expressions/-/cucumber-tag-expressions-1.1.1.tgz" + integrity sha512-V9jv81sR/HaJ87FoidrvHkviXId7KmBcUi7aQPfi+W3nRO30N6GqH6lcp8K+nyiT1DgemRJBPDDeBMS93xJqMQ== cucumber@^3.2.1: version "3.2.1" - resolved "https://registry.yarnpkg.com/cucumber/-/cucumber-3.2.1.tgz#7898509bf6f3fe4ef5fa30ba987bd53d88d53251" + resolved "https://registry.npmjs.org/cucumber/-/cucumber-3.2.1.tgz" + integrity sha512-04ZxLBtGeEUsuYD/AhEuv+WO/hDVi22b4FO13JdB7oiwMCLS4mF70PzUK5ww1etEivSR0ea+oKs5i5jVHwPNlA== dependencies: assertion-error-formatter "^2.0.1" babel-runtime "^6.11.6" @@ -259,75 +318,95 @@ cucumber@^3.2.1: util-arity "^1.0.2" verror "^1.9.0" -d@1: - version "1.0.0" - resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f" - dependencies: - es5-ext "^0.10.9" - d@~0.1.1: version "0.1.1" - resolved "https://registry.yarnpkg.com/d/-/d-0.1.1.tgz#da184c535d18d8ee7ba2aa229b914009fae11309" + resolved "https://registry.npmjs.org/d/-/d-0.1.1.tgz" + integrity sha512-0SdM9V9pd/OXJHoWmTfNPTAeD+lw6ZqHg+isPyBFuJsZLSE0Ygg1cYZ/0l6DrKQXMOqGOu1oWupMoOfoRfMZrQ== dependencies: es5-ext "~0.10.2" +d@1: + version "1.0.0" + resolved "https://registry.npmjs.org/d/-/d-1.0.0.tgz" + integrity sha512-9x1NruMD5YQ7xccKbGEy/bjitRfn5LEIhJIXIOAXC8I1laA5gfezUMVES1/vjLxfGzZjirLLBzEqxMO2/LzGxQ== + dependencies: + es5-ext "^0.10.9" + dashdash@^1.12.0: version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" + resolved "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz" + integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g== dependencies: assert-plus "^1.0.0" +debug@^3.2.6: + version "3.2.7" + resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + define-properties@^1.1.2: version "1.1.2" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94" + resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz" + integrity sha512-hpr5VSFXGamODSCN6P2zdSBY6zJT7DlcBAHiPIa2PWDvfBqJQntSK0ehUoHoS6HGeSS19dgj7E+1xOjfG3zEtQ== dependencies: foreach "^2.0.5" object-keys "^1.0.8" delayed-stream@~1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" + integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== diff@^3.0.0: version "3.4.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c" + resolved "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz" + integrity sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA== docdash@^0.4.0: version "0.4.0" - resolved "https://registry.yarnpkg.com/docdash/-/docdash-0.4.0.tgz#05c3a50d83189981699ee0c076d3a3950db7ec00" + resolved "https://registry.npmjs.org/docdash/-/docdash-0.4.0.tgz" + integrity sha512-cdmktbSCiqO0gr6/YO5AQAZLOpCTv7usry2+cgsjcO0YnTtG4tlZvyVvZ+BLp3vyOovp6cunldeK+gjCPnG4Dg== duplexer@~0.1.1: version "0.1.1" - resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" + resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz" + integrity sha512-sxNZ+ljy+RA1maXoUReeqBBpBC6RLKmg5ewzV+x+mSETmWNoKdZN6vcQjpFROemza23hGFskJtFNoUWUaQ+R4Q== duration@^0.2.0: version "0.2.0" - resolved "https://registry.yarnpkg.com/duration/-/duration-0.2.0.tgz#5f9c4dfaafff655de986112efe25c5978dd85146" + resolved "https://registry.npmjs.org/duration/-/duration-0.2.0.tgz" + integrity sha512-6Jvqm7Ins+CxFiSxZupMgsVWnD1Ij7KjaSflmfnmlHhTd4OpU06PdZdXj82eQ6ynR6t1hQtn0MaltgihdfEmmA== dependencies: d "~0.1.1" es5-ext "~0.10.2" ecc-jsbn@~0.1.1: version "0.1.1" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505" + resolved "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz" + integrity sha512-8Pvg9QY16SYajEL9W1Lk+9yM7XCK/MOq2wibslLZYAAEEkbAIO6mLkW+GFYbvvw8qTuDFzFMg40rS9IxkNCWPg== dependencies: jsbn "~0.1.0" error-ex@^1.3.1: version "1.3.1" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" + resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz" + integrity sha512-FfmVxYsm1QOFoPI2xQmNnEH10Af42mCxtGrKvS1JfDTXlPLYiAz2T+QpjHPxf+OGniMfWZah9ULAhPoKQ3SEqg== dependencies: is-arrayish "^0.2.1" error-stack-parser@^2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.1.tgz#a3202b8fb03114aa9b40a0e3669e48b2b65a010a" + resolved "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.1.tgz" + integrity sha512-txH6xLNA1/gwRsixQU7B5u2F9CKP11NLQArbyaX0qkB9V2mC/LV666O7DSXYoxvyP1GKgPoeCpLKLBZdno8QAw== dependencies: stackframe "^1.0.3" es-abstract@^1.4.3: version "1.10.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864" + resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.10.0.tgz" + integrity sha512-/uh/DhdqIOSkAWifU+8nG78vlQxdLckUdI/sPgy0VhuXi2qJ7T8czBmqIYtLQVpCIFYafChnsRsB5pyb1JdmCQ== dependencies: es-to-primitive "^1.1.1" function-bind "^1.1.1" @@ -337,7 +416,8 @@ es-abstract@^1.4.3: es-to-primitive@^1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d" + resolved "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz" + integrity sha512-wXsac552n5sYhgVjyFvhXLunXZFPOiT/WgP7hFhUPU5gtaUQpm9OryPwlWQUS3Qptk8iZzY/2T3J62GtC/toSw== dependencies: is-callable "^1.1.1" is-date-object "^1.0.1" @@ -345,14 +425,16 @@ es-to-primitive@^1.1.1: es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14, es5-ext@~0.10.2: version "0.10.38" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.38.tgz#fa7d40d65bbc9bb8a67e1d3f9cc656a00530eed3" + resolved "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.38.tgz" + integrity sha512-jCMyePo7AXbUESwbl8Qi01VSH2piY9s/a3rSU/5w/MlTIx8HPL1xn2InGN8ejt/xulcJgnTO7vqNtOAxzYd2Kg== dependencies: es6-iterator "~2.0.3" es6-symbol "~3.1.1" es6-iterator@~2.0.3: version "2.0.3" - resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" + resolved "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz" + integrity sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g== dependencies: d "1" es5-ext "^0.10.35" @@ -360,18 +442,21 @@ es6-iterator@~2.0.3: es6-symbol@^3.1.1, es6-symbol@~3.1.1: version "3.1.1" - resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" + resolved "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz" + integrity sha512-exfuQY8UGtn/N+gL1iKkH8fpNd5sJ760nJq6mmZAHldfxMD5kX07lbQuYlspoXsuknXNv9Fb7y2GsPOnQIbxHg== dependencies: d "1" es5-ext "~0.10.14" escape-string-regexp@^1.0.5, escape-string-regexp@~1.0.5: version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" + integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== event-stream@~3.3.0: version "3.3.4" - resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571" + resolved "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz" + integrity sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g== dependencies: duplexer "~0.1.1" from "~0" @@ -383,47 +468,60 @@ event-stream@~3.3.0: extend@~3.0.1: version "3.0.1" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" + resolved "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz" + integrity sha512-u1aUSYGdAQxyguoP919qsgj24krDCtaO/DJFNPwFmojMmKp14gtCTVsc8lQSqRDFrwAch+mxMWC8/6ZJPz5Hpw== -extsprintf@1.3.0: +extsprintf@^1.2.0, extsprintf@1.3.0: version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" + resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz" + integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g== fast-deep-equal@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff" + resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz" + integrity sha512-46+Jxk9Yj/nQY+3a1KTnpbBTemcAbPySTKya8iM9D7EsiONpSWbvzesalcCJ6tmJrCUITT2fmAQfNHFG+OHM6Q== fast-json-stable-stringify@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz" + integrity sha512-eIgZvM9C3P05kg0qxfqaVU6Tma4QedCPIByQOcemV0vju8ot3cS2DpHi4m2G2JvbSMI152rjfLX0p1pkSdyPlQ== figures@2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" + resolved "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz" + integrity sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA== dependencies: escape-string-regexp "^1.0.5" +find-up@^4.1.0: + version "4.1.0" + resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + find@^0.2.7: version "0.2.9" - resolved "https://registry.yarnpkg.com/find/-/find-0.2.9.tgz#4b73f1ff9e56ad91b76e716407fe5ffe6554bb8c" + resolved "https://registry.npmjs.org/find/-/find-0.2.9.tgz" + integrity sha512-7a4/LCiInB9xYMnAUEjLilL9FKclwbwK7VlXw+h5jMvT2TDFeYFCHM24O1XdnC/on/hx8mxVO3FTQkyHZnOghQ== dependencies: traverse-chain "~0.1.0" foreach@^2.0.5: version "2.0.5" - resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" + resolved "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz" + integrity sha512-ZBbtRiapkZYLsqoPyZOR+uPfto0GRMNQN1GwzZtZt7iZvPPbDDQV0JF5Hx4o/QFQ5c0vyuoZ98T8RSBbopzWtA== forever-agent@~0.6.1: version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" + resolved "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz" + integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw== form-data@~2.3.1: version "2.3.1" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf" + resolved "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz" + integrity sha512-ZznzvgkNMfVvSHP0rlg09OeW/g7ib4+NpwNGxLFJOrwUcjN0O8OUASn5cvnpnWve9ZlzW6GUa6NhhlCdb6DqCw== dependencies: asynckit "^0.4.0" combined-stream "^1.0.5" @@ -431,11 +529,13 @@ form-data@~2.3.1: from@~0: version "0.1.7" - resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" + resolved "https://registry.npmjs.org/from/-/from-0.1.7.tgz" + integrity sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g== fs-extra@^3.0.1: version "3.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291" + resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz" + integrity sha512-V3Z3WZWVUYd8hoCL5xfXJCaHWYzmtwW5XWYSlLgERi8PWd8bx1kUHUk8L1BT57e49oKnDDD180mjfrHc1yA9rg== dependencies: graceful-fs "^4.1.2" jsonfile "^3.0.0" @@ -443,25 +543,30 @@ fs-extra@^3.0.1: fs.realpath@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" + integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== function-bind@^1.0.2, function-bind@^1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== getpass@^0.1.1: version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" + resolved "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz" + integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng== dependencies: assert-plus "^1.0.0" gherkin@^5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/gherkin/-/gherkin-5.0.0.tgz#96def41198ec3908258b511af74f655a2764d2a1" + resolved "https://registry.npmjs.org/gherkin/-/gherkin-5.0.0.tgz" + integrity sha512-Y+93z2Nh+TNIKuKEf+6M0FQrX/z0Yv9C2LFfc5NlcGJWRrrTeI/jOg2374y1FOw6ZYQ3RgJBezRkli7CLDubDA== glob@^7.0.0, glob@^7.0.5: version "7.1.2" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" + resolved "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz" + integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -472,32 +577,38 @@ glob@^7.0.0, glob@^7.0.5: graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9: version "4.1.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" + resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz" + integrity sha512-9x6DLUuW+ROFdMTII9ec9t/FK8va6kYcC8/LggumssLM8kNv7IdFl3VrNUqgir2tJuBVxBga1QBoRziZacO5Zg== har-schema@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" + resolved "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz" + integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q== har-validator@~5.0.3: version "5.0.3" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd" + resolved "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz" + integrity sha512-r7LZkP7Z6WMxj5zARzB9dSpIKu/sp0NfHIgtj6kmQXhEArNctjB5FEv/L2XfLdWqIocPT2QVt0LFOlEUioTBtQ== dependencies: ajv "^5.1.0" har-schema "^2.0.0" has-flag@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" + resolved "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz" + integrity sha512-P+1n3MnwjR/Epg9BBo1KT8qbye2g2Ou4sFumihwt6I4tsUX7jnLcX4BTOSKg/B1ZrIYMN9FcEnG4x5a7NB8Eng== has@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28" + resolved "https://registry.npmjs.org/has/-/has-1.0.1.tgz" + integrity sha512-8wpov6mGFPJ/SYWGQIFo6t0yuNWoO9MkSq3flX8LhiGmbIUhDETp9knPMcIm0Xig1ybWsw6gq2w0gCz1JHD+Qw== dependencies: function-bind "^1.0.2" hawk@~6.0.2: version "6.0.2" - resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038" + resolved "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz" + integrity sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ== dependencies: boom "4.x.x" cryptiles "3.x.x" @@ -506,108 +617,143 @@ hawk@~6.0.2: hoek@4.x.x: version "4.2.0" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d" + resolved "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz" + integrity sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ== hosted-git-info@^2.1.4: version "2.5.0" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c" + resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz" + integrity sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg== http-signature@~1.2.0: version "1.2.0" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" + resolved "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz" + integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ== dependencies: assert-plus "^1.0.0" jsprim "^1.2.2" sshpk "^1.7.0" +iconv-lite@^0.4.4: + version "0.4.24" + resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + indent-string@^3.1.0: version "3.2.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" + resolved "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz" + integrity sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ== inflight@^1.0.4: version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz" + integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== dependencies: once "^1.3.0" wrappy "1" inherits@2: version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" + integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw== inherits@2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" + resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + integrity sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA== is-arrayish@^0.2.1: version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz" + integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== + +is-buffer@~1.1.6: + version "1.1.6" + resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz" + integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== is-builtin-module@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" + resolved "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz" + integrity sha512-C2wz7Juo5pUZTFQVer9c+9b4qw3I5T/CHQxQyhVu7BJel6C22FmsLIWsdseYyOw6xz9Pqy9eJWSkQ7+3iN1HVw== dependencies: builtin-modules "^1.0.0" is-callable@^1.1.1, is-callable@^1.1.3: version "1.1.3" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2" + resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz" + integrity sha512-gcmUh1kFielP0yJSKD+A1aOPNlI8ZzruhHum+Geq6M3Ibx5JnwcsTJCktWj+reKIjjtefToy/u8YNRUZq4FHuQ== is-date-object@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" + resolved "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz" + integrity sha512-P5rExV1phPi42ppoMWy7V63N3i173RY921l4JJ7zonMSxK+OWGPj76GD+cUKUb68l4vQXcJp2SsG+r/A4ABVzg== is-generator@^1.0.2: version "1.0.3" - resolved "https://registry.yarnpkg.com/is-generator/-/is-generator-1.0.3.tgz#c14c21057ed36e328db80347966c693f886389f3" + resolved "https://registry.npmjs.org/is-generator/-/is-generator-1.0.3.tgz" + integrity sha512-G56jBpbJeg7ds83HW1LuShNs8J73Fv3CPz/bmROHOHlnKkN8sWb9ujiagjmxxMUywftgq48HlBZELKKqFLk0oA== is-regex@^1.0.4: version "1.0.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" + resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz" + integrity sha512-WQgPrEkb1mPCWLSlLFuN1VziADSixANugwSkJfPRR73FNWIQQN+tR/t1zWfyES/Y9oag/XBtVsahFdfBku3Kyw== dependencies: has "^1.0.1" is-stream@^1.1.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + resolved "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz" + integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ== is-symbol@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572" + resolved "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz" + integrity sha512-Z1cLAG7dXM1vJv8mAGjA+XteO0YzYPwD473+qPAWKycNZxwCH/I56QIohKGYCZSB7j6tajrxi/FvOpAfqGhhRQ== is-typedarray@~1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz" + integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== isexe@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" + integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== isstream@~0.1.2: version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + resolved "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz" + integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g== js-base64@^2.3.2: version "2.4.3" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582" + resolved "https://registry.npmjs.org/js-base64/-/js-base64-2.4.3.tgz" + integrity sha512-H7ErYLM34CvDMto3GbD6xD0JLUGYXR3QTcH6B/tr4Hi/QpSThnCsIp+Sy5FRTw3B0d6py4HcNkW7nO/wdtGWEw== js2xmlparser@~3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-3.0.0.tgz#3fb60eaa089c5440f9319f51760ccd07e2499733" + resolved "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz" + integrity sha512-CSOkdn0/GhRFwxnipmhXfqJ+FG6+wkWBi46kKSsPx6+j65176ZiQcrCYpg6K8x3iLbO4k3zScBnZ7I/L80dAtw== dependencies: xmlcreate "^1.0.1" jsbn@~0.1.0: version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz" + integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg== jsdoc-one-page@0.0.5: version "0.0.5" - resolved "https://registry.yarnpkg.com/jsdoc-one-page/-/jsdoc-one-page-0.0.5.tgz#8701e022159844dbd9cb64d9504974059604f58a" + resolved "https://registry.npmjs.org/jsdoc-one-page/-/jsdoc-one-page-0.0.5.tgz" + integrity sha512-EFLNLh0Xy6XKL9KJmfHORQSrP8q0f7tN+bnKLlWIDtH8ymJQHP7osPDQsKLJjM4h/AbgD27TILcZnoIPBjlwNA== jsdoc@^3.5.5: version "3.5.5" - resolved "https://registry.yarnpkg.com/jsdoc/-/jsdoc-3.5.5.tgz#484521b126e81904d632ff83ec9aaa096708fa4d" + resolved "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz" + integrity sha512-6PxB65TAU4WO0Wzyr/4/YhlGovXl0EVYfpKbpSroSj0qBxT4/xod/l40Opkm38dRHRdQgdeY836M0uVnJQG7kg== dependencies: babylon "7.0.0-beta.19" bluebird "~3.5.0" @@ -624,33 +770,40 @@ jsdoc@^3.5.5: json-parse-better-errors@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz#50183cd1b2d25275de069e9e71b467ac9eab973a" + resolved "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz" + integrity sha512-xyQpxeWWMKyJps9CuGJYeng6ssI5bpqS9ltQpdVQ90t4ql6NdnxFKh95JcRt2cun/DjMVNrdjniLPuMA69xmCw== json-schema-traverse@^0.3.0: version "0.3.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" + resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz" + integrity sha512-4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA== json-schema@0.2.3: version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" + resolved "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz" + integrity sha512-a3xHnILGMtk+hDOqNwHzF6e2fNbiMrXZvxKQiEv2MlgQP+pjIOzqAmKYD2mDpXYE/44M7g+n9p2bKkYWDUcXCQ== json-stringify-safe@~5.0.1: version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + resolved "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" + integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== jsonfile@^3.0.0: version "3.0.1" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66" + resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz" + integrity sha512-oBko6ZHlubVB5mRFkur5vgYR1UyqX+S6Y/oCfLhqNdcc2fYFlDpIoNc7AfKS1KOGcnNAkvsr0grLck9ANM815w== optionalDependencies: graceful-fs "^4.1.6" jsonify@~0.0.0: version "0.0.0" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" + resolved "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz" + integrity sha512-trvBk1ki43VZptdBI5rIlG4YOzyeH/WefQt5rj1grasPn4iiZWKet8nkgc4GlsAylaztn0qZfUYOiTsASJFdNA== jsprim@^1.2.2: version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" + resolved "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz" + integrity sha512-4Dj8Rf+fQ+/Pn7C5qeEX02op1WfOss3PKTE9Nsop3Dx+6UPxlm1dr/og7o2cRa5hNN07CACr4NFzRLtj/rjWog== dependencies: assert-plus "1.0.0" extsprintf "1.3.0" @@ -659,105 +812,154 @@ jsprim@^1.2.2: jszip@2.5.0: version "2.5.0" - resolved "https://registry.yarnpkg.com/jszip/-/jszip-2.5.0.tgz#7444fd8551ddf3e5da7198fea0c91bc8308cc274" + resolved "https://registry.npmjs.org/jszip/-/jszip-2.5.0.tgz" + integrity sha512-IRoyf8JSYY3nx+uyh5xPc0qdy8pUDTp2UkHOWYNF/IO/3D8nx7899UlSAjD8rf8wUgOmm0lACWx/GbW3EaxIXQ== dependencies: pako "~0.2.5" klaw@~2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/klaw/-/klaw-2.0.0.tgz#59c128e0dc5ce410201151194eeb9cbf858650f6" + resolved "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz" + integrity sha512-Hx5PvgJKTWpMkNJCYrBUNBLlxYIkxN4FVU/BnZP4CFh5BpiHOgujAPx7iFVz/phD0bP8rsqD48gtqcvNlUt0lQ== dependencies: graceful-fs "^4.1.9" load-json-file@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" + resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz" + integrity sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw== dependencies: graceful-fs "^4.1.2" parse-json "^4.0.0" pify "^3.0.0" strip-bom "^3.0.0" +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + lodash@^4.0.0, lodash@^4.17.2, lodash@^4.17.4: version "4.17.4" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" + resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" + integrity sha512-6X37Sq9KCpLSXEh8uM12AKYlviHPNNk4RxiGBn4cmKGJinbXBneWIV7iE/nXkM928O7ytHcHb6+X6Svl0f4hXg== lower-case@^1.1.1: version "1.1.4" - resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" + resolved "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz" + integrity sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA== lru-cache@^4.0.1: version "4.1.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55" + resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz" + integrity sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew== dependencies: pseudomap "^1.0.2" yallist "^2.1.2" map-stream@~0.1.0: version "0.1.0" - resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194" + resolved "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz" + integrity sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g== marked@~0.3.6: version "0.3.12" - resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.12.tgz#7cf25ff2252632f3fe2406bde258e94eee927519" + resolved "https://registry.npmjs.org/marked/-/marked-0.3.12.tgz" + integrity sha512-k4NaW+vS7ytQn6MgJn3fYpQt20/mOgYM5Ft9BYMfQJDz2QT6yEeS9XJ8k2Nw8JTeWK/znPPW2n3UJGzyYEiMoA== + +md5@^2.2.1: + version "2.3.0" + resolved "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz" + integrity sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g== + dependencies: + charenc "0.0.2" + crypt "0.0.2" + is-buffer "~1.1.6" memorystream@^0.3.1: version "0.3.1" - resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2" + resolved "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz" + integrity sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw== mime-db@~1.30.0: version "1.30.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01" + resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz" + integrity sha512-SUaL89ROHF5P6cwrhLxE1Xmk60cFcctcJl3zwMeQWcoQzt0Al/X8qxUz2gi19NECqYspzbYpAJryIRnLcjp20g== mime-types@^2.1.12, mime-types@~2.1.17: version "2.1.17" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a" + resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz" + integrity sha512-rOFZoFAbaupSpzARUe5CU1P9mwfX+lIFAuj0soNsEZEnrHu6LZNyV7/FClEB/oF9A1o5KStlumRjW6D4Q2FRCA== dependencies: mime-db "~1.30.0" minimatch@^3.0.4: version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== dependencies: brace-expansion "^1.1.7" minimist@0.0.8: version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + resolved "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" + integrity sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q== mkdirp@~0.5.1: version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" + resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz" + integrity sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA== dependencies: minimist "0.0.8" +ms@^2.1.1: + version "2.1.3" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + mz@^2.4.0: version "2.7.0" - resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" + resolved "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz" + integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== dependencies: any-promise "^1.0.0" object-assign "^4.0.1" thenify-all "^1.0.0" +needle@^2.4.0: + version "2.9.1" + resolved "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz" + integrity sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ== + dependencies: + debug "^3.2.6" + iconv-lite "^0.4.4" + sax "^1.2.4" + no-case@^2.2.0: version "2.3.2" - resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac" + resolved "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz" + integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ== dependencies: lower-case "^1.1.1" node-zip@^1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/node-zip/-/node-zip-1.1.1.tgz#94d1ad674a3cd46a1588dd736f4a9a78c757eb62" + resolved "https://registry.npmjs.org/node-zip/-/node-zip-1.1.1.tgz" + integrity sha512-sXfGL65EcaAJqNSXxuyf//i4D4geUtJgZDYUd7IBo2/CH8XY8vcWh1+CBCxuVVyR+S4vAFc3hr//JkCi2+V5vg== dependencies: jszip "2.5.0" normalize-newline@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-newline/-/normalize-newline-3.0.0.tgz#1cbea804aba436001f83938ab21ec039d69ae9d3" + resolved "https://registry.npmjs.org/normalize-newline/-/normalize-newline-3.0.0.tgz" + integrity sha512-uLZbfjzZfHTlaGXMJkwc5TUEhY7/+LHvP1X/OcDt6SLkubrshIOg7hbT6rkmAhyvGpi6kJ+XcMfwM7D3/Zieqg== normalize-package-data@^2.3.2: version "2.4.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" + resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz" + integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw== dependencies: hosted-git-info "^2.1.4" is-builtin-module "^1.0.0" @@ -766,7 +968,8 @@ normalize-package-data@^2.3.2: npm-run-all@^4.1.2: version "4.1.2" - resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.2.tgz#90d62d078792d20669139e718621186656cea056" + resolved "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.2.tgz" + integrity sha512-Z2aRlajMK4SQ8u19ZA75NZZu7wupfCNQWdYosIi8S6FgBdGf/8Y6Hgyjdc8zU2cYmIRVCx1nM80tJPkdEd+UYg== dependencies: ansi-styles "^3.2.0" chalk "^2.1.0" @@ -780,96 +983,140 @@ npm-run-all@^4.1.2: oauth-sign@~0.8.2: version "0.8.2" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" + resolved "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz" + integrity sha512-VlF07iu3VV3+BTXj43Nmp6Irt/G7j/NgEctUS6IweH1RGhURjjCc2NWtzXFPXXWWfc7hgbXQdtiQu2LGp6MxUg== object-assign@^4.0.1: version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz" + integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== object-keys@^1.0.8: version "1.0.11" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d" + resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz" + integrity sha512-I0jUsqFqmQFOIhQQFlW8QDuX3pVqUWkiiavYj8+TBiS7m+pM9hPCxSnYWqL1hHMBb7BbQ2HidT+6CZ8/BT/ilw== once@^1.3.0: version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz" + integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== dependencies: wrappy "1" open@0.0.5: version "0.0.5" - resolved "https://registry.yarnpkg.com/open/-/open-0.0.5.tgz#42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc" + resolved "https://registry.npmjs.org/open/-/open-0.0.5.tgz" + integrity sha512-+X/dJYLapVO1VbC620DhtNZK9U4/kQVaTQp/Gh7cb6UTLYfGZzzU2ZXkWrOA/wBrf4UqAFwtLqXYTxe4tSnWQQ== + +p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== pad-right@^0.2.2: version "0.2.2" - resolved "https://registry.yarnpkg.com/pad-right/-/pad-right-0.2.2.tgz#6fbc924045d244f2a2a244503060d3bfc6009774" + resolved "https://registry.npmjs.org/pad-right/-/pad-right-0.2.2.tgz" + integrity sha512-4cy8M95ioIGolCoMmm2cMntGR1lPLEbOMzOKu8bzjuJP6JpzEMQcDHmh7hHLYGgob+nKe1YHFMaG4V59HQa89g== dependencies: repeat-string "^1.5.2" pako@~0.2.5: version "0.2.9" - resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" + resolved "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz" + integrity sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA== parse-json@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" + resolved "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz" + integrity sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw== dependencies: error-ex "^1.3.1" json-parse-better-errors "^1.0.1" +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + path-is-absolute@^1.0.0: version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" + integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== path-parse@^1.0.5: version "1.0.5" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1" + resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz" + integrity sha512-u4e4H/UUeMbJ1UnBnePf6r4cm4fFZs57BMocUSFeea807JTYk2HJnE9GjUpWHaDZk1OQGoArnWW1yEo9nd57ww== path-type@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" + resolved "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz" + integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg== dependencies: pify "^3.0.0" pause-stream@0.0.11: version "0.0.11" - resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445" + resolved "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz" + integrity sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A== dependencies: through "~2.3" performance-now@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz" + integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== pify@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" + resolved "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz" + integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg== progress@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f" + resolved "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz" + integrity sha512-TRNLrLfTyjKMs865PwLv6WM5TTMRvzqcZTkKaMVd0ooNM0fnMM8aEp0/7IpnGo295TAiI13Ju30zBZK0rdWZUg== ps-tree@^1.1.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.1.0.tgz#b421b24140d6203f1ed3c76996b4427b08e8c014" + resolved "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz" + integrity sha512-Bt+85PaXe+fR7yv2KiZ+b/xoZ1To4cRE8P/1IVbFbxbqTl0b7kuK7xWS8yApyFnxNi4gDJ4kRpXh+NuW4V+5hQ== dependencies: event-stream "~3.3.0" pseudomap@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" + resolved "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz" + integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ== punycode@^1.4.1: version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" + resolved "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz" + integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ== qs@~6.5.1: version "6.5.1" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8" + resolved "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz" + integrity sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A== read-pkg@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" + resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz" + integrity sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA== dependencies: load-json-file "^4.0.0" normalize-package-data "^2.3.2" @@ -877,15 +1124,18 @@ read-pkg@^3.0.0: regenerator-runtime@^0.11.0: version "0.11.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" + resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz" + integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== repeat-string@^1.5.2, repeat-string@^1.6.1: version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + resolved "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz" + integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== request@^2.83.0: version "2.83.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356" + resolved "https://registry.npmjs.org/request/-/request-2.83.0.tgz" + integrity sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw== dependencies: aws-sign2 "~0.7.0" aws4 "^1.6.0" @@ -912,37 +1162,54 @@ request@^2.83.0: requizzle@~0.2.1: version "0.2.1" - resolved "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.1.tgz#6943c3530c4d9a7e46f1cddd51c158fc670cdbde" + resolved "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz" + integrity sha512-Lk39CGyJafiW6ZM+1jPiCpcqZTUKVtft5QdvGw/5DylN5SplowmUU9Uf7hCdiKxoESF0JfaLM/plZlsXawnBFQ== dependencies: underscore "~1.6.0" resolve@^1.3.3: version "1.5.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36" + resolved "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz" + integrity sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw== dependencies: path-parse "^1.0.5" safe-buffer@^5.0.1, safe-buffer@^5.1.1: version "5.1.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" + resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz" + integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg== + +"safer-buffer@>= 2.1.2 < 3": + version "2.1.2" + resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +sax@^1.2.4: + version "1.4.1" + resolved "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz" + integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg== "semver@2 || 3 || 4 || 5": version "5.5.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" + resolved "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz" + integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA== shebang-command@^1.2.0: version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz" + integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg== dependencies: shebang-regex "^1.0.0" shebang-regex@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz" + integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ== shell-quote@^1.6.1: version "1.6.1" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767" + resolved "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz" + integrity sha512-V0iQEZ/uoem3NmD91rD8XiuozJnq9/ZJnbHVXHnWqP1ucAhS3yJ7sLIIzEi57wFFcK3oi3kFUC46uSyWr35mxg== dependencies: array-filter "~0.0.0" array-map "~0.0.0" @@ -951,41 +1218,49 @@ shell-quote@^1.6.1: sntp@2.x.x: version "2.1.0" - resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8" + resolved "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz" + integrity sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg== dependencies: hoek "4.x.x" source-map@0.5.6: version "0.5.6" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" + resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz" + integrity sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA== spdx-correct@~1.0.0: version "1.0.2" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40" + resolved "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz" + integrity sha512-A6UuuDdsSvKK2bqmUetv33zJVv0iczyaQZ536YL9+GAvbC4HceGKvXDtptnU9YZ/zGgryaFFsR4YaUCq+N/53g== dependencies: spdx-license-ids "^1.0.2" spdx-expression-parse@~1.0.0: version "1.0.4" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c" + resolved "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz" + integrity sha512-xMXXC4eLKaIskvZm89nZi/MstVv1UtGk3nJz9BBKjreMVyoWisWFKfboH+kJS97+wUyBLpO/8ghV9M5VvrwwrA== spdx-license-ids@^1.0.2: version "1.2.2" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57" + resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz" + integrity sha512-qIBFhkh6ILCWNeWEe3ODFPKDYhPJrZpqdNCI2Z+w9lNdH5hoVEkfRLLbRfoIi8fb4xRYmpEOaaMH4G2pwYp/iQ== split@0.3: version "0.3.3" - resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f" + resolved "https://registry.npmjs.org/split/-/split-0.3.3.tgz" + integrity sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA== dependencies: through "2" sprintf-js@~1.0.2: version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" + integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== sshpk@^1.7.0: version "1.13.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3" + resolved "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz" + integrity sha512-oKPL4k+ld5d737ZPB4VM99bqNb3JH+ZkxwWXR1iSPtqYbZv81hkLD7v8gmclrgR7aA8uh8ar+q0IF7gHFHg7PQ== dependencies: asn1 "~0.2.3" assert-plus "^1.0.0" @@ -999,28 +1274,33 @@ sshpk@^1.7.0: stack-chain@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/stack-chain/-/stack-chain-2.0.0.tgz#d73d1172af89565f07438b5bcc086831b6689b2d" + resolved "https://registry.npmjs.org/stack-chain/-/stack-chain-2.0.0.tgz" + integrity sha512-GGrHXePi305aW7XQweYZZwiRwR7Js3MWoK/EHzzB9ROdc75nCnjSJVi21rdAGxFl+yCx2L2qdfl5y7NO4lTyqg== stack-generator@^2.0.1: version "2.0.2" - resolved "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.2.tgz#3c13d952a596ab9318fec0669d0a1df8b87176c7" + resolved "https://registry.npmjs.org/stack-generator/-/stack-generator-2.0.2.tgz" + integrity sha512-Qj3X+vY7qQ0OOLQomEihHk5SSnSPCI3z4RfB8kDk9lnzwznBODlkWODitEo8sHpp0a2VdSy3yuJkabNsQN5RGA== dependencies: stackframe "^1.0.4" stackframe@^1.0.3, stackframe@^1.0.4: version "1.0.4" - resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.0.4.tgz#357b24a992f9427cba6b545d96a14ed2cbca187b" + resolved "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz" + integrity sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw== stacktrace-gps@^3.0.1: version "3.0.2" - resolved "https://registry.yarnpkg.com/stacktrace-gps/-/stacktrace-gps-3.0.2.tgz#33f8baa4467323ab2bd1816efa279942ba431ccc" + resolved "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-3.0.2.tgz" + integrity sha512-9o+nWhiz5wFnrB3hBHs2PTyYrS60M1vvpSzHxwxnIbtY2q9Nt51hZvhrG1+2AxD374ecwyS+IUwfkHRE/2zuGg== dependencies: source-map "0.5.6" stackframe "^1.0.4" stacktrace-js@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/stacktrace-js/-/stacktrace-js-2.0.0.tgz#776ca646a95bc6c6b2b90776536a7fc72c6ddb58" + resolved "https://registry.npmjs.org/stacktrace-js/-/stacktrace-js-2.0.0.tgz" + integrity sha512-S+7N3SXGbBFwBZHptUCVND2j/6VEDK8/Y168DkGz8OGFId/pdBJUz0X0luXg5xqrIk7J/l5xhTyQdCe/7pgKvg== dependencies: error-stack-parser "^2.0.1" stack-generator "^2.0.1" @@ -1028,17 +1308,20 @@ stacktrace-js@^2.0.0: stream-combiner@~0.0.4: version "0.0.4" - resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14" + resolved "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz" + integrity sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw== dependencies: duplexer "~0.1.1" string-argv@0.0.2: version "0.0.2" - resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.0.2.tgz#dac30408690c21f3c3630a3ff3a05877bdcbd736" + resolved "https://registry.npmjs.org/string-argv/-/string-argv-0.0.2.tgz" + integrity sha512-p6/Mqq0utTQWUeGMi/m0uBtlLZEwXSY3+mXzeRRqw7fz5ezUb28Wr0R99NlfbWaMmL/jCyT9be4jpn7Yz8IO8w== string.prototype.padend@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0" + resolved "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz" + integrity sha512-hkMAJJtc5MwJvEsIXdQZ317tklAF6ozyqVI+NMVHeRR0GuF3Xi0/sYJCi4MJqiJrDHq5VFLEX3PWS/LJeuf4FA== dependencies: define-properties "^1.1.2" es-abstract "^1.4.3" @@ -1046,115 +1329,143 @@ string.prototype.padend@^3.0.0: stringstream@~0.0.5: version "0.0.5" - resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" + resolved "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz" + integrity sha512-QUQ1kThMjLRt4jA8lsn9lyIkE9bKafE7LDOL/nBBUY9Tfv2i3x1NAsVHG0uMCusFOWeeI6COhY/F20+avxRWSw== strip-bom@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" + resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz" + integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA== strip-json-comments@~2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz" + integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== supports-color@^4.0.0: version "4.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz" + integrity sha512-ycQR/UbvI9xIlEdQT1TQqwoXtEldExbCEAJgRo5YXlmSKjv6ThHnP9/vwGa1gr19Gfw+LkFd7KqYMhzrRC5JYw== dependencies: has-flag "^2.0.0" taffydb@2.6.2: version "2.6.2" - resolved "https://registry.yarnpkg.com/taffydb/-/taffydb-2.6.2.tgz#7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268" + resolved "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz" + integrity sha512-y3JaeRSplks6NYQuCOj3ZFMO3j60rTwbuKCvZxsAraGYH2epusatvZ0baZYA01WsGqJBq/Dl6vOrMUJqyMj8kA== thenify-all@^1.0.0: version "1.6.0" - resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" + resolved "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz" + integrity sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA== dependencies: thenify ">= 3.1.0 < 4" "thenify@>= 3.1.0 < 4": version "3.3.0" - resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839" + resolved "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz" + integrity sha512-ho5BRit179DQqrTnGIjO+L9vLP/zLyGk6jXn70DLD6MTUYD2FSgR2Y4qWcgca90VD54sQ7GdQ2/C765V6kPcqA== dependencies: any-promise "^1.0.0" -through@2, through@~2.3, through@~2.3.1: +through@~2.3, through@~2.3.1, through@2: version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz" + integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== title-case@^2.1.1: version "2.1.1" - resolved "https://registry.yarnpkg.com/title-case/-/title-case-2.1.1.tgz#3e127216da58d2bc5becf137ab91dae3a7cd8faa" + resolved "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz" + integrity sha512-EkJoZ2O3zdCz3zJsYCsxyq2OC5hrxR9mfdd5I+w8h/tmFfeOxJ+vvkxsKxdmN0WtS9zLdHEgfgVOiMVgv+Po4Q== dependencies: no-case "^2.2.0" upper-case "^1.0.3" tough-cookie@~2.3.3: version "2.3.3" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561" + resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz" + integrity sha512-WR9pjSY3qO0z3yC6g33CRcVt2Wbevh0gP1XiSFql0/xRioi9qbDs3C+g4Nv2N8jmv/BloIi/SYoy/mfw5vus2A== dependencies: punycode "^1.4.1" traverse-chain@~0.1.0: version "0.1.0" - resolved "https://registry.yarnpkg.com/traverse-chain/-/traverse-chain-0.1.0.tgz#61dbc2d53b69ff6091a12a168fd7d433107e40f1" + resolved "https://registry.npmjs.org/traverse-chain/-/traverse-chain-0.1.0.tgz" + integrity sha512-up6Yvai4PYKhpNp5PkYtx50m3KbwQrqDwbuZP/ItyL64YEWHAvH6Md83LFLV/GRSk/BoUVwwgUzX6SOQSbsfAg== tunnel-agent@^0.6.0: version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + resolved "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz" + integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w== dependencies: safe-buffer "^5.0.1" tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + resolved "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz" + integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA== underscore-contrib@~0.3.0: version "0.3.0" - resolved "https://registry.yarnpkg.com/underscore-contrib/-/underscore-contrib-0.3.0.tgz#665b66c24783f8fa2b18c9f8cbb0e2c7d48c26c7" + resolved "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz" + integrity sha512-OT7lal0sQBw7Kz18uC6wkbHqBBuJYFgdehJ+W1Z9+9Jyip38rBtdQ9tITaXbJjmws3uDOkzT7+I6V5oNhH2lrw== dependencies: underscore "1.6.0" -underscore@1.6.0, underscore@~1.6.0: +underscore@~1.6.0: version "1.6.0" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8" + resolved "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" + integrity sha512-z4o1fvKUojIWh9XuaVLUDdf86RQiq13AC1dmHbTpoyuu+bquHms76v16CjycCbec87J7z0k//SiQVk0sMdFmpQ== underscore@~1.8.3: version "1.8.3" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" + resolved "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz" + integrity sha512-5WsVTFcH1ut/kkhAaHf4PVgI8c7++GiVcpCGxPouI6ZVjsqPnSDf8h/8HtVqc0t4fzRXwnMK70EcZeAs3PIddg== + +underscore@1.6.0: + version "1.6.0" + resolved "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" + integrity sha512-z4o1fvKUojIWh9XuaVLUDdf86RQiq13AC1dmHbTpoyuu+bquHms76v16CjycCbec87J7z0k//SiQVk0sMdFmpQ== universalify@^0.1.0: version "0.1.1" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7" + resolved "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz" + integrity sha512-MVi79HEPwGk0grI7/Kl6H51fX7wcDTe6gGoCdK22pkRG6IPsi9L6NltClWJfBLUoIE5y3pKy3SplFAs/b0G+QQ== upper-case@^1.0.3: version "1.1.3" - resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598" + resolved "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz" + integrity sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA== util-arity@^1.0.2: version "1.1.0" - resolved "https://registry.yarnpkg.com/util-arity/-/util-arity-1.1.0.tgz#59d01af1fdb3fede0ac4e632b0ab5f6ce97c9330" + resolved "https://registry.npmjs.org/util-arity/-/util-arity-1.1.0.tgz" + integrity sha512-kkyIsXKwemfSy8ZEoaIz06ApApnWsk5hQO0vLjZS6UkBiGiW++Jsyb8vSBoc0WKlffGoGs5yYy/j5pp8zckrFA== util@0.10.3: version "0.10.3" - resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" + resolved "https://registry.npmjs.org/util/-/util-0.10.3.tgz" + integrity sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ== dependencies: inherits "2.0.1" uuid@^3.1.0: version "3.2.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" + resolved "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz" + integrity sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA== validate-npm-package-license@^3.0.1: version "3.0.1" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc" + resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz" + integrity sha512-VD0zBfAttoSxzPa+I+rF6ckOEEPSbifYNTSgRW5BsyfaD7gSE/uge00r2Xqa0d/yhF1MyHnMPHqLUdQRNimR2A== dependencies: spdx-correct "~1.0.0" spdx-expression-parse "~1.0.0" -verror@1.10.0, verror@^1.9.0: +verror@^1.9.0, verror@1.10.0: version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" + resolved "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz" + integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw== dependencies: assert-plus "^1.0.0" core-util-is "1.0.2" @@ -1162,25 +1473,30 @@ verror@1.10.0, verror@^1.9.0: which@^1.2.9: version "1.3.0" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" + resolved "https://registry.npmjs.org/which/-/which-1.3.0.tgz" + integrity sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg== dependencies: isexe "^2.0.0" wrappy@1: version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== xmlcreate@^1.0.1: version "1.0.2" - resolved "https://registry.yarnpkg.com/xmlcreate/-/xmlcreate-1.0.2.tgz#fa6bf762a60a413fb3dd8f4b03c5b269238d308f" + resolved "https://registry.npmjs.org/xmlcreate/-/xmlcreate-1.0.2.tgz" + integrity sha512-Mbe56Dvj00onbnSo9J0qj/XlY5bfN9KidsOnpd5tRCsR3ekB3hyyNU9fGrTdqNT5ZNvv4BsA2TcQlignsZyVcw== yallist@^2.1.2: version "2.1.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" + resolved "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz" + integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A== yamljs@^0.3.0: version "0.3.0" - resolved "https://registry.yarnpkg.com/yamljs/-/yamljs-0.3.0.tgz#dc060bf267447b39f7304e9b2bfbe8b5a7ddb03b" + resolved "https://registry.npmjs.org/yamljs/-/yamljs-0.3.0.tgz" + integrity sha512-C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ== dependencies: argparse "^1.0.7" glob "^7.0.5" diff --git a/dox-sequence-diagram-ui/package.json b/dox-sequence-diagram-ui/package.json index 0b803969cb..614d821d02 100644 --- a/dox-sequence-diagram-ui/package.json +++ b/dox-sequence-diagram-ui/package.json @@ -40,7 +40,7 @@ "eslint-plugin-prettier": "^2.6.0", "eslint-plugin-react": "^7.7.0", "file-loader": "^1.1.11", - "node-sass": "^4.7.2", + "node-sass": "^9.0.0", "path": "^0.12.7", "prettier": "1.10.2", "raw-loader": "^0.5.1", 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..01240cf858 100644 --- a/integration-tests/integration-tests-init/Dockerfile +++ b/integration-tests/integration-tests-init/Dockerfile @@ -19,12 +19,12 @@ 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 \ - 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 \ + 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 \ + faraday:2.8.1 minitar:0.12.1 \ io-console:0.4.6 \ webrick \ json \ @@ -49,8 +49,7 @@ 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 init-script /home/onap/init-script/ COPY --chown=onap:onap startup.sh /home/onap/ RUN chmod 770 /home/onap/startup.sh diff --git a/integration-tests/integration-tests-init/chef-repo/cookbooks/sdc-integration-tests-setup/attributes/default.rb b/integration-tests/integration-tests-init/chef-repo/cookbooks/sdc-integration-tests-setup/attributes/default.rb deleted file mode 100644 index 682885312e..0000000000 --- a/integration-tests/integration-tests-init/chef-repo/cookbooks/sdc-integration-tests-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/integration-tests/integration-tests-init/chef-repo/cookbooks/sdc-integration-tests-setup/recipes/1_check_Backend.rb b/integration-tests/integration-tests-init/chef-repo/cookbooks/sdc-integration-tests-setup/recipes/1_check_Backend.rb deleted file mode 100644 index 2e479e0848..0000000000 --- a/integration-tests/integration-tests-init/chef-repo/cookbooks/sdc-integration-tests-setup/recipes/1_check_Backend.rb +++ /dev/null @@ -1,27 +0,0 @@ -require 'base64' -if node['disableHttp'] - protocol = "https" - https_flag = "--https" - be_port = node['BE']['https_port'] -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}" - action :run -end
\ No newline at end of file diff --git a/integration-tests/integration-tests-init/chef-repo/cookbooks/sdc-integration-tests-setup/recipes/2_import_Normatives.rb b/integration-tests/integration-tests-init/chef-repo/cookbooks/sdc-integration-tests-setup/recipes/2_import_Normatives.rb deleted file mode 100644 index be32e98f2b..0000000000 --- a/integration-tests/integration-tests-init/chef-repo/cookbooks/sdc-integration-tests-setup/recipes/2_import_Normatives.rb +++ /dev/null @@ -1,33 +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" -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} > #{ENV['ONAP_LOG']}/init.log" - cwd "/var/tmp/" - action :run -end diff --git a/integration-tests/integration-tests-init/chef-solo/LICENSE b/integration-tests/integration-tests-init/chef-solo/LICENSE deleted file mode 100644 index 11069edd79..0000000000 --- a/integration-tests/integration-tests-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/integration-tests/integration-tests-init/chef-solo/README.md b/integration-tests/integration-tests-init/chef-solo/README.md deleted file mode 100644 index ddb0fda830..0000000000 --- a/integration-tests/integration-tests-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/integration-tests/integration-tests-init/chef-solo/chefignore b/integration-tests/integration-tests-init/chef-solo/chefignore deleted file mode 100644 index ba30af6cff..0000000000 --- a/integration-tests/integration-tests-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/integration-tests/integration-tests-init/chef-solo/cookbooks/README.md b/integration-tests/integration-tests-init/chef-solo/cookbooks/README.md deleted file mode 100644 index 86ea46bfbb..0000000000 --- a/integration-tests/integration-tests-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/integration-tests/integration-tests-init/chef-solo/data_bags/README.md b/integration-tests/integration-tests-init/chef-solo/data_bags/README.md deleted file mode 100644 index 0c15a391fa..0000000000 --- a/integration-tests/integration-tests-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/integration-tests/integration-tests-init/chef-solo/environments/README.md b/integration-tests/integration-tests-init/chef-solo/environments/README.md deleted file mode 100644 index 50ac48db2b..0000000000 --- a/integration-tests/integration-tests-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/integration-tests/integration-tests-init/chef-solo/importNormatives.json b/integration-tests/integration-tests-init/chef-solo/importNormatives.json deleted file mode 100644 index f5c9276e2e..0000000000 --- a/integration-tests/integration-tests-init/chef-solo/importNormatives.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "run_list": [ "recipe[sdc-normatives::import_Normatives]" ] -} - diff --git a/integration-tests/integration-tests-init/chef-solo/importNormatives.rb b/integration-tests/integration-tests-init/chef-solo/importNormatives.rb deleted file mode 100644 index 2693926c4b..0000000000 --- a/integration-tests/integration-tests-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/integration-tests/integration-tests-init/chef-solo/roles/README.md b/integration-tests/integration-tests-init/chef-solo/roles/README.md deleted file mode 100644 index b0ee0b4d21..0000000000 --- a/integration-tests/integration-tests-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/integration-tests/integration-tests-init/chef-solo/roles/integration-tests-setup.json b/integration-tests/integration-tests-init/chef-solo/roles/integration-tests-setup.json deleted file mode 100644 index e0ca93727b..0000000000 --- a/integration-tests/integration-tests-init/chef-solo/roles/integration-tests-setup.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "integration-tests", - "description": "Installation application - integrationTest", - "json_class": "Chef::Role", - "default_attributes": { - - }, - "override_attributes": { - - }, - "chef_type": "role", - "run_list": [ - "recipe[sdc-integration-tests-setup::1_check_Backend]", - "recipe[sdc-integration-tests-setup::2_import_Normatives]" - - ], - "env_run_lists": { - } -} - diff --git a/integration-tests/integration-tests-init/chef-solo/solo.json b/integration-tests/integration-tests-init/chef-solo/solo.json deleted file mode 100644 index 537de6637c..0000000000 --- a/integration-tests/integration-tests-init/chef-solo/solo.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "run_list": [ "role[integration-tests-setup]" ] -} - diff --git a/integration-tests/integration-tests-init/chef-solo/solo.rb b/integration-tests/integration-tests-init/chef-solo/solo.rb deleted file mode 100644 index 06c1af4592..0000000000 --- a/integration-tests/integration-tests-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/integration-tests/integration-tests-init/init-script/check_backend.sh b/integration-tests/integration-tests-init/init-script/check_backend.sh new file mode 100644 index 0000000000..fba37fb705 --- /dev/null +++ b/integration-tests/integration-tests-init/init-script/check_backend.sh @@ -0,0 +1,43 @@ +#!/bin/sh + +# Set environment variables +DISABLE_HTTP="false" +BE_HTTP_PORT="8080" +BE_HTTPS_PORT="8443" +BE_IP="sdc-BE" +BASIC_AUTH_ENABLED="true" +BASIC_AUTH_USER="testName" +BASIC_AUTH_PASS="testPass" + +# 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 for basic authentication +if [ -n "$BASIC_AUTH_USER" ] && [ -n "$BASIC_AUTH_PASS" ]; then + # Base64 encode the "username:password" + basic_auth_config="--header $(echo -n "$BASIC_AUTH_USER:$BASIC_AUTH_PASS" | base64)" +fi + +# Execute the check backend health command +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 + +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/integration-tests-init/init-script/import_normatives.sh b/integration-tests/integration-tests-init/init-script/import_normatives.sh new file mode 100644 index 0000000000..8bdb6d7d68 --- /dev/null +++ b/integration-tests/integration-tests-init/init-script/import_normatives.sh @@ -0,0 +1,58 @@ +#!/bin/sh + +# Set environment variables +DISABLE_HTTP="false" +BE_HTTP_PORT="8080" +BE_HTTPS_PORT="8443" +BE_IP="sdc-BE" +BASIC_AUTH_ENABLED="true" +BASIC_AUTH_USER="testName" +BASIC_AUTH_PASS="testPass" + +# 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" +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 + +# Copy normatives.tar.gz to /var/tmp and extract it +echo "Extracting normatives.tar.gz..." +cp /home/onap/normatives.tar.gz /var/tmp/ +cd /var/tmp/ || exit 1 +tar -xvf normatives.tar.gz + +# Run sdcinit with the constructed parameters +start_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$start_time] Starting sdcinit..." + +cd /var/tmp/normatives/import/tosca || exit 1 +sdcinit $param $basic_auth_config > "/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/integration-tests/integration-tests-init/startup.sh b/integration-tests/integration-tests-init/startup.sh index e216341882..60dda604fc 100644 --- a/integration-tests/integration-tests-init/startup.sh +++ b/integration-tests/integration-tests-init/startup.sh @@ -1,4 +1,5 @@ #!/bin/sh -cd /home/"${user}"/chef-solo || exit $? -chef-solo -c solo.rb -E "${ENVNAME}"
\ No newline at end of file +cd /home/onap/init-script +sh -x /home/onap/check_backend.sh +sh -x /home/onap/import_normatives.sh 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..7f7dc26499 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.14.1-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> @@ -485,7 +620,7 @@ limitations under the License. </goals> <configuration> <outputDirectory> - integration-tests-init/chef-repo/cookbooks/sdc-integration-tests-setup/files/default + integration-tests-init </outputDirectory> <resources> <resource> @@ -534,10 +669,10 @@ limitations under the License. <resources> <resource> <directory> - ${project.parent.basedir}/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ + ${project.parent.basedir}/integration-tests/catalog-be/ </directory> <includes> - <include>BE-configuration.yaml.erb</include> + <include>configuration.yaml</include> </includes> </resource> </resources> @@ -545,6 +680,10 @@ limitations under the License. </execution> </executions> </plugin> + + + + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>wagon-maven-plugin</artifactId> @@ -673,7 +812,7 @@ limitations under the License. <filesets> <fileset> <directory> - integration-tests-init/chef-repo/cookbooks/sdc-integration-tests-setup/files/default + integration-tests-init </directory> <followSymlinks>false</followSymlinks> <includes> @@ -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,16 +1134,14 @@ 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 </volume> - </bind> </volumes> <wait> - <time>360000</time> + <time>60000</time> <tcp> <host>sdc-FE</host> <mode>direct</mode> @@ -1049,7 +1211,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> @@ -1139,16 +1301,9 @@ limitations under the License. <ENVNAME>${it.env.name}</ENVNAME> </env> <hostname>integration-tests-init</hostname> - <volumes> - <bind> - <volume> - ${it.chef.config}:/home/onap/chef-solo/environments - </volume> - </bind> - </volumes> <wait> <time>660000</time> - <log>Chef Client finished</log> + <log>Done</log> </wait> <network> <mode>custom</mode> @@ -1157,6 +1312,7 @@ limitations under the License. </network> </run> </image> + </images> </configuration> <executions> diff --git a/onboarding/pom.xml b/onboarding/pom.xml index 3d41b0bd23..6fabeb255b 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.14.1-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/README.md b/openecomp-be/README.md new file mode 100644 index 0000000000..65ab142e9b --- /dev/null +++ b/openecomp-be/README.md @@ -0,0 +1,3 @@ +# sdc-onboarding-be + +This maven module is named `openecomp-be` but it's deployed service is called [sdc-onboarding-be](https://git.onap.org/oom/tree/kubernetes/sdc/components/sdc-onboarding-be). 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..9cc04319e9 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.14.1-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..94d3bc2ce5 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.14.1-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..30b8dab0a8 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.14.1-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..341c11e4bd 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.14.1-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..58c5c0d54a 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.14.1-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..e8270b6bdd 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.14.1-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..e8317034e0 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.14.1-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..16bcddb5f4 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.14.1-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..4e1d4464e5 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.14.1-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..924a6d9caa 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.14.1-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..8c768a3aba 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.14.1-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..a4e4c3db61 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.14.1-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..9304b16eef 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.14.1-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..84a7abc3a5 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.14.1-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..5469eb0242 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.14.1-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..66c5c82d35 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.14.1-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..199d159de9 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.14.1-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..877c271663 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.14.1-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..7a02d86d63 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.14.1-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..be6db0d5ea 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.14.1-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..a2bf61675b 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.14.1-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..d308a3877c 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.14.1-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..c6c7eaff30 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.14.1-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..348bc76bf7 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.14.1-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..62679f2516 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.14.1-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..fb911e2ba6 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.14.1-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..6f7ffeb16d 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.14.1-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..15080e5230 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.14.1-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..9b318c45fd 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.14.1-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..436d943deb 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.14.1-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..8731a3591c 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.14.1-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..498bd8a127 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.14.1-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..bd829fdad4 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.14.1-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..018edb8439 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.14.1-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..e770782b10 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.14.1-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..2893aa74a9 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.14.1-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..75a835427a 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.14.1-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..01e4151166 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.14.1-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..cbc5b1984f 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.14.1-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..470f2e3590 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.14.1-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..22932f853d 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.14.1-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..950a0c84ea 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.14.1-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..59a5d2a9fa 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.14.1-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..57f57cf1b8 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.14.1-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/api/pom.xml b/openecomp-be/api/pom.xml index 2122f1372c..369cb7d9a7 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.14.1-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..9defbe828e 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.14.1-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..e21a51cc4d 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.14.1-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..1ea511f064 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.14.1-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..fd2d4d2c03 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.14.1-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..32a3fd18fc 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.14.1-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..0e7d1f1b78 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.14.1-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..21920950dc 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.14.1-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..92d7972264 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.14.1-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..e018a0719c 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.14.1-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..902a1f6c06 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.14.1-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/backend/pom.xml b/openecomp-be/backend/pom.xml index 604d7e2353..1615c4cfed 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.14.1-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/dist/pom.xml b/openecomp-be/dist/pom.xml index f5db41e0ce..18f30bd1eb 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.14.1-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..eed10f45b1 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.14.1-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..20e548d6b6 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.14.1-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..bbf51b831c 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.14.1-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..3a7699b6ea 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.14.1-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..e899cef19f 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.14.1-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..a51ef9f621 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.14.1-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..b954127929 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.14.1-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..9534b1e68f 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.14.1-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..57b08e6681 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.14.1-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..a2b685ab9a 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.14.1-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..e92dcee765 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.14.1-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..bc034fdc70 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.14.1-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..16e93a42d9 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.14.1-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..b4c5409fce 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.14.1-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..af54b6f3ca 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.14.1-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..2a0b98dfe5 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.14.1-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..b5090eeeca 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.14.1-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..7f11065c6e 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.14.1-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..d51efecd23 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.14.1-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..bcb47da779 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.14.1-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..be8f52f112 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.14.1-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..e27049a540 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.14.1-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..ff5be17e99 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.14.1-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..11c3989c51 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.14.1-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..03d2d55f74 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.14.1-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..99abeb36eb 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.14.1-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..aff253a8ca 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.14.1-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..72aa160c95 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.14.1-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..29913fcb74 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.14.1-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..98386991c9 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.14.1-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..363598a797 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.14.1-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..293e42b902 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.14.1-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..1601ee7ab5 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.14.1-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..58086ff1da 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.14.1-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..0c266e335d 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.14.1-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..8c89d2bac3 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.14.1-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..5a01be0711 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.14.1-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..c13a8f83fa 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.14.1-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..57322c77d2 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.14.1-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..fcbf684c78 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.14.1-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..9e53759d3c 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.14.1-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..1cb3d3cfd8 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.14.1-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..641017b634 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.14.1-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..abfb455033 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.14.1-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..59830e8e85 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.14.1-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..559c114082 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.14.1-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..7667fe851b 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.14.1-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..dde334ff13 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.14.1-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..4235ca1da2 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.14.1-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..5c72d02574 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.14.1-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..b01a86b16e 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.14.1-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..3b117f1e21 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.14.1-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..9a584819f7 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.14.1-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..5f75785694 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.14.1-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..5430e58f23 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.14.1-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..161042b57e 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.14.1-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..14e767e68e 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.14.1-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..1c7ed43ab1 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.14.1-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..052f2409b5 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.14.1-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..b5a20aa073 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.14.1-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..cbe420302a 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.14.1-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..fcd247ecae 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.14.1-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..9c81f54826 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.14.1-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..488d0e98d9 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.14.1-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..ddc2f0a45b 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.14.1-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..be5679578c 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.14.1-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..28e3c31093 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.14.1-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..79a3bc9ca1 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.14.1-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..6db4a6ee9d 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.14.1-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..df8335cee6 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.14.1-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..ad15970444 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.14.1-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..731bfa6cda 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.14.1-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..1aba2651da 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.14.1-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..a299b0709a 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.14.1-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..759040326e 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.14.1-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..4fa0b6cc99 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.14.1-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..78301908cc 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.14.1-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..7eec8f4b41 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.14.1-SNAPSHOT</version> </parent> <dependencies> diff --git a/openecomp-be/lib/pom.xml b/openecomp-be/lib/pom.xml index c3720b88f8..47b7137d34 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.14.1-SNAPSHOT</version> </parent> <modules> diff --git a/openecomp-be/pom.xml b/openecomp-be/pom.xml index c5acd3ef40..48c098bebf 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.14.1-SNAPSHOT</version> <relativePath>../onboarding/pom.xml</relativePath> </parent> diff --git a/openecomp-be/readMe.txt b/openecomp-be/readMe.txt deleted file mode 100644 index 3d5054c16e..0000000000 --- a/openecomp-be/readMe.txt +++ /dev/null @@ -1,42 +0,0 @@ -# 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. - -# Compiling Onboarding be war - -###SDC can be compiled easily with a `mvn clean install`. Integration tests are started with the following profile - `-P with-integration-tests` - -###Location of war : \sdc\openecomp-be\api\openecomp-sdc-rest-webapp\onboarding-rest-war\target\onboarding-be-1.0-SNAPSHOT.war - -# Starting SDC - -Steps : - -### Copy onboarding war on jetty server : onboarding-be.war - -###open rpm -###install jetty -###run installJettyBase.sh -###copy jvm.properties to base -###export variables -###run startJetty.sh - -# Accessing SDC - -You can access SDC at the following link : http://<hostname>:<portname>/sdc1/proxy-designer1#/onboardVendor - -# Logging - -SDC Onboarding supports EELF Logger, which is of the following types : - -### Error -### Debug -### Metrics -### Audit - diff --git a/openecomp-be/tools/swagger-ui/pom.xml b/openecomp-be/tools/swagger-ui/pom.xml index 0d6aaca650..28c29ba709 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.14.1-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..08f5d7ad60 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.14.1-SNAPSHOT</version> </parent> <properties> diff --git a/openecomp-ui/.babelrc b/openecomp-ui/.babelrc index 7949c034d8..7b8d637641 100644 --- a/openecomp-ui/.babelrc +++ b/openecomp-ui/.babelrc @@ -1,14 +1,29 @@ { - "presets": [["env", { - "targets": { - "browsers": ["last 2 versions", "Firefox >= 47"] - } - }], "react"], + "presets": [ + [ + "@babel/preset-env", + { + "targets": { + "browsers": [ + "last 2 versions", + "Firefox >= 47" + ] + } + } + ], + "@babel/preset-react" + ], "plugins": [ - "transform-object-rest-spread", - "transform-class-properties", - "transform-runtime", - "transform-decorators-legacy" + "@babel/plugin-proposal-object-rest-spread", + "@babel/plugin-proposal-class-properties", + "@babel/plugin-transform-runtime", + "@babel/plugin-transform-modules-commonjs", + [ + "@babel/plugin-proposal-decorators", + { + "legacy": true + } + ] ], "sourceMap": "inline" } diff --git a/openecomp-ui/package.json b/openecomp-ui/package.json index 9fb606c03e..e7b47cf15c 100644 --- a/openecomp-ui/package.json +++ b/openecomp-ui/package.json @@ -29,7 +29,7 @@ "intl-relativeformat": "^1.2.0", "lodash": "^4.13.1", "md5": "^2.1.0", - "onap-ui-react": "^1.0.0", + "onap-ui-react": "^1.0.2", "onap-ui-common": "^1.0.101", "prop-types": "^15.6.2", "react": "^16.4.2", @@ -52,16 +52,19 @@ "validator": "^4.3.0" }, "devDependencies": { - "babel-core": "^6.26.0", + "@babel/core": "^7.26.0", + "@babel/plugin-proposal-class-properties": "^7.18.6", + "@babel/plugin-proposal-decorators": "^7.25.9", + "@babel/plugin-proposal-object-rest-spread": "^7.20.7", + "@babel/plugin-transform-modules-commonjs": "^7.26.3", + "@babel/plugin-transform-runtime": "^7.25.9", + "@babel/preset-env": "^7.26.0", + "@babel/preset-react": "^7.26.3", + "@babel/runtime": "^7.26.0", + "@testing-library/react": "11", "babel-eslint": "^8.2.1", - "babel-jest": "^22.1.0", - "babel-loader": "7.1.4", - "babel-plugin-transform-class-properties": "^6.10.2", - "babel-plugin-transform-decorators-legacy": "^1.3.4", - "babel-plugin-transform-object-rest-spread": "^6.8.0", - "babel-plugin-transform-runtime": "^6.22.0", - "babel-preset-env": "^1.6.1", - "babel-preset-react": "^6.23.0", + "babel-jest": "^29.7.0", + "babel-loader": "^8.0.0", "clean-webpack-plugin": "^0.1.19", "css-loader": "^0.23.1", "deep-freeze": "0.0.1", @@ -80,13 +83,14 @@ "http-proxy-middleware": "^0.17.4", "ignore-loader": "^0.1.1", "jasmine-core": "^2.5.2", - "jest": "^21.2.1", + "jest": "^29.7.0", + "jest-environment-jsdom": "^29.7.0", "jshint": "^2.9.4", "json-loader": "^0.5.4", "jsx-loader": "^0.13.2", "mkdirp": "^0.5.1", "moment": "^2.18.1", - "node-sass": "^4.7.2", + "node-sass": "^9.0.0", "node-watch": "^0.3.5", "prettier": "1.10.2", "prompt": "^0.2.14", @@ -141,7 +145,8 @@ "setupTestFrameworkScriptFile": "<rootDir>/test-utils/test-setup.js", "testPathIgnorePatterns": [ "<rootDir>/node_modules/", - "<rootDir>/test/nfvo-components/storyshots.test.js" + "<rootDir>/test/nfvo-components/storyshots.test.js", + "<rootDir>/test/softwareProduct/validation/SoftwareProductValidationActionHelper.test.js" ], "collectCoverageFrom": [ "src/**/*.{js,jsx}" @@ -152,6 +157,17 @@ ], "coverageReporters": [ "lcov" + ], + "testEnvironment": "jest-environment-jsdom", + "transformIgnorePatterns": [ + "<rootDir>/node_modules/(?!cheerio|enzyme)/" + ], + "transform": { + "^.+\\.jsx?$": "babel-jest" + }, + "extensionsToTreatAsEsm": [ + ".jsx" + ] } } diff --git a/openecomp-ui/pom.xml b/openecomp-ui/pom.xml index e94a0d6abd..4387282fbe 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.14.1-SNAPSHOT</version> <relativePath>../onboarding</relativePath> </parent> @@ -102,7 +102,7 @@ <goal>install-node-and-yarn</goal> </goals> <configuration> - <nodeVersion>v14.17.1</nodeVersion> + <nodeVersion>v16.20.0</nodeVersion> <yarnVersion>v1.19.1</yarnVersion> </configuration> </execution> diff --git a/openecomp-ui/test-utils/MockRest.js b/openecomp-ui/test-utils/MockRest.js index 6cc676a2bb..0ec0d42e73 100644 --- a/openecomp-ui/test-utils/MockRest.js +++ b/openecomp-ui/test-utils/MockRest.js @@ -41,7 +41,7 @@ export default { fetch(baseUrl, options) { const {fetch} = queue; if(!fetch.length) { - throw new Error(`Fetch operation was called without proper handler. baseUrl: '${baseUrl}' options: '${options}'`); + throw new Error(`Fetch operation was called without proper handler. baseUrl: ${baseUrl} options: ${options}`); } return handleOperation(fetch.shift(), {options, baseUrl}); }, diff --git a/openecomp-ui/test/activity-log/ActivityLog.test.js b/openecomp-ui/test/activity-log/ActivityLog.test.js index a397197773..998abb2f95 100644 --- a/openecomp-ui/test/activity-log/ActivityLog.test.js +++ b/openecomp-ui/test/activity-log/ActivityLog.test.js @@ -30,12 +30,16 @@ import VersionFactory from 'test-utils/factories/common/VersionFactory.js'; import { UserFactory } from 'test-utils/factories/users/UsersFactories.js'; import { actionTypes as userActionTypes } from 'sdc-app/onboarding/users/UsersConstants.js'; +import Adapter from 'enzyme-adapter-react-16'; +import Enzyme from 'enzyme'; describe('Activity Log Module Tests', function() { const LICENSE_MODEL_ID = '555'; const version = VersionFactory.build(); const usersList = UserFactory.buildList(3); + Enzyme.configure({ adapter: new Adapter() }) + it('mapStateToProps mapper exists', () => { expect(mapStateToProps).toBeTruthy(); }); diff --git a/openecomp-ui/test/features/featureToggle.test.js b/openecomp-ui/test/features/featureToggle.test.js index 707180bc9b..1aaf840091 100644 --- a/openecomp-ui/test/features/featureToggle.test.js +++ b/openecomp-ui/test/features/featureToggle.test.js @@ -19,8 +19,13 @@ import {mount} from 'enzyme'; import deepFreeze from 'deep-freeze'; import FeatureFactory from 'test-utils/factories/features/FeaturesFactory.js'; import {FeatureComponent} from 'sdc-app/features/featureToggle.js'; +import Adapter from 'enzyme-adapter-react-16'; +import Enzyme from 'enzyme'; describe('feature toggle decorator test', () => { + + Enzyme.configure({ adapter: new Adapter() }) + it('feature on toggle test', () => { const featuresList = [FeatureFactory.build({name: 'TEST', active: true})]; deepFreeze(featuresList); diff --git a/openecomp-ui/test/nfvo-components/input/validation/input.test.js b/openecomp-ui/test/nfvo-components/input/validation/input.test.js index 841f64ac3f..8b4b0fa1d7 100644 --- a/openecomp-ui/test/nfvo-components/input/validation/input.test.js +++ b/openecomp-ui/test/nfvo-components/input/validation/input.test.js @@ -20,8 +20,13 @@ import {scryRenderedDOMComponentsWithTestId} from 'test-utils/Util.js'; import Input from 'nfvo-components/input/validation/Input.jsx'; import Overlay from 'react-bootstrap/lib/Overlay.js'; import {shallow} from 'enzyme'; +import Adapter from 'enzyme-adapter-react-16'; +import Enzyme from 'enzyme'; describe('Input', function () { + + Enzyme.configure({ adapter: new Adapter() }) + it('should render with type text', () => { let renderedOutput = TestUtils.renderIntoDocument(<Input type='text' data-test-id='mytest' />); const elem = scryRenderedDOMComponentsWithTestId(renderedOutput,'mytest'); diff --git a/openecomp-ui/test/nfvo-components/listEditor/listEditor.test.js b/openecomp-ui/test/nfvo-components/listEditor/listEditor.test.js index 269e5681c4..6e65740c2b 100644 --- a/openecomp-ui/test/nfvo-components/listEditor/listEditor.test.js +++ b/openecomp-ui/test/nfvo-components/listEditor/listEditor.test.js @@ -16,12 +16,15 @@ import React from 'react'; import {mount} from 'enzyme'; +import Adapter from 'enzyme-adapter-react-16'; +import Enzyme from 'enzyme'; import TestUtils from 'react-dom/test-utils'; import ListEditorView from 'src/nfvo-components/listEditor/ListEditorView.jsx'; import ListEditorItemView from 'src/nfvo-components/listEditor/ListEditorItemView.jsx'; describe('listEditor Module Tests', function () { + Enzyme.configure({ adapter: new Adapter() }) it('list editor view should exist', () => { expect(ListEditorView).toBeTruthy(); diff --git a/openecomp-ui/test/onboard/filter/filter.test.js b/openecomp-ui/test/onboard/filter/filter.test.js index bf9ce63346..8d984d57b4 100644 --- a/openecomp-ui/test/onboard/filter/filter.test.js +++ b/openecomp-ui/test/onboard/filter/filter.test.js @@ -60,7 +60,7 @@ describe('Onboard Filter Tests', () => { type: actionTypes.FILTER_DATA_CHANGED, deltaData: {} }); - return timeoutPromise.then(function() { + timeoutPromise.then(function() { expect(store.getState()).toEqual(expectedStore); done(); }); @@ -107,7 +107,7 @@ describe('Onboard Filter Tests', () => { deltaData: { versionStatus: versionStatus.CERTIFIED } }); - return timeoutPromise.then(function() { + timeoutPromise.then(function() { expect(store.getState()).toEqual(expectedStoreWithFilteredLists); done(); }); @@ -136,7 +136,7 @@ describe('Onboard Filter Tests', () => { tabsMapping.CATALOG ); - return timeoutPromise.then(() => { + timeoutPromise.then(function() { expect(store.getState().onboard.filter.versionStatus).toEqual( versionStatus.CERTIFIED ); diff --git a/openecomp-ui/test/onboard/filter/filterView.test.js b/openecomp-ui/test/onboard/filter/filterView.test.js index 9e6e1ee4c2..f071befb9c 100644 --- a/openecomp-ui/test/onboard/filter/filterView.test.js +++ b/openecomp-ui/test/onboard/filter/filterView.test.js @@ -19,9 +19,12 @@ import { mount } from 'enzyme'; import { Provider } from 'react-redux'; import { storeCreator } from 'sdc-app/AppStore.js'; import Filter from 'sdc-app/onboarding//onboard/filter/Filter.jsx'; +import Adapter from 'enzyme-adapter-react-16'; +import Enzyme from 'enzyme'; describe('Filter component view Tests', () => { it('simple jsx test', () => { + Enzyme.configure({ adapter: new Adapter() }) const store = storeCreator(); const wrapper = mount( <Provider store={store}> diff --git a/openecomp-ui/test/softwareProduct/components/monitoring/test.js b/openecomp-ui/test/softwareProduct/components/monitoring/test.js index 50fda91871..f7f690851e 100644 --- a/openecomp-ui/test/softwareProduct/components/monitoring/test.js +++ b/openecomp-ui/test/softwareProduct/components/monitoring/test.js @@ -34,25 +34,24 @@ describe('Software Product Components Monitoring Module Tests', function () { }); - it('Fetch for existing files - no files', done => { - + it('Fetch for existing files - no files', (done) => { let emptyResult = VSPComponentsMonitoringRestFactory.build(); - - mockRest.addHandler('fetch', ({ baseUrl}) => { + + mockRest.addHandler('fetch', ({ baseUrl }) => { expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${softwareProductId}/versions/${version.id}/components/${componentId}/uploads`); return emptyResult; }); - - return SoftwareProductComponentsMonitoringActionHelper.fetchExistingFiles(store.dispatch, {softwareProductId, version, componentId}).then(() => { - var {softwareProduct: {softwareProductComponents: {monitoring}}} = store.getState(); + + // Return the promise so Jest knows to wait for it + SoftwareProductComponentsMonitoringActionHelper.fetchExistingFiles(store.dispatch, { softwareProductId, version, componentId }).then(() => { + var { softwareProduct: { softwareProductComponents: { monitoring } } } = store.getState(); expect(monitoring[trap]).toEqual(emptyResult[trap]); expect(monitoring[poll]).toEqual(emptyResult[poll]); expect(monitoring[ves]).toEqual(emptyResult[ves]); done(); }); - - }); + it('Fetch for existing files - only snmp trap file exists', done => { let response = VSPComponentsMonitoringRestFactory.build({}, {createTrap: true}); @@ -62,7 +61,7 @@ describe('Software Product Components Monitoring Module Tests', function () { return response; }); - return SoftwareProductComponentsMonitoringActionHelper.fetchExistingFiles(store.dispatch, {softwareProductId, version, componentId}).then(() => { + SoftwareProductComponentsMonitoringActionHelper.fetchExistingFiles(store.dispatch, {softwareProductId, version, componentId}).then(() => { var {softwareProduct: {softwareProductComponents: {monitoring}}} = store.getState(); expect(monitoring[poll]).toEqual(undefined); @@ -81,7 +80,7 @@ describe('Software Product Components Monitoring Module Tests', function () { return response; }); - return SoftwareProductComponentsMonitoringActionHelper.fetchExistingFiles(store.dispatch, {softwareProductId, version, componentId}).then(() => { + SoftwareProductComponentsMonitoringActionHelper.fetchExistingFiles(store.dispatch, {softwareProductId, version, componentId}).then(() => { var {softwareProduct: {softwareProductComponents: {monitoring}}} = store.getState(); expect(monitoring[trap]).toEqual(response[trap]); @@ -101,7 +100,7 @@ describe('Software Product Components Monitoring Module Tests', function () { let file = new Blob([JSON.stringify(debug, null, 2)], {type: 'application/json'});; let formData = new FormData(); formData.append('upload', file); - return SoftwareProductComponentsMonitoringActionHelper.uploadFile(store.dispatch, { + SoftwareProductComponentsMonitoringActionHelper.uploadFile(store.dispatch, { softwareProductId, version, componentId, @@ -125,7 +124,7 @@ describe('Software Product Components Monitoring Module Tests', function () { }); - return SoftwareProductComponentsMonitoringActionHelper.deleteFile(store.dispatch, { + SoftwareProductComponentsMonitoringActionHelper.deleteFile(store.dispatch, { softwareProductId, version, componentId, diff --git a/openecomp-ui/test/softwareProduct/dependencies/SoftwareProductDependencies.test.js b/openecomp-ui/test/softwareProduct/dependencies/SoftwareProductDependencies.test.js index 15b2960191..38c84f0b45 100644 --- a/openecomp-ui/test/softwareProduct/dependencies/SoftwareProductDependencies.test.js +++ b/openecomp-ui/test/softwareProduct/dependencies/SoftwareProductDependencies.test.js @@ -15,7 +15,7 @@ */ import React from 'react'; -import {mount} from 'enzyme'; +// import {mount} from 'enzyme'; import {mapStateToProps} from 'sdc-app/onboarding/softwareProduct/dependencies/SoftwareProductDependencies.js'; import { SoftwareProductDependenciesResponseFactory, diff --git a/openecomp-ui/test/softwareProduct/validation/SoftwareProductValidationActionHelper.test.js b/openecomp-ui/test/softwareProduct/validation/SoftwareProductValidationActionHelper.test.js index 3be1d68bbc..bb8bb3f638 100644 --- a/openecomp-ui/test/softwareProduct/validation/SoftwareProductValidationActionHelper.test.js +++ b/openecomp-ui/test/softwareProduct/validation/SoftwareProductValidationActionHelper.test.js @@ -78,13 +78,13 @@ describe('Software Product Validation Action Helper Tests', function() { 'softwareProduct.softwareProductValidation.vspChecks', vspChecksList ); - mockRest.addHandler('fetch', ({ baseUrl }) => { + mockRest.addHandler('fetch', ({ options, data, baseUrl }) => { expect(baseUrl).toEqual( `${restPrefix}/v1.0/externaltesting/testcasetree` ); return vspChecksList; }); - return SoftwareProductValidationActionHelper.fetchVspChecks( + SoftwareProductValidationActionHelper.fetchVspChecks( store.dispatch ) .then(() => { diff --git a/openecomp-ui/test/versionsPage/VersionsPage.test.js b/openecomp-ui/test/versionsPage/VersionsPage.test.js index fd7659e70e..d785c992e9 100644 --- a/openecomp-ui/test/versionsPage/VersionsPage.test.js +++ b/openecomp-ui/test/versionsPage/VersionsPage.test.js @@ -16,7 +16,7 @@ import React from 'react'; import ShallowRenderer from 'react-test-renderer/shallow'; -import {mount} from 'enzyme'; +// import {mount} from 'enzyme'; import {Provider} from 'react-redux'; import deepFreeze from 'deep-freeze'; import mockRest from 'test-utils/MockRest.js'; diff --git a/openecomp-ui/webpack.config.js b/openecomp-ui/webpack.config.js index a007714a2e..225ebcc02a 100644 --- a/openecomp-ui/webpack.config.js +++ b/openecomp-ui/webpack.config.js @@ -59,7 +59,15 @@ module.exports = (env, argv) => { { test: /\.(js|jsx)$/, include: path.resolve(__dirname, 'src'), - use: [{ loader: 'babel-loader' }] + use: [ + { + loader: 'babel-loader', + options: { + presets: ['@babel/preset-env'], // Add any additional presets like @babel/preset-react if necessary + cacheDirectory: true + } + } + ] }, { test: /\.(js|jsx)$/, @@ -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.14.1-SNAPSHOT</version> <packaging>pom</packaging> <name>sdc</name> @@ -45,7 +45,7 @@ Modifications copyright (c) 2018-2019 Nokia <!-- 3rd parties versions --> <lang3.version>3.12.0</lang3.version> <guava.version>32.1.1-jre</guava.version> - <janusgraph.version>0.3.3</janusgraph.version> + <janusgraph.version>0.5.0</janusgraph.version> <spring.version>5.3.27</spring.version> <mvn.assembly.version>3.6.0</mvn.assembly.version> @@ -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> @@ -818,12 +848,12 @@ Modifications copyright (c) 2018-2019 Nokia <profile> <id>fast-build-no-ui</id> <properties> - <maven.test.skip>true</maven.test.skip> - <skipYamlJsonValidator>true</skipYamlJsonValidator> + <!-- <maven.test.skip>true</maven.test.skip> + <skipYamlJsonValidator>true</skipYamlJsonValidator> --> <checkstyle.skip>true</checkstyle.skip> - <jacoco.skip>true</jacoco.skip> + <!-- <jacoco.skip>true</jacoco.skip> <maven.antrun.skip>true</maven.antrun.skip> - <swagger.skip>true</swagger.skip> + <swagger.skip>true</swagger.skip> --> </properties> <modules> <module>openecomp-be</module> 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/releases/1.14.0-container.yaml b/releases/1.14.0-container.yaml new file mode 100644 index 0000000000..1a696c75dc --- /dev/null +++ b/releases/1.14.0-container.yaml @@ -0,0 +1,22 @@ +distribution_type: 'container' +container_release_tag: '1.14.0' +project: 'sdc' +log_dir: 'sdc-maven-docker-stage-master/1441/' +ref: df357f729c3109055a80126bc011618beec83126 +containers: + - name: 'sdc-backend' + version: '1.14-20250210T105410Z' + - name: 'sdc-backend-init' + version: '1.14-20250210T105410Z' + - name: 'sdc-backend-all-plugins' + version: '1.14-20250210T105410Z' + - name: 'sdc-cassandra' + version: '1.14-20250210T105410Z' + - name: 'sdc-cassandra-init' + version: '1.14-20250210T105410Z' + - name: 'sdc-frontend' + version: '1.14-20250210T105410Z' + - name: 'sdc-onboard-backend' + version: '1.14-20250210T105410Z' + - name: 'sdc-onboard-cassandra-init' + version: '1.14-20250210T105410Z' diff --git a/releases/1.14.1-container.yaml b/releases/1.14.1-container.yaml new file mode 100644 index 0000000000..6de8bd3129 --- /dev/null +++ b/releases/1.14.1-container.yaml @@ -0,0 +1,22 @@ +distribution_type: 'container' +container_release_tag: '1.14.1' +project: 'sdc' +log_dir: 'sdc-maven-docker-stage-master/1443/' +ref: c8d9b63d72ec6ce72d587eb0ac20ae4709a0222d +containers: + - name: 'sdc-backend' + version: '1.14-20250226T042926Z' + - name: 'sdc-backend-init' + version: '1.14-20250226T042926Z' + - name: 'sdc-backend-all-plugins' + version: '1.14-20250226T042926Z' + - name: 'sdc-cassandra' + version: '1.14-20250226T042926Z' + - name: 'sdc-cassandra-init' + version: '1.14-20250226T042926Z' + - name: 'sdc-frontend' + version: '1.14-20250226T042926Z' + - name: 'sdc-onboard-backend' + version: '1.14-20250226T042926Z' + - name: 'sdc-onboard-cassandra-init' + version: '1.14-20250226T042926Z' diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml index 324c3ceaad..1522749703 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.14.1-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..3f98998379 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.14.1-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> diff --git a/version.properties b/version.properties index d19157a11f..dae27a27ef 100644 --- a/version.properties +++ b/version.properties @@ -1,13 +1,11 @@ + ########################################################### # Versioning variables # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support - major=1 -minor=13 -patch=8 - +minor=14 +patch=0 base_version=${major}.${minor}.${patch} - release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT |