diff options
231 files changed, 8282 insertions, 6446 deletions
diff --git a/.gitignore b/.gitignore index e38db8cb2b..639faecf3c 100644 --- a/.gitignore +++ b/.gitignore @@ -166,3 +166,7 @@ sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/testSuites/* /common/openecomp-common-configuration-management/openecomp-configuration-management-cli/dependency-reduced-pom.xml + +/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/tools/* + +/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb diff --git a/asdc-tests/pom.xml b/asdc-tests/pom.xml index 266ad36903..81a3bf6502 100644 --- a/asdc-tests/pom.xml +++ b/asdc-tests/pom.xml @@ -10,6 +10,10 @@ <artifactId>sdc-main</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> + + <properties> + <sonar.skip>true</sonar.skip> + </properties> <dependencies> diff --git a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactFileContentTest/images/mysql.png b/asdc-tests/src/test/resources/CI/tests/getResourceArtifactFileContentTest/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactFileContentTest/images/mysql.png +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactFileContentTest/mysql.yml b/asdc-tests/src/test/resources/CI/tests/getResourceArtifactFileContentTest/mysql.yml deleted file mode 100644 index f512f8071e..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactFileContentTest/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getResourceArtifactFileContentTest -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getResourceArtifactFileContentTest: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactFileContentTest/scripts/install_mysql.sh b/asdc-tests/src/test/resources/CI/tests/getResourceArtifactFileContentTest/scripts/install_mysql.sh deleted file mode 100644 index 400bcf40cb..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactFileContentTest/scripts/install_mysql.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -echo "Debian based MYSQL install 5..." -LOCK="/tmp/lockaptget" - -while true; do - if mkdir "${LOCK}" &>/dev/null; then - echo "MySQL take the lock" - break; - fi - echo "Waiting the end of one of our recipes..." - sleep 0.5 -done - -while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - echo "Waiting for other software managers to finish..." - sleep 0.5 -done -sudo rm -f /var/lib/dpkg/lock - -sudo apt-get update || (sleep 15; sudo apt-get update || exit ${1}) -sudo DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server-5.5 pwgen || exit ${1} -rm -rf "${LOCK}" - -sudo /etc/init.d/mysql stop -sudo rm -rf /var/lib/apt/lists/* -sudo rm -rf /var/lib/mysql/* -echo "MySQL Installation complete."
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactFileContentTest/scripts/start_mysql.sh b/asdc-tests/src/test/resources/CI/tests/getResourceArtifactFileContentTest/scripts/start_mysql.sh deleted file mode 100644 index 648bd45756..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactFileContentTest/scripts/start_mysql.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -echo "------------------------ ENV ------------------------" -echo "ENV VAR USED VOLUME_HOME : $VOLUME_HOME" -echo "ENV VAR USED PORT : $PORT" -echo "ENV VAR USED DB_NAME : $DB_NAME" -echo "ENV VAR USED DB_USER : $DB_USER" -echo "ENV VAR USED DB_PASSWORD : $DB_PASSWORD" -echo "---------------------------- ------------------------" - -CURRENT_PATH=`dirname "$0"` - -function StartMySQL { - echo "Starting MYSQL..." - sudo /etc/init.d/mysql stop - sudo /usr/bin/mysqld_safe > /dev/null 2>&1 & - RET=1 - while [[ RET -ne 0 ]]; do - echo "=> Waiting for confirmation of MySQL service startup" - sleep 5 - sudo mysql -uroot -e "status" > /dev/null 2>&1 - RET=$? - done -} - -function AllowFileSystemToMySQL { - MYSQL_DATA_DIR=$VOLUME_HOME/data - MYSQL_LOG=$VOLUME_HOME/logs - - echo "Setting data directory to $MYSQL_DATA_DIR an logs to $MYSQL_LOG ..." - if sudo test ! -d $MYSQL_DATA_DIR; then - echo "Creating DATA dir > $MYSQL_DATA_DIR ..." - sudo mkdir -p $MYSQL_DATA_DIR - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_DATA_DIR - fi - if sudo test ! -d $MYSQL_LOG; then - echo "Creating LOG dir > $MYSQL_LOG ..." - sudo mkdir -p $MYSQL_LOG - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_LOG - fi - - # edit app mysql permission in : /etc/apparmor.d/usr.sbin.mysqld - COUNT_LINE=`sudo cat /etc/apparmor.d/usr.sbin.mysqld | wc -l` - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/** rwk," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/** rwk," /etc/apparmor.d/usr.sbin.mysqld - - # reload app permission manager service - sudo service apparmor reload -} - -function UpdateMySQLConf { - echo "Updating MySQL conf files [DATA, LOGS]..." - sudo sed -i "s:/var/lib/mysql:$MYSQL_DATA_DIR:g" /etc/mysql/my.cnf - sudo sed -i "s:/var/log/mysql/error.log:$MYSQL_LOG/error.log:g" /etc/mysql/my.cnf - sudo sed -i "s:3306:$PORT:g" /etc/mysql/my.cnf - - if sudo test ! -f /usr/share/mysql/my-default.cnf; then - sudo cp /etc/mysql/my.cnf /usr/share/mysql/my-default.cnf - fi - if sudo test ! -f /etc/mysql/conf.d/mysqld_charset.cnf; then - sudo cp $configs/mysqld_charset.cnf /etc/mysql/conf.d/mysqld_charset.cnf - fi - - if [ "$BIND_ADRESS" == "true" ]; then - sudo sed -i "s/bind-address.*/bind-address = 0.0.0.0/" /etc/mysql/my.cnf - fi -} - -function InitMySQLDb { - # create database DB_NAME - if [ "$DB_NAME" ]; then - echo "INIT DATABASE $DB_NAME" - sudo mysql -u root -e "CREATE DATABASE $DB_NAME"; - fi - - # create user and give rights - if [ "$DB_USER" ]; then - echo "CREATE USER $DB_USER WITH PASSWORD $DB_PASSWORD AND GRAND RIGHTS ON $DB_NAME" - sudo mysql -uroot -e "CREATE USER '${DB_USER}'@'%' IDENTIFIED BY '$DB_PASSWORD'" - sudo mysql -uroot -e "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO '${DB_USER}'@'%' WITH GRANT OPTION" - sudo mysql -uroot -e "FLUSH PRIVILEGES" - fi -} - -# Create a new database path to the attched volume -if sudo test ! -d $VOLUME_HOME/data; then - echo "=> An empty or uninitialized MySQL volume is detected in $VOLUME_HOME/data" - AllowFileSystemToMySQL - UpdateMySQLConf - echo "=> Init new database path to $MYSQL_DATA_DIR" - sudo mysql_install_db --basedir=/usr --datadir=$MYSQL_DATA_DIR - echo "=> MySQL database initialized !" -else - echo "=> Using an existing volume of MySQL" - AllowFileSystemToMySQL - UpdateMySQLConf -fi - -# Finally start MySQL with new configuration -StartMySQL -InitMySQLDb
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactListNoContentTest/mysql.yml b/asdc-tests/src/test/resources/CI/tests/getResourceArtifactListNoContentTest/mysql.yml deleted file mode 100644 index 180e247ea2..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactListNoContentTest/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getResourceArtifactListNoContentTest -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getResourceArtifactListNoContentTest: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactListTest/images/mysql.png b/asdc-tests/src/test/resources/CI/tests/getResourceArtifactListTest/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactListTest/images/mysql.png +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactListTest/mysql.yml b/asdc-tests/src/test/resources/CI/tests/getResourceArtifactListTest/mysql.yml deleted file mode 100644 index b8f9bbdc69..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactListTest/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-GetResourceArtifactListTest -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-GetResourceArtifactListTest: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactListTest/scripts/install_mysql.sh b/asdc-tests/src/test/resources/CI/tests/getResourceArtifactListTest/scripts/install_mysql.sh deleted file mode 100644 index 400bcf40cb..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactListTest/scripts/install_mysql.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -echo "Debian based MYSQL install 5..." -LOCK="/tmp/lockaptget" - -while true; do - if mkdir "${LOCK}" &>/dev/null; then - echo "MySQL take the lock" - break; - fi - echo "Waiting the end of one of our recipes..." - sleep 0.5 -done - -while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - echo "Waiting for other software managers to finish..." - sleep 0.5 -done -sudo rm -f /var/lib/dpkg/lock - -sudo apt-get update || (sleep 15; sudo apt-get update || exit ${1}) -sudo DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server-5.5 pwgen || exit ${1} -rm -rf "${LOCK}" - -sudo /etc/init.d/mysql stop -sudo rm -rf /var/lib/apt/lists/* -sudo rm -rf /var/lib/mysql/* -echo "MySQL Installation complete."
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactListTest/scripts/start_mysql.sh b/asdc-tests/src/test/resources/CI/tests/getResourceArtifactListTest/scripts/start_mysql.sh deleted file mode 100644 index 648bd45756..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactListTest/scripts/start_mysql.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -echo "------------------------ ENV ------------------------" -echo "ENV VAR USED VOLUME_HOME : $VOLUME_HOME" -echo "ENV VAR USED PORT : $PORT" -echo "ENV VAR USED DB_NAME : $DB_NAME" -echo "ENV VAR USED DB_USER : $DB_USER" -echo "ENV VAR USED DB_PASSWORD : $DB_PASSWORD" -echo "---------------------------- ------------------------" - -CURRENT_PATH=`dirname "$0"` - -function StartMySQL { - echo "Starting MYSQL..." - sudo /etc/init.d/mysql stop - sudo /usr/bin/mysqld_safe > /dev/null 2>&1 & - RET=1 - while [[ RET -ne 0 ]]; do - echo "=> Waiting for confirmation of MySQL service startup" - sleep 5 - sudo mysql -uroot -e "status" > /dev/null 2>&1 - RET=$? - done -} - -function AllowFileSystemToMySQL { - MYSQL_DATA_DIR=$VOLUME_HOME/data - MYSQL_LOG=$VOLUME_HOME/logs - - echo "Setting data directory to $MYSQL_DATA_DIR an logs to $MYSQL_LOG ..." - if sudo test ! -d $MYSQL_DATA_DIR; then - echo "Creating DATA dir > $MYSQL_DATA_DIR ..." - sudo mkdir -p $MYSQL_DATA_DIR - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_DATA_DIR - fi - if sudo test ! -d $MYSQL_LOG; then - echo "Creating LOG dir > $MYSQL_LOG ..." - sudo mkdir -p $MYSQL_LOG - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_LOG - fi - - # edit app mysql permission in : /etc/apparmor.d/usr.sbin.mysqld - COUNT_LINE=`sudo cat /etc/apparmor.d/usr.sbin.mysqld | wc -l` - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/** rwk," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/** rwk," /etc/apparmor.d/usr.sbin.mysqld - - # reload app permission manager service - sudo service apparmor reload -} - -function UpdateMySQLConf { - echo "Updating MySQL conf files [DATA, LOGS]..." - sudo sed -i "s:/var/lib/mysql:$MYSQL_DATA_DIR:g" /etc/mysql/my.cnf - sudo sed -i "s:/var/log/mysql/error.log:$MYSQL_LOG/error.log:g" /etc/mysql/my.cnf - sudo sed -i "s:3306:$PORT:g" /etc/mysql/my.cnf - - if sudo test ! -f /usr/share/mysql/my-default.cnf; then - sudo cp /etc/mysql/my.cnf /usr/share/mysql/my-default.cnf - fi - if sudo test ! -f /etc/mysql/conf.d/mysqld_charset.cnf; then - sudo cp $configs/mysqld_charset.cnf /etc/mysql/conf.d/mysqld_charset.cnf - fi - - if [ "$BIND_ADRESS" == "true" ]; then - sudo sed -i "s/bind-address.*/bind-address = 0.0.0.0/" /etc/mysql/my.cnf - fi -} - -function InitMySQLDb { - # create database DB_NAME - if [ "$DB_NAME" ]; then - echo "INIT DATABASE $DB_NAME" - sudo mysql -u root -e "CREATE DATABASE $DB_NAME"; - fi - - # create user and give rights - if [ "$DB_USER" ]; then - echo "CREATE USER $DB_USER WITH PASSWORD $DB_PASSWORD AND GRAND RIGHTS ON $DB_NAME" - sudo mysql -uroot -e "CREATE USER '${DB_USER}'@'%' IDENTIFIED BY '$DB_PASSWORD'" - sudo mysql -uroot -e "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO '${DB_USER}'@'%' WITH GRANT OPTION" - sudo mysql -uroot -e "FLUSH PRIVILEGES" - fi -} - -# Create a new database path to the attched volume -if sudo test ! -d $VOLUME_HOME/data; then - echo "=> An empty or uninitialized MySQL volume is detected in $VOLUME_HOME/data" - AllowFileSystemToMySQL - UpdateMySQLConf - echo "=> Init new database path to $MYSQL_DATA_DIR" - sudo mysql_install_db --basedir=/usr --datadir=$MYSQL_DATA_DIR - echo "=> MySQL database initialized !" -else - echo "=> Using an existing volume of MySQL" - AllowFileSystemToMySQL - UpdateMySQLConf -fi - -# Finally start MySQL with new configuration -StartMySQL -InitMySQLDb
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactMetadataNoContentTest/mysql.yml b/asdc-tests/src/test/resources/CI/tests/getResourceArtifactMetadataNoContentTest/mysql.yml deleted file mode 100644 index 72ff4f37e0..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactMetadataNoContentTest/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getResourceArtifactMetadataNoContentTest -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getResourceArtifactMetadataNoContentTest: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactMetadataTest/images/mysql.png b/asdc-tests/src/test/resources/CI/tests/getResourceArtifactMetadataTest/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactMetadataTest/images/mysql.png +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactMetadataTest/mysql.yml b/asdc-tests/src/test/resources/CI/tests/getResourceArtifactMetadataTest/mysql.yml deleted file mode 100644 index 527e4a0081..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactMetadataTest/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getResourceArtifactMetadataTest -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getResourceArtifactMetadataTest: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactMetadataTest/scripts/install_mysql.sh b/asdc-tests/src/test/resources/CI/tests/getResourceArtifactMetadataTest/scripts/install_mysql.sh deleted file mode 100644 index 400bcf40cb..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactMetadataTest/scripts/install_mysql.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -echo "Debian based MYSQL install 5..." -LOCK="/tmp/lockaptget" - -while true; do - if mkdir "${LOCK}" &>/dev/null; then - echo "MySQL take the lock" - break; - fi - echo "Waiting the end of one of our recipes..." - sleep 0.5 -done - -while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - echo "Waiting for other software managers to finish..." - sleep 0.5 -done -sudo rm -f /var/lib/dpkg/lock - -sudo apt-get update || (sleep 15; sudo apt-get update || exit ${1}) -sudo DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server-5.5 pwgen || exit ${1} -rm -rf "${LOCK}" - -sudo /etc/init.d/mysql stop -sudo rm -rf /var/lib/apt/lists/* -sudo rm -rf /var/lib/mysql/* -echo "MySQL Installation complete."
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactMetadataTest/scripts/start_mysql.sh b/asdc-tests/src/test/resources/CI/tests/getResourceArtifactMetadataTest/scripts/start_mysql.sh deleted file mode 100644 index 648bd45756..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactMetadataTest/scripts/start_mysql.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -echo "------------------------ ENV ------------------------" -echo "ENV VAR USED VOLUME_HOME : $VOLUME_HOME" -echo "ENV VAR USED PORT : $PORT" -echo "ENV VAR USED DB_NAME : $DB_NAME" -echo "ENV VAR USED DB_USER : $DB_USER" -echo "ENV VAR USED DB_PASSWORD : $DB_PASSWORD" -echo "---------------------------- ------------------------" - -CURRENT_PATH=`dirname "$0"` - -function StartMySQL { - echo "Starting MYSQL..." - sudo /etc/init.d/mysql stop - sudo /usr/bin/mysqld_safe > /dev/null 2>&1 & - RET=1 - while [[ RET -ne 0 ]]; do - echo "=> Waiting for confirmation of MySQL service startup" - sleep 5 - sudo mysql -uroot -e "status" > /dev/null 2>&1 - RET=$? - done -} - -function AllowFileSystemToMySQL { - MYSQL_DATA_DIR=$VOLUME_HOME/data - MYSQL_LOG=$VOLUME_HOME/logs - - echo "Setting data directory to $MYSQL_DATA_DIR an logs to $MYSQL_LOG ..." - if sudo test ! -d $MYSQL_DATA_DIR; then - echo "Creating DATA dir > $MYSQL_DATA_DIR ..." - sudo mkdir -p $MYSQL_DATA_DIR - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_DATA_DIR - fi - if sudo test ! -d $MYSQL_LOG; then - echo "Creating LOG dir > $MYSQL_LOG ..." - sudo mkdir -p $MYSQL_LOG - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_LOG - fi - - # edit app mysql permission in : /etc/apparmor.d/usr.sbin.mysqld - COUNT_LINE=`sudo cat /etc/apparmor.d/usr.sbin.mysqld | wc -l` - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/** rwk," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/** rwk," /etc/apparmor.d/usr.sbin.mysqld - - # reload app permission manager service - sudo service apparmor reload -} - -function UpdateMySQLConf { - echo "Updating MySQL conf files [DATA, LOGS]..." - sudo sed -i "s:/var/lib/mysql:$MYSQL_DATA_DIR:g" /etc/mysql/my.cnf - sudo sed -i "s:/var/log/mysql/error.log:$MYSQL_LOG/error.log:g" /etc/mysql/my.cnf - sudo sed -i "s:3306:$PORT:g" /etc/mysql/my.cnf - - if sudo test ! -f /usr/share/mysql/my-default.cnf; then - sudo cp /etc/mysql/my.cnf /usr/share/mysql/my-default.cnf - fi - if sudo test ! -f /etc/mysql/conf.d/mysqld_charset.cnf; then - sudo cp $configs/mysqld_charset.cnf /etc/mysql/conf.d/mysqld_charset.cnf - fi - - if [ "$BIND_ADRESS" == "true" ]; then - sudo sed -i "s/bind-address.*/bind-address = 0.0.0.0/" /etc/mysql/my.cnf - fi -} - -function InitMySQLDb { - # create database DB_NAME - if [ "$DB_NAME" ]; then - echo "INIT DATABASE $DB_NAME" - sudo mysql -u root -e "CREATE DATABASE $DB_NAME"; - fi - - # create user and give rights - if [ "$DB_USER" ]; then - echo "CREATE USER $DB_USER WITH PASSWORD $DB_PASSWORD AND GRAND RIGHTS ON $DB_NAME" - sudo mysql -uroot -e "CREATE USER '${DB_USER}'@'%' IDENTIFIED BY '$DB_PASSWORD'" - sudo mysql -uroot -e "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO '${DB_USER}'@'%' WITH GRANT OPTION" - sudo mysql -uroot -e "FLUSH PRIVILEGES" - fi -} - -# Create a new database path to the attched volume -if sudo test ! -d $VOLUME_HOME/data; then - echo "=> An empty or uninitialized MySQL volume is detected in $VOLUME_HOME/data" - AllowFileSystemToMySQL - UpdateMySQLConf - echo "=> Init new database path to $MYSQL_DATA_DIR" - sudo mysql_install_db --basedir=/usr --datadir=$MYSQL_DATA_DIR - echo "=> MySQL database initialized !" -else - echo "=> Using an existing volume of MySQL" - AllowFileSystemToMySQL - UpdateMySQLConf -fi - -# Finally start MySQL with new configuration -StartMySQL -InitMySQLDb
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactPayloadNoContentTest/mysql.yml b/asdc-tests/src/test/resources/CI/tests/getResourceArtifactPayloadNoContentTest/mysql.yml deleted file mode 100644 index 7177a65387..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getResourceArtifactPayloadNoContentTest/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getResourceArtifactPayloadNoContentTest -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getResourceArtifactPayloadNoContentTest: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/images/mysql.png b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/images/mysql.png +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/mysql.yml b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/mysql.yml deleted file mode 100644 index e0a0c6458e..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getServiceArtifactListTest -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getServiceArtifactListTest: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase-getServiceArtifactListTest - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase-getServiceArtifactListTest: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript-getServiceArtifactListTest: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/scripts/install_mysql.sh b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/scripts/install_mysql.sh deleted file mode 100644 index 400bcf40cb..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/scripts/install_mysql.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -echo "Debian based MYSQL install 5..." -LOCK="/tmp/lockaptget" - -while true; do - if mkdir "${LOCK}" &>/dev/null; then - echo "MySQL take the lock" - break; - fi - echo "Waiting the end of one of our recipes..." - sleep 0.5 -done - -while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - echo "Waiting for other software managers to finish..." - sleep 0.5 -done -sudo rm -f /var/lib/dpkg/lock - -sudo apt-get update || (sleep 15; sudo apt-get update || exit ${1}) -sudo DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server-5.5 pwgen || exit ${1} -rm -rf "${LOCK}" - -sudo /etc/init.d/mysql stop -sudo rm -rf /var/lib/apt/lists/* -sudo rm -rf /var/lib/mysql/* -echo "MySQL Installation complete."
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/scripts/start_mysql.sh b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/scripts/start_mysql.sh deleted file mode 100644 index 648bd45756..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/scripts/start_mysql.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -echo "------------------------ ENV ------------------------" -echo "ENV VAR USED VOLUME_HOME : $VOLUME_HOME" -echo "ENV VAR USED PORT : $PORT" -echo "ENV VAR USED DB_NAME : $DB_NAME" -echo "ENV VAR USED DB_USER : $DB_USER" -echo "ENV VAR USED DB_PASSWORD : $DB_PASSWORD" -echo "---------------------------- ------------------------" - -CURRENT_PATH=`dirname "$0"` - -function StartMySQL { - echo "Starting MYSQL..." - sudo /etc/init.d/mysql stop - sudo /usr/bin/mysqld_safe > /dev/null 2>&1 & - RET=1 - while [[ RET -ne 0 ]]; do - echo "=> Waiting for confirmation of MySQL service startup" - sleep 5 - sudo mysql -uroot -e "status" > /dev/null 2>&1 - RET=$? - done -} - -function AllowFileSystemToMySQL { - MYSQL_DATA_DIR=$VOLUME_HOME/data - MYSQL_LOG=$VOLUME_HOME/logs - - echo "Setting data directory to $MYSQL_DATA_DIR an logs to $MYSQL_LOG ..." - if sudo test ! -d $MYSQL_DATA_DIR; then - echo "Creating DATA dir > $MYSQL_DATA_DIR ..." - sudo mkdir -p $MYSQL_DATA_DIR - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_DATA_DIR - fi - if sudo test ! -d $MYSQL_LOG; then - echo "Creating LOG dir > $MYSQL_LOG ..." - sudo mkdir -p $MYSQL_LOG - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_LOG - fi - - # edit app mysql permission in : /etc/apparmor.d/usr.sbin.mysqld - COUNT_LINE=`sudo cat /etc/apparmor.d/usr.sbin.mysqld | wc -l` - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/** rwk," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/** rwk," /etc/apparmor.d/usr.sbin.mysqld - - # reload app permission manager service - sudo service apparmor reload -} - -function UpdateMySQLConf { - echo "Updating MySQL conf files [DATA, LOGS]..." - sudo sed -i "s:/var/lib/mysql:$MYSQL_DATA_DIR:g" /etc/mysql/my.cnf - sudo sed -i "s:/var/log/mysql/error.log:$MYSQL_LOG/error.log:g" /etc/mysql/my.cnf - sudo sed -i "s:3306:$PORT:g" /etc/mysql/my.cnf - - if sudo test ! -f /usr/share/mysql/my-default.cnf; then - sudo cp /etc/mysql/my.cnf /usr/share/mysql/my-default.cnf - fi - if sudo test ! -f /etc/mysql/conf.d/mysqld_charset.cnf; then - sudo cp $configs/mysqld_charset.cnf /etc/mysql/conf.d/mysqld_charset.cnf - fi - - if [ "$BIND_ADRESS" == "true" ]; then - sudo sed -i "s/bind-address.*/bind-address = 0.0.0.0/" /etc/mysql/my.cnf - fi -} - -function InitMySQLDb { - # create database DB_NAME - if [ "$DB_NAME" ]; then - echo "INIT DATABASE $DB_NAME" - sudo mysql -u root -e "CREATE DATABASE $DB_NAME"; - fi - - # create user and give rights - if [ "$DB_USER" ]; then - echo "CREATE USER $DB_USER WITH PASSWORD $DB_PASSWORD AND GRAND RIGHTS ON $DB_NAME" - sudo mysql -uroot -e "CREATE USER '${DB_USER}'@'%' IDENTIFIED BY '$DB_PASSWORD'" - sudo mysql -uroot -e "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO '${DB_USER}'@'%' WITH GRANT OPTION" - sudo mysql -uroot -e "FLUSH PRIVILEGES" - fi -} - -# Create a new database path to the attched volume -if sudo test ! -d $VOLUME_HOME/data; then - echo "=> An empty or uninitialized MySQL volume is detected in $VOLUME_HOME/data" - AllowFileSystemToMySQL - UpdateMySQLConf - echo "=> Init new database path to $MYSQL_DATA_DIR" - sudo mysql_install_db --basedir=/usr --datadir=$MYSQL_DATA_DIR - echo "=> MySQL database initialized !" -else - echo "=> Using an existing volume of MySQL" - AllowFileSystemToMySQL - UpdateMySQLConf -fi - -# Finally start MySQL with new configuration -StartMySQL -InitMySQLDb
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/images/mysql.png b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/images/mysql.png +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/mysql.yml b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/mysql.yml deleted file mode 100644 index dc5ff158c8..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getServiceArtifactListTest2 -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getServiceArtifactListTest2: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase-getServiceArtifactListTest2 - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase-getServiceArtifactListTest2: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript-getServiceArtifactListTest2: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/scripts/install_mysql2.sh b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/scripts/install_mysql2.sh deleted file mode 100644 index 400bcf40cb..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/scripts/install_mysql2.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -echo "Debian based MYSQL install 5..." -LOCK="/tmp/lockaptget" - -while true; do - if mkdir "${LOCK}" &>/dev/null; then - echo "MySQL take the lock" - break; - fi - echo "Waiting the end of one of our recipes..." - sleep 0.5 -done - -while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - echo "Waiting for other software managers to finish..." - sleep 0.5 -done -sudo rm -f /var/lib/dpkg/lock - -sudo apt-get update || (sleep 15; sudo apt-get update || exit ${1}) -sudo DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server-5.5 pwgen || exit ${1} -rm -rf "${LOCK}" - -sudo /etc/init.d/mysql stop -sudo rm -rf /var/lib/apt/lists/* -sudo rm -rf /var/lib/mysql/* -echo "MySQL Installation complete."
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/scripts/start_mysql2.sh b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/scripts/start_mysql2.sh deleted file mode 100644 index 648bd45756..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/scripts/start_mysql2.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -echo "------------------------ ENV ------------------------" -echo "ENV VAR USED VOLUME_HOME : $VOLUME_HOME" -echo "ENV VAR USED PORT : $PORT" -echo "ENV VAR USED DB_NAME : $DB_NAME" -echo "ENV VAR USED DB_USER : $DB_USER" -echo "ENV VAR USED DB_PASSWORD : $DB_PASSWORD" -echo "---------------------------- ------------------------" - -CURRENT_PATH=`dirname "$0"` - -function StartMySQL { - echo "Starting MYSQL..." - sudo /etc/init.d/mysql stop - sudo /usr/bin/mysqld_safe > /dev/null 2>&1 & - RET=1 - while [[ RET -ne 0 ]]; do - echo "=> Waiting for confirmation of MySQL service startup" - sleep 5 - sudo mysql -uroot -e "status" > /dev/null 2>&1 - RET=$? - done -} - -function AllowFileSystemToMySQL { - MYSQL_DATA_DIR=$VOLUME_HOME/data - MYSQL_LOG=$VOLUME_HOME/logs - - echo "Setting data directory to $MYSQL_DATA_DIR an logs to $MYSQL_LOG ..." - if sudo test ! -d $MYSQL_DATA_DIR; then - echo "Creating DATA dir > $MYSQL_DATA_DIR ..." - sudo mkdir -p $MYSQL_DATA_DIR - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_DATA_DIR - fi - if sudo test ! -d $MYSQL_LOG; then - echo "Creating LOG dir > $MYSQL_LOG ..." - sudo mkdir -p $MYSQL_LOG - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_LOG - fi - - # edit app mysql permission in : /etc/apparmor.d/usr.sbin.mysqld - COUNT_LINE=`sudo cat /etc/apparmor.d/usr.sbin.mysqld | wc -l` - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/** rwk," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/** rwk," /etc/apparmor.d/usr.sbin.mysqld - - # reload app permission manager service - sudo service apparmor reload -} - -function UpdateMySQLConf { - echo "Updating MySQL conf files [DATA, LOGS]..." - sudo sed -i "s:/var/lib/mysql:$MYSQL_DATA_DIR:g" /etc/mysql/my.cnf - sudo sed -i "s:/var/log/mysql/error.log:$MYSQL_LOG/error.log:g" /etc/mysql/my.cnf - sudo sed -i "s:3306:$PORT:g" /etc/mysql/my.cnf - - if sudo test ! -f /usr/share/mysql/my-default.cnf; then - sudo cp /etc/mysql/my.cnf /usr/share/mysql/my-default.cnf - fi - if sudo test ! -f /etc/mysql/conf.d/mysqld_charset.cnf; then - sudo cp $configs/mysqld_charset.cnf /etc/mysql/conf.d/mysqld_charset.cnf - fi - - if [ "$BIND_ADRESS" == "true" ]; then - sudo sed -i "s/bind-address.*/bind-address = 0.0.0.0/" /etc/mysql/my.cnf - fi -} - -function InitMySQLDb { - # create database DB_NAME - if [ "$DB_NAME" ]; then - echo "INIT DATABASE $DB_NAME" - sudo mysql -u root -e "CREATE DATABASE $DB_NAME"; - fi - - # create user and give rights - if [ "$DB_USER" ]; then - echo "CREATE USER $DB_USER WITH PASSWORD $DB_PASSWORD AND GRAND RIGHTS ON $DB_NAME" - sudo mysql -uroot -e "CREATE USER '${DB_USER}'@'%' IDENTIFIED BY '$DB_PASSWORD'" - sudo mysql -uroot -e "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO '${DB_USER}'@'%' WITH GRANT OPTION" - sudo mysql -uroot -e "FLUSH PRIVILEGES" - fi -} - -# Create a new database path to the attched volume -if sudo test ! -d $VOLUME_HOME/data; then - echo "=> An empty or uninitialized MySQL volume is detected in $VOLUME_HOME/data" - AllowFileSystemToMySQL - UpdateMySQLConf - echo "=> Init new database path to $MYSQL_DATA_DIR" - sudo mysql_install_db --basedir=/usr --datadir=$MYSQL_DATA_DIR - echo "=> MySQL database initialized !" -else - echo "=> Using an existing volume of MySQL" - AllowFileSystemToMySQL - UpdateMySQLConf -fi - -# Finally start MySQL with new configuration -StartMySQL -InitMySQLDb
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/topology.txt b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/topology.txt deleted file mode 100644 index cb3c3e8546..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/topology.txt +++ /dev/null @@ -1 +0,0 @@ -{"id":"6a4b2f9d-7fe1-482d-af11-97f483dff5b7","delegateId":"9c063349-2259-40fe-97f1-7c40e659e1b0","delegateType":"topologytemplate","dependencies":[{"name":"tosca-normative-types-DBMS","version":"1.0.0.wd03-SNAPSHOT"},{"name":"mysql-getServiceArtifactListTest2","version":"1.1.1-SNAPSHOT"},{"name":"tosca-normative-types-softwareComponent","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-compute","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-root","version":"1.0.0.wd03-SNAPSHOT"},{"name":"mysql-getServiceArtifactListTest","version":"1.1.1-SNAPSHOT"},{"name":"tosca-normative-types-database","version":"1.0.0.wd03-SNAPSHOT"}],"nodeTemplates":[{"key":"Mysql-getServiceArtifactListTest","value":{"type":"alien.nodes.Mysql-getServiceArtifactListTest","name":null,"properties":{"bind_address":"true","storage_path":"/mountedStorage","db_port":"3306","db_name":"wordpress","db_user":"pass","db_password":"pass"},"attributes":{"tosca_id":null,"tosca_name":null},"relationships":{"hostedOnCompute":{"type":"tosca.relationships.HostedOn","target":"Compute","requirementName":"host","requirementType":"tosca.nodes.Compute","targetedCapabilityName":"host"}},"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"host":{"type":"tosca.nodes.Compute","properties":null}},"capabilities":{"database_endpoint":{"type":"tosca.capabilities.DatabaseEndpoint","properties":{"port":null,"protocol":{"value":"tcp","definition":false},"url_path":null,"secure":{"value":"false","definition":false}}},"host":{"type":"alien.capabilities.MysqlDatabase-getServiceArtifactListTest","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null}},"artifacts":{"scripts":{"artifactType":"tosca.artifacts.File","artifactRef":"scripts","artifactName":"scripts","artifactRepository":null}}}},{"key":"Compute","value":{"type":"tosca.nodes.Compute","name":null,"properties":{"disk_size":null,"num_cpus":null,"os_distribution":null,"os_arch":null,"mem_size":null,"os_type":null,"os_version":null},"attributes":{"ip_address":null,"tosca_id":null,"tosca_name":null},"relationships":null,"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"network":{"type":"tosca.capabilities.Connectivity","properties":null}},"capabilities":{"host":{"type":"tosca.capabilities.Container","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null},"attach":{"type":"tosca.capabilities.Attachment","properties":null},"scalable":{"type":"tosca.capabilities.Scalable","properties":{"max_intances":{"value":"1","definition":false},"default_instances":{"value":"1","definition":false},"min_intances":{"value":"1","definition":false}}}},"artifacts":null}},{"key":"Mysql-getServiceArtifactListTest2","value":{"type":"alien.nodes.Mysql-getServiceArtifactListTest2","name":null,"properties":{"bind_address":"true","storage_path":"/mountedStorage","db_port":"3306","db_name":"wordpress","db_user":"pass","db_password":"pass"},"attributes":{"tosca_id":null,"tosca_name":null},"relationships":{"hostedOnCompute":{"type":"tosca.relationships.HostedOn","target":"Compute","requirementName":"host","requirementType":"tosca.nodes.Compute","targetedCapabilityName":"host"}},"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"host":{"type":"tosca.nodes.Compute","properties":null}},"capabilities":{"database_endpoint":{"type":"tosca.capabilities.DatabaseEndpoint","properties":{"port":null,"protocol":{"value":"tcp","definition":false},"url_path":null,"secure":{"value":"false","definition":false}}},"host":{"type":"alien.capabilities.MysqlDatabase-getServiceArtifactListTest2","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null}},"artifacts":{"scripts":{"artifactType":"tosca.artifacts.File","artifactRef":"scripts","artifactName":"scripts","artifactRepository":null}}}}]}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/topologyTemplate.txt b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/topologyTemplate.txt deleted file mode 100644 index f0d0849db8..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/topologyTemplate.txt +++ /dev/null @@ -1,2 +0,0 @@ -{"id":"9c063349-2259-40fe-97f1-7c40e659e1b0","name":"Andrey","description":null,"topologyId":"6a4b2f9d-7fe1-482d-af11-97f483dff5b7"} - diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource1/images/mysql.png b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource1/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource1/images/mysql.png +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource1/mysql.yml b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource1/mysql.yml deleted file mode 100644 index 4ee2c8ca88..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource1/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getServiceArtifactListNoContentTest -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getServiceArtifactListNoContentTest: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase-getServiceArtifactListNoContentTest - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase-getServiceArtifactListNoContentTest: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript-getServiceArtifactListNoContentTest: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource2/images/mysql.png b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource2/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource2/images/mysql.png +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource2/mysql.yml b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource2/mysql.yml deleted file mode 100644 index b564dd0c4e..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource2/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getServiceArtifactListNoContentTest2 -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getServiceArtifactListNoContentTest2: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase-getServiceArtifactListNoContentTest2 - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase-getServiceArtifactListNoContentTest2: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript-getServiceArtifactListNoContentTest2: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/topology.txt b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/topology.txt deleted file mode 100644 index 279351879a..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/topology.txt +++ /dev/null @@ -1 +0,0 @@ -{"id":"3293c9c8-a162-43fc-b8d1-431399f89cb7","delegateId":"25845cce-05c8-4502-b5fe-abfd6bd6f28e","delegateType":"topologytemplate","dependencies":[{"name":"tosca-normative-types-DBMS","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-softwareComponent","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-compute","version":"1.0.0.wd03-SNAPSHOT"},{"name":"mysql-getServiceArtifactListNoContentTest2","version":"1.1.1-SNAPSHOT"},{"name":"tosca-normative-types-root","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-database","version":"1.0.0.wd03-SNAPSHOT"}],"nodeTemplates":[{"key":"Mysql-getServiceArtifactListNoContentTest2","value":{"type":"alien.nodes.Mysql-getServiceArtifactListNoContentTest2","name":null,"properties":{"bind_address":"true","storage_path":"/mountedStorage","db_port":"3306","db_name":"wordpress","db_user":"pass","db_password":"pass"},"attributes":{"tosca_id":null,"tosca_name":null},"relationships":null,"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"host":{"type":"tosca.nodes.Compute","properties":null}},"capabilities":{"database_endpoint":{"type":"tosca.capabilities.DatabaseEndpoint","properties":{"port":null,"protocol":{"value":"tcp","definition":false},"url_path":null,"secure":{"value":"false","definition":false}}},"host":{"type":"alien.capabilities.MysqlDatabase-getServiceArtifactListNoContentTest2","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null}},"artifacts":{"scripts":{"artifactType":"tosca.artifacts.File","artifactRef":"scripts","artifactName":"scripts","artifactRepository":null}}}},{"key":"Compute","value":{"type":"tosca.nodes.Compute","name":null,"properties":{"disk_size":null,"num_cpus":null,"os_distribution":null,"os_arch":null,"mem_size":null,"os_type":null,"os_version":null},"attributes":{"ip_address":null,"tosca_id":null,"tosca_name":null},"relationships":{"dependsOnMysql-getServiceArtifactListNoContentTest2":{"type":"tosca.relationships.DependsOn","target":"Mysql-getServiceArtifactListNoContentTest2","requirementName":"dependency","requirementType":"tosca.capabilities.Root","targetedCapabilityName":"root"}},"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"network":{"type":"tosca.capabilities.Connectivity","properties":null}},"capabilities":{"host":{"type":"tosca.capabilities.Container","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null},"attach":{"type":"tosca.capabilities.Attachment","properties":null},"scalable":{"type":"tosca.capabilities.Scalable","properties":{"max_intances":{"value":"1","definition":false},"default_instances":{"value":"1","definition":false},"min_intances":{"value":"1","definition":false}}}},"artifacts":null}}]}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/topologyTemplate.txt b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/topologyTemplate.txt deleted file mode 100644 index 3c342f6cd1..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/topologyTemplate.txt +++ /dev/null @@ -1,2 +0,0 @@ -{"id":"25845cce-05c8-4502-b5fe-abfd6bd6f28e","name":"ServiceArtListNoContent","description":null,"topologyId":"3293c9c8-a162-43fc-b8d1-431399f89cb7"} - diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/images/mysql.png b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/images/mysql.png +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/mysql.yml b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/mysql.yml deleted file mode 100644 index e0a0c6458e..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getServiceArtifactListTest -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getServiceArtifactListTest: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase-getServiceArtifactListTest - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase-getServiceArtifactListTest: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript-getServiceArtifactListTest: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/scripts/install_mysql.sh b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/scripts/install_mysql.sh deleted file mode 100644 index 400bcf40cb..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/scripts/install_mysql.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -echo "Debian based MYSQL install 5..." -LOCK="/tmp/lockaptget" - -while true; do - if mkdir "${LOCK}" &>/dev/null; then - echo "MySQL take the lock" - break; - fi - echo "Waiting the end of one of our recipes..." - sleep 0.5 -done - -while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - echo "Waiting for other software managers to finish..." - sleep 0.5 -done -sudo rm -f /var/lib/dpkg/lock - -sudo apt-get update || (sleep 15; sudo apt-get update || exit ${1}) -sudo DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server-5.5 pwgen || exit ${1} -rm -rf "${LOCK}" - -sudo /etc/init.d/mysql stop -sudo rm -rf /var/lib/apt/lists/* -sudo rm -rf /var/lib/mysql/* -echo "MySQL Installation complete."
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/scripts/start_mysql.sh b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/scripts/start_mysql.sh deleted file mode 100644 index 648bd45756..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/scripts/start_mysql.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -echo "------------------------ ENV ------------------------" -echo "ENV VAR USED VOLUME_HOME : $VOLUME_HOME" -echo "ENV VAR USED PORT : $PORT" -echo "ENV VAR USED DB_NAME : $DB_NAME" -echo "ENV VAR USED DB_USER : $DB_USER" -echo "ENV VAR USED DB_PASSWORD : $DB_PASSWORD" -echo "---------------------------- ------------------------" - -CURRENT_PATH=`dirname "$0"` - -function StartMySQL { - echo "Starting MYSQL..." - sudo /etc/init.d/mysql stop - sudo /usr/bin/mysqld_safe > /dev/null 2>&1 & - RET=1 - while [[ RET -ne 0 ]]; do - echo "=> Waiting for confirmation of MySQL service startup" - sleep 5 - sudo mysql -uroot -e "status" > /dev/null 2>&1 - RET=$? - done -} - -function AllowFileSystemToMySQL { - MYSQL_DATA_DIR=$VOLUME_HOME/data - MYSQL_LOG=$VOLUME_HOME/logs - - echo "Setting data directory to $MYSQL_DATA_DIR an logs to $MYSQL_LOG ..." - if sudo test ! -d $MYSQL_DATA_DIR; then - echo "Creating DATA dir > $MYSQL_DATA_DIR ..." - sudo mkdir -p $MYSQL_DATA_DIR - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_DATA_DIR - fi - if sudo test ! -d $MYSQL_LOG; then - echo "Creating LOG dir > $MYSQL_LOG ..." - sudo mkdir -p $MYSQL_LOG - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_LOG - fi - - # edit app mysql permission in : /etc/apparmor.d/usr.sbin.mysqld - COUNT_LINE=`sudo cat /etc/apparmor.d/usr.sbin.mysqld | wc -l` - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/** rwk," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/** rwk," /etc/apparmor.d/usr.sbin.mysqld - - # reload app permission manager service - sudo service apparmor reload -} - -function UpdateMySQLConf { - echo "Updating MySQL conf files [DATA, LOGS]..." - sudo sed -i "s:/var/lib/mysql:$MYSQL_DATA_DIR:g" /etc/mysql/my.cnf - sudo sed -i "s:/var/log/mysql/error.log:$MYSQL_LOG/error.log:g" /etc/mysql/my.cnf - sudo sed -i "s:3306:$PORT:g" /etc/mysql/my.cnf - - if sudo test ! -f /usr/share/mysql/my-default.cnf; then - sudo cp /etc/mysql/my.cnf /usr/share/mysql/my-default.cnf - fi - if sudo test ! -f /etc/mysql/conf.d/mysqld_charset.cnf; then - sudo cp $configs/mysqld_charset.cnf /etc/mysql/conf.d/mysqld_charset.cnf - fi - - if [ "$BIND_ADRESS" == "true" ]; then - sudo sed -i "s/bind-address.*/bind-address = 0.0.0.0/" /etc/mysql/my.cnf - fi -} - -function InitMySQLDb { - # create database DB_NAME - if [ "$DB_NAME" ]; then - echo "INIT DATABASE $DB_NAME" - sudo mysql -u root -e "CREATE DATABASE $DB_NAME"; - fi - - # create user and give rights - if [ "$DB_USER" ]; then - echo "CREATE USER $DB_USER WITH PASSWORD $DB_PASSWORD AND GRAND RIGHTS ON $DB_NAME" - sudo mysql -uroot -e "CREATE USER '${DB_USER}'@'%' IDENTIFIED BY '$DB_PASSWORD'" - sudo mysql -uroot -e "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO '${DB_USER}'@'%' WITH GRANT OPTION" - sudo mysql -uroot -e "FLUSH PRIVILEGES" - fi -} - -# Create a new database path to the attched volume -if sudo test ! -d $VOLUME_HOME/data; then - echo "=> An empty or uninitialized MySQL volume is detected in $VOLUME_HOME/data" - AllowFileSystemToMySQL - UpdateMySQLConf - echo "=> Init new database path to $MYSQL_DATA_DIR" - sudo mysql_install_db --basedir=/usr --datadir=$MYSQL_DATA_DIR - echo "=> MySQL database initialized !" -else - echo "=> Using an existing volume of MySQL" - AllowFileSystemToMySQL - UpdateMySQLConf -fi - -# Finally start MySQL with new configuration -StartMySQL -InitMySQLDb
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/images/mysql.png b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/images/mysql.png +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/mysql.yml b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/mysql.yml deleted file mode 100644 index dc5ff158c8..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getServiceArtifactListTest2 -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getServiceArtifactListTest2: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase-getServiceArtifactListTest2 - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase-getServiceArtifactListTest2: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript-getServiceArtifactListTest2: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/scripts/install_mysql2.sh b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/scripts/install_mysql2.sh deleted file mode 100644 index 400bcf40cb..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/scripts/install_mysql2.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -echo "Debian based MYSQL install 5..." -LOCK="/tmp/lockaptget" - -while true; do - if mkdir "${LOCK}" &>/dev/null; then - echo "MySQL take the lock" - break; - fi - echo "Waiting the end of one of our recipes..." - sleep 0.5 -done - -while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - echo "Waiting for other software managers to finish..." - sleep 0.5 -done -sudo rm -f /var/lib/dpkg/lock - -sudo apt-get update || (sleep 15; sudo apt-get update || exit ${1}) -sudo DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server-5.5 pwgen || exit ${1} -rm -rf "${LOCK}" - -sudo /etc/init.d/mysql stop -sudo rm -rf /var/lib/apt/lists/* -sudo rm -rf /var/lib/mysql/* -echo "MySQL Installation complete."
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/scripts/start_mysql2.sh b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/scripts/start_mysql2.sh deleted file mode 100644 index 648bd45756..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/scripts/start_mysql2.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -echo "------------------------ ENV ------------------------" -echo "ENV VAR USED VOLUME_HOME : $VOLUME_HOME" -echo "ENV VAR USED PORT : $PORT" -echo "ENV VAR USED DB_NAME : $DB_NAME" -echo "ENV VAR USED DB_USER : $DB_USER" -echo "ENV VAR USED DB_PASSWORD : $DB_PASSWORD" -echo "---------------------------- ------------------------" - -CURRENT_PATH=`dirname "$0"` - -function StartMySQL { - echo "Starting MYSQL..." - sudo /etc/init.d/mysql stop - sudo /usr/bin/mysqld_safe > /dev/null 2>&1 & - RET=1 - while [[ RET -ne 0 ]]; do - echo "=> Waiting for confirmation of MySQL service startup" - sleep 5 - sudo mysql -uroot -e "status" > /dev/null 2>&1 - RET=$? - done -} - -function AllowFileSystemToMySQL { - MYSQL_DATA_DIR=$VOLUME_HOME/data - MYSQL_LOG=$VOLUME_HOME/logs - - echo "Setting data directory to $MYSQL_DATA_DIR an logs to $MYSQL_LOG ..." - if sudo test ! -d $MYSQL_DATA_DIR; then - echo "Creating DATA dir > $MYSQL_DATA_DIR ..." - sudo mkdir -p $MYSQL_DATA_DIR - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_DATA_DIR - fi - if sudo test ! -d $MYSQL_LOG; then - echo "Creating LOG dir > $MYSQL_LOG ..." - sudo mkdir -p $MYSQL_LOG - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_LOG - fi - - # edit app mysql permission in : /etc/apparmor.d/usr.sbin.mysqld - COUNT_LINE=`sudo cat /etc/apparmor.d/usr.sbin.mysqld | wc -l` - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/** rwk," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/** rwk," /etc/apparmor.d/usr.sbin.mysqld - - # reload app permission manager service - sudo service apparmor reload -} - -function UpdateMySQLConf { - echo "Updating MySQL conf files [DATA, LOGS]..." - sudo sed -i "s:/var/lib/mysql:$MYSQL_DATA_DIR:g" /etc/mysql/my.cnf - sudo sed -i "s:/var/log/mysql/error.log:$MYSQL_LOG/error.log:g" /etc/mysql/my.cnf - sudo sed -i "s:3306:$PORT:g" /etc/mysql/my.cnf - - if sudo test ! -f /usr/share/mysql/my-default.cnf; then - sudo cp /etc/mysql/my.cnf /usr/share/mysql/my-default.cnf - fi - if sudo test ! -f /etc/mysql/conf.d/mysqld_charset.cnf; then - sudo cp $configs/mysqld_charset.cnf /etc/mysql/conf.d/mysqld_charset.cnf - fi - - if [ "$BIND_ADRESS" == "true" ]; then - sudo sed -i "s/bind-address.*/bind-address = 0.0.0.0/" /etc/mysql/my.cnf - fi -} - -function InitMySQLDb { - # create database DB_NAME - if [ "$DB_NAME" ]; then - echo "INIT DATABASE $DB_NAME" - sudo mysql -u root -e "CREATE DATABASE $DB_NAME"; - fi - - # create user and give rights - if [ "$DB_USER" ]; then - echo "CREATE USER $DB_USER WITH PASSWORD $DB_PASSWORD AND GRAND RIGHTS ON $DB_NAME" - sudo mysql -uroot -e "CREATE USER '${DB_USER}'@'%' IDENTIFIED BY '$DB_PASSWORD'" - sudo mysql -uroot -e "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO '${DB_USER}'@'%' WITH GRANT OPTION" - sudo mysql -uroot -e "FLUSH PRIVILEGES" - fi -} - -# Create a new database path to the attched volume -if sudo test ! -d $VOLUME_HOME/data; then - echo "=> An empty or uninitialized MySQL volume is detected in $VOLUME_HOME/data" - AllowFileSystemToMySQL - UpdateMySQLConf - echo "=> Init new database path to $MYSQL_DATA_DIR" - sudo mysql_install_db --basedir=/usr --datadir=$MYSQL_DATA_DIR - echo "=> MySQL database initialized !" -else - echo "=> Using an existing volume of MySQL" - AllowFileSystemToMySQL - UpdateMySQLConf -fi - -# Finally start MySQL with new configuration -StartMySQL -InitMySQLDb
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/topology.txt b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/topology.txt deleted file mode 100644 index cb3c3e8546..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/topology.txt +++ /dev/null @@ -1 +0,0 @@ -{"id":"6a4b2f9d-7fe1-482d-af11-97f483dff5b7","delegateId":"9c063349-2259-40fe-97f1-7c40e659e1b0","delegateType":"topologytemplate","dependencies":[{"name":"tosca-normative-types-DBMS","version":"1.0.0.wd03-SNAPSHOT"},{"name":"mysql-getServiceArtifactListTest2","version":"1.1.1-SNAPSHOT"},{"name":"tosca-normative-types-softwareComponent","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-compute","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-root","version":"1.0.0.wd03-SNAPSHOT"},{"name":"mysql-getServiceArtifactListTest","version":"1.1.1-SNAPSHOT"},{"name":"tosca-normative-types-database","version":"1.0.0.wd03-SNAPSHOT"}],"nodeTemplates":[{"key":"Mysql-getServiceArtifactListTest","value":{"type":"alien.nodes.Mysql-getServiceArtifactListTest","name":null,"properties":{"bind_address":"true","storage_path":"/mountedStorage","db_port":"3306","db_name":"wordpress","db_user":"pass","db_password":"pass"},"attributes":{"tosca_id":null,"tosca_name":null},"relationships":{"hostedOnCompute":{"type":"tosca.relationships.HostedOn","target":"Compute","requirementName":"host","requirementType":"tosca.nodes.Compute","targetedCapabilityName":"host"}},"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"host":{"type":"tosca.nodes.Compute","properties":null}},"capabilities":{"database_endpoint":{"type":"tosca.capabilities.DatabaseEndpoint","properties":{"port":null,"protocol":{"value":"tcp","definition":false},"url_path":null,"secure":{"value":"false","definition":false}}},"host":{"type":"alien.capabilities.MysqlDatabase-getServiceArtifactListTest","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null}},"artifacts":{"scripts":{"artifactType":"tosca.artifacts.File","artifactRef":"scripts","artifactName":"scripts","artifactRepository":null}}}},{"key":"Compute","value":{"type":"tosca.nodes.Compute","name":null,"properties":{"disk_size":null,"num_cpus":null,"os_distribution":null,"os_arch":null,"mem_size":null,"os_type":null,"os_version":null},"attributes":{"ip_address":null,"tosca_id":null,"tosca_name":null},"relationships":null,"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"network":{"type":"tosca.capabilities.Connectivity","properties":null}},"capabilities":{"host":{"type":"tosca.capabilities.Container","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null},"attach":{"type":"tosca.capabilities.Attachment","properties":null},"scalable":{"type":"tosca.capabilities.Scalable","properties":{"max_intances":{"value":"1","definition":false},"default_instances":{"value":"1","definition":false},"min_intances":{"value":"1","definition":false}}}},"artifacts":null}},{"key":"Mysql-getServiceArtifactListTest2","value":{"type":"alien.nodes.Mysql-getServiceArtifactListTest2","name":null,"properties":{"bind_address":"true","storage_path":"/mountedStorage","db_port":"3306","db_name":"wordpress","db_user":"pass","db_password":"pass"},"attributes":{"tosca_id":null,"tosca_name":null},"relationships":{"hostedOnCompute":{"type":"tosca.relationships.HostedOn","target":"Compute","requirementName":"host","requirementType":"tosca.nodes.Compute","targetedCapabilityName":"host"}},"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"host":{"type":"tosca.nodes.Compute","properties":null}},"capabilities":{"database_endpoint":{"type":"tosca.capabilities.DatabaseEndpoint","properties":{"port":null,"protocol":{"value":"tcp","definition":false},"url_path":null,"secure":{"value":"false","definition":false}}},"host":{"type":"alien.capabilities.MysqlDatabase-getServiceArtifactListTest2","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null}},"artifacts":{"scripts":{"artifactType":"tosca.artifacts.File","artifactRef":"scripts","artifactName":"scripts","artifactRepository":null}}}}]}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/topologyTemplate.txt b/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/topologyTemplate.txt deleted file mode 100644 index f0d0849db8..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest/topologyTemplate.txt +++ /dev/null @@ -1,2 +0,0 @@ -{"id":"9c063349-2259-40fe-97f1-7c40e659e1b0","name":"Andrey","description":null,"topologyId":"6a4b2f9d-7fe1-482d-af11-97f483dff5b7"} - diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/images/mysql.png b/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/images/mysql.png +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/mysql.yml b/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/mysql.yml deleted file mode 100644 index e0a0c6458e..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getServiceArtifactListTest -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getServiceArtifactListTest: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase-getServiceArtifactListTest - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase-getServiceArtifactListTest: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript-getServiceArtifactListTest: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/scripts/install_mysql.sh b/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/scripts/install_mysql.sh deleted file mode 100644 index 400bcf40cb..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/scripts/install_mysql.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -echo "Debian based MYSQL install 5..." -LOCK="/tmp/lockaptget" - -while true; do - if mkdir "${LOCK}" &>/dev/null; then - echo "MySQL take the lock" - break; - fi - echo "Waiting the end of one of our recipes..." - sleep 0.5 -done - -while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - echo "Waiting for other software managers to finish..." - sleep 0.5 -done -sudo rm -f /var/lib/dpkg/lock - -sudo apt-get update || (sleep 15; sudo apt-get update || exit ${1}) -sudo DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server-5.5 pwgen || exit ${1} -rm -rf "${LOCK}" - -sudo /etc/init.d/mysql stop -sudo rm -rf /var/lib/apt/lists/* -sudo rm -rf /var/lib/mysql/* -echo "MySQL Installation complete."
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/scripts/start_mysql.sh b/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/scripts/start_mysql.sh deleted file mode 100644 index 648bd45756..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/scripts/start_mysql.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -echo "------------------------ ENV ------------------------" -echo "ENV VAR USED VOLUME_HOME : $VOLUME_HOME" -echo "ENV VAR USED PORT : $PORT" -echo "ENV VAR USED DB_NAME : $DB_NAME" -echo "ENV VAR USED DB_USER : $DB_USER" -echo "ENV VAR USED DB_PASSWORD : $DB_PASSWORD" -echo "---------------------------- ------------------------" - -CURRENT_PATH=`dirname "$0"` - -function StartMySQL { - echo "Starting MYSQL..." - sudo /etc/init.d/mysql stop - sudo /usr/bin/mysqld_safe > /dev/null 2>&1 & - RET=1 - while [[ RET -ne 0 ]]; do - echo "=> Waiting for confirmation of MySQL service startup" - sleep 5 - sudo mysql -uroot -e "status" > /dev/null 2>&1 - RET=$? - done -} - -function AllowFileSystemToMySQL { - MYSQL_DATA_DIR=$VOLUME_HOME/data - MYSQL_LOG=$VOLUME_HOME/logs - - echo "Setting data directory to $MYSQL_DATA_DIR an logs to $MYSQL_LOG ..." - if sudo test ! -d $MYSQL_DATA_DIR; then - echo "Creating DATA dir > $MYSQL_DATA_DIR ..." - sudo mkdir -p $MYSQL_DATA_DIR - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_DATA_DIR - fi - if sudo test ! -d $MYSQL_LOG; then - echo "Creating LOG dir > $MYSQL_LOG ..." - sudo mkdir -p $MYSQL_LOG - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_LOG - fi - - # edit app mysql permission in : /etc/apparmor.d/usr.sbin.mysqld - COUNT_LINE=`sudo cat /etc/apparmor.d/usr.sbin.mysqld | wc -l` - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/** rwk," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/** rwk," /etc/apparmor.d/usr.sbin.mysqld - - # reload app permission manager service - sudo service apparmor reload -} - -function UpdateMySQLConf { - echo "Updating MySQL conf files [DATA, LOGS]..." - sudo sed -i "s:/var/lib/mysql:$MYSQL_DATA_DIR:g" /etc/mysql/my.cnf - sudo sed -i "s:/var/log/mysql/error.log:$MYSQL_LOG/error.log:g" /etc/mysql/my.cnf - sudo sed -i "s:3306:$PORT:g" /etc/mysql/my.cnf - - if sudo test ! -f /usr/share/mysql/my-default.cnf; then - sudo cp /etc/mysql/my.cnf /usr/share/mysql/my-default.cnf - fi - if sudo test ! -f /etc/mysql/conf.d/mysqld_charset.cnf; then - sudo cp $configs/mysqld_charset.cnf /etc/mysql/conf.d/mysqld_charset.cnf - fi - - if [ "$BIND_ADRESS" == "true" ]; then - sudo sed -i "s/bind-address.*/bind-address = 0.0.0.0/" /etc/mysql/my.cnf - fi -} - -function InitMySQLDb { - # create database DB_NAME - if [ "$DB_NAME" ]; then - echo "INIT DATABASE $DB_NAME" - sudo mysql -u root -e "CREATE DATABASE $DB_NAME"; - fi - - # create user and give rights - if [ "$DB_USER" ]; then - echo "CREATE USER $DB_USER WITH PASSWORD $DB_PASSWORD AND GRAND RIGHTS ON $DB_NAME" - sudo mysql -uroot -e "CREATE USER '${DB_USER}'@'%' IDENTIFIED BY '$DB_PASSWORD'" - sudo mysql -uroot -e "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO '${DB_USER}'@'%' WITH GRANT OPTION" - sudo mysql -uroot -e "FLUSH PRIVILEGES" - fi -} - -# Create a new database path to the attched volume -if sudo test ! -d $VOLUME_HOME/data; then - echo "=> An empty or uninitialized MySQL volume is detected in $VOLUME_HOME/data" - AllowFileSystemToMySQL - UpdateMySQLConf - echo "=> Init new database path to $MYSQL_DATA_DIR" - sudo mysql_install_db --basedir=/usr --datadir=$MYSQL_DATA_DIR - echo "=> MySQL database initialized !" -else - echo "=> Using an existing volume of MySQL" - AllowFileSystemToMySQL - UpdateMySQLConf -fi - -# Finally start MySQL with new configuration -StartMySQL -InitMySQLDb
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/images/mysql.png b/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/images/mysql.png +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/mysql.yml b/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/mysql.yml deleted file mode 100644 index dc5ff158c8..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getServiceArtifactListTest2 -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getServiceArtifactListTest2: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase-getServiceArtifactListTest2 - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase-getServiceArtifactListTest2: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript-getServiceArtifactListTest2: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/scripts/install_mysql2.sh b/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/scripts/install_mysql2.sh deleted file mode 100644 index 400bcf40cb..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/scripts/install_mysql2.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -echo "Debian based MYSQL install 5..." -LOCK="/tmp/lockaptget" - -while true; do - if mkdir "${LOCK}" &>/dev/null; then - echo "MySQL take the lock" - break; - fi - echo "Waiting the end of one of our recipes..." - sleep 0.5 -done - -while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - echo "Waiting for other software managers to finish..." - sleep 0.5 -done -sudo rm -f /var/lib/dpkg/lock - -sudo apt-get update || (sleep 15; sudo apt-get update || exit ${1}) -sudo DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server-5.5 pwgen || exit ${1} -rm -rf "${LOCK}" - -sudo /etc/init.d/mysql stop -sudo rm -rf /var/lib/apt/lists/* -sudo rm -rf /var/lib/mysql/* -echo "MySQL Installation complete."
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/scripts/start_mysql2.sh b/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/scripts/start_mysql2.sh deleted file mode 100644 index 648bd45756..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/scripts/start_mysql2.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -echo "------------------------ ENV ------------------------" -echo "ENV VAR USED VOLUME_HOME : $VOLUME_HOME" -echo "ENV VAR USED PORT : $PORT" -echo "ENV VAR USED DB_NAME : $DB_NAME" -echo "ENV VAR USED DB_USER : $DB_USER" -echo "ENV VAR USED DB_PASSWORD : $DB_PASSWORD" -echo "---------------------------- ------------------------" - -CURRENT_PATH=`dirname "$0"` - -function StartMySQL { - echo "Starting MYSQL..." - sudo /etc/init.d/mysql stop - sudo /usr/bin/mysqld_safe > /dev/null 2>&1 & - RET=1 - while [[ RET -ne 0 ]]; do - echo "=> Waiting for confirmation of MySQL service startup" - sleep 5 - sudo mysql -uroot -e "status" > /dev/null 2>&1 - RET=$? - done -} - -function AllowFileSystemToMySQL { - MYSQL_DATA_DIR=$VOLUME_HOME/data - MYSQL_LOG=$VOLUME_HOME/logs - - echo "Setting data directory to $MYSQL_DATA_DIR an logs to $MYSQL_LOG ..." - if sudo test ! -d $MYSQL_DATA_DIR; then - echo "Creating DATA dir > $MYSQL_DATA_DIR ..." - sudo mkdir -p $MYSQL_DATA_DIR - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_DATA_DIR - fi - if sudo test ! -d $MYSQL_LOG; then - echo "Creating LOG dir > $MYSQL_LOG ..." - sudo mkdir -p $MYSQL_LOG - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_LOG - fi - - # edit app mysql permission in : /etc/apparmor.d/usr.sbin.mysqld - COUNT_LINE=`sudo cat /etc/apparmor.d/usr.sbin.mysqld | wc -l` - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/** rwk," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/** rwk," /etc/apparmor.d/usr.sbin.mysqld - - # reload app permission manager service - sudo service apparmor reload -} - -function UpdateMySQLConf { - echo "Updating MySQL conf files [DATA, LOGS]..." - sudo sed -i "s:/var/lib/mysql:$MYSQL_DATA_DIR:g" /etc/mysql/my.cnf - sudo sed -i "s:/var/log/mysql/error.log:$MYSQL_LOG/error.log:g" /etc/mysql/my.cnf - sudo sed -i "s:3306:$PORT:g" /etc/mysql/my.cnf - - if sudo test ! -f /usr/share/mysql/my-default.cnf; then - sudo cp /etc/mysql/my.cnf /usr/share/mysql/my-default.cnf - fi - if sudo test ! -f /etc/mysql/conf.d/mysqld_charset.cnf; then - sudo cp $configs/mysqld_charset.cnf /etc/mysql/conf.d/mysqld_charset.cnf - fi - - if [ "$BIND_ADRESS" == "true" ]; then - sudo sed -i "s/bind-address.*/bind-address = 0.0.0.0/" /etc/mysql/my.cnf - fi -} - -function InitMySQLDb { - # create database DB_NAME - if [ "$DB_NAME" ]; then - echo "INIT DATABASE $DB_NAME" - sudo mysql -u root -e "CREATE DATABASE $DB_NAME"; - fi - - # create user and give rights - if [ "$DB_USER" ]; then - echo "CREATE USER $DB_USER WITH PASSWORD $DB_PASSWORD AND GRAND RIGHTS ON $DB_NAME" - sudo mysql -uroot -e "CREATE USER '${DB_USER}'@'%' IDENTIFIED BY '$DB_PASSWORD'" - sudo mysql -uroot -e "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO '${DB_USER}'@'%' WITH GRANT OPTION" - sudo mysql -uroot -e "FLUSH PRIVILEGES" - fi -} - -# Create a new database path to the attched volume -if sudo test ! -d $VOLUME_HOME/data; then - echo "=> An empty or uninitialized MySQL volume is detected in $VOLUME_HOME/data" - AllowFileSystemToMySQL - UpdateMySQLConf - echo "=> Init new database path to $MYSQL_DATA_DIR" - sudo mysql_install_db --basedir=/usr --datadir=$MYSQL_DATA_DIR - echo "=> MySQL database initialized !" -else - echo "=> Using an existing volume of MySQL" - AllowFileSystemToMySQL - UpdateMySQLConf -fi - -# Finally start MySQL with new configuration -StartMySQL -InitMySQLDb
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/topology.txt b/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/topology.txt deleted file mode 100644 index cb3c3e8546..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/topology.txt +++ /dev/null @@ -1 +0,0 @@ -{"id":"6a4b2f9d-7fe1-482d-af11-97f483dff5b7","delegateId":"9c063349-2259-40fe-97f1-7c40e659e1b0","delegateType":"topologytemplate","dependencies":[{"name":"tosca-normative-types-DBMS","version":"1.0.0.wd03-SNAPSHOT"},{"name":"mysql-getServiceArtifactListTest2","version":"1.1.1-SNAPSHOT"},{"name":"tosca-normative-types-softwareComponent","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-compute","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-root","version":"1.0.0.wd03-SNAPSHOT"},{"name":"mysql-getServiceArtifactListTest","version":"1.1.1-SNAPSHOT"},{"name":"tosca-normative-types-database","version":"1.0.0.wd03-SNAPSHOT"}],"nodeTemplates":[{"key":"Mysql-getServiceArtifactListTest","value":{"type":"alien.nodes.Mysql-getServiceArtifactListTest","name":null,"properties":{"bind_address":"true","storage_path":"/mountedStorage","db_port":"3306","db_name":"wordpress","db_user":"pass","db_password":"pass"},"attributes":{"tosca_id":null,"tosca_name":null},"relationships":{"hostedOnCompute":{"type":"tosca.relationships.HostedOn","target":"Compute","requirementName":"host","requirementType":"tosca.nodes.Compute","targetedCapabilityName":"host"}},"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"host":{"type":"tosca.nodes.Compute","properties":null}},"capabilities":{"database_endpoint":{"type":"tosca.capabilities.DatabaseEndpoint","properties":{"port":null,"protocol":{"value":"tcp","definition":false},"url_path":null,"secure":{"value":"false","definition":false}}},"host":{"type":"alien.capabilities.MysqlDatabase-getServiceArtifactListTest","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null}},"artifacts":{"scripts":{"artifactType":"tosca.artifacts.File","artifactRef":"scripts","artifactName":"scripts","artifactRepository":null}}}},{"key":"Compute","value":{"type":"tosca.nodes.Compute","name":null,"properties":{"disk_size":null,"num_cpus":null,"os_distribution":null,"os_arch":null,"mem_size":null,"os_type":null,"os_version":null},"attributes":{"ip_address":null,"tosca_id":null,"tosca_name":null},"relationships":null,"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"network":{"type":"tosca.capabilities.Connectivity","properties":null}},"capabilities":{"host":{"type":"tosca.capabilities.Container","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null},"attach":{"type":"tosca.capabilities.Attachment","properties":null},"scalable":{"type":"tosca.capabilities.Scalable","properties":{"max_intances":{"value":"1","definition":false},"default_instances":{"value":"1","definition":false},"min_intances":{"value":"1","definition":false}}}},"artifacts":null}},{"key":"Mysql-getServiceArtifactListTest2","value":{"type":"alien.nodes.Mysql-getServiceArtifactListTest2","name":null,"properties":{"bind_address":"true","storage_path":"/mountedStorage","db_port":"3306","db_name":"wordpress","db_user":"pass","db_password":"pass"},"attributes":{"tosca_id":null,"tosca_name":null},"relationships":{"hostedOnCompute":{"type":"tosca.relationships.HostedOn","target":"Compute","requirementName":"host","requirementType":"tosca.nodes.Compute","targetedCapabilityName":"host"}},"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"host":{"type":"tosca.nodes.Compute","properties":null}},"capabilities":{"database_endpoint":{"type":"tosca.capabilities.DatabaseEndpoint","properties":{"port":null,"protocol":{"value":"tcp","definition":false},"url_path":null,"secure":{"value":"false","definition":false}}},"host":{"type":"alien.capabilities.MysqlDatabase-getServiceArtifactListTest2","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null}},"artifacts":{"scripts":{"artifactType":"tosca.artifacts.File","artifactRef":"scripts","artifactName":"scripts","artifactRepository":null}}}}]}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/topologyTemplate.txt b/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/topologyTemplate.txt deleted file mode 100644 index f0d0849db8..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service1/topologyTemplate.txt +++ /dev/null @@ -1,2 +0,0 @@ -{"id":"9c063349-2259-40fe-97f1-7c40e659e1b0","name":"Andrey","description":null,"topologyId":"6a4b2f9d-7fe1-482d-af11-97f483dff5b7"} - diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service2/resource1/images/mysql.png b/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service2/resource1/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service2/resource1/images/mysql.png +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service2/resource1/mysql.yml b/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service2/resource1/mysql.yml deleted file mode 100644 index 4ee2c8ca88..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service2/resource1/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getServiceArtifactListNoContentTest -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getServiceArtifactListNoContentTest: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase-getServiceArtifactListNoContentTest - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase-getServiceArtifactListNoContentTest: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript-getServiceArtifactListNoContentTest: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service2/resource2/images/mysql.png b/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service2/resource2/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service2/resource2/images/mysql.png +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service2/resource2/mysql.yml b/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service2/resource2/mysql.yml deleted file mode 100644 index b564dd0c4e..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service2/resource2/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getServiceArtifactListNoContentTest2 -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getServiceArtifactListNoContentTest2: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase-getServiceArtifactListNoContentTest2 - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase-getServiceArtifactListNoContentTest2: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript-getServiceArtifactListNoContentTest2: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service2/topology.txt b/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service2/topology.txt deleted file mode 100644 index 279351879a..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service2/topology.txt +++ /dev/null @@ -1 +0,0 @@ -{"id":"3293c9c8-a162-43fc-b8d1-431399f89cb7","delegateId":"25845cce-05c8-4502-b5fe-abfd6bd6f28e","delegateType":"topologytemplate","dependencies":[{"name":"tosca-normative-types-DBMS","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-softwareComponent","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-compute","version":"1.0.0.wd03-SNAPSHOT"},{"name":"mysql-getServiceArtifactListNoContentTest2","version":"1.1.1-SNAPSHOT"},{"name":"tosca-normative-types-root","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-database","version":"1.0.0.wd03-SNAPSHOT"}],"nodeTemplates":[{"key":"Mysql-getServiceArtifactListNoContentTest2","value":{"type":"alien.nodes.Mysql-getServiceArtifactListNoContentTest2","name":null,"properties":{"bind_address":"true","storage_path":"/mountedStorage","db_port":"3306","db_name":"wordpress","db_user":"pass","db_password":"pass"},"attributes":{"tosca_id":null,"tosca_name":null},"relationships":null,"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"host":{"type":"tosca.nodes.Compute","properties":null}},"capabilities":{"database_endpoint":{"type":"tosca.capabilities.DatabaseEndpoint","properties":{"port":null,"protocol":{"value":"tcp","definition":false},"url_path":null,"secure":{"value":"false","definition":false}}},"host":{"type":"alien.capabilities.MysqlDatabase-getServiceArtifactListNoContentTest2","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null}},"artifacts":{"scripts":{"artifactType":"tosca.artifacts.File","artifactRef":"scripts","artifactName":"scripts","artifactRepository":null}}}},{"key":"Compute","value":{"type":"tosca.nodes.Compute","name":null,"properties":{"disk_size":null,"num_cpus":null,"os_distribution":null,"os_arch":null,"mem_size":null,"os_type":null,"os_version":null},"attributes":{"ip_address":null,"tosca_id":null,"tosca_name":null},"relationships":{"dependsOnMysql-getServiceArtifactListNoContentTest2":{"type":"tosca.relationships.DependsOn","target":"Mysql-getServiceArtifactListNoContentTest2","requirementName":"dependency","requirementType":"tosca.capabilities.Root","targetedCapabilityName":"root"}},"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"network":{"type":"tosca.capabilities.Connectivity","properties":null}},"capabilities":{"host":{"type":"tosca.capabilities.Container","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null},"attach":{"type":"tosca.capabilities.Attachment","properties":null},"scalable":{"type":"tosca.capabilities.Scalable","properties":{"max_intances":{"value":"1","definition":false},"default_instances":{"value":"1","definition":false},"min_intances":{"value":"1","definition":false}}}},"artifacts":null}}]}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service2/topologyTemplate.txt b/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service2/topologyTemplate.txt deleted file mode 100644 index 3c342f6cd1..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/getServiceListTest/Service2/topologyTemplate.txt +++ /dev/null @@ -1,2 +0,0 @@ -{"id":"25845cce-05c8-4502-b5fe-abfd6bd6f28e","name":"ServiceArtListNoContent","description":null,"topologyId":"3293c9c8-a162-43fc-b8d1-431399f89cb7"} - diff --git a/asdc-tests/src/test/resources/CI/tests/uploadComponent/images/mysql.png b/asdc-tests/src/test/resources/CI/tests/uploadComponent/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/uploadComponent/images/mysql.png +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/tests/uploadComponent/mysql.yml b/asdc-tests/src/test/resources/CI/tests/uploadComponent/mysql.yml deleted file mode 100644 index a2eb4d423a..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/uploadComponent/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-uploadComponent -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-uploadComponent: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/asdc-tests/src/test/resources/CI/tests/uploadComponent/scripts/install_mysql.sh b/asdc-tests/src/test/resources/CI/tests/uploadComponent/scripts/install_mysql.sh deleted file mode 100644 index 400bcf40cb..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/uploadComponent/scripts/install_mysql.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -echo "Debian based MYSQL install 5..." -LOCK="/tmp/lockaptget" - -while true; do - if mkdir "${LOCK}" &>/dev/null; then - echo "MySQL take the lock" - break; - fi - echo "Waiting the end of one of our recipes..." - sleep 0.5 -done - -while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - echo "Waiting for other software managers to finish..." - sleep 0.5 -done -sudo rm -f /var/lib/dpkg/lock - -sudo apt-get update || (sleep 15; sudo apt-get update || exit ${1}) -sudo DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server-5.5 pwgen || exit ${1} -rm -rf "${LOCK}" - -sudo /etc/init.d/mysql stop -sudo rm -rf /var/lib/apt/lists/* -sudo rm -rf /var/lib/mysql/* -echo "MySQL Installation complete."
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/tests/uploadComponent/scripts/start_mysql.sh b/asdc-tests/src/test/resources/CI/tests/uploadComponent/scripts/start_mysql.sh deleted file mode 100644 index 648bd45756..0000000000 --- a/asdc-tests/src/test/resources/CI/tests/uploadComponent/scripts/start_mysql.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -echo "------------------------ ENV ------------------------" -echo "ENV VAR USED VOLUME_HOME : $VOLUME_HOME" -echo "ENV VAR USED PORT : $PORT" -echo "ENV VAR USED DB_NAME : $DB_NAME" -echo "ENV VAR USED DB_USER : $DB_USER" -echo "ENV VAR USED DB_PASSWORD : $DB_PASSWORD" -echo "---------------------------- ------------------------" - -CURRENT_PATH=`dirname "$0"` - -function StartMySQL { - echo "Starting MYSQL..." - sudo /etc/init.d/mysql stop - sudo /usr/bin/mysqld_safe > /dev/null 2>&1 & - RET=1 - while [[ RET -ne 0 ]]; do - echo "=> Waiting for confirmation of MySQL service startup" - sleep 5 - sudo mysql -uroot -e "status" > /dev/null 2>&1 - RET=$? - done -} - -function AllowFileSystemToMySQL { - MYSQL_DATA_DIR=$VOLUME_HOME/data - MYSQL_LOG=$VOLUME_HOME/logs - - echo "Setting data directory to $MYSQL_DATA_DIR an logs to $MYSQL_LOG ..." - if sudo test ! -d $MYSQL_DATA_DIR; then - echo "Creating DATA dir > $MYSQL_DATA_DIR ..." - sudo mkdir -p $MYSQL_DATA_DIR - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_DATA_DIR - fi - if sudo test ! -d $MYSQL_LOG; then - echo "Creating LOG dir > $MYSQL_LOG ..." - sudo mkdir -p $MYSQL_LOG - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_LOG - fi - - # edit app mysql permission in : /etc/apparmor.d/usr.sbin.mysqld - COUNT_LINE=`sudo cat /etc/apparmor.d/usr.sbin.mysqld | wc -l` - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/** rwk," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/** rwk," /etc/apparmor.d/usr.sbin.mysqld - - # reload app permission manager service - sudo service apparmor reload -} - -function UpdateMySQLConf { - echo "Updating MySQL conf files [DATA, LOGS]..." - sudo sed -i "s:/var/lib/mysql:$MYSQL_DATA_DIR:g" /etc/mysql/my.cnf - sudo sed -i "s:/var/log/mysql/error.log:$MYSQL_LOG/error.log:g" /etc/mysql/my.cnf - sudo sed -i "s:3306:$PORT:g" /etc/mysql/my.cnf - - if sudo test ! -f /usr/share/mysql/my-default.cnf; then - sudo cp /etc/mysql/my.cnf /usr/share/mysql/my-default.cnf - fi - if sudo test ! -f /etc/mysql/conf.d/mysqld_charset.cnf; then - sudo cp $configs/mysqld_charset.cnf /etc/mysql/conf.d/mysqld_charset.cnf - fi - - if [ "$BIND_ADRESS" == "true" ]; then - sudo sed -i "s/bind-address.*/bind-address = 0.0.0.0/" /etc/mysql/my.cnf - fi -} - -function InitMySQLDb { - # create database DB_NAME - if [ "$DB_NAME" ]; then - echo "INIT DATABASE $DB_NAME" - sudo mysql -u root -e "CREATE DATABASE $DB_NAME"; - fi - - # create user and give rights - if [ "$DB_USER" ]; then - echo "CREATE USER $DB_USER WITH PASSWORD $DB_PASSWORD AND GRAND RIGHTS ON $DB_NAME" - sudo mysql -uroot -e "CREATE USER '${DB_USER}'@'%' IDENTIFIED BY '$DB_PASSWORD'" - sudo mysql -uroot -e "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO '${DB_USER}'@'%' WITH GRANT OPTION" - sudo mysql -uroot -e "FLUSH PRIVILEGES" - fi -} - -# Create a new database path to the attched volume -if sudo test ! -d $VOLUME_HOME/data; then - echo "=> An empty or uninitialized MySQL volume is detected in $VOLUME_HOME/data" - AllowFileSystemToMySQL - UpdateMySQLConf - echo "=> Init new database path to $MYSQL_DATA_DIR" - sudo mysql_install_db --basedir=/usr --datadir=$MYSQL_DATA_DIR - echo "=> MySQL database initialized !" -else - echo "=> Using an existing volume of MySQL" - AllowFileSystemToMySQL - UpdateMySQLConf -fi - -# Finally start MySQL with new configuration -StartMySQL -InitMySQLDb
\ No newline at end of file diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index 8b638e84d7..78907ba03d 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -611,41 +611,6 @@ </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <includeScope>compile</includeScope> - </configuration> - </execution> - <execution> - <id>copy-installed</id> - <phase>install</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>${project.groupId}</groupId> - <artifactId>${project.artifactId}</artifactId> - <version>${project.version}</version> - <type>${project.packaging}</type> - </artifactItem> - </artifactItems> - <outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-backend/</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> <groupId>com.jcabi</groupId> <artifactId>jcabi-maven-plugin</artifactId> <version>${jcabi.plugin.version}</version> @@ -662,25 +627,6 @@ <artifactId>maven-resources-plugin</artifactId> <version>2.6</version> <executions> - <execution> - <id>copy-normatives</id> - <phase>install</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/files/default</outputDirectory> - <resources> - <resource> - <directory>./target</directory> - <includes> - <include>normatives.tar.gz</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - <execution> <id>copy-tosca-folder</id> <!-- here the phase you need --> diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentBusinessLogic.java index 33180cd35e..a34bf00a7a 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentBusinessLogic.java @@ -38,11 +38,7 @@ import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum; import org.openecomp.sdc.be.datamodel.api.HighestFilterEnum; import org.openecomp.sdc.be.datatypes.components.ServiceMetadataDataDefinition; import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition; -import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; -import org.openecomp.sdc.be.datatypes.enums.FilterKeyEnum; -import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; -import org.openecomp.sdc.be.datatypes.enums.OriginTypeEnum; -import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum; +import org.openecomp.sdc.be.datatypes.enums.*; import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition; import org.openecomp.sdc.be.model.ArtifactDefinition; import org.openecomp.sdc.be.model.CapReqDef; @@ -686,8 +682,11 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic { } public Either<ImmutablePair<String, byte[]>, ResponseFormat> getToscaModelByComponentUuid(ComponentTypeEnum componentType, String uuid, EnumMap<AuditingFieldsKeysEnum, Object> additionalParam) { - - Either<List<Component>, StorageOperationStatus> latestVersionEither = toscaOperationFacade.getComponentListByUuid(uuid, null); + + Map<GraphPropertyEnum, Object> additionalPropertiesToMatch = new EnumMap<>(GraphPropertyEnum.class); + additionalPropertiesToMatch.put(GraphPropertyEnum.COMPONENT_TYPE, componentType.name()); + + Either<List<Component>, StorageOperationStatus> latestVersionEither = toscaOperationFacade.getComponentListByUuid(uuid, additionalPropertiesToMatch); if (latestVersionEither.isRight()) { ResponseFormat response = componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(latestVersionEither.right().value(), componentType)); diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java index e5282ce437..b0feffdd42 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java @@ -1869,27 +1869,25 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic { log.debug("************* Going to create all nodes {}", yamlName); Either<Map<String, Resource>, ResponseFormat> createdResourcesFromdNodeTypeMap = this.handleNodeTypes(yamlName, resource, topologyTemplateYaml, false, nodeTypesArtifactsToCreate, nodeTypesNewCreatedArtifacts, nodeTypesInfo, csarInfo, nodeName); - log.debug("************* Finished to create all nodes {}", yamlName); if (createdResourcesFromdNodeTypeMap.isRight()) { log.debug("failed to resources from node types status is {}", createdResourcesFromdNodeTypeMap.right().value()); return Either.right(createdResourcesFromdNodeTypeMap.right().value()); } + log.debug("************* Finished to create all nodes {}", yamlName); log.debug("************* Going to create all resource instances {}", yamlName); createResourcesInstancesEither = createResourceInstances(csarInfo.getModifier(), yamlName, resource, uploadComponentInstanceInfoMap, true, false, csarInfo.getCreatedNodes()); - log.debug("************* Finished to create all resource instances {}", yamlName); if (createResourcesInstancesEither.isRight()) { log.debug("failed to create resource instances status is {}", createResourcesInstancesEither.right().value()); result = createResourcesInstancesEither; return createResourcesInstancesEither; } + log.debug("************* Finished to create all resource instances for {}", yamlName); resource = createResourcesInstancesEither.left().value(); log.debug("************* Going to create all relations {}", yamlName); createResourcesInstancesEither = createResourceInstancesRelations(csarInfo.getModifier(), yamlName, resource, uploadComponentInstanceInfoMap); - log.debug("************* Finished to create all relations {}", yamlName); - if (createResourcesInstancesEither.isRight()) { log.debug("failed to create relation between resource instances status is {}", createResourcesInstancesEither.right().value()); result = createResourcesInstancesEither; @@ -1897,6 +1895,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic { } else { resource = createResourcesInstancesEither.left().value(); } + log.debug("************* Finished to create all relations {}", yamlName); log.debug("************* Going to create positions {}", yamlName); Either<List<ComponentInstance>, ResponseFormat> eitherSetPosition = compositionBusinessLogic.setPositionsForComponentInstances(resource, csarInfo.getModifier().getUserId()); @@ -4265,7 +4264,6 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic { return Either.left(validRegDef); } - @SuppressWarnings("unchecked") public Either<ParsedToscaYamlInfo, ResponseFormat> parseResourceInfoFromYaml(String yamlFileName, Resource resource, String resourceYml, Map<String, String> createdNodesToscaResourceNames, Map<String, NodeTypeInfo> nodeTypesInfo, String nodeName) { Map<String, Object> mappedToscaTemplate; @@ -4319,7 +4317,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic { Map<String, Resource> nodeNamespaceMap) { Either<Resource, ResponseFormat> eitherResource = null; - log.debug("createResourceInstances is {} - going to create resource instanse from CSAR", yamlName); + log.debug("{} - going to create resource instanse from CSAR", yamlName); if (uploadResInstancesMap == null || uploadResInstancesMap.isEmpty()) { ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE); @@ -4334,13 +4332,13 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic { Iterator<Entry<String, UploadComponentInstanceInfo>> nodesInfoValue = uploadResInstancesMap.entrySet().iterator(); Map<ComponentInstance, Resource> resourcesInstancesMap = new HashMap<>(); while (nodesInfoValue.hasNext()) { - log.debug("*************Going to create resource instances {}", yamlName); + log.debug("*************Going to create resource instances from {}", yamlName); Entry<String, UploadComponentInstanceInfo> uploadComponentInstanceInfoEntry = nodesInfoValue.next(); UploadComponentInstanceInfo uploadComponentInstanceInfo = uploadComponentInstanceInfoEntry.getValue(); // updating type if the type is node type name - we need to take the // updated name - log.debug("*************Going to create resource instances {}", uploadComponentInstanceInfo.getName()); + log.debug("*************Going to create resource instance {}", uploadComponentInstanceInfo.getName()); if (nodeNamespaceMap.containsKey(uploadComponentInstanceInfo.getType())) { uploadComponentInstanceInfo.setType(nodeNamespaceMap.get(uploadComponentInstanceInfo.getType()).getToscaResourceName()); } @@ -4357,17 +4355,19 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic { ComponentTypeEnum containerComponentType = resource.getComponentType(); NodeTypeEnum containerNodeType = containerComponentType.getNodeType(); - - if (containerNodeType.equals(NodeTypeEnum.Resource) && uploadComponentInstanceInfo.getCapabilities() != null) { - Either<Map<String, List<CapabilityDefinition>>, ResponseFormat> getValidComponentInstanceCapabilitiesRes = getValidComponentInstanceCapabilities(refResource.getCapabilities(), uploadComponentInstanceInfo.getCapabilities()); + //************ + if (containerNodeType.equals(NodeTypeEnum.Resource) && MapUtils.isNotEmpty(uploadComponentInstanceInfo.getCapabilities()) && MapUtils.isNotEmpty(refResource.getCapabilities())) { + setCapabilityNamesTypes(refResource.getCapabilities(), uploadComponentInstanceInfo.getCapabilities()); + Either<Map<String, List<CapabilityDefinition>>, ResponseFormat> getValidComponentInstanceCapabilitiesRes = getValidComponentInstanceCapabilities(refResource.getUniqueId(), refResource.getCapabilities(), uploadComponentInstanceInfo.getCapabilities()); if (getValidComponentInstanceCapabilitiesRes.isRight()) { return Either.right(getValidComponentInstanceCapabilitiesRes.right().value()); } else { componentInstance.setCapabilities(getValidComponentInstanceCapabilitiesRes.left().value()); } } + //*********************** if (!existingnodeTypeMap.containsKey(uploadComponentInstanceInfo.getType())) { - log.debug("createResourceInstances - not found lates version for resource instance with name {} and type ", uploadComponentInstanceInfo.getName(), uploadComponentInstanceInfo.getType()); + log.debug("createResourceInstances - not found latest version for resource instance with name {} and type ", uploadComponentInstanceInfo.getName(), uploadComponentInstanceInfo.getType()); ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_NODE_TEMPLATE, yamlName, uploadComponentInstanceInfo.getName(), uploadComponentInstanceInfo.getType()); return Either.right(responseFormat); } @@ -4417,16 +4417,30 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic { return Either.left(eitherGerResource.left().value()); } + + private void setCapabilityNamesTypes(Map<String, List<CapabilityDefinition>> originCapabilities, Map<String, List<UploadCapInfo>> uploadedCapabilities) { + for(Entry<String, List<UploadCapInfo>> currEntry : uploadedCapabilities.entrySet()){ + if(originCapabilities.containsKey(currEntry.getKey())){ + currEntry.getValue().stream().forEach(cap -> cap.setType(currEntry.getKey())); + } + } + + for(Map.Entry<String, List<CapabilityDefinition>> capabilities : originCapabilities.entrySet()){ + capabilities.getValue().stream().forEach(cap -> {if(uploadedCapabilities.containsKey(cap.getName())){uploadedCapabilities.get(cap.getName()).stream().forEach(c -> {c.setName(cap.getName());c.setType(cap.getType());});};}); + } + } + + private Either<Resource, ResponseFormat> validateResourceInstanceBeforeCreate(String yamlName, UploadComponentInstanceInfo uploadComponentInstanceInfo, Map<String, Resource> nodeNamespaceMap) { - log.debug("validateResourceInstanceBeforeCreate - going to validate resource instance with name {} and type before create", uploadComponentInstanceInfo.getName(), uploadComponentInstanceInfo.getType()); + log.debug("going to validate resource instance with name {} and type {} before create", uploadComponentInstanceInfo.getName(), uploadComponentInstanceInfo.getType()); Resource refResource = null; if (nodeNamespaceMap.containsKey(uploadComponentInstanceInfo.getType())) { refResource = nodeNamespaceMap.get(uploadComponentInstanceInfo.getType()); } else { Either<Resource, StorageOperationStatus> findResourceEither = toscaOperationFacade.getLatestCertifiedNodeTypeByToscaResourceName(uploadComponentInstanceInfo.getType()); if (findResourceEither.isRight()) { - log.debug("validateResourceInstanceBeforeCreate - not found lates version for resource instance with name {} and type ", uploadComponentInstanceInfo.getName(), uploadComponentInstanceInfo.getType()); + log.debug("not found lates version for resource instance with name {} and type {}", uploadComponentInstanceInfo.getName(), uploadComponentInstanceInfo.getType()); ResponseFormat responseFormat = componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(findResourceEither.right().value())); return Either.right(responseFormat); } @@ -4435,16 +4449,17 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic { } String componentState = refResource.getComponentMetadataDefinition().getMetadataDataDefinition().getState(); if (componentState.equals(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.name())) { - log.debug("validateResourceInstanceBeforeCreate - component instance of component {} can not be created because the component is in an illegal state {}.", refResource.getName(), componentState); + log.debug("component instance of component {} can not be created because the component is in an illegal state {}.", refResource.getName(), componentState); ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.ILLEGAL_COMPONENT_STATE, refResource.getComponentType().getValue(), refResource.getName(), componentState); return Either.right(responseFormat); } if (!ToscaUtils.isAtomicType(refResource) && refResource.getResourceType() != ResourceTypeEnum.CVFC) { - log.debug("validateResourceInstanceBeforeCreate - ref resource type is ", refResource.getResourceType()); + log.debug("ref resource type is {}", refResource.getResourceType()); ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_NODE_TEMPLATE, yamlName, uploadComponentInstanceInfo.getName(), uploadComponentInstanceInfo.getType()); return Either.right(responseFormat); } + log.debug("validate resource instance with name {} and type {} before create, successful",uploadComponentInstanceInfo.getName(), uploadComponentInstanceInfo.getType()); return Either.left(refResource); } @@ -7058,7 +7073,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic { return null; } - private Either<Map<String, List<CapabilityDefinition>>, ResponseFormat> getValidComponentInstanceCapabilities(Map<String, List<CapabilityDefinition>> defaultCapabilities, Map<String, List<UploadCapInfo>> uploadedCapabilities) { + private Either<Map<String, List<CapabilityDefinition>>, ResponseFormat> getValidComponentInstanceCapabilities(String resourceId, Map<String, List<CapabilityDefinition>> defaultCapabilities, Map<String, List<UploadCapInfo>> uploadedCapabilities) { ResponseFormat responseFormat; Map<String, List<CapabilityDefinition>> validCapabilitiesMap = new HashMap<>(); @@ -7068,14 +7083,33 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic { responseFormat = componentsUtils.getResponseFormat(ActionStatus.MISSING_CAPABILITY_TYPE, capabilityType); return Either.right(responseFormat); } else { - CapabilityDefinition delaultCapability = defaultCapabilities.get(capabilityType).get(0); - Either<Boolean, String> validationRes = validateUniquenessUpdateUploadedComponentInstanceCapability(delaultCapability, uploadedCapabilitiesEntry.getValue().get(0)); - if (validationRes.isRight()) { - responseFormat = componentsUtils.getResponseFormat(ActionStatus.PROPERTY_NAME_ALREADY_EXISTS, validationRes.right().value()); + CapabilityDefinition defaultCapability; + if(CollectionUtils.isNotEmpty(defaultCapabilities.get(capabilityType).get(0).getProperties())){ + defaultCapability = defaultCapabilities.get(capabilityType).get(0); + } else { + Either<Component, StorageOperationStatus> getFullComponentRes = toscaOperationFacade.getToscaFullElement(resourceId); + if(getFullComponentRes.isRight()){ + log.debug("Failed to get full component {}. Status is {}. ", resourceId, getFullComponentRes.right().value()); + responseFormat = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_NOT_FOUND, resourceId); + return Either.right(responseFormat); + } + defaultCapability = getFullComponentRes.left().value().getCapabilities().get(capabilityType).get(0); + } + if(CollectionUtils.isEmpty(defaultCapability.getProperties()) && CollectionUtils.isNotEmpty(uploadedCapabilitiesEntry.getValue().get(0).getProperties())){ + log.debug("Failed to validate capability {} of component {}. Property list is empty. ", defaultCapability.getName(), resourceId); + log.debug("Failed to update capability property values. Property list of fetched capability {} is empty. ", defaultCapability.getName()); + responseFormat = componentsUtils.getResponseFormat(ActionStatus.PROPERTY_NOT_FOUND, resourceId); return Either.right(responseFormat); } + if(CollectionUtils.isNotEmpty(defaultCapability.getProperties()) && CollectionUtils.isNotEmpty(uploadedCapabilitiesEntry.getValue().get(0).getProperties())){ + Either<Boolean, String> validationRes = validateUniquenessUpdateUploadedComponentInstanceCapability(defaultCapability, uploadedCapabilitiesEntry.getValue().get(0)); + if (validationRes.isRight()) { + responseFormat = componentsUtils.getResponseFormat(ActionStatus.PROPERTY_NAME_ALREADY_EXISTS, validationRes.right().value()); + return Either.right(responseFormat); + } + } List<CapabilityDefinition> validCapabilityList = new ArrayList<>(); - validCapabilityList.add(delaultCapability); + validCapabilityList.add(defaultCapability); validCapabilitiesMap.put(uploadedCapabilitiesEntry.getKey(), validCapabilityList); } } diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml index eb26c8a34f..2ae2cccb77 100644 --- a/catalog-be/src/main/resources/config/configuration.yaml +++ b/catalog-be/src/main/resources/config/configuration.yaml @@ -328,6 +328,9 @@ serviceDeploymentArtifacts: PLAN: acceptedTypes: - xml + validForResourceTypes: + - VF + - VFC resourceDeploymentArtifacts: HEAT: diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.json b/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.json new file mode 100644 index 0000000000..d9b008a870 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.json @@ -0,0 +1,21 @@ +{ + "payloadName": "genericNeutronNet.yml", + "contactId": "jh0003", + "name": "Generic NeutronNet", + "description": "Generic NeutronNet", + "resourceIconPath": "network", + "resourceType": "VL", + "categories": [ + { + "name": "Generic", + "subcategories": [ + { + "name": "Network Elements" + } + ] + } +], + "tags": [ + "Generic NeutronNet" + ] +}
\ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.yml b/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.yml new file mode 100644 index 0000000000..12dc13e98b --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.yml @@ -0,0 +1,36 @@ +tosca_definitions_version: tosca_simple_yaml_1_0 +node_types: + org.openecomp.resource.vl.GenericNeutronNet: + derived_from: org.openecomp.resource.vl.extVL + description: Generic Neutron Network + properties: + network_role: + type: string + description: | + Unique label that defines the role that this network performs. example: vce oam network, vnat sr-iov1 network + network_assignments: + type: org.openecomp.datatypes.network.NetworkAssignments + network_flows: + type: org.openecomp.datatypes.network.NetworkFlows + network_scope: + type: string + network_ecomp_naming: + type: org.openecomp.datatypes.EcompNaming + network_type: + type: string + description: ECOMP supported network types. + default: NEUTRON + provider_network: + type: org.openecomp.datatypes.network.ProviderNetwork + network_technology: + type: string + description: ECOMP supported network technology + default: NEUTRON + network_homing: + type: org.openecomp.datatypes.EcompHoming + capabilities: + virtual_linkable: + type: tosca.capabilities.network.Linkable + occurrences: + - 1 + - UNBOUNDED
\ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.zip b/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.zip Binary files differnew file mode 100644 index 0000000000..ed51f834f3 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.zip diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml index 958806a097..51a8ce539e 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml @@ -17,126 +17,126 @@ metadata: node_types: - # ***************************************************************************** - # Overlay tunnel service - # ***************************************************************************** + # ***************************************************************************** + # Overlay tunnel service + # ***************************************************************************** - org.openecomp.resource.vl.overlaytunnel: - derived_from: tosca.nodes.Root - description: This entity represents abstract overlay tunnel end point. - properties: - id: - type: string - description: Identifier of the Tunnel Endpoint node. - required: false - template_name: - type: string - required: false - version: - type: string - required: false - name: - type: string - description: Overlay tunnel name used by for reference by the administrator. - required: false - description: - type: string - description: Additional comments/information about overlay tunnel. - required: false - tunnelType: - type: string - constraints: - - valid_values: ['L3-DCI','L2-DCI'] - description: type defines if the overlay tunnel is L3-DCI tunnel or L2-DCI tunnel. - required: true - site1_id: - type: string - description: Identifier of first DCI overlay tunnel endpoint. This could be IP address of domain controller. - required: true - site1_description: - type: string - description: Additional comments/information about overlay tunnel. Description can also be used to identify domain controller. - required: false - site1_networkName: - type: string - description: Name of the network that is being associated with overlay tunnel. - required: true - site1_routerId: - type: string - description: Identifier of router connected to L3 tunnel end point, while configuring L3-DCI tunnel. - required: false - site1_importRT1: - type: string - description: List of Route targets imported by the local router. - required: false - site1_exportRT1: - type: string - description: List of Route targets exported by the local router. - required: false - site1_vni: - type: integer - description: VXLAN ID - required: false - site1_fireWallEnable: - type: boolean - required: false - description: Identifies if a firewall exists in the path of overlay tunnel. - default: false - site1_fireWallId: - type: string - description: Identifier of Firewall that is in overlay tunnel path - required: false - site1_localNetworkAll: - type: boolean - description: Identifies whether all the local networks associate with the tunnel or not. - required: false - default: 'false' - site2_id: - type: string - description: Identifier of second DCI overlay tunnel endpoint. This could be IP address of domain controller. - required: true - site2_description: - type: string - description: Additional comments/information about overlay tunnel. Description can also be used to identify domain controller. - required: false - site2_networkName: - type: string - description: Name of the network that is being associated with overlay tunnel. - required: true - site2_routerId: - type: string - description: Identifier of router connected to L3 tunnel end point, while configuring L3-DCI tunnel. - required: false - site2_importRT1: - type: string - description: List of Route targets imported by the local router. - required: false - site2_exportRT1: - type: string - description: List of Route targets exported by the local router. - required: false - site2_vni: - type: integer - description: VXLAN ID - required: false - site2_fireWallEnable: - type: boolean - required: false - description: Identifies if a firewall exists in the path of overlay tunnel. - default: false - site2_fireWallId: - type: string - description: Identifier of Firewall that is in overlay tunnel path - required: false - site2_localNetworkAll: - type: boolean - description: Identifies whether all the local networks associate with the tunnel or not. - required: false - default: 'false' - requirements: - - virtualLink: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - capabilities: - virtual_linkable: - type: tosca.capabilities.network.Linkable + org.openecomp.resource.vl.overlaytunnel: + derived_from: tosca.nodes.Root + description: This entity represents abstract overlay tunnel end point. + properties: + id: + type: string + description: Identifier of the Tunnel Endpoint node. + required: false + template_name: + type: string + required: false + version: + type: string + required: false + name: + type: string + description: Overlay tunnel name used by for reference by the administrator. + required: false + description: + type: string + description: Additional comments/information about overlay tunnel. + required: false + tunnelType: + type: string + constraints: + - valid_values: ['L3-DCI','L2-DCI'] + description: type defines if the overlay tunnel is L3-DCI tunnel or L2-DCI tunnel. + required: true + site1_id: + type: string + description: Identifier of first DCI overlay tunnel endpoint. This could be IP address of domain controller. + required: true + site1_description: + type: string + description: Additional comments/information about overlay tunnel. Description can also be used to identify domain controller. + required: false + site1_networkName: + type: string + description: Name of the network that is being associated with overlay tunnel. + required: true + site1_routerId: + type: string + description: Identifier of router connected to L3 tunnel end point, while configuring L3-DCI tunnel. + required: false + site1_importRT1: + type: string + description: List of Route targets imported by the local router. + required: false + site1_exportRT1: + type: string + description: List of Route targets exported by the local router. + required: false + site1_vni: + type: integer + description: VXLAN ID + required: false + site1_fireWallEnable: + type: boolean + required: false + description: Identifies if a firewall exists in the path of overlay tunnel. + default: false + site1_fireWallId: + type: string + description: Identifier of Firewall that is in overlay tunnel path + required: false + site1_localNetworkAll: + type: boolean + description: Identifies whether all the local networks associate with the tunnel or not. + required: false + default: 'false' + site2_id: + type: string + description: Identifier of second DCI overlay tunnel endpoint. This could be IP address of domain controller. + required: true + site2_description: + type: string + description: Additional comments/information about overlay tunnel. Description can also be used to identify domain controller. + required: false + site2_networkName: + type: string + description: Name of the network that is being associated with overlay tunnel. + required: true + site2_routerId: + type: string + description: Identifier of router connected to L3 tunnel end point, while configuring L3-DCI tunnel. + required: false + site2_importRT1: + type: string + description: List of Route targets imported by the local router. + required: false + site2_exportRT1: + type: string + description: List of Route targets exported by the local router. + required: false + site2_vni: + type: integer + description: VXLAN ID + required: false + site2_fireWallEnable: + type: boolean + required: false + description: Identifies if a firewall exists in the path of overlay tunnel. + default: false + site2_fireWallId: + type: string + description: Identifier of Firewall that is in overlay tunnel path + required: false + site2_localNetworkAll: + type: boolean + description: Identifies whether all the local networks associate with the tunnel or not. + required: false + default: 'false' + requirements: + - virtualLink: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + capabilities: + virtual_linkable: + type: tosca.capabilities.network.Linkable diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip Binary files differindex e60fcbc0a6..9340f06ca7 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip +++ b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json index 6107261dd9..1311fe9f32 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json +++ b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json @@ -7,7 +7,7 @@ "resourceType": "VL", "categories": [ { - "name": "Generic", + "name": "Network Connectivity", "subcategories": [ { "name": "Virtual Links" diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip Binary files differindex 4a0bce00f7..65bc805bb7 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip +++ b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.json b/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.json new file mode 100644 index 0000000000..22788ec06c --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.json @@ -0,0 +1,15 @@ +{ + "payloadName": "NSD.yml", + "contactId": "jh0003", + "name": "NSD", + "description": "NSD", + "resourceIconPath": "network", + "resourceType": "VFC", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Network Elements" + }] + }], + "tags": ["NSD"] +}
\ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.yml b/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.yml new file mode 100644 index 0000000000..1b3d8820d5 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.yml @@ -0,0 +1,41 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + org.openecomp.resource.vfc.NSD: + derived_from: tosca.nodes.Root + description: ECOMP Allotted Resource base type all other allotted resources node types derive from + properties: + nsd_id: + type: string + required: true + description: ID of the NSD + nsd_designer: + type: string + required: true + description: Designer of the NSD + nsd_version: + type: string + required: true + description: Version of the NSD + nsd_name: + type: string + required: true + description: Name of the NSD + providing_service_uuid: + type: string + required: true + description: The depending service uuid in order to map the allotted resource to the specific service version + providing_service_invariant_uuid: + type: string + required: true + description: The depending service invariant uuid in order to map the allotted resource to the specific service version + providing_service_name: + type: string + required: true + description: The depending service name in order to map the allotted resource to the specific service version + requirements: + - virtualLink: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + capabilities: + virtual_linkable: + type: tosca.capabilities.network.Linkable diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.zip b/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.zip Binary files differnew file mode 100644 index 0000000000..d741b50c16 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.zip diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.json b/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.json index 6a565dc3b8..955e5e3e30 100644 --- a/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.json +++ b/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.json @@ -11,5 +11,5 @@ "name": "Network Elements" }] }], - "tags": ["Ext ZTE CP"] + "tags": ["ext ZTE CP"] }
\ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.yml b/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.yml index 5cd45b74e3..1638305021 100644 --- a/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.yml +++ b/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.yml @@ -1,5 +1,6 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: +node_types: + tosca.nodes.nfv.ext.zte.VDU: derived_from: tosca.nodes.Root properties: manual_scale_select_vim: diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.zip b/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.zip Binary files differindex a7ad624422..2bf0f54ea3 100644 --- a/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.zip +++ b/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.zip diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.yml b/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.yml index e1f6d068ce..e5d79fcacf 100644 --- a/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.yml +++ b/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.yml @@ -50,7 +50,7 @@ node_types: - 0 - UNBOUNDED - virtual_link: - capability: tosca.capabilities.nfv.VirtualBindable + capability: tosca.capabilities.nfv.VirtualLinkable occurrences: - 0 - UNBOUNDED
\ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.zip b/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.zip Binary files differindex 6a9d4be124..e1b5be9f2f 100644 --- a/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.zip +++ b/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.zip diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py index 3b4ed5463f..c72c2c394f 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py @@ -51,9 +51,10 @@ def importHeatTypes(beHost, bePort, adminUser, fileDir, updateversion): "subInterface", "contrailV2VLANSubInterface", "multiFlavorVFC", - "vnfConfiguration"#, - #"underlayVpn", - #"overlayTunnel" + "vnfConfiguration", + "underlayVpn", + "overlayTunnel", + "genericNeutronNet" ] responseCodes = [200, 201] diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py index 44b63a795b..31c11c74bc 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py @@ -21,10 +21,16 @@ import importCommon def importOnapTypes(beHost, bePort, adminUser, fileDir, updateversion): - onapTypes = [ "vduCompute", + onapTypes = [ "extImageFile", + "extLocalStorage", + "extZteCP", + "extZteVDU", + "extZteVL", + "vduCompute", "vduCpd", "vduVirtualStorage", - "vnfVirtualLinkDesc" + "vnfVirtualLinkDesc", + "NSD" ] responseCodes = [200, 201] diff --git a/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json b/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json index a6948f5da8..c518855860 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json +++ b/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json @@ -1,13 +1,54 @@ { "heat": [ - "contrailPort", - "extCp", - "contrailV2VirtualMachineInterface", + "globalNetwork", + "globalPort", + "globalCompute", + "volume", + "cinderVolume", + "contrailVirtualNetwork", + "neutronNet", "neutronPort", + "novaServer", + "extVl", + "internalVl", + "extCp", + "vl", + "eline", + "abstractSubstitute", + "Generic_VFC", + "Generic_VF", "Generic_PNF", + "Generic_Service", + "contrailNetworkRules", + "contrailPort", + "contrailV2NetworkRules", + "contrailV2VirtualNetwork", + "securityRules", + "contrailAbstractSubstitute", + "contrailCompute", + "contrailV2VirtualMachineInterface", + "subInterface", + "contrailV2VLANSubInterface", "multiFlavorVFC", - "vnfConfiguration" + "vnfConfiguration", + "underlayVpn", + "overlayTunnel", + "genericNeutronNet" ], "normative": [ + "root", + "compute", + "softwareComponent", + "webServer", + "webApplication", + "DBMS", + "database", + "objectStorage", + "blockStorage", + "containerRuntime", + "containerApplication", + "loadBalancer", + "port", + "network" ] }
\ No newline at end of file diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactDefinitionInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactDefinitionInfoTest.java new file mode 100644 index 0000000000..a9b9352673 --- /dev/null +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactDefinitionInfoTest.java @@ -0,0 +1,124 @@ +package org.openecomp.sdc.be.info; + +import javax.annotation.Generated; + +import org.junit.Test; +import org.openecomp.sdc.be.model.ArtifactDefinition; + + +public class ArtifactDefinitionInfoTest { + + private ArtifactDefinitionInfo createTestSubject() { + return new ArtifactDefinitionInfo(new ArtifactDefinition()); + } + + + @Test + public void testGetUniqueId() throws Exception { + ArtifactDefinitionInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUniqueId(); + } + + + @Test + public void testSetUniqueId() throws Exception { + ArtifactDefinitionInfo testSubject; + String uniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUniqueId(uniqueId); + } + + + @Test + public void testGetArtifactName() throws Exception { + ArtifactDefinitionInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getArtifactName(); + } + + + @Test + public void testSetArtifactName() throws Exception { + ArtifactDefinitionInfo testSubject; + String artifactName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setArtifactName(artifactName); + } + + + @Test + public void testGetArtifactDisplayName() throws Exception { + ArtifactDefinitionInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getArtifactDisplayName(); + } + + + @Test + public void testSetArtifactDisplayName() throws Exception { + ArtifactDefinitionInfo testSubject; + String artifactDisplayName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setArtifactDisplayName(artifactDisplayName); + } + + + @Test + public void testGetArtifactVersion() throws Exception { + ArtifactDefinitionInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getArtifactVersion(); + } + + + @Test + public void testSetArtifactVersion() throws Exception { + ArtifactDefinitionInfo testSubject; + String artifactVersion = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setArtifactVersion(artifactVersion); + } + + + @Test + public void testGetArtifactUUID() throws Exception { + ArtifactDefinitionInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getArtifactUUID(); + } + + + @Test + public void testSetArtifactUUID() throws Exception { + ArtifactDefinitionInfo testSubject; + String artifactUUID = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setArtifactUUID(artifactUUID); + } +}
\ No newline at end of file diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupDefinitionInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupDefinitionInfoTest.java new file mode 100644 index 0000000000..36644c5ff7 --- /dev/null +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/GroupDefinitionInfoTest.java @@ -0,0 +1,247 @@ +package org.openecomp.sdc.be.info; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; +import org.openecomp.sdc.be.model.GroupProperty; + + +public class GroupDefinitionInfoTest { + + private GroupDefinitionInfo createTestSubject() { + return new GroupDefinitionInfo(); + } + + + @Test + public void testGetInvariantUUID() throws Exception { + GroupDefinitionInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getInvariantUUID(); + } + + + @Test + public void testSetInvariantUUID() throws Exception { + GroupDefinitionInfo testSubject; + String invariantUUID = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setInvariantUUID(invariantUUID); + } + + + @Test + public void testGetName() throws Exception { + GroupDefinitionInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getName(); + } + + + @Test + public void testSetName() throws Exception { + GroupDefinitionInfo testSubject; + String name = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setName(name); + } + + + @Test + public void testGetUniqueId() throws Exception { + GroupDefinitionInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUniqueId(); + } + + + @Test + public void testSetUniqueId() throws Exception { + GroupDefinitionInfo testSubject; + String uniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUniqueId(uniqueId); + } + + + @Test + public void testGetGroupUUID() throws Exception { + GroupDefinitionInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getGroupUUID(); + } + + + @Test + public void testSetGroupUUID() throws Exception { + GroupDefinitionInfo testSubject; + String groupUUID = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setGroupUUID(groupUUID); + } + + + @Test + public void testGetVersion() throws Exception { + GroupDefinitionInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getVersion(); + } + + + @Test + public void testSetVersion() throws Exception { + GroupDefinitionInfo testSubject; + String version = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setVersion(version); + } + + + @Test + public void testGetCustomizationUUID() throws Exception { + GroupDefinitionInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCustomizationUUID(); + } + + + @Test + public void testSetCustomizationUUID() throws Exception { + GroupDefinitionInfo testSubject; + String customizationUUID = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setCustomizationUUID(customizationUUID); + } + + + @Test + public void testGetIsBase() throws Exception { + GroupDefinitionInfo testSubject; + Boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getIsBase(); + } + + + @Test + public void testSetIsBase() throws Exception { + GroupDefinitionInfo testSubject; + Boolean isBase = null; + + // default test + testSubject = createTestSubject(); + testSubject.setIsBase(isBase); + } + + + @Test + public void testGetArtifacts() throws Exception { + GroupDefinitionInfo testSubject; + List<ArtifactDefinitionInfo> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getArtifacts(); + } + + + @Test + public void testSetArtifacts() throws Exception { + GroupDefinitionInfo testSubject; + List<ArtifactDefinitionInfo> artifacts = null; + + // default test + testSubject = createTestSubject(); + testSubject.setArtifacts(artifacts); + } + + + @Test + public void testGetProperties() throws Exception { + GroupDefinitionInfo testSubject; + List<? extends GroupProperty> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getProperties(); + } + + + @Test + public void testSetProperties() throws Exception { + GroupDefinitionInfo testSubject; + List<? extends GroupProperty> properties = null; + + // default test + testSubject = createTestSubject(); + testSubject.setProperties(properties); + } + + + @Test + public void testGetGroupInstanceUniqueId() throws Exception { + GroupDefinitionInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getGroupInstanceUniqueId(); + } + + + @Test + public void testSetGroupInstanceUniqueId() throws Exception { + GroupDefinitionInfo testSubject; + String groupInstanceUniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setGroupInstanceUniqueId(groupInstanceUniqueId); + } + + + @Test + public void testToString() throws Exception { + GroupDefinitionInfo testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } +}
\ No newline at end of file diff --git a/catalog-be/src/test/resources/config/elasticsearch.yml.bak b/catalog-be/src/test/resources/config/elasticsearch.yml.bak deleted file mode 100644 index 98c6864bf2..0000000000 --- a/catalog-be/src/test/resources/config/elasticsearch.yml.bak +++ /dev/null @@ -1,387 +0,0 @@ - -cluster.name: elasticsearch_pavel - -discovery.zen.ping.multicast.enabled: false -discovery.zen.ping.unicast.enabled: true -discovery.zen.ping.unicast.hosts: elasticsearch_host - - - -##################### Elasticsearch Configuration Example ##################### - -# This file contains an overview of various configuration settings, -# targeted at operations staff. Application developers should -# consult the guide at <http://elasticsearch.org/guide>. -# -# The installation procedure is covered at -# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/setup.html>. -# -# Elasticsearch comes with reasonable defaults for most settings, -# so you can try it out without bothering with configuration. -# -# Most of the time, these defaults are just fine for running a production -# cluster. If you're fine-tuning your cluster, or wondering about the -# effect of certain configuration option, please _do ask_ on the -# mailing list or IRC channel [http://elasticsearch.org/community]. - -# Any element in the configuration can be replaced with environment variables -# by placing them in ${...} notation. For example: -# -# node.rack: ${RACK_ENV_VAR} - -# For information on supported formats and syntax for the config file, see -# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/setup-configuration.html> - - -################################### Cluster ################################### - -# Cluster name identifies your cluster for auto-discovery. If you're running -# multiple clusters on the same network, make sure you're using unique names. -# -# cluster.name: elasticsearch - - -#################################### Node ##################################### - -# Node names are generated dynamically on startup, so you're relieved -# from configuring them manually. You can tie this node to a specific name: -# -# node.name: "Franz Kafka" - -# Every node can be configured to allow or deny being eligible as the master, -# and to allow or deny to store the data. -# -# Allow this node to be eligible as a master node (enabled by default): -# -# node.master: true -# -# Allow this node to store data (enabled by default): -# -# node.data: true - -# You can exploit these settings to design advanced cluster topologies. -# -# 1. You want this node to never become a master node, only to hold data. -# This will be the "workhorse" of your cluster. -# -# node.master: false -# node.data: true -# -# 2. You want this node to only serve as a master: to not store any data and -# to have free resources. This will be the "coordinator" of your cluster. -# -# node.master: true -# node.data: false -# -# 3. You want this node to be neither master nor data node, but -# to act as a "search load balancer" (fetching data from nodes, -# aggregating results, etc.) -# -# node.master: false -# node.data: false - -# Use the Cluster Health API [http://localhost:9200/_cluster/health], the -# Node Info API [http://localhost:9200/_nodes] or GUI tools -# such as <http://www.elasticsearch.org/overview/marvel/>, -# <http://github.com/karmi/elasticsearch-paramedic>, -# <http://github.com/lukas-vlcek/bigdesk> and -# <http://mobz.github.com/elasticsearch-head> to inspect the cluster state. - -# A node can have generic attributes associated with it, which can later be used -# for customized shard allocation filtering, or allocation awareness. An attribute -# is a simple key value pair, similar to node.key: value, here is an example: -# -# node.rack: rack314 - -# By default, multiple nodes are allowed to start from the same installation location -# to disable it, set the following: -# node.max_local_storage_nodes: 1 - - -#################################### Index #################################### - -# You can set a number of options (such as shard/replica options, mapping -# or analyzer definitions, translog settings, ...) for indices globally, -# in this file. -# -# Note, that it makes more sense to configure index settings specifically for -# a certain index, either when creating it or by using the index templates API. -# -# See <http://elasticsearch.org/guide/en/elasticsearch/reference/current/index-modules.html> and -# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/indices-create-index.html> -# for more information. - -# Set the number of shards (splits) of an index (5 by default): -# -# index.number_of_shards: 5 - -# Set the number of replicas (additional copies) of an index (1 by default): -# -# index.number_of_replicas: 1 - -# Note, that for development on a local machine, with small indices, it usually -# makes sense to "disable" the distributed features: -# -index.number_of_shards: 1 -index.number_of_replicas: 0 - -# These settings directly affect the performance of index and search operations -# in your cluster. Assuming you have enough machines to hold shards and -# replicas, the rule of thumb is: -# -# 1. Having more *shards* enhances the _indexing_ performance and allows to -# _distribute_ a big index across machines. -# 2. Having more *replicas* enhances the _search_ performance and improves the -# cluster _availability_. -# -# The "number_of_shards" is a one-time setting for an index. -# -# The "number_of_replicas" can be increased or decreased anytime, -# by using the Index Update Settings API. -# -# Elasticsearch takes care about load balancing, relocating, gathering the -# results from nodes, etc. Experiment with different settings to fine-tune -# your setup. - -# Use the Index Status API (<http://localhost:9200/A/_status>) to inspect -# the index status. - - -#################################### Paths #################################### - -# Path to directory containing configuration (this file and logging.yml): -# -path.conf: /src/test/resources - -# Path to directory where to store index data allocated for this node. -# -path.data: target/esdata -# -# Can optionally include more than one location, causing data to be striped across -# the locations (a la RAID 0) on a file level, favouring locations with most free -# space on creation. For example: -# -# path.data: /path/to/data1,/path/to/data2 - -# Path to temporary files: -# -path.work: /target/eswork - -# Path to log files: -# -path.logs: /target/eslogs - -# Path to where plugins are installed: -# -# path.plugins: /path/to/plugins - - -#################################### Plugin ################################### - -# If a plugin listed here is not installed for current node, the node will not start. -# -# plugin.mandatory: mapper-attachments,lang-groovy - - -################################### Memory #################################### - -# Elasticsearch performs poorly when JVM starts swapping: you should ensure that -# it _never_ swaps. -# -# Set this property to true to lock the memory: -# -# bootstrap.mlockall: true - -# Make sure that the ES_MIN_MEM and ES_MAX_MEM environment variables are set -# to the same value, and that the machine has enough memory to allocate -# for Elasticsearch, leaving enough memory for the operating system itself. -# -# You should also make sure that the Elasticsearch process is allowed to lock -# the memory, eg. by using `ulimit -l unlimited`. - - -############################## Network And HTTP ############################### - -# Elasticsearch, by default, binds itself to the 0.0.0.0 address, and listens -# on port [9200-9300] for HTTP traffic and on port [9300-9400] for node-to-node -# communication. (the range means that if the port is busy, it will automatically -# try the next port). - -# Set the bind address specifically (IPv4 or IPv6): -# -# network.bind_host: 192.168.0.1 - -# Set the address other nodes will use to communicate with this node. If not -# set, it is automatically derived. It must point to an actual IP address. -# -# network.publish_host: 192.168.0.1 - -# Set both 'bind_host' and 'publish_host': -# -# network.host: 192.168.0.1 - -# Set a custom port for the node to node communication (9300 by default): -# -# transport.tcp.port: 9300 - -# Enable compression for all communication between nodes (disabled by default): -# -# transport.tcp.compress: true - -# Set a custom port to listen for HTTP traffic: -# -# http.port: 9200 - -# Set a custom allowed content length: -# -# http.max_content_length: 100mb - -# Disable HTTP completely: -# -# http.enabled: false - - -################################### Gateway ################################### - -# The gateway allows for persisting the cluster state between full cluster -# restarts. Every change to the state (such as adding an index) will be stored -# in the gateway, and when the cluster starts up for the first time, -# it will read its state from the gateway. - -# There are several types of gateway implementations. For more information, see -# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-gateway.html>. - -# The default gateway type is the "local" gateway (recommended): -# -# gateway.type: local - -# Settings below control how and when to start the initial recovery process on -# a full cluster restart (to reuse as much local data as possible when using shared -# gateway). - -# Allow recovery process after N nodes in a cluster are up: -# -gateway.recover_after_nodes: 1 - -# Set the timeout to initiate the recovery process, once the N nodes -# from previous setting are up (accepts time value): -# -# gateway.recover_after_time: 5m - -# Set how many nodes are expected in this cluster. Once these N nodes -# are up (and recover_after_nodes is met), begin recovery process immediately -# (without waiting for recover_after_time to expire): -# -gateway.expected_nodes: 1 - - -############################# Recovery Throttling ############################# - -# These settings allow to control the process of shards allocation between -# nodes during initial recovery, replica allocation, rebalancing, -# or when adding and removing nodes. - -# Set the number of concurrent recoveries happening on a node: -# -# 1. During the initial recovery -# -# cluster.routing.allocation.node_initial_primaries_recoveries: 4 -# -# 2. During adding/removing nodes, rebalancing, etc -# -# cluster.routing.allocation.node_concurrent_recoveries: 2 - -# Set to throttle throughput when recovering (eg. 100mb, by default 20mb): -# -# indices.recovery.max_bytes_per_sec: 20mb - -# Set to limit the number of open concurrent streams when -# recovering a shard from a peer: -# -# indices.recovery.concurrent_streams: 5 - - -################################## Discovery ################################## - -# Discovery infrastructure ensures nodes can be found within a cluster -# and master node is elected. Multicast discovery is the default. - -# Set to ensure a node sees N other master eligible nodes to be considered -# operational within the cluster. Its recommended to set it to a higher value -# than 1 when running more than 2 nodes in the cluster. -# -# discovery.zen.minimum_master_nodes: 1 - -# Set the time to wait for ping responses from other nodes when discovering. -# Set this option to a higher value on a slow or congested network -# to minimize discovery failures: -# -# discovery.zen.ping.timeout: 3s - -# For more information, see -# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-discovery-zen.html> - -# Unicast discovery allows to explicitly control which nodes will be used -# to discover the cluster. It can be used when multicast is not present, -# or to restrict the cluster communication-wise. -# -# 1. Disable multicast discovery (enabled by default): -# -# discovery.zen.ping.multicast.enabled: false -# -# 2. Configure an initial list of master nodes in the cluster -# to perform discovery when new nodes (master or data) are started: -# -# discovery.zen.ping.unicast.hosts: ["host1", "host2:port"] - -# EC2 discovery allows to use AWS EC2 API in order to perform discovery. -# -# You have to install the cloud-aws plugin for enabling the EC2 discovery. -# -# For more information, see -# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-discovery-ec2.html> -# -# See <http://elasticsearch.org/tutorials/elasticsearch-on-ec2/> -# for a step-by-step tutorial. - -# GCE discovery allows to use Google Compute Engine API in order to perform discovery. -# -# You have to install the cloud-gce plugin for enabling the GCE discovery. -# -# For more information, see <https://github.com/elasticsearch/elasticsearch-cloud-gce>. - -# Azure discovery allows to use Azure API in order to perform discovery. -# -# You have to install the cloud-azure plugin for enabling the Azure discovery. -# -# For more information, see <https://github.com/elasticsearch/elasticsearch-cloud-azure>. - -################################## Slow Log ################################## - -# Shard level query and fetch threshold logging. - -#index.search.slowlog.threshold.query.warn: 10s -#index.search.slowlog.threshold.query.info: 5s -#index.search.slowlog.threshold.query.debug: 2s -#index.search.slowlog.threshold.query.trace: 500ms - -#index.search.slowlog.threshold.fetch.warn: 1s -#index.search.slowlog.threshold.fetch.info: 800ms -#index.search.slowlog.threshold.fetch.debug: 500ms -#index.search.slowlog.threshold.fetch.trace: 200ms - -#index.indexing.slowlog.threshold.index.warn: 10s -#index.indexing.slowlog.threshold.index.info: 5s -#index.indexing.slowlog.threshold.index.debug: 2s -#index.indexing.slowlog.threshold.index.trace: 500ms - -################################## GC Logging ################################ - -#monitor.jvm.gc.young.warn: 1000ms -#monitor.jvm.gc.young.info: 700ms -#monitor.jvm.gc.young.debug: 400ms - -#monitor.jvm.gc.old.warn: 10s -#monitor.jvm.gc.old.info: 5s -#monitor.jvm.gc.old.debug: 2s - diff --git a/catalog-be/src/test/resources/config/mysql-type-empty-nodes.zip b/catalog-be/src/test/resources/config/mysql-type-empty-nodes.zip Binary files differdeleted file mode 100644 index d317bccd1e..0000000000 --- a/catalog-be/src/test/resources/config/mysql-type-empty-nodes.zip +++ /dev/null diff --git a/catalog-be/src/test/resources/config/mysql-type-no-nodes.zip b/catalog-be/src/test/resources/config/mysql-type-no-nodes.zip Binary files differdeleted file mode 100644 index 09999faed5..0000000000 --- a/catalog-be/src/test/resources/config/mysql-type-no-nodes.zip +++ /dev/null diff --git a/catalog-be/src/test/resources/config/mysql-type-no-version.zip b/catalog-be/src/test/resources/config/mysql-type-no-version.zip Binary files differdeleted file mode 100644 index fa1319f311..0000000000 --- a/catalog-be/src/test/resources/config/mysql-type-no-version.zip +++ /dev/null diff --git a/catalog-be/src/test/resources/config/mysql-type-only-yaml.zip b/catalog-be/src/test/resources/config/mysql-type-only-yaml.zip Binary files differdeleted file mode 100644 index b4b1946940..0000000000 --- a/catalog-be/src/test/resources/config/mysql-type-only-yaml.zip +++ /dev/null diff --git a/catalog-be/src/test/resources/config/mysql-type-with-scripts.zip b/catalog-be/src/test/resources/config/mysql-type-with-scripts.zip Binary files differdeleted file mode 100644 index d689b668a1..0000000000 --- a/catalog-be/src/test/resources/config/mysql-type-with-scripts.zip +++ /dev/null diff --git a/catalog-be/src/test/resources/config/mysql-type.yml b/catalog-be/src/test/resources/config/mysql-type.yml deleted file mode 100644 index f1985a0bdc..0000000000 --- a/catalog-be/src/test/resources/config/mysql-type.yml +++ /dev/null @@ -1,82 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-type -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/catalog-be/src/test/resources/config/mysql-type.zip b/catalog-be/src/test/resources/config/mysql-type.zip Binary files differdeleted file mode 100644 index b4b1946940..0000000000 --- a/catalog-be/src/test/resources/config/mysql-type.zip +++ /dev/null diff --git a/catalog-be/src/test/resources/config/sample.yaml b/catalog-be/src/test/resources/config/sample.yaml deleted file mode 100644 index 12ab2c777f..0000000000 --- a/catalog-be/src/test/resources/config/sample.yaml +++ /dev/null @@ -1,17 +0,0 @@ -version: 1.0 -released: 2012-11-30 - -# Connection parameters -connection: - url: jdbc:mysql://localhost:3306/db - poolSize: 5 - -# Protocols -protocols: - - http - - https - -# Users -users: - tom: passwd - bob: passwd
\ No newline at end of file diff --git a/catalog-be/src/test/resources/config/sampleNoProtocol.yaml b/catalog-be/src/test/resources/config/sampleNoProtocol.yaml deleted file mode 100644 index 6197232aa4..0000000000 --- a/catalog-be/src/test/resources/config/sampleNoProtocol.yaml +++ /dev/null @@ -1,17 +0,0 @@ -version: 1.0 -released: 2012-11-30 - -# Connection parameters -connection: - url: jdbc:mysql://localhost:3306/db - poolSize: 5 - -# Protocols -#protocols: -# - http -# - https - -# Users -users: - tom: passwd - bob: passwd
\ No newline at end of file diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index 155b14c486..fc55523280 100644 --- a/catalog-fe/pom.xml +++ b/catalog-fe/pom.xml @@ -323,42 +323,7 @@ </webResources> </configuration> </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <includeScope>compile</includeScope> - </configuration> - </execution> - <execution> - <id>copy-installed</id> - <phase>install</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>${project.groupId}</groupId> - <artifactId>${project.artifactId}</artifactId> - <version>${project.version}</version> - <type>${project.packaging}</type> - </artifactItem> - </artifactItems> - <outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-frontend/</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - + <plugin> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/AdditionalInformationDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/AdditionalInformationDefinitionTest.java new file mode 100644 index 0000000000..f20b7f35c4 --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/AdditionalInformationDefinitionTest.java @@ -0,0 +1,46 @@ +package org.openecomp.sdc.be.model; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class AdditionalInformationDefinitionTest { + + private AdditionalInformationDefinition createTestSubject() { + return new AdditionalInformationDefinition(); + } + + + @Test + public void testGetParentUniqueId() throws Exception { + AdditionalInformationDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getParentUniqueId(); + } + + + @Test + public void testSetParentUniqueId() throws Exception { + AdditionalInformationDefinition testSubject; + String parentUniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setParentUniqueId(parentUniqueId); + } + + + @Test + public void testToString() throws Exception { + AdditionalInformationDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } +}
\ No newline at end of file diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ArtifactDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ArtifactDefinitionTest.java new file mode 100644 index 0000000000..ae347cabc3 --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ArtifactDefinitionTest.java @@ -0,0 +1,111 @@ +package org.openecomp.sdc.be.model; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class ArtifactDefinitionTest { + + private ArtifactDefinition createTestSubject() { + return new ArtifactDefinition(); + } + + + @Test + public void testGetPayloadData() throws Exception { + ArtifactDefinition testSubject; + byte[] result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getPayloadData(); + } + + + @Test + public void testSetPayload() throws Exception { + ArtifactDefinition testSubject; + byte[] payloadData = new byte[] { ' ' }; + + // default test + testSubject = createTestSubject(); + testSubject.setPayload(payloadData); + } + + + @Test + public void testSetPayloadData() throws Exception { + ArtifactDefinition testSubject; + String payloadData = ""; + + // test 1 + testSubject = createTestSubject(); + payloadData = null; + testSubject.setPayloadData(payloadData); + + // test 2 + testSubject = createTestSubject(); + payloadData = ""; + testSubject.setPayloadData(payloadData); + } + + + @Test + public void testGetListHeatParameters() throws Exception { + ArtifactDefinition testSubject; + List<HeatParameterDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getListHeatParameters(); + } + + + @Test + public void testSetListHeatParameters() throws Exception { + ArtifactDefinition testSubject; + List<HeatParameterDefinition> properties = null; + + // test 1 + testSubject = createTestSubject(); + properties = null; + testSubject.setListHeatParameters(properties); + } + + + @Test + public void testCheckEsIdExist() throws Exception { + ArtifactDefinition testSubject; + boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.checkEsIdExist(); + } + + + @Test + public void testHashCode() throws Exception { + ArtifactDefinition testSubject; + int result; + + // default test + testSubject = createTestSubject(); + result = testSubject.hashCode(); + } + + + @Test + public void testEquals() throws Exception { + ArtifactDefinition testSubject; + Object obj = null; + boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.equals(obj); + } +}
\ No newline at end of file diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapabilityDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapabilityDefinitionTest.java new file mode 100644 index 0000000000..7286bee4a0 --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapabilityDefinitionTest.java @@ -0,0 +1,71 @@ +package org.openecomp.sdc.be.model; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class CapabilityDefinitionTest { + + private CapabilityDefinition createTestSubject() { + return new CapabilityDefinition(); + } + + + @Test + public void testHashCode() throws Exception { + CapabilityDefinition testSubject; + int result; + + // default test + testSubject = createTestSubject(); + result = testSubject.hashCode(); + } + + + @Test + public void testEquals() throws Exception { + CapabilityDefinition testSubject; + Object obj = null; + boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.equals(obj); + } + + + @Test + public void testToString() throws Exception { + CapabilityDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } + + + @Test + public void testGetProperties() throws Exception { + CapabilityDefinition testSubject; + List<ComponentInstanceProperty> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getProperties(); + } + + + @Test + public void testSetProperties() throws Exception { + CapabilityDefinition testSubject; + List<ComponentInstanceProperty> properties = null; + + // default test + testSubject = createTestSubject(); + testSubject.setProperties(properties); + } +}
\ No newline at end of file diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapabilityTypeDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapabilityTypeDefinitionTest.java new file mode 100644 index 0000000000..75cc2054e5 --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/CapabilityTypeDefinitionTest.java @@ -0,0 +1,70 @@ +package org.openecomp.sdc.be.model; + +import java.util.Map; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class CapabilityTypeDefinitionTest { + + private CapabilityTypeDefinition createTestSubject() { + return new CapabilityTypeDefinition(); + } + + + @Test + public void testGetDerivedFrom() throws Exception { + CapabilityTypeDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDerivedFrom(); + } + + + @Test + public void testSetDerivedFrom() throws Exception { + CapabilityTypeDefinition testSubject; + String derivedFrom = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setDerivedFrom(derivedFrom); + } + + + @Test + public void testGetProperties() throws Exception { + CapabilityTypeDefinition testSubject; + Map<String, PropertyDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getProperties(); + } + + + @Test + public void testSetProperties() throws Exception { + CapabilityTypeDefinition testSubject; + Map<String, PropertyDefinition> properties = null; + + // default test + testSubject = createTestSubject(); + testSubject.setProperties(properties); + } + + + @Test + public void testToString() throws Exception { + CapabilityTypeDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } +}
\ No newline at end of file diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentMetadataDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentMetadataDefinitionTest.java new file mode 100644 index 0000000000..f728aac968 --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/ComponentMetadataDefinitionTest.java @@ -0,0 +1,51 @@ +package org.openecomp.sdc.be.model; + +import javax.annotation.Generated; + +import org.junit.Assert; +import org.junit.Test; +import org.openecomp.sdc.be.datatypes.components.ComponentMetadataDataDefinition; + + +public class ComponentMetadataDefinitionTest { + + private ComponentMetadataDefinition createTestSubject() { + return new ComponentMetadataDefinition(); + } + + + @Test + public void testGetMetadataDataDefinition() throws Exception { + ComponentMetadataDefinition testSubject; + ComponentMetadataDataDefinition result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getMetadataDataDefinition(); + } + + + @Test + public void testHashCode() throws Exception { + ComponentMetadataDefinition testSubject; + int result; + + // default test + testSubject = createTestSubject(); + result = testSubject.hashCode(); + } + + + @Test + public void testEquals() throws Exception { + ComponentMetadataDefinition testSubject; + Object obj = null; + boolean result; + + // test 1 + testSubject = createTestSubject(); + obj = null; + result = testSubject.equals(obj); + Assert.assertEquals(false, result); + } +}
\ No newline at end of file diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/DataTypeDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/DataTypeDefinitionTest.java new file mode 100644 index 0000000000..26db09fb4f --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/DataTypeDefinitionTest.java @@ -0,0 +1,92 @@ +package org.openecomp.sdc.be.model; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class DataTypeDefinitionTest { + + private DataTypeDefinition createTestSubject() { + return new DataTypeDefinition(); + } + + + @Test + public void testGetConstraints() throws Exception { + DataTypeDefinition testSubject; + List<PropertyConstraint> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getConstraints(); + } + + + @Test + public void testSetConstraints() throws Exception { + DataTypeDefinition testSubject; + List<PropertyConstraint> constraints = null; + + // default test + testSubject = createTestSubject(); + testSubject.setConstraints(constraints); + } + + + @Test + public void testGetDerivedFrom() throws Exception { + DataTypeDefinition testSubject; + DataTypeDefinition result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDerivedFrom(); + } + + + @Test + public void testSetDerivedFrom() throws Exception { + DataTypeDefinition testSubject; + DataTypeDefinition derivedFrom = null; + + // default test + testSubject = createTestSubject(); + testSubject.setDerivedFrom(derivedFrom); + } + + + @Test + public void testGetProperties() throws Exception { + DataTypeDefinition testSubject; + List<PropertyDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getProperties(); + } + + + @Test + public void testSetProperties() throws Exception { + DataTypeDefinition testSubject; + List<PropertyDefinition> properties = null; + + // default test + testSubject = createTestSubject(); + testSubject.setProperties(properties); + } + + + @Test + public void testToString() throws Exception { + DataTypeDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } +}
\ No newline at end of file diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupDefinitionTest.java new file mode 100644 index 0000000000..6cae685644 --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupDefinitionTest.java @@ -0,0 +1,50 @@ +package org.openecomp.sdc.be.model; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class GroupDefinitionTest { + + private GroupDefinition createTestSubject() { + return new GroupDefinition(); + } + + + @Test + public void testConvertToGroupProperties() throws Exception { + GroupDefinition testSubject; + List<GroupProperty> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.convertToGroupProperties(); + } + + + @Test + public void testConvertFromGroupProperties() throws Exception { + GroupDefinition testSubject; + List<GroupProperty> properties = null; + + // test 1 + testSubject = createTestSubject(); + properties = null; + testSubject.convertFromGroupProperties(properties); + } + + + @Test + public void testIsSamePrefix() throws Exception { + GroupDefinition testSubject; + String resourceName = ""; + boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.isSamePrefix(resourceName); + } +}
\ No newline at end of file diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupTypeDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupTypeDefinitionTest.java new file mode 100644 index 0000000000..4fe180970b --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/GroupTypeDefinitionTest.java @@ -0,0 +1,48 @@ +package org.openecomp.sdc.be.model; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class GroupTypeDefinitionTest { + + private GroupTypeDefinition createTestSubject() { + return new GroupTypeDefinition(); + } + + + @Test + public void testGetProperties() throws Exception { + GroupTypeDefinition testSubject; + List<PropertyDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getProperties(); + } + + + @Test + public void testSetProperties() throws Exception { + GroupTypeDefinition testSubject; + List<PropertyDefinition> properties = null; + + // default test + testSubject = createTestSubject(); + testSubject.setProperties(properties); + } + + + @Test + public void testToString() throws Exception { + GroupTypeDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } +}
\ No newline at end of file diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/InputDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/InputDefinitionTest.java new file mode 100644 index 0000000000..68ff7ed6d3 --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/InputDefinitionTest.java @@ -0,0 +1,59 @@ +package org.openecomp.sdc.be.model; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class InputDefinitionTest { + + private InputDefinition createTestSubject() { + return new InputDefinition(); + } + + + @Test + public void testGetInputs() throws Exception { + InputDefinition testSubject; + List<ComponentInstanceInput> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getInputs(); + } + + + @Test + public void testSetInputs() throws Exception { + InputDefinition testSubject; + List<ComponentInstanceInput> inputs = null; + + // default test + testSubject = createTestSubject(); + testSubject.setInputs(inputs); + } + + + @Test + public void testGetProperties() throws Exception { + InputDefinition testSubject; + List<ComponentInstanceProperty> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getProperties(); + } + + + @Test + public void testSetProperties() throws Exception { + InputDefinition testSubject; + List<ComponentInstanceProperty> properties = null; + + // default test + testSubject = createTestSubject(); + testSubject.setProperties(properties); + } +}
\ No newline at end of file diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/InterfaceDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/InterfaceDefinitionTest.java new file mode 100644 index 0000000000..88c253360c --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/InterfaceDefinitionTest.java @@ -0,0 +1,57 @@ +package org.openecomp.sdc.be.model; + +import java.util.Map; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class InterfaceDefinitionTest { + + private InterfaceDefinition createTestSubject() { + return new InterfaceDefinition(); + } + + @Test + public void testIsDefinition() throws Exception { + InterfaceDefinition testSubject; + boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.isDefinition(); + } + + @Test + public void testSetDefinition() throws Exception { + InterfaceDefinition testSubject; + boolean definition = false; + + // default test + testSubject = createTestSubject(); + testSubject.setDefinition(definition); + } + + @Test + public void testGetOperationsMap() throws Exception { + InterfaceDefinition testSubject; + Map<String, Operation> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getOperationsMap(); + } + + + + @Test + public void testToString() throws Exception { + InterfaceDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } +}
\ No newline at end of file diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/PolicyTypeDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/PolicyTypeDefinitionTest.java new file mode 100644 index 0000000000..3ba8f61826 --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/PolicyTypeDefinitionTest.java @@ -0,0 +1,48 @@ +package org.openecomp.sdc.be.model; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class PolicyTypeDefinitionTest { + + private PolicyTypeDefinition createTestSubject() { + return new PolicyTypeDefinition(); + } + + + @Test + public void testGetProperties() throws Exception { + PolicyTypeDefinition testSubject; + List<PropertyDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getProperties(); + } + + + @Test + public void testSetProperties() throws Exception { + PolicyTypeDefinition testSubject; + List<PropertyDefinition> properties = null; + + // default test + testSubject = createTestSubject(); + testSubject.setProperties(properties); + } + + + @Test + public void testToString() throws Exception { + PolicyTypeDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } +}
\ No newline at end of file diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/PropertyDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/PropertyDefinitionTest.java new file mode 100644 index 0000000000..81df0e223d --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/PropertyDefinitionTest.java @@ -0,0 +1,86 @@ +package org.openecomp.sdc.be.model; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class PropertyDefinitionTest { + + private PropertyDefinition createTestSubject() { + return new PropertyDefinition(); + } + + @Test + public void testGetConstraints() throws Exception { + PropertyDefinition testSubject; + List<PropertyConstraint> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getConstraints(); + } + + @Test + public void testSetConstraints() throws Exception { + PropertyDefinition testSubject; + List<PropertyConstraint> constraints = null; + + // default test + testSubject = createTestSubject(); + testSubject.setConstraints(constraints); + } + + @Test + public void testToString() throws Exception { + PropertyDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } + + @Test + public void testIsDefinition() throws Exception { + PropertyDefinition testSubject; + boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.isDefinition(); + } + + @Test + public void testSetDefinition() throws Exception { + PropertyDefinition testSubject; + boolean definition = false; + + // default test + testSubject = createTestSubject(); + testSubject.setDefinition(definition); + } + + @Test + public void testHashCode() throws Exception { + PropertyDefinition testSubject; + int result; + + // default test + testSubject = createTestSubject(); + result = testSubject.hashCode(); + } + + @Test + public void testEquals() throws Exception { + PropertyDefinition testSubject; + Object obj = null; + boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.equals(obj); + } +}
\ No newline at end of file diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/category/CategoryDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/category/CategoryDefinitionTest.java new file mode 100644 index 0000000000..6d0f192d1c --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/category/CategoryDefinitionTest.java @@ -0,0 +1,59 @@ +package org.openecomp.sdc.be.model.category; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class CategoryDefinitionTest { + + private CategoryDefinition createTestSubject() { + return new CategoryDefinition(); + } + + + @Test + public void testGetSubcategories() throws Exception { + CategoryDefinition testSubject; + List<SubCategoryDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getSubcategories(); + } + + + @Test + public void testSetSubcategories() throws Exception { + CategoryDefinition testSubject; + List<SubCategoryDefinition> subcategories = null; + + // default test + testSubject = createTestSubject(); + testSubject.setSubcategories(subcategories); + } + + + @Test + public void testAddSubCategory() throws Exception { + CategoryDefinition testSubject; + SubCategoryDefinition subcategory = null; + + // default test + testSubject = createTestSubject(); + testSubject.addSubCategory(subcategory); + } + + + @Test + public void testToString() throws Exception { + CategoryDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } +}
\ No newline at end of file diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/category/SubCategoryDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/category/SubCategoryDefinitionTest.java new file mode 100644 index 0000000000..f9acabdc4b --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/category/SubCategoryDefinitionTest.java @@ -0,0 +1,59 @@ +package org.openecomp.sdc.be.model.category; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class SubCategoryDefinitionTest { + + private SubCategoryDefinition createTestSubject() { + return new SubCategoryDefinition(); + } + + + @Test + public void testGetGroupings() throws Exception { + SubCategoryDefinition testSubject; + List<GroupingDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getGroupings(); + } + + + @Test + public void testSetGroupings() throws Exception { + SubCategoryDefinition testSubject; + List<GroupingDefinition> groupingDefinitions = null; + + // default test + testSubject = createTestSubject(); + testSubject.setGroupings(groupingDefinitions); + } + + + @Test + public void testAddGrouping() throws Exception { + SubCategoryDefinition testSubject; + GroupingDefinition groupingDefinition = null; + + // default test + testSubject = createTestSubject(); + testSubject.addGrouping(groupingDefinition); + } + + + @Test + public void testToString() throws Exception { + SubCategoryDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/category/CategoryDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/category/CategoryDataDefinitionTest.java new file mode 100644 index 0000000000..af950ee45f --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/category/CategoryDataDefinitionTest.java @@ -0,0 +1,140 @@ +package org.openecomp.sdc.be.datatypes.category; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Assert; +import org.junit.Test; + + +public class CategoryDataDefinitionTest { + + private CategoryDataDefinition createTestSubject() { + return new CategoryDataDefinition(); + } + + + @Test + public void testGetName() throws Exception { + CategoryDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getName(); + } + + + @Test + public void testSetName() throws Exception { + CategoryDataDefinition testSubject; + String name = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setName(name); + } + + + @Test + public void testGetNormalizedName() throws Exception { + CategoryDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getNormalizedName(); + } + + + @Test + public void testSetNormalizedName() throws Exception { + CategoryDataDefinition testSubject; + String normalizedName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setNormalizedName(normalizedName); + } + + + @Test + public void testGetUniqueId() throws Exception { + CategoryDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUniqueId(); + } + + + @Test + public void testSetUniqueId() throws Exception { + CategoryDataDefinition testSubject; + String uniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUniqueId(uniqueId); + } + + + @Test + public void testGetIcons() throws Exception { + CategoryDataDefinition testSubject; + List<String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getIcons(); + } + + + @Test + public void testSetIcons() throws Exception { + CategoryDataDefinition testSubject; + List<String> icons = null; + + // default test + testSubject = createTestSubject(); + testSubject.setIcons(icons); + } + + + @Test + public void testHashCode() throws Exception { + CategoryDataDefinition testSubject; + int result; + + // default test + testSubject = createTestSubject(); + result = testSubject.hashCode(); + } + + + @Test + public void testEquals() throws Exception { + CategoryDataDefinition testSubject; + Object obj = null; + boolean result; + + // test 1 + testSubject = createTestSubject(); + obj = null; + result = testSubject.equals(obj); + Assert.assertEquals(false, result); + } + + + @Test + public void testToString() throws Exception { + CategoryDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/category/GroupingDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/category/GroupingDataDefinitionTest.java new file mode 100644 index 0000000000..be109eab7c --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/category/GroupingDataDefinitionTest.java @@ -0,0 +1,116 @@ +package org.openecomp.sdc.be.datatypes.category; + +import javax.annotation.Generated; + +import org.junit.Assert; +import org.junit.Test; + + +public class GroupingDataDefinitionTest { + + private GroupingDataDefinition createTestSubject() { + return new GroupingDataDefinition(); + } + + + @Test + public void testGetName() throws Exception { + GroupingDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getName(); + } + + + @Test + public void testSetName() throws Exception { + GroupingDataDefinition testSubject; + String name = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setName(name); + } + + + @Test + public void testGetNormalizedName() throws Exception { + GroupingDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getNormalizedName(); + } + + + @Test + public void testSetNormalizedName() throws Exception { + GroupingDataDefinition testSubject; + String normalizedName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setNormalizedName(normalizedName); + } + + + @Test + public void testGetUniqueId() throws Exception { + GroupingDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUniqueId(); + } + + + @Test + public void testSetUniqueId() throws Exception { + GroupingDataDefinition testSubject; + String uniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUniqueId(uniqueId); + } + + + @Test + public void testHashCode() throws Exception { + GroupingDataDefinition testSubject; + int result; + + // default test + testSubject = createTestSubject(); + result = testSubject.hashCode(); + } + + + @Test + public void testEquals() throws Exception { + GroupingDataDefinition testSubject; + Object obj = null; + boolean result; + + // test 1 + testSubject = createTestSubject(); + obj = null; + result = testSubject.equals(obj); + Assert.assertEquals(false, result); + } + + + @Test + public void testToString() throws Exception { + GroupingDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/category/SubCategoryDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/category/SubCategoryDataDefinitionTest.java new file mode 100644 index 0000000000..73d0865fe9 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/category/SubCategoryDataDefinitionTest.java @@ -0,0 +1,140 @@ +package org.openecomp.sdc.be.datatypes.category; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Assert; +import org.junit.Test; + + +public class SubCategoryDataDefinitionTest { + + private SubCategoryDataDefinition createTestSubject() { + return new SubCategoryDataDefinition(); + } + + + @Test + public void testGetName() throws Exception { + SubCategoryDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getName(); + } + + + @Test + public void testSetName() throws Exception { + SubCategoryDataDefinition testSubject; + String name = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setName(name); + } + + + @Test + public void testGetNormalizedName() throws Exception { + SubCategoryDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getNormalizedName(); + } + + + @Test + public void testSetNormalizedName() throws Exception { + SubCategoryDataDefinition testSubject; + String normalizedName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setNormalizedName(normalizedName); + } + + + @Test + public void testGetUniqueId() throws Exception { + SubCategoryDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUniqueId(); + } + + + @Test + public void testSetUniqueId() throws Exception { + SubCategoryDataDefinition testSubject; + String uniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUniqueId(uniqueId); + } + + + @Test + public void testGetIcons() throws Exception { + SubCategoryDataDefinition testSubject; + List<String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getIcons(); + } + + + @Test + public void testSetIcons() throws Exception { + SubCategoryDataDefinition testSubject; + List<String> icons = null; + + // default test + testSubject = createTestSubject(); + testSubject.setIcons(icons); + } + + + @Test + public void testHashCode() throws Exception { + SubCategoryDataDefinition testSubject; + int result; + + // default test + testSubject = createTestSubject(); + result = testSubject.hashCode(); + } + + + @Test + public void testEquals() throws Exception { + SubCategoryDataDefinition testSubject; + Object obj = null; + boolean result; + + // test 1 + testSubject = createTestSubject(); + obj = null; + result = testSubject.equals(obj); + Assert.assertEquals(false, result); + } + + + @Test + public void testToString() throws Exception { + SubCategoryDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/components/ResourceMetadataDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/components/ResourceMetadataDataDefinitionTest.java new file mode 100644 index 0000000000..249a844c9c --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/components/ResourceMetadataDataDefinitionTest.java @@ -0,0 +1,224 @@ +package org.openecomp.sdc.be.datatypes.components; + +import javax.annotation.Generated; + +import org.junit.Test; +import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum; + + +public class ResourceMetadataDataDefinitionTest { + + private ResourceMetadataDataDefinition createTestSubject() { + return new ResourceMetadataDataDefinition(); + } + + + @Test + public void testGetVendorName() throws Exception { + ResourceMetadataDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getVendorName(); + } + + + @Test + public void testSetVendorName() throws Exception { + ResourceMetadataDataDefinition testSubject; + String vendorName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setVendorName(vendorName); + } + + + @Test + public void testGetVendorRelease() throws Exception { + ResourceMetadataDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getVendorRelease(); + } + + + @Test + public void testSetVendorRelease() throws Exception { + ResourceMetadataDataDefinition testSubject; + String vendorRelease = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setVendorRelease(vendorRelease); + } + + + @Test + public void testGetResourceVendorModelNumber() throws Exception { + ResourceMetadataDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getResourceVendorModelNumber(); + } + + + @Test + public void testSetResourceVendorModelNumber() throws Exception { + ResourceMetadataDataDefinition testSubject; + String resourceVendorModelNumber = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setResourceVendorModelNumber(resourceVendorModelNumber); + } + + + @Test + public void testGetResourceType() throws Exception { + ResourceMetadataDataDefinition testSubject; + ResourceTypeEnum result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getResourceType(); + } + + + @Test + public void testSetResourceType() throws Exception { + ResourceMetadataDataDefinition testSubject; + ResourceTypeEnum resourceType = null; + + // default test + testSubject = createTestSubject(); + testSubject.setResourceType(resourceType); + } + + + @Test + public void testIsAbstract() throws Exception { + ResourceMetadataDataDefinition testSubject; + Boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.isAbstract(); + } + + + @Test + public void testSetAbstract() throws Exception { + ResourceMetadataDataDefinition testSubject; + Boolean isAbstract = null; + + // default test + testSubject = createTestSubject(); + testSubject.setAbstract(isAbstract); + } + + + @Test + public void testGetCost() throws Exception { + ResourceMetadataDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCost(); + } + + + @Test + public void testSetCost() throws Exception { + ResourceMetadataDataDefinition testSubject; + String cost = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setCost(cost); + } + + + @Test + public void testGetLicenseType() throws Exception { + ResourceMetadataDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getLicenseType(); + } + + + @Test + public void testSetLicenseType() throws Exception { + ResourceMetadataDataDefinition testSubject; + String licenseType = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setLicenseType(licenseType); + } + + + @Test + public void testGetToscaResourceName() throws Exception { + ResourceMetadataDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getToscaResourceName(); + } + + + @Test + public void testSetToscaResourceName() throws Exception { + ResourceMetadataDataDefinition testSubject; + String toscaResourceName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setToscaResourceName(toscaResourceName); + } + + + @Test + public void testToString() throws Exception { + ResourceMetadataDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } + + + @Test + public void testHashCode() throws Exception { + ResourceMetadataDataDefinition testSubject; + int result; + + // default test + testSubject = createTestSubject(); + result = testSubject.hashCode(); + } + + + @Test + public void testEquals() throws Exception { + ResourceMetadataDataDefinition testSubject; + Object obj = null; + boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.equals(obj); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/components/ServiceMetadataDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/components/ServiceMetadataDataDefinitionTest.java new file mode 100644 index 0000000000..4fc110350c --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/components/ServiceMetadataDataDefinitionTest.java @@ -0,0 +1,160 @@ +package org.openecomp.sdc.be.datatypes.components; + +import javax.annotation.Generated; + +import org.junit.Assert; +import org.junit.Test; + + +public class ServiceMetadataDataDefinitionTest { + + private ServiceMetadataDataDefinition createTestSubject() { + return new ServiceMetadataDataDefinition(); + } + + + @Test + public void testGetDistributionStatus() throws Exception { + ServiceMetadataDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDistributionStatus(); + } + + + @Test + public void testSetDistributionStatus() throws Exception { + ServiceMetadataDataDefinition testSubject; + String distributionStatus = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setDistributionStatus(distributionStatus); + } + + + @Test + public void testGetServiceType() throws Exception { + ServiceMetadataDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getServiceType(); + } + + + @Test + public void testSetServiceType() throws Exception { + ServiceMetadataDataDefinition testSubject; + String serviceType = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setServiceType(serviceType); + } + + + @Test + public void testGetServiceRole() throws Exception { + ServiceMetadataDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getServiceRole(); + } + + + @Test + public void testSetServiceRole() throws Exception { + ServiceMetadataDataDefinition testSubject; + String serviceRole = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setServiceRole(serviceRole); + } + + + @Test + public void testIsEcompGeneratedNaming() throws Exception { + ServiceMetadataDataDefinition testSubject; + Boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.isEcompGeneratedNaming(); + } + + + @Test + public void testSetEcompGeneratedNaming() throws Exception { + ServiceMetadataDataDefinition testSubject; + Boolean ecompGeneratedNaming = null; + + // default test + testSubject = createTestSubject(); + testSubject.setEcompGeneratedNaming(ecompGeneratedNaming); + } + + + @Test + public void testGetNamingPolicy() throws Exception { + ServiceMetadataDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getNamingPolicy(); + } + + + @Test + public void testSetNamingPolicy() throws Exception { + ServiceMetadataDataDefinition testSubject; + String namingPolicy = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setNamingPolicy(namingPolicy); + } + + + @Test + public void testToString() throws Exception { + ServiceMetadataDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } + + + @Test + public void testHashCode() throws Exception { + ServiceMetadataDataDefinition testSubject; + int result; + + // default test + testSubject = createTestSubject(); + result = testSubject.hashCode(); + } + + + @Test + public void testEquals() throws Exception { + ServiceMetadataDataDefinition testSubject; + Object obj = null; + boolean result; + + // test 1 + testSubject = createTestSubject(); + obj = null; + result = testSubject.equals(obj); + Assert.assertEquals(false, result); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/AdditionalInfoParameterDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/AdditionalInfoParameterDataDefinitionTest.java new file mode 100644 index 0000000000..94ec9166ee --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/AdditionalInfoParameterDataDefinitionTest.java @@ -0,0 +1,136 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class AdditionalInfoParameterDataDefinitionTest { + + private AdditionalInfoParameterDataDefinition createTestSubject() { + return new AdditionalInfoParameterDataDefinition(); + } + + + @Test + public void testGetUniqueId() throws Exception { + AdditionalInfoParameterDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUniqueId(); + } + + + @Test + public void testSetUniqueId() throws Exception { + AdditionalInfoParameterDataDefinition testSubject; + String uniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUniqueId(uniqueId); + } + + + @Test + public void testGetCreationTime() throws Exception { + AdditionalInfoParameterDataDefinition testSubject; + Long result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCreationTime(); + } + + + @Test + public void testSetCreationTime() throws Exception { + AdditionalInfoParameterDataDefinition testSubject; + Long creationTime = null; + + // default test + testSubject = createTestSubject(); + testSubject.setCreationTime(creationTime); + } + + + @Test + public void testGetModificationTime() throws Exception { + AdditionalInfoParameterDataDefinition testSubject; + Long result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getModificationTime(); + } + + + @Test + public void testSetModificationTime() throws Exception { + AdditionalInfoParameterDataDefinition testSubject; + Long modificationTime = null; + + // default test + testSubject = createTestSubject(); + testSubject.setModificationTime(modificationTime); + } + + + @Test + public void testGetLastCreatedCounter() throws Exception { + AdditionalInfoParameterDataDefinition testSubject; + Integer result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getLastCreatedCounter(); + } + + + @Test + public void testSetLastCreatedCounter() throws Exception { + AdditionalInfoParameterDataDefinition testSubject; + Integer lastCreatedCounter = 0; + + // default test + testSubject = createTestSubject(); + testSubject.setLastCreatedCounter(lastCreatedCounter); + } + + + @Test + public void testGetParameters() throws Exception { + AdditionalInfoParameterDataDefinition testSubject; + List<AdditionalInfoParameterInfo> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getParameters(); + } + + + @Test + public void testSetParameters() throws Exception { + AdditionalInfoParameterDataDefinition testSubject; + List<AdditionalInfoParameterInfo> parameters = null; + + // default test + testSubject = createTestSubject(); + testSubject.setParameters(parameters); + } + + + @Test + public void testToString() throws Exception { + AdditionalInfoParameterDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ArtifactDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ArtifactDataDefinitionTest.java new file mode 100644 index 0000000000..315067d8a9 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ArtifactDataDefinitionTest.java @@ -0,0 +1,736 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Assert; +import org.junit.Test; +import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum; + + +public class ArtifactDataDefinitionTest { + + private ArtifactDataDefinition createTestSubject() { + return new ArtifactDataDefinition(); + } + + + @Test + public void testGetArtifactName() throws Exception { + ArtifactDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getArtifactName(); + } + + + @Test + public void testGetArtifactType() throws Exception { + ArtifactDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getArtifactType(); + } + + + @Test + public void testSetArtifactType() throws Exception { + ArtifactDataDefinition testSubject; + String artifactType = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setArtifactType(artifactType); + } + + + @Test + public void testGetArtifactRef() throws Exception { + ArtifactDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getArtifactRef(); + } + + + @Test + public void testSetArtifactRef() throws Exception { + ArtifactDataDefinition testSubject; + String artifactRef = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setArtifactRef(artifactRef); + } + + + @Test + public void testGetArtifactRepository() throws Exception { + ArtifactDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getArtifactRepository(); + } + + + @Test + public void testSetArtifactRepository() throws Exception { + ArtifactDataDefinition testSubject; + String artifactRepository = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setArtifactRepository(artifactRepository); + } + + + @Test + public void testSetArtifactName() throws Exception { + ArtifactDataDefinition testSubject; + String artifactName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setArtifactName(artifactName); + } + + + @Test + public void testGetArtifactChecksum() throws Exception { + ArtifactDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getArtifactChecksum(); + } + + + @Test + public void testSetArtifactChecksum() throws Exception { + ArtifactDataDefinition testSubject; + String artifactChecksum = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setArtifactChecksum(artifactChecksum); + } + + + @Test + public void testGetUserIdCreator() throws Exception { + ArtifactDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUserIdCreator(); + } + + + @Test + public void testSetUserIdCreator() throws Exception { + ArtifactDataDefinition testSubject; + String userIdCreator = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUserIdCreator(userIdCreator); + } + + + @Test + public void testGetUserIdLastUpdater() throws Exception { + ArtifactDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUserIdLastUpdater(); + } + + + @Test + public void testSetUserIdLastUpdater() throws Exception { + ArtifactDataDefinition testSubject; + String userIdLastUpdater = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUserIdLastUpdater(userIdLastUpdater); + } + + + @Test + public void testGetCreatorFullName() throws Exception { + ArtifactDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCreatorFullName(); + } + + + @Test + public void testSetCreatorFullName() throws Exception { + ArtifactDataDefinition testSubject; + String creatorFullName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setCreatorFullName(creatorFullName); + } + + + @Test + public void testGetUpdaterFullName() throws Exception { + ArtifactDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUpdaterFullName(); + } + + + @Test + public void testSetUpdaterFullName() throws Exception { + ArtifactDataDefinition testSubject; + String updaterFullName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUpdaterFullName(updaterFullName); + } + + + @Test + public void testGetCreationDate() throws Exception { + ArtifactDataDefinition testSubject; + Long result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCreationDate(); + } + + + @Test + public void testSetCreationDate() throws Exception { + ArtifactDataDefinition testSubject; + Long creationDate = null; + + // default test + testSubject = createTestSubject(); + testSubject.setCreationDate(creationDate); + } + + + @Test + public void testGetLastUpdateDate() throws Exception { + ArtifactDataDefinition testSubject; + Long result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getLastUpdateDate(); + } + + + @Test + public void testSetLastUpdateDate() throws Exception { + ArtifactDataDefinition testSubject; + Long lastUpdateDate = null; + + // default test + testSubject = createTestSubject(); + testSubject.setLastUpdateDate(lastUpdateDate); + } + + + @Test + public void testGetUniqueId() throws Exception { + ArtifactDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUniqueId(); + } + + + @Test + public void testSetUniqueId() throws Exception { + ArtifactDataDefinition testSubject; + String uniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUniqueId(uniqueId); + } + + + @Test + public void testGetDescription() throws Exception { + ArtifactDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDescription(); + } + + + @Test + public void testSetDescription() throws Exception { + ArtifactDataDefinition testSubject; + String description = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setDescription(description); + } + + + @Test + public void testGetArtifactLabel() throws Exception { + ArtifactDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getArtifactLabel(); + } + + + @Test + public void testSetArtifactLabel() throws Exception { + ArtifactDataDefinition testSubject; + String artifactLabel = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setArtifactLabel(artifactLabel); + } + + + @Test + public void testGetEsId() throws Exception { + ArtifactDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getEsId(); + } + + + @Test + public void testSetEsId() throws Exception { + ArtifactDataDefinition testSubject; + String esId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setEsId(esId); + } + + + @Test + public void testGetArtifactCreator() throws Exception { + ArtifactDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getArtifactCreator(); + } + + + @Test + public void testSetArtifactCreator() throws Exception { + ArtifactDataDefinition testSubject; + String artifactCreator = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setArtifactCreator(artifactCreator); + } + + + @Test + public void testGetMandatory() throws Exception { + ArtifactDataDefinition testSubject; + Boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getMandatory(); + } + + + @Test + public void testSetMandatory() throws Exception { + ArtifactDataDefinition testSubject; + Boolean mandatory = null; + + // default test + testSubject = createTestSubject(); + testSubject.setMandatory(mandatory); + } + + + @Test + public void testGetArtifactDisplayName() throws Exception { + ArtifactDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getArtifactDisplayName(); + } + + + @Test + public void testSetArtifactDisplayName() throws Exception { + ArtifactDataDefinition testSubject; + String artifactDisplayName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setArtifactDisplayName(artifactDisplayName); + } + + + @Test + public void testGetApiUrl() throws Exception { + ArtifactDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getApiUrl(); + } + + + @Test + public void testSetApiUrl() throws Exception { + ArtifactDataDefinition testSubject; + String apiUrl = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setApiUrl(apiUrl); + } + + + @Test + public void testGetServiceApi() throws Exception { + ArtifactDataDefinition testSubject; + Boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getServiceApi(); + } + + + @Test + public void testSetServiceApi() throws Exception { + ArtifactDataDefinition testSubject; + Boolean serviceApi = null; + + // default test + testSubject = createTestSubject(); + testSubject.setServiceApi(serviceApi); + } + + + @Test + public void testGetArtifactGroupType() throws Exception { + ArtifactDataDefinition testSubject; + ArtifactGroupTypeEnum result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getArtifactGroupType(); + } + + + @Test + public void testSetArtifactGroupType() throws Exception { + ArtifactDataDefinition testSubject; + ArtifactGroupTypeEnum artifactGroupType = null; + + // test 1 + testSubject = createTestSubject(); + artifactGroupType = null; + testSubject.setArtifactGroupType(artifactGroupType); + } + + + @Test + public void testGetTimeout() throws Exception { + ArtifactDataDefinition testSubject; + Integer result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getTimeout(); + } + + + @Test + public void testSetTimeout() throws Exception { + ArtifactDataDefinition testSubject; + Integer timeout = 0; + + // default test + testSubject = createTestSubject(); + testSubject.setTimeout(timeout); + } + + + @Test + public void testGetArtifactVersion() throws Exception { + ArtifactDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getArtifactVersion(); + } + + + @Test + public void testSetArtifactVersion() throws Exception { + ArtifactDataDefinition testSubject; + String artifactVersion = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setArtifactVersion(artifactVersion); + } + + + @Test + public void testGetArtifactUUID() throws Exception { + ArtifactDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getArtifactUUID(); + } + + + @Test + public void testSetArtifactUUID() throws Exception { + ArtifactDataDefinition testSubject; + String artifactUUID = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setArtifactUUID(artifactUUID); + } + + + @Test + public void testGetPayloadUpdateDate() throws Exception { + ArtifactDataDefinition testSubject; + Long result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getPayloadUpdateDate(); + } + + + @Test + public void testSetPayloadUpdateDate() throws Exception { + ArtifactDataDefinition testSubject; + Long payloadUpdateDate = null; + + // default test + testSubject = createTestSubject(); + testSubject.setPayloadUpdateDate(payloadUpdateDate); + } + + + @Test + public void testGetHeatParamsUpdateDate() throws Exception { + ArtifactDataDefinition testSubject; + Long result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getHeatParamsUpdateDate(); + } + + + @Test + public void testSetHeatParamsUpdateDate() throws Exception { + ArtifactDataDefinition testSubject; + Long heatParamsUpdateDate = null; + + // default test + testSubject = createTestSubject(); + testSubject.setHeatParamsUpdateDate(heatParamsUpdateDate); + } + + + @Test + public void testGetRequiredArtifacts() throws Exception { + ArtifactDataDefinition testSubject; + List<String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getRequiredArtifacts(); + } + + + @Test + public void testSetRequiredArtifacts() throws Exception { + ArtifactDataDefinition testSubject; + List<String> requiredArtifacts = null; + + // default test + testSubject = createTestSubject(); + testSubject.setRequiredArtifacts(requiredArtifacts); + } + + + @Test + public void testGetGenerated() throws Exception { + ArtifactDataDefinition testSubject; + Boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getGenerated(); + } + + + @Test + public void testSetGenerated() throws Exception { + ArtifactDataDefinition testSubject; + Boolean generated = null; + + // default test + testSubject = createTestSubject(); + testSubject.setGenerated(generated); + } + + + @Test + public void testGetDuplicated() throws Exception { + ArtifactDataDefinition testSubject; + Boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDuplicated(); + } + + + @Test + public void testSetDuplicated() throws Exception { + ArtifactDataDefinition testSubject; + Boolean duplicated = null; + + // default test + testSubject = createTestSubject(); + testSubject.setDuplicated(duplicated); + } + + + @Test + public void testGetHeatParameters() throws Exception { + ArtifactDataDefinition testSubject; + List<HeatParameterDataDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getHeatParameters(); + } + + + @Test + public void testSetHeatParameters() throws Exception { + ArtifactDataDefinition testSubject; + List<HeatParameterDataDefinition> properties = null; + + // default test + testSubject = createTestSubject(); + testSubject.setHeatParameters(properties); + } + + + @Test + public void testGetGeneratedFromId() throws Exception { + ArtifactDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getGeneratedFromId(); + } + + + @Test + public void testSetGeneratedFromId() throws Exception { + ArtifactDataDefinition testSubject; + String generatedFromId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setGeneratedFromId(generatedFromId); + } + + + @Test + public void testToString() throws Exception { + ArtifactDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } + + + @Test + public void testHashCode() throws Exception { + ArtifactDataDefinition testSubject; + int result; + + // default test + testSubject = createTestSubject(); + result = testSubject.hashCode(); + } + + + @Test + public void testEquals() throws Exception { + ArtifactDataDefinition testSubject; + Object obj = null; + boolean result; + + // test 1 + testSubject = createTestSubject(); + obj = null; + result = testSubject.equals(obj); + Assert.assertEquals(false, result); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/CapabilityDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/CapabilityDataDefinitionTest.java new file mode 100644 index 0000000000..218ca8d74f --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/CapabilityDataDefinitionTest.java @@ -0,0 +1,371 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Assert; +import org.junit.Test; + + +public class CapabilityDataDefinitionTest { + + private CapabilityDataDefinition createTestSubject() { + return new CapabilityDataDefinition(); + } + + + @Test + public void testGetOwnerId() throws Exception { + CapabilityDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getOwnerId(); + } + + + @Test + public void testSetOwnerId() throws Exception { + CapabilityDataDefinition testSubject; + String ownerId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setOwnerId(ownerId); + } + + + @Test + public void testGetOwnerName() throws Exception { + CapabilityDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getOwnerName(); + } + + + @Test + public void testSetOwnerName() throws Exception { + CapabilityDataDefinition testSubject; + String ownerName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setOwnerName(ownerName); + } + + + @Test + public void testGetMinOccurrences() throws Exception { + CapabilityDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getMinOccurrences(); + } + + + @Test + public void testSetMinOccurrences() throws Exception { + CapabilityDataDefinition testSubject; + String minOccurrences = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setMinOccurrences(minOccurrences); + } + + + @Test + public void testGetMaxOccurrences() throws Exception { + CapabilityDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getMaxOccurrences(); + } + + + @Test + public void testSetMaxOccurrences() throws Exception { + CapabilityDataDefinition testSubject; + String maxOccurrences = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setMaxOccurrences(maxOccurrences); + } + + + @Test + public void testGetLeftOccurrences() throws Exception { + CapabilityDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getLeftOccurrences(); + } + + + @Test + public void testSetLeftOccurrences() throws Exception { + CapabilityDataDefinition testSubject; + String leftOccurrences = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setLeftOccurrences(leftOccurrences); + } + + + @Test + public void testGetUniqueId() throws Exception { + CapabilityDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUniqueId(); + } + + + @Test + public void testSetUniqueId() throws Exception { + CapabilityDataDefinition testSubject; + String uniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUniqueId(uniqueId); + } + + + @Test + public void testGetDescription() throws Exception { + CapabilityDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDescription(); + } + + + @Test + public void testSetDescription() throws Exception { + CapabilityDataDefinition testSubject; + String description = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setDescription(description); + } + + + @Test + public void testGetName() throws Exception { + CapabilityDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getName(); + } + + + @Test + public void testSetName() throws Exception { + CapabilityDataDefinition testSubject; + String name = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setName(name); + } + + + @Test + public void testGetParentName() throws Exception { + CapabilityDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getParentName(); + } + + + @Test + public void testSetParentName() throws Exception { + CapabilityDataDefinition testSubject; + String parentName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setParentName(parentName); + } + + + @Test + public void testGetType() throws Exception { + CapabilityDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getType(); + } + + + @Test + public void testSetType() throws Exception { + CapabilityDataDefinition testSubject; + String type = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setType(type); + } + + + @Test + public void testGetValidSourceTypes() throws Exception { + CapabilityDataDefinition testSubject; + List<String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getValidSourceTypes(); + } + + + @Test + public void testSetValidSourceTypes() throws Exception { + CapabilityDataDefinition testSubject; + List<String> validSourceTypes = null; + + // default test + testSubject = createTestSubject(); + testSubject.setValidSourceTypes(validSourceTypes); + } + + + @Test + public void testGetCapabilitySources() throws Exception { + CapabilityDataDefinition testSubject; + List<String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCapabilitySources(); + } + + + @Test + public void testSetCapabilitySources() throws Exception { + CapabilityDataDefinition testSubject; + List<String> capabilitySources = null; + + // default test + testSubject = createTestSubject(); + testSubject.setCapabilitySources(capabilitySources); + } + + + @Test + public void testSetPath() throws Exception { + CapabilityDataDefinition testSubject; + List<String> path = null; + + // default test + testSubject = createTestSubject(); + testSubject.setPath(path); + } + + + @Test + public void testGetPath() throws Exception { + CapabilityDataDefinition testSubject; + List<String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getPath(); + } + + + @Test + public void testSetSource() throws Exception { + CapabilityDataDefinition testSubject; + String source = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setSource(source); + } + + + @Test + public void testGetSource() throws Exception { + CapabilityDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getSource(); + } + + + @Test + public void testAddToPath() throws Exception { + CapabilityDataDefinition testSubject; + String elementInPath = ""; + + // default test + testSubject = createTestSubject(); + testSubject.addToPath(elementInPath); + } + + + @Test + public void testHashCode() throws Exception { + CapabilityDataDefinition testSubject; + int result; + + // default test + testSubject = createTestSubject(); + result = testSubject.hashCode(); + } + + + @Test + public void testEquals() throws Exception { + CapabilityDataDefinition testSubject; + Object obj = null; + boolean result; + + // test 1 + testSubject = createTestSubject(); + obj = null; + result = testSubject.equals(obj); + Assert.assertEquals(false, result); + } + + + @Test + public void testToString() throws Exception { + CapabilityDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ComponentInstanceDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ComponentInstanceDataDefinitionTest.java new file mode 100644 index 0000000000..a6faeb3d30 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ComponentInstanceDataDefinitionTest.java @@ -0,0 +1,444 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import javax.annotation.Generated; + +import org.junit.Test; +import org.openecomp.sdc.be.datatypes.enums.OriginTypeEnum; + + +public class ComponentInstanceDataDefinitionTest { + + private ComponentInstanceDataDefinition createTestSubject() { + return new ComponentInstanceDataDefinition(); + } + + + @Test + public void testGetIcon() throws Exception { + ComponentInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getIcon(); + } + + + @Test + public void testSetIcon() throws Exception { + ComponentInstanceDataDefinition testSubject; + String icon = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setIcon(icon); + } + + + @Test + public void testGetUniqueId() throws Exception { + ComponentInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUniqueId(); + } + + + @Test + public void testSetUniqueId() throws Exception { + ComponentInstanceDataDefinition testSubject; + String uniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUniqueId(uniqueId); + } + + + @Test + public void testGetCreationTime() throws Exception { + ComponentInstanceDataDefinition testSubject; + Long result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCreationTime(); + } + + + @Test + public void testSetCreationTime() throws Exception { + ComponentInstanceDataDefinition testSubject; + Long creationTime = null; + + // default test + testSubject = createTestSubject(); + testSubject.setCreationTime(creationTime); + } + + + @Test + public void testGetModificationTime() throws Exception { + ComponentInstanceDataDefinition testSubject; + Long result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getModificationTime(); + } + + + @Test + public void testSetModificationTime() throws Exception { + ComponentInstanceDataDefinition testSubject; + Long modificationTime = null; + + // default test + testSubject = createTestSubject(); + testSubject.setModificationTime(modificationTime); + } + + + @Test + public void testGetDescription() throws Exception { + ComponentInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDescription(); + } + + + @Test + public void testSetDescription() throws Exception { + ComponentInstanceDataDefinition testSubject; + String description = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setDescription(description); + } + + + @Test + public void testGetPosX() throws Exception { + ComponentInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getPosX(); + } + + + @Test + public void testSetPosX() throws Exception { + ComponentInstanceDataDefinition testSubject; + String posX = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setPosX(posX); + } + + + @Test + public void testGetPosY() throws Exception { + ComponentInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getPosY(); + } + + + @Test + public void testSetPosY() throws Exception { + ComponentInstanceDataDefinition testSubject; + String posY = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setPosY(posY); + } + + + @Test + public void testGetComponentUid() throws Exception { + ComponentInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getComponentUid(); + } + + + @Test + public void testSetComponentUid() throws Exception { + ComponentInstanceDataDefinition testSubject; + String resourceUid = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setComponentUid(resourceUid); + } + + + @Test + public void testGetName() throws Exception { + ComponentInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getName(); + } + + + @Test + public void testSetName() throws Exception { + ComponentInstanceDataDefinition testSubject; + String name = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setName(name); + } + + + @Test + public void testGetInvariantName() throws Exception { + ComponentInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getInvariantName(); + } + + + @Test + public void testSetInvariantName() throws Exception { + ComponentInstanceDataDefinition testSubject; + String invariantName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setInvariantName(invariantName); + } + + + @Test + public void testGetPropertyValueCounter() throws Exception { + ComponentInstanceDataDefinition testSubject; + Integer result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getPropertyValueCounter(); + } + + + @Test + public void testSetPropertyValueCounter() throws Exception { + ComponentInstanceDataDefinition testSubject; + Integer propertyValueCounter = 0; + + // default test + testSubject = createTestSubject(); + testSubject.setPropertyValueCounter(propertyValueCounter); + } + + + @Test + public void testGetNormalizedName() throws Exception { + ComponentInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getNormalizedName(); + } + + + @Test + public void testSetNormalizedName() throws Exception { + ComponentInstanceDataDefinition testSubject; + String normalizedName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setNormalizedName(normalizedName); + } + + + @Test + public void testGetOriginType() throws Exception { + ComponentInstanceDataDefinition testSubject; + OriginTypeEnum result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getOriginType(); + } + + + @Test + public void testSetOriginType() throws Exception { + ComponentInstanceDataDefinition testSubject; + OriginTypeEnum originType = null; + + // test 1 + testSubject = createTestSubject(); + originType = null; + testSubject.setOriginType(originType); + } + + + @Test + public void testGetAttributeValueCounter() throws Exception { + ComponentInstanceDataDefinition testSubject; + Integer result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getAttributeValueCounter(); + } + + + @Test + public void testSetAttributeValueCounter() throws Exception { + ComponentInstanceDataDefinition testSubject; + Integer attributeValueCounter = 0; + + // default test + testSubject = createTestSubject(); + testSubject.setAttributeValueCounter(attributeValueCounter); + } + + + @Test + public void testGetInputValueCounter() throws Exception { + ComponentInstanceDataDefinition testSubject; + Integer result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getInputValueCounter(); + } + + + @Test + public void testSetInputValueCounter() throws Exception { + ComponentInstanceDataDefinition testSubject; + Integer inputValueCounter = 0; + + // default test + testSubject = createTestSubject(); + testSubject.setInputValueCounter(inputValueCounter); + } + + + @Test + public void testGetCustomizationUUID() throws Exception { + ComponentInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCustomizationUUID(); + } + + + @Test + public void testSetCustomizationUUID() throws Exception { + ComponentInstanceDataDefinition testSubject; + String customizationUUID = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setCustomizationUUID(customizationUUID); + } + + + @Test + public void testGetComponentName() throws Exception { + ComponentInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getComponentName(); + } + + + @Test + public void testSetComponentName() throws Exception { + ComponentInstanceDataDefinition testSubject; + String resourceName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setComponentName(resourceName); + } + + + @Test + public void testGetComponentVersion() throws Exception { + ComponentInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getComponentVersion(); + } + + + @Test + public void testGetToscaComponentName() throws Exception { + ComponentInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getToscaComponentName(); + } + + + @Test + public void testSetToscaComponentName() throws Exception { + ComponentInstanceDataDefinition testSubject; + String toscaComponentName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setToscaComponentName(toscaComponentName); + } + + + @Test + public void testSetComponentVersion() throws Exception { + ComponentInstanceDataDefinition testSubject; + String resourceVersion = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setComponentVersion(resourceVersion); + } + + + @Test + public void testToString() throws Exception { + ComponentInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/CompositionDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/CompositionDataDefinitionTest.java new file mode 100644 index 0000000000..3418265183 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/CompositionDataDefinitionTest.java @@ -0,0 +1,83 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.Map; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class CompositionDataDefinitionTest { + + private CompositionDataDefinition createTestSubject() { + return new CompositionDataDefinition(); + } + + + @Test + public void testGetComponentInstances() throws Exception { + CompositionDataDefinition testSubject; + Map<String, ComponentInstanceDataDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getComponentInstances(); + } + + + @Test + public void testSetComponentInstances() throws Exception { + CompositionDataDefinition testSubject; + Map<String, ComponentInstanceDataDefinition> componentInstances = null; + + // default test + testSubject = createTestSubject(); + testSubject.setComponentInstances(componentInstances); + } + + + @Test + public void testGetRelations() throws Exception { + CompositionDataDefinition testSubject; + Map<String, RelationshipInstDataDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getRelations(); + } + + + @Test + public void testSetRelations() throws Exception { + CompositionDataDefinition testSubject; + Map<String, RelationshipInstDataDefinition> relations = null; + + // default test + testSubject = createTestSubject(); + testSubject.setRelations(relations); + } + + + @Test + public void testAddInstance() throws Exception { + CompositionDataDefinition testSubject; + String key = ""; + ComponentInstanceDataDefinition instance = null; + + // default test + testSubject = createTestSubject(); + testSubject.addInstance(key, instance); + } + + + @Test + public void testAddRelation() throws Exception { + CompositionDataDefinition testSubject; + String key = ""; + RelationshipInstDataDefinition relation = null; + + // default test + testSubject = createTestSubject(); + testSubject.addRelation(key, relation); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ConsumerDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ConsumerDataDefinitionTest.java new file mode 100644 index 0000000000..7d5a73333c --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ConsumerDataDefinitionTest.java @@ -0,0 +1,182 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import javax.annotation.Generated; + +import org.junit.Assert; +import org.junit.Test; + + +public class ConsumerDataDefinitionTest { + + private ConsumerDataDefinition createTestSubject() { + return new ConsumerDataDefinition(); + } + + + @Test + public void testGetConsumerName() throws Exception { + ConsumerDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getConsumerName(); + } + + + @Test + public void testSetConsumerName() throws Exception { + ConsumerDataDefinition testSubject; + String consumerName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setConsumerName(consumerName); + } + + + @Test + public void testGetConsumerPassword() throws Exception { + ConsumerDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getConsumerPassword(); + } + + + @Test + public void testSetConsumerPassword() throws Exception { + ConsumerDataDefinition testSubject; + String consumerPassword = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setConsumerPassword(consumerPassword); + } + + + @Test + public void testGetConsumerSalt() throws Exception { + ConsumerDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getConsumerSalt(); + } + + + @Test + public void testSetConsumerSalt() throws Exception { + ConsumerDataDefinition testSubject; + String consumerSalt = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setConsumerSalt(consumerSalt); + } + + + @Test + public void testGetConsumerLastAuthenticationTime() throws Exception { + ConsumerDataDefinition testSubject; + Long result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getConsumerLastAuthenticationTime(); + } + + + @Test + public void testSetConsumerLastAuthenticationTime() throws Exception { + ConsumerDataDefinition testSubject; + Long consumerLastAuthenticationTime = null; + + // default test + testSubject = createTestSubject(); + testSubject.setConsumerLastAuthenticationTime(consumerLastAuthenticationTime); + } + + + @Test + public void testGetConsumerDetailsLastupdatedtime() throws Exception { + ConsumerDataDefinition testSubject; + Long result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getConsumerDetailsLastupdatedtime(); + } + + + @Test + public void testSetConsumerDetailsLastupdatedtime() throws Exception { + ConsumerDataDefinition testSubject; + Long consumerDetailsLastupdatedtime = null; + + // default test + testSubject = createTestSubject(); + testSubject.setConsumerDetailsLastupdatedtime(consumerDetailsLastupdatedtime); + } + + + @Test + public void testGetLastModfierAtuid() throws Exception { + ConsumerDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getLastModfierAtuid(); + } + + + @Test + public void testSetLastModfierAtuid() throws Exception { + ConsumerDataDefinition testSubject; + String lastModfierAtuid = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setLastModfierAtuid(lastModfierAtuid); + } + + + @Test + public void testToString() throws Exception { + ConsumerDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } + + + @Test + public void testHashCode() throws Exception { + ConsumerDataDefinition testSubject; + int result; + + // default test + testSubject = createTestSubject(); + result = testSubject.hashCode(); + } + + + @Test + public void testEquals() throws Exception { + ConsumerDataDefinition testSubject; + Object obj = null; + boolean result; + + // test 1 + testSubject = createTestSubject(); + obj = null; + result = testSubject.equals(obj); + Assert.assertEquals(false, result); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/DataTypeDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/DataTypeDataDefinitionTest.java new file mode 100644 index 0000000000..54d9bdac36 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/DataTypeDataDefinitionTest.java @@ -0,0 +1,156 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class DataTypeDataDefinitionTest { + + private DataTypeDataDefinition createTestSubject() { + return new DataTypeDataDefinition(); + } + + + @Test + public void testGetName() throws Exception { + DataTypeDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getName(); + } + + + @Test + public void testSetName() throws Exception { + DataTypeDataDefinition testSubject; + String name = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setName(name); + } + + + @Test + public void testGetDerivedFromName() throws Exception { + DataTypeDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDerivedFromName(); + } + + + @Test + public void testSetDerivedFromName() throws Exception { + DataTypeDataDefinition testSubject; + String derivedFromName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setDerivedFromName(derivedFromName); + } + + + @Test + public void testGetDescription() throws Exception { + DataTypeDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDescription(); + } + + + @Test + public void testSetDescription() throws Exception { + DataTypeDataDefinition testSubject; + String description = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setDescription(description); + } + + + @Test + public void testGetUniqueId() throws Exception { + DataTypeDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUniqueId(); + } + + + @Test + public void testSetUniqueId() throws Exception { + DataTypeDataDefinition testSubject; + String uniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUniqueId(uniqueId); + } + + + @Test + public void testGetCreationTime() throws Exception { + DataTypeDataDefinition testSubject; + Long result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCreationTime(); + } + + + @Test + public void testSetCreationTime() throws Exception { + DataTypeDataDefinition testSubject; + Long creationTime = null; + + // default test + testSubject = createTestSubject(); + testSubject.setCreationTime(creationTime); + } + + + @Test + public void testGetModificationTime() throws Exception { + DataTypeDataDefinition testSubject; + Long result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getModificationTime(); + } + + + @Test + public void testSetModificationTime() throws Exception { + DataTypeDataDefinition testSubject; + Long modificationTime = null; + + // default test + testSubject = createTestSubject(); + testSubject.setModificationTime(modificationTime); + } + + + @Test + public void testToString() throws Exception { + DataTypeDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GetInputValueDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GetInputValueDataDefinitionTest.java new file mode 100644 index 0000000000..2ac0fda57b --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GetInputValueDataDefinitionTest.java @@ -0,0 +1,182 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import javax.annotation.Generated; + +import org.junit.Assert; +import org.junit.Test; + + +public class GetInputValueDataDefinitionTest { + + private GetInputValueDataDefinition createTestSubject() { + return new GetInputValueDataDefinition(); + } + + + @Test + public void testGetPropName() throws Exception { + GetInputValueDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getPropName(); + } + + + @Test + public void testSetPropName() throws Exception { + GetInputValueDataDefinition testSubject; + String propName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setPropName(propName); + } + + + @Test + public void testGetInputName() throws Exception { + GetInputValueDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getInputName(); + } + + + @Test + public void testSetInputName() throws Exception { + GetInputValueDataDefinition testSubject; + String inputName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setInputName(inputName); + } + + + @Test + public void testGetIndexValue() throws Exception { + GetInputValueDataDefinition testSubject; + Integer result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getIndexValue(); + } + + + @Test + public void testSetIndexValue() throws Exception { + GetInputValueDataDefinition testSubject; + Integer indexValue = 0; + + // default test + testSubject = createTestSubject(); + testSubject.setIndexValue(indexValue); + } + + + @Test + public void testGetGetInputIndex() throws Exception { + GetInputValueDataDefinition testSubject; + GetInputValueDataDefinition result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getGetInputIndex(); + } + + + @Test + public void testSetGetInputIndex() throws Exception { + GetInputValueDataDefinition testSubject; + GetInputValueDataDefinition getInputIndex = null; + + // default test + testSubject = createTestSubject(); + testSubject.setGetInputIndex(getInputIndex); + } + + + @Test + public void testIsList() throws Exception { + GetInputValueDataDefinition testSubject; + boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.isList(); + } + + + @Test + public void testSetList() throws Exception { + GetInputValueDataDefinition testSubject; + boolean isList = false; + + // default test + testSubject = createTestSubject(); + testSubject.setList(isList); + } + + + @Test + public void testGetInputId() throws Exception { + GetInputValueDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getInputId(); + } + + + @Test + public void testSetInputId() throws Exception { + GetInputValueDataDefinition testSubject; + String inputId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setInputId(inputId); + } + + + @Test + public void testToString() throws Exception { + GetInputValueDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } + + + @Test + public void testHashCode() throws Exception { + GetInputValueDataDefinition testSubject; + int result; + + // default test + testSubject = createTestSubject(); + result = testSubject.hashCode(); + } + + + @Test + public void testEquals() throws Exception { + GetInputValueDataDefinition testSubject; + Object obj = null; + boolean result; + + // test 1 + testSubject = createTestSubject(); + obj = null; + result = testSubject.equals(obj); + Assert.assertEquals(false, result); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GroupDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GroupDataDefinitionTest.java new file mode 100644 index 0000000000..74e1bf3a47 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GroupDataDefinitionTest.java @@ -0,0 +1,313 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.List; +import java.util.Map; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class GroupDataDefinitionTest { + + private GroupDataDefinition createTestSubject() { + return new GroupDataDefinition(); + } + + + @Test + public void testGetName() throws Exception { + GroupDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getName(); + } + + + @Test + public void testSetName() throws Exception { + GroupDataDefinition testSubject; + String name = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setName(name); + } + + + @Test + public void testGetUniqueId() throws Exception { + GroupDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUniqueId(); + } + + + @Test + public void testSetUniqueId() throws Exception { + GroupDataDefinition testSubject; + String uniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUniqueId(uniqueId); + } + + + @Test + public void testGetType() throws Exception { + GroupDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getType(); + } + + + @Test + public void testSetType() throws Exception { + GroupDataDefinition testSubject; + String type = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setType(type); + } + + + @Test + public void testGetVersion() throws Exception { + GroupDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getVersion(); + } + + + @Test + public void testSetVersion() throws Exception { + GroupDataDefinition testSubject; + String version = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setVersion(version); + } + + + @Test + public void testGetInvariantUUID() throws Exception { + GroupDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getInvariantUUID(); + } + + + @Test + public void testSetInvariantUUID() throws Exception { + GroupDataDefinition testSubject; + String invariantUUID = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setInvariantUUID(invariantUUID); + } + + + @Test + public void testGetDescription() throws Exception { + GroupDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDescription(); + } + + + @Test + public void testSetDescription() throws Exception { + GroupDataDefinition testSubject; + String description = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setDescription(description); + } + + + @Test + public void testGetPropertyValueCounter() throws Exception { + GroupDataDefinition testSubject; + Integer result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getPropertyValueCounter(); + } + + + @Test + public void testSetPropertyValueCounter() throws Exception { + GroupDataDefinition testSubject; + Integer propertyValueCounter = 0; + + // default test + testSubject = createTestSubject(); + testSubject.setPropertyValueCounter(propertyValueCounter); + } + + + @Test + public void testGetGroupUUID() throws Exception { + GroupDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getGroupUUID(); + } + + + @Test + public void testSetGroupUUID() throws Exception { + GroupDataDefinition testSubject; + String groupUUID = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setGroupUUID(groupUUID); + } + + + @Test + public void testGetMembers() throws Exception { + GroupDataDefinition testSubject; + Map<String, String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getMembers(); + } + + + @Test + public void testSetMembers() throws Exception { + GroupDataDefinition testSubject; + Map<String, String> members = null; + + // default test + testSubject = createTestSubject(); + testSubject.setMembers(members); + } + + + @Test + public void testGetArtifacts() throws Exception { + GroupDataDefinition testSubject; + List<String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getArtifacts(); + } + + + @Test + public void testSetArtifacts() throws Exception { + GroupDataDefinition testSubject; + List<String> artifacts = null; + + // default test + testSubject = createTestSubject(); + testSubject.setArtifacts(artifacts); + } + + + @Test + public void testGetArtifactsUuid() throws Exception { + GroupDataDefinition testSubject; + List<String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getArtifactsUuid(); + } + + + @Test + public void testSetArtifactsUuid() throws Exception { + GroupDataDefinition testSubject; + List<String> artifactsUuid = null; + + // default test + testSubject = createTestSubject(); + testSubject.setArtifactsUuid(artifactsUuid); + } + + + @Test + public void testGetProperties() throws Exception { + GroupDataDefinition testSubject; + List<PropertyDataDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getProperties(); + } + + + @Test + public void testSetProperties() throws Exception { + GroupDataDefinition testSubject; + List<PropertyDataDefinition> properties = null; + + // default test + testSubject = createTestSubject(); + testSubject.setProperties(properties); + } + + + @Test + public void testGetTypeUid() throws Exception { + GroupDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getTypeUid(); + } + + + @Test + public void testSetTypeUid() throws Exception { + GroupDataDefinition testSubject; + String typeUid = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setTypeUid(typeUid); + } + + + @Test + public void testToString() throws Exception { + GroupDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GroupInstanceDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GroupInstanceDataDefinitionTest.java new file mode 100644 index 0000000000..4fc8d2417c --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GroupInstanceDataDefinitionTest.java @@ -0,0 +1,486 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class GroupInstanceDataDefinitionTest { + + private GroupInstanceDataDefinition createTestSubject() { + return new GroupInstanceDataDefinition(); + } + + + @Test + public void testGetUniqueId() throws Exception { + GroupInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUniqueId(); + } + + + @Test + public void testSetUniqueId() throws Exception { + GroupInstanceDataDefinition testSubject; + String uniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUniqueId(uniqueId); + } + + + @Test + public void testGetName() throws Exception { + GroupInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getName(); + } + + + @Test + public void testSetName() throws Exception { + GroupInstanceDataDefinition testSubject; + String name = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setName(name); + } + + + @Test + public void testGetNormalizedName() throws Exception { + GroupInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getNormalizedName(); + } + + + @Test + public void testSetNormalizedName() throws Exception { + GroupInstanceDataDefinition testSubject; + String normalizedName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setNormalizedName(normalizedName); + } + + + @Test + public void testGetGroupUid() throws Exception { + GroupInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getGroupUid(); + } + + + @Test + public void testSetGroupUid() throws Exception { + GroupInstanceDataDefinition testSubject; + String groupUid = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setGroupUid(groupUid); + } + + + @Test + public void testGetCreationTime() throws Exception { + GroupInstanceDataDefinition testSubject; + Long result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCreationTime(); + } + + + @Test + public void testSetCreationTime() throws Exception { + GroupInstanceDataDefinition testSubject; + Long creationTime = null; + + // default test + testSubject = createTestSubject(); + testSubject.setCreationTime(creationTime); + } + + + @Test + public void testGetModificationTime() throws Exception { + GroupInstanceDataDefinition testSubject; + Long result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getModificationTime(); + } + + + @Test + public void testSetModificationTime() throws Exception { + GroupInstanceDataDefinition testSubject; + Long modificationTime = null; + + // default test + testSubject = createTestSubject(); + testSubject.setModificationTime(modificationTime); + } + + + @Test + public void testGetPosX() throws Exception { + GroupInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getPosX(); + } + + + @Test + public void testSetPosX() throws Exception { + GroupInstanceDataDefinition testSubject; + String posX = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setPosX(posX); + } + + + @Test + public void testGetPosY() throws Exception { + GroupInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getPosY(); + } + + + @Test + public void testSetPosY() throws Exception { + GroupInstanceDataDefinition testSubject; + String posY = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setPosY(posY); + } + + + @Test + public void testGetPropertyValueCounter() throws Exception { + GroupInstanceDataDefinition testSubject; + Integer result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getPropertyValueCounter(); + } + + + @Test + public void testSetPropertyValueCounter() throws Exception { + GroupInstanceDataDefinition testSubject; + Integer propertyValueCounter = 0; + + // default test + testSubject = createTestSubject(); + testSubject.setPropertyValueCounter(propertyValueCounter); + } + + + @Test + public void testGetCustomizationUUID() throws Exception { + GroupInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCustomizationUUID(); + } + + + @Test + public void testSetCustomizationUUID() throws Exception { + GroupInstanceDataDefinition testSubject; + String customizationUUID = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setCustomizationUUID(customizationUUID); + } + + + @Test + public void testGetGroupName() throws Exception { + GroupInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getGroupName(); + } + + + @Test + public void testSetGroupName() throws Exception { + GroupInstanceDataDefinition testSubject; + String groupName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setGroupName(groupName); + } + + + @Test + public void testGetInvariantUUID() throws Exception { + GroupInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getInvariantUUID(); + } + + + @Test + public void testSetInvariantUUID() throws Exception { + GroupInstanceDataDefinition testSubject; + String invariantUUID = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setInvariantUUID(invariantUUID); + } + + + @Test + public void testGetType() throws Exception { + GroupInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getType(); + } + + + @Test + public void testSetType() throws Exception { + GroupInstanceDataDefinition testSubject; + String type = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setType(type); + } + + + @Test + public void testGetGroupUUID() throws Exception { + GroupInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getGroupUUID(); + } + + + @Test + public void testSetGroupUUID() throws Exception { + GroupInstanceDataDefinition testSubject; + String groupUUID = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setGroupUUID(groupUUID); + } + + + @Test + public void testGetVersion() throws Exception { + GroupInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getVersion(); + } + + + @Test + public void testSetVersion() throws Exception { + GroupInstanceDataDefinition testSubject; + String version = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setVersion(version); + } + + + @Test + public void testGetDescription() throws Exception { + GroupInstanceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDescription(); + } + + + @Test + public void testSetDescription() throws Exception { + GroupInstanceDataDefinition testSubject; + String description = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setDescription(description); + } + + + @Test + public void testGetArtifacts() throws Exception { + GroupInstanceDataDefinition testSubject; + List<String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getArtifacts(); + } + + + @Test + public void testSetArtifacts() throws Exception { + GroupInstanceDataDefinition testSubject; + List<String> artifacts = null; + + // default test + testSubject = createTestSubject(); + testSubject.setArtifacts(artifacts); + } + + + @Test + public void testGetArtifactsUuid() throws Exception { + GroupInstanceDataDefinition testSubject; + List<String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getArtifactsUuid(); + } + + + @Test + public void testSetArtifactsUuid() throws Exception { + GroupInstanceDataDefinition testSubject; + List<String> artifactsUuid = null; + + // default test + testSubject = createTestSubject(); + testSubject.setArtifactsUuid(artifactsUuid); + } + + + @Test + public void testGetGroupInstanceArtifacts() throws Exception { + GroupInstanceDataDefinition testSubject; + List<String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getGroupInstanceArtifacts(); + } + + + @Test + public void testSetGroupInstanceArtifacts() throws Exception { + GroupInstanceDataDefinition testSubject; + List<String> groupInstanceArtifacts = null; + + // default test + testSubject = createTestSubject(); + testSubject.setGroupInstanceArtifacts(groupInstanceArtifacts); + } + + + @Test + public void testGetGroupInstanceArtifactsUuid() throws Exception { + GroupInstanceDataDefinition testSubject; + List<String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getGroupInstanceArtifactsUuid(); + } + + + @Test + public void testSetGroupInstanceArtifactsUuid() throws Exception { + GroupInstanceDataDefinition testSubject; + List<String> groupInstanceArtifactsUuid = null; + + // default test + testSubject = createTestSubject(); + testSubject.setGroupInstanceArtifactsUuid(groupInstanceArtifactsUuid); + } + + + @Test + public void testGetProperties() throws Exception { + GroupInstanceDataDefinition testSubject; + List<PropertyDataDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getProperties(); + } + + + @Test + public void testSetProperties() throws Exception { + GroupInstanceDataDefinition testSubject; + List<PropertyDataDefinition> properties = null; + + // default test + testSubject = createTestSubject(); + testSubject.setProperties(properties); + } + + + @Test + public void testGetSerialversionuid() throws Exception { + long result; + + // default test + result = GroupInstanceDataDefinition.getSerialversionuid(); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GroupTypeDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GroupTypeDataDefinitionTest.java new file mode 100644 index 0000000000..aec794abd0 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/GroupTypeDataDefinitionTest.java @@ -0,0 +1,247 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.List; +import java.util.Map; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class GroupTypeDataDefinitionTest { + + private GroupTypeDataDefinition createTestSubject() { + return new GroupTypeDataDefinition(); + } + + + @Test + public void testGetType() throws Exception { + GroupTypeDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getType(); + } + + + @Test + public void testSetType() throws Exception { + GroupTypeDataDefinition testSubject; + String type = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setType(type); + } + + + @Test + public void testGetVersion() throws Exception { + GroupTypeDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getVersion(); + } + + + @Test + public void testSetVersion() throws Exception { + GroupTypeDataDefinition testSubject; + String version = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setVersion(version); + } + + + @Test + public void testGetMembers() throws Exception { + GroupTypeDataDefinition testSubject; + List<String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getMembers(); + } + + + @Test + public void testSetMembers() throws Exception { + GroupTypeDataDefinition testSubject; + List<String> members = null; + + // default test + testSubject = createTestSubject(); + testSubject.setMembers(members); + } + + + @Test + public void testGetMetadata() throws Exception { + GroupTypeDataDefinition testSubject; + Map<String, String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getMetadata(); + } + + + @Test + public void testSetMetadata() throws Exception { + GroupTypeDataDefinition testSubject; + Map<String, String> metadata = null; + + // default test + testSubject = createTestSubject(); + testSubject.setMetadata(metadata); + } + + + @Test + public void testGetDescription() throws Exception { + GroupTypeDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDescription(); + } + + + @Test + public void testSetDescription() throws Exception { + GroupTypeDataDefinition testSubject; + String description = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setDescription(description); + } + + + @Test + public void testGetUniqueId() throws Exception { + GroupTypeDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUniqueId(); + } + + + @Test + public void testSetUniqueId() throws Exception { + GroupTypeDataDefinition testSubject; + String uniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUniqueId(uniqueId); + } + + + @Test + public void testGetCreationTime() throws Exception { + GroupTypeDataDefinition testSubject; + Long result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCreationTime(); + } + + + @Test + public void testSetCreationTime() throws Exception { + GroupTypeDataDefinition testSubject; + Long creationTime = null; + + // default test + testSubject = createTestSubject(); + testSubject.setCreationTime(creationTime); + } + + + @Test + public void testGetModificationTime() throws Exception { + GroupTypeDataDefinition testSubject; + Long result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getModificationTime(); + } + + + @Test + public void testSetModificationTime() throws Exception { + GroupTypeDataDefinition testSubject; + Long modificationTime = null; + + // default test + testSubject = createTestSubject(); + testSubject.setModificationTime(modificationTime); + } + + + @Test + public void testToString() throws Exception { + GroupTypeDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } + + + @Test + public void testGetDerivedFrom() throws Exception { + GroupTypeDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDerivedFrom(); + } + + + @Test + public void testSetDerivedFrom() throws Exception { + GroupTypeDataDefinition testSubject; + String derivedFrom = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setDerivedFrom(derivedFrom); + } + + + @Test + public void testIsHighestVersion() throws Exception { + GroupTypeDataDefinition testSubject; + boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.isHighestVersion(); + } + + + @Test + public void testSetHighestVersion() throws Exception { + GroupTypeDataDefinition testSubject; + boolean isLatestVersion = false; + + // default test + testSubject = createTestSubject(); + testSubject.setHighestVersion(isLatestVersion); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/HeatParameterDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/HeatParameterDataDefinitionTest.java new file mode 100644 index 0000000000..b4d98363a9 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/HeatParameterDataDefinitionTest.java @@ -0,0 +1,182 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import javax.annotation.Generated; + +import org.junit.Assert; +import org.junit.Test; + + +public class HeatParameterDataDefinitionTest { + + private HeatParameterDataDefinition createTestSubject() { + return new HeatParameterDataDefinition(); + } + + + @Test + public void testGetUniqueId() throws Exception { + HeatParameterDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUniqueId(); + } + + + @Test + public void testSetUniqueId() throws Exception { + HeatParameterDataDefinition testSubject; + String uniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUniqueId(uniqueId); + } + + + @Test + public void testGetName() throws Exception { + HeatParameterDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getName(); + } + + + @Test + public void testSetName() throws Exception { + HeatParameterDataDefinition testSubject; + String name = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setName(name); + } + + + @Test + public void testGetType() throws Exception { + HeatParameterDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getType(); + } + + + @Test + public void testSetType() throws Exception { + HeatParameterDataDefinition testSubject; + String type = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setType(type); + } + + + @Test + public void testGetDescription() throws Exception { + HeatParameterDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDescription(); + } + + + @Test + public void testSetDescription() throws Exception { + HeatParameterDataDefinition testSubject; + String description = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setDescription(description); + } + + + @Test + public void testGetCurrentValue() throws Exception { + HeatParameterDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCurrentValue(); + } + + + @Test + public void testSetCurrentValue() throws Exception { + HeatParameterDataDefinition testSubject; + String currentValue = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setCurrentValue(currentValue); + } + + + @Test + public void testGetDefaultValue() throws Exception { + HeatParameterDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDefaultValue(); + } + + + @Test + public void testSetDefaultValue() throws Exception { + HeatParameterDataDefinition testSubject; + String defaultValue = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setDefaultValue(defaultValue); + } + + + @Test + public void testToString() throws Exception { + HeatParameterDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } + + + @Test + public void testHashCode() throws Exception { + HeatParameterDataDefinition testSubject; + int result; + + // default test + testSubject = createTestSubject(); + result = testSubject.hashCode(); + } + + + @Test + public void testEquals() throws Exception { + HeatParameterDataDefinition testSubject; + Object obj = null; + boolean result; + + // test 1 + testSubject = createTestSubject(); + obj = null; + result = testSubject.equals(obj); + Assert.assertEquals(false, result); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/InputDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/InputDataDefinitionTest.java new file mode 100644 index 0000000000..05e0372b83 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/InputDataDefinitionTest.java @@ -0,0 +1,79 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class InputDataDefinitionTest { + + private InputDataDefinition createTestSubject() { + return new InputDataDefinition(); + } + + + @Test + public void testIsHidden() throws Exception { + InputDataDefinition testSubject; + Boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.isHidden(); + } + + + @Test + public void testSetHidden() throws Exception { + InputDataDefinition testSubject; + Boolean hidden = null; + + // default test + testSubject = createTestSubject(); + testSubject.setHidden(hidden); + } + + + @Test + public void testIsImmutable() throws Exception { + InputDataDefinition testSubject; + Boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.isImmutable(); + } + + + @Test + public void testSetImmutable() throws Exception { + InputDataDefinition testSubject; + Boolean immutable = null; + + // default test + testSubject = createTestSubject(); + testSubject.setImmutable(immutable); + } + + + @Test + public void testGetLabel() throws Exception { + InputDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getLabel(); + } + + + @Test + public void testSetLabel() throws Exception { + InputDataDefinition testSubject; + String label = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setLabel(label); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/InputsValueDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/InputsValueDataDefinitionTest.java new file mode 100644 index 0000000000..fa37a425b9 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/InputsValueDataDefinitionTest.java @@ -0,0 +1,79 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class InputsValueDataDefinitionTest { + + private InputsValueDataDefinition createTestSubject() { + return new InputsValueDataDefinition("", ""); + } + + + @Test + public void testGetUniqueId() throws Exception { + InputsValueDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUniqueId(); + } + + + @Test + public void testSetUniqueId() throws Exception { + InputsValueDataDefinition testSubject; + String uniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUniqueId(uniqueId); + } + + + @Test + public void testGetName() throws Exception { + InputsValueDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getName(); + } + + + @Test + public void testSetName() throws Exception { + InputsValueDataDefinition testSubject; + String name = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setName(name); + } + + + @Test + public void testGetValue() throws Exception { + InputsValueDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getValue(); + } + + + @Test + public void testSetValue() throws Exception { + InputsValueDataDefinition testSubject; + String value = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setValue(value); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/InterfaceDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/InterfaceDataDefinitionTest.java new file mode 100644 index 0000000000..e54ba4b175 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/InterfaceDataDefinitionTest.java @@ -0,0 +1,147 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.Map; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class InterfaceDataDefinitionTest { + + private InterfaceDataDefinition createTestSubject() { + return new InterfaceDataDefinition(); + } + + + @Test + public void testGetUniqueId() throws Exception { + InterfaceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUniqueId(); + } + + + @Test + public void testSetUniqueId() throws Exception { + InterfaceDataDefinition testSubject; + String uniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUniqueId(uniqueId); + } + + + @Test + public void testGetType() throws Exception { + InterfaceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getType(); + } + + + @Test + public void testSetType() throws Exception { + InterfaceDataDefinition testSubject; + String type = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setType(type); + } + + + @Test + public void testGetCreationDate() throws Exception { + InterfaceDataDefinition testSubject; + Long result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCreationDate(); + } + + + @Test + public void testSetCreationDate() throws Exception { + InterfaceDataDefinition testSubject; + Long creationDate = null; + + // default test + testSubject = createTestSubject(); + testSubject.setCreationDate(creationDate); + } + + + @Test + public void testGetLastUpdateDate() throws Exception { + InterfaceDataDefinition testSubject; + Long result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getLastUpdateDate(); + } + + + @Test + public void testSetLastUpdateDate() throws Exception { + InterfaceDataDefinition testSubject; + Long lastUpdateDate = null; + + // default test + testSubject = createTestSubject(); + testSubject.setLastUpdateDate(lastUpdateDate); + } + + + @Test + public void testGetDescription() throws Exception { + InterfaceDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDescription(); + } + + + @Test + public void testSetDescription() throws Exception { + InterfaceDataDefinition testSubject; + String description = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setDescription(description); + } + + + @Test + public void testGetOperations() throws Exception { + InterfaceDataDefinition testSubject; + Map<String, OperationDataDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getOperations(); + } + + + @Test + public void testSetOperations() throws Exception { + InterfaceDataDefinition testSubject; + Map<String, OperationDataDefinition> operations = null; + + // default test + testSubject = createTestSubject(); + testSubject.setOperations(operations); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListCapabilityDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListCapabilityDataDefinitionTest.java new file mode 100644 index 0000000000..5ee6d81c09 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListCapabilityDataDefinitionTest.java @@ -0,0 +1,39 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class ListCapabilityDataDefinitionTest { + + private ListCapabilityDataDefinition createTestSubject() { + List list = new ArrayList<>(); + return new ListCapabilityDataDefinition(list); + } + + + @Test + public void testGetListToscaDataDefinition() throws Exception { + ListCapabilityDataDefinition testSubject; + List<CapabilityDataDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getListToscaDataDefinition(); + } + + + @Test + public void testSetListToscaDataDefinition() throws Exception { + ListCapabilityDataDefinition testSubject; + List<CapabilityDataDefinition> listToscaDataDefinition = null; + + // default test + testSubject = createTestSubject(); + testSubject.setListToscaDataDefinition(listToscaDataDefinition); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListDataDefinitionTest.java new file mode 100644 index 0000000000..29d465b074 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListDataDefinitionTest.java @@ -0,0 +1,47 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class ListDataDefinitionTest { + + private ListDataDefinition createTestSubject() { + List list = new ArrayList<>(); + return new ListDataDefinition(list); + } + + + + + + + @Test + public void testSetOwnerIdIfEmpty() throws Exception { + ListDataDefinition testSubject; + String ownerId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setOwnerIdIfEmpty(ownerId); + } + + + + + + @Test + public void testFindUidMatch() throws Exception { + ListDataDefinition testSubject; + String uid = ""; + boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.findUidMatch(uid); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListMapPropertiesDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListMapPropertiesDataDefinitionTest.java new file mode 100644 index 0000000000..102990e0c0 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListMapPropertiesDataDefinitionTest.java @@ -0,0 +1,39 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class ListMapPropertiesDataDefinitionTest { + + private ListMapPropertiesDataDefinition createTestSubject() { + List list = new ArrayList<>(); + return new ListMapPropertiesDataDefinition(list); + } + + + @Test + public void testGetListToscaDataDefinition() throws Exception { + ListMapPropertiesDataDefinition testSubject; + List<MapPropertiesDataDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getListToscaDataDefinition(); + } + + + @Test + public void testSetMapToscaDataDefinition() throws Exception { + ListMapPropertiesDataDefinition testSubject; + List<MapPropertiesDataDefinition> listToscaDataDefinition = null; + + // default test + testSubject = createTestSubject(); + testSubject.setMapToscaDataDefinition(listToscaDataDefinition); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListRequirementDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListRequirementDataDefinitionTest.java new file mode 100644 index 0000000000..645b25d010 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ListRequirementDataDefinitionTest.java @@ -0,0 +1,39 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class ListRequirementDataDefinitionTest { + + private ListRequirementDataDefinition createTestSubject() { + List list = new ArrayList<>(); + return new ListRequirementDataDefinition(list); + } + + + @Test + public void testGetListToscaDataDefinition() throws Exception { + ListRequirementDataDefinition testSubject; + List<RequirementDataDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getListToscaDataDefinition(); + } + + + @Test + public void testSetListToscaDataDefinition() throws Exception { + ListRequirementDataDefinition testSubject; + List<RequirementDataDefinition> listToscaDataDefinition = null; + + // default test + testSubject = createTestSubject(); + testSubject.setListToscaDataDefinition(listToscaDataDefinition); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapArtifactDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapArtifactDataDefinitionTest.java new file mode 100644 index 0000000000..bc026ff085 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapArtifactDataDefinitionTest.java @@ -0,0 +1,63 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.HashMap; +import java.util.Map; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class MapArtifactDataDefinitionTest { + + private MapArtifactDataDefinition createTestSubject() { + + Map map = new HashMap<>(); + + return new MapArtifactDataDefinition(new MapDataDefinition(map), ""); + } + + + @Test + public void testGetMapToscaDataDefinition() throws Exception { + MapArtifactDataDefinition testSubject; + Map<String, ArtifactDataDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getMapToscaDataDefinition(); + } + + + @Test + public void testSetMapToscaDataDefinition() throws Exception { + MapArtifactDataDefinition testSubject; + Map<String, ArtifactDataDefinition> mapToscaDataDefinition = null; + + // default test + testSubject = createTestSubject(); + testSubject.setMapToscaDataDefinition(mapToscaDataDefinition); + } + + + @Test + public void testGetParentName() throws Exception { + MapArtifactDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getParentName(); + } + + + @Test + public void testSetParentName() throws Exception { + MapArtifactDataDefinition testSubject; + String parentName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setParentName(parentName); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapDataDefinitionTest.java new file mode 100644 index 0000000000..5c7b071f47 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapDataDefinitionTest.java @@ -0,0 +1,60 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.HashMap; +import java.util.Map; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class MapDataDefinitionTest { + + private MapDataDefinition createTestSubject() { + Map myMap = new HashMap<>(); + return new MapDataDefinition(myMap); + } + + + + + + + + + @Test + public void testDelete() throws Exception { + MapDataDefinition testSubject; + String key = ""; + + // default test + testSubject = createTestSubject(); + testSubject.delete(key); + } + + + + + + @Test + public void testSetOwnerIdIfEmpty() throws Exception { + MapDataDefinition testSubject; + String ownerId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setOwnerIdIfEmpty(ownerId); + } + + + @Test + public void testFindKeyByItemUidMatch() throws Exception { + MapDataDefinition testSubject; + String uid = ""; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.findKeyByItemUidMatch(uid); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapListCapabiltyDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapListCapabiltyDataDefinitionTest.java new file mode 100644 index 0000000000..b0ecee8d05 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapListCapabiltyDataDefinitionTest.java @@ -0,0 +1,40 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.HashMap; +import java.util.Map; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class MapListCapabiltyDataDefinitionTest { + + private MapListCapabiltyDataDefinition createTestSubject() { + Map map = new HashMap<>(); + return new MapListCapabiltyDataDefinition(map); + } + + + @Test + public void testGetMapToscaDataDefinition() throws Exception { + MapListCapabiltyDataDefinition testSubject; + Map<String, ListCapabilityDataDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getMapToscaDataDefinition(); + } + + + @Test + public void testAdd() throws Exception { + MapListCapabiltyDataDefinition testSubject; + String key = ""; + CapabilityDataDefinition value = null; + + // default test + testSubject = createTestSubject(); + testSubject.add(key, value); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapListRequirementDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapListRequirementDataDefinitionTest.java new file mode 100644 index 0000000000..8c352b5337 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapListRequirementDataDefinitionTest.java @@ -0,0 +1,42 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class MapListRequirementDataDefinitionTest { + + private MapListRequirementDataDefinition createTestSubject() { + Map map = new HashMap<>(); + return new MapListRequirementDataDefinition(map); + } + + + @Test + public void testGetMapToscaDataDefinition() throws Exception { + MapListRequirementDataDefinition testSubject; + Map<String, ListRequirementDataDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getMapToscaDataDefinition(); + } + + + @Test + public void testAdd() throws Exception { + MapListRequirementDataDefinition testSubject; + String key = ""; + RequirementDataDefinition value = null; + + // default test + testSubject = createTestSubject(); + testSubject.add(key, value); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapPropertiesDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapPropertiesDataDefinitionTest.java new file mode 100644 index 0000000000..97027b3d33 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/MapPropertiesDataDefinitionTest.java @@ -0,0 +1,61 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.HashMap; +import java.util.Map; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class MapPropertiesDataDefinitionTest { + + private MapPropertiesDataDefinition createTestSubject() { + Map map = new HashMap<>(); + return new MapPropertiesDataDefinition(new MapDataDefinition(map), ""); + } + + + @Test + public void testGetMapToscaDataDefinition() throws Exception { + MapPropertiesDataDefinition testSubject; + Map<String, PropertyDataDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getMapToscaDataDefinition(); + } + + + @Test + public void testSetMapToscaDataDefinition() throws Exception { + MapPropertiesDataDefinition testSubject; + Map<String, PropertyDataDefinition> mapToscaDataDefinition = null; + + // default test + testSubject = createTestSubject(); + testSubject.setMapToscaDataDefinition(mapToscaDataDefinition); + } + + + @Test + public void testGetParentName() throws Exception { + MapPropertiesDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getParentName(); + } + + + @Test + public void testSetParentName() throws Exception { + MapPropertiesDataDefinition testSubject; + String parentName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setParentName(parentName); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/OperationDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/OperationDataDefinitionTest.java new file mode 100644 index 0000000000..9169cdf019 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/OperationDataDefinitionTest.java @@ -0,0 +1,147 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.Map; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class OperationDataDefinitionTest { + + private OperationDataDefinition createTestSubject() { + return new OperationDataDefinition(); + } + + + @Test + public void testGetUniqueId() throws Exception { + OperationDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUniqueId(); + } + + + @Test + public void testSetUniqueId() throws Exception { + OperationDataDefinition testSubject; + String uniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUniqueId(uniqueId); + } + + + @Test + public void testGetCreationDate() throws Exception { + OperationDataDefinition testSubject; + Long result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCreationDate(); + } + + + @Test + public void testSetCreationDate() throws Exception { + OperationDataDefinition testSubject; + Long creationDate = null; + + // default test + testSubject = createTestSubject(); + testSubject.setCreationDate(creationDate); + } + + + @Test + public void testGetLastUpdateDate() throws Exception { + OperationDataDefinition testSubject; + Long result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getLastUpdateDate(); + } + + + @Test + public void testSetLastUpdateDate() throws Exception { + OperationDataDefinition testSubject; + Long lastUpdateDate = null; + + // default test + testSubject = createTestSubject(); + testSubject.setLastUpdateDate(lastUpdateDate); + } + + + @Test + public void testGetDescription() throws Exception { + OperationDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDescription(); + } + + + @Test + public void testSetDescription() throws Exception { + OperationDataDefinition testSubject; + String description = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setDescription(description); + } + + + @Test + public void testGetImplementation() throws Exception { + OperationDataDefinition testSubject; + ArtifactDataDefinition result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getImplementation(); + } + + + @Test + public void testSetImplementation() throws Exception { + OperationDataDefinition testSubject; + ArtifactDataDefinition implementation = null; + + // default test + testSubject = createTestSubject(); + testSubject.setImplementation(implementation); + } + + + @Test + public void testGetInputs() throws Exception { + OperationDataDefinition testSubject; + Map<String, PropertyDataDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getInputs(); + } + + + @Test + public void testSetInputs() throws Exception { + OperationDataDefinition testSubject; + Map<String, PropertyDataDefinition> inputs = null; + + // default test + testSubject = createTestSubject(); + testSubject.setInputs(inputs); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/PolicyTypeDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/PolicyTypeDataDefinitionTest.java new file mode 100644 index 0000000000..57fda65334 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/PolicyTypeDataDefinitionTest.java @@ -0,0 +1,247 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.List; +import java.util.Map; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class PolicyTypeDataDefinitionTest { + + private PolicyTypeDataDefinition createTestSubject() { + return new PolicyTypeDataDefinition(); + } + + + @Test + public void testGetType() throws Exception { + PolicyTypeDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getType(); + } + + + @Test + public void testSetType() throws Exception { + PolicyTypeDataDefinition testSubject; + String type = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setType(type); + } + + + @Test + public void testGetVersion() throws Exception { + PolicyTypeDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getVersion(); + } + + + @Test + public void testSetVersion() throws Exception { + PolicyTypeDataDefinition testSubject; + String version = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setVersion(version); + } + + + @Test + public void testGetTargets() throws Exception { + PolicyTypeDataDefinition testSubject; + List<String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getTargets(); + } + + + @Test + public void testSetTargets() throws Exception { + PolicyTypeDataDefinition testSubject; + List<String> members = null; + + // default test + testSubject = createTestSubject(); + testSubject.setTargets(members); + } + + + @Test + public void testGetMetadata() throws Exception { + PolicyTypeDataDefinition testSubject; + Map<String, String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getMetadata(); + } + + + @Test + public void testSetMetadata() throws Exception { + PolicyTypeDataDefinition testSubject; + Map<String, String> metadata = null; + + // default test + testSubject = createTestSubject(); + testSubject.setMetadata(metadata); + } + + + @Test + public void testGetDescription() throws Exception { + PolicyTypeDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDescription(); + } + + + @Test + public void testSetDescription() throws Exception { + PolicyTypeDataDefinition testSubject; + String description = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setDescription(description); + } + + + @Test + public void testGetUniqueId() throws Exception { + PolicyTypeDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUniqueId(); + } + + + @Test + public void testSetUniqueId() throws Exception { + PolicyTypeDataDefinition testSubject; + String uniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUniqueId(uniqueId); + } + + + @Test + public void testGetCreationTime() throws Exception { + PolicyTypeDataDefinition testSubject; + Long result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCreationTime(); + } + + + @Test + public void testSetCreationTime() throws Exception { + PolicyTypeDataDefinition testSubject; + Long creationTime = null; + + // default test + testSubject = createTestSubject(); + testSubject.setCreationTime(creationTime); + } + + + @Test + public void testGetModificationTime() throws Exception { + PolicyTypeDataDefinition testSubject; + Long result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getModificationTime(); + } + + + @Test + public void testSetModificationTime() throws Exception { + PolicyTypeDataDefinition testSubject; + Long modificationTime = null; + + // default test + testSubject = createTestSubject(); + testSubject.setModificationTime(modificationTime); + } + + + @Test + public void testToString() throws Exception { + PolicyTypeDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } + + + @Test + public void testGetDerivedFrom() throws Exception { + PolicyTypeDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDerivedFrom(); + } + + + @Test + public void testSetDerivedFrom() throws Exception { + PolicyTypeDataDefinition testSubject; + String derivedFrom = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setDerivedFrom(derivedFrom); + } + + + @Test + public void testIsHighestVersion() throws Exception { + PolicyTypeDataDefinition testSubject; + boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.isHighestVersion(); + } + + + @Test + public void testSetHighestVersion() throws Exception { + PolicyTypeDataDefinition testSubject; + boolean isLatestVersion = false; + + // default test + testSubject = createTestSubject(); + testSubject.setHighestVersion(isLatestVersion); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ProductMetadataDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ProductMetadataDataDefinitionTest.java new file mode 100644 index 0000000000..49ad568e3a --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/ProductMetadataDataDefinitionTest.java @@ -0,0 +1,132 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class ProductMetadataDataDefinitionTest { + + private ProductMetadataDataDefinition createTestSubject() { + return new ProductMetadataDataDefinition(); + } + + + @Test + public void testGetIsActive() throws Exception { + ProductMetadataDataDefinition testSubject; + Boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getIsActive(); + } + + + @Test + public void testSetIsActive() throws Exception { + ProductMetadataDataDefinition testSubject; + Boolean active = null; + + // default test + testSubject = createTestSubject(); + testSubject.setIsActive(active); + } + + + @Test + public void testGetContacts() throws Exception { + ProductMetadataDataDefinition testSubject; + List<String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getContacts(); + } + + + @Test + public void testSetContacts() throws Exception { + ProductMetadataDataDefinition testSubject; + List<String> contacts = null; + + // default test + testSubject = createTestSubject(); + testSubject.setContacts(contacts); + } + + + @Test + public void testAddContact() throws Exception { + ProductMetadataDataDefinition testSubject; + String contact = ""; + + // test 1 + testSubject = createTestSubject(); + contact = null; + testSubject.addContact(contact); + + // test 2 + testSubject = createTestSubject(); + contact = ""; + testSubject.addContact(contact); + } + + + @Test + public void testGetFullName() throws Exception { + ProductMetadataDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getFullName(); + } + + + @Test + public void testSetFullName() throws Exception { + ProductMetadataDataDefinition testSubject; + String fullName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setFullName(fullName); + } + + + @Test + public void testToString() throws Exception { + ProductMetadataDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } + + + @Test + public void testHashCode() throws Exception { + ProductMetadataDataDefinition testSubject; + int result; + + // default test + testSubject = createTestSubject(); + result = testSubject.hashCode(); + } + + + @Test + public void testEquals() throws Exception { + ProductMetadataDataDefinition testSubject; + Object obj = null; + boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.equals(obj); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinitionTest.java new file mode 100644 index 0000000000..d03a44d384 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinitionTest.java @@ -0,0 +1,511 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Assert; +import org.junit.Test; +import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields; + + +public class PropertyDataDefinitionTest { + + private PropertyDataDefinition createTestSubject() { + return new PropertyDataDefinition(); + } + + + @Test + public void testGetInputPath() throws Exception { + PropertyDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getInputPath(); + } + + + @Test + public void testSetInputPath() throws Exception { + PropertyDataDefinition testSubject; + String inputPath = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setInputPath(inputPath); + } + + + @Test + public void testGetName() throws Exception { + PropertyDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getName(); + } + + + @Test + public void testSetName() throws Exception { + PropertyDataDefinition testSubject; + String name = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setName(name); + } + + + @Test + public void testGetValue() throws Exception { + PropertyDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getValue(); + } + + + @Test + public void testSetValue() throws Exception { + PropertyDataDefinition testSubject; + String value = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setValue(value); + } + + + @Test + public void testIsDefinition() throws Exception { + PropertyDataDefinition testSubject; + boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.isDefinition(); + } + + + @Test + public void testSetDefinition() throws Exception { + PropertyDataDefinition testSubject; + boolean definition = false; + + // default test + testSubject = createTestSubject(); + testSubject.setDefinition(definition); + } + + + @Test + public void testGetType() throws Exception { + PropertyDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getType(); + } + + + @Test + public void testGetDefaultValue() throws Exception { + PropertyDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDefaultValue(); + } + + + @Test + public void testSetDefaultValue() throws Exception { + PropertyDataDefinition testSubject; + String defaultValue = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setDefaultValue(defaultValue); + } + + + @Test + public void testSetType() throws Exception { + PropertyDataDefinition testSubject; + String type = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setType(type); + } + + + @Test + public void testIsRequired() throws Exception { + PropertyDataDefinition testSubject; + Boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.isRequired(); + } + + + @Test + public void testSetRequired() throws Exception { + PropertyDataDefinition testSubject; + Boolean required = null; + + // default test + testSubject = createTestSubject(); + testSubject.setRequired(required); + } + + + @Test + public void testGetDescription() throws Exception { + PropertyDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDescription(); + } + + + @Test + public void testSetDescription() throws Exception { + PropertyDataDefinition testSubject; + String description = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setDescription(description); + } + + + @Test + public void testIsPassword() throws Exception { + PropertyDataDefinition testSubject; + boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.isPassword(); + } + + + @Test + public void testSetPassword() throws Exception { + PropertyDataDefinition testSubject; + boolean password = false; + + // default test + testSubject = createTestSubject(); + testSubject.setPassword(password); + } + + + @Test + public void testGetUniqueId() throws Exception { + PropertyDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUniqueId(); + } + + + @Test + public void testSetUniqueId() throws Exception { + PropertyDataDefinition testSubject; + String uniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUniqueId(uniqueId); + } + + + @Test + public void testGetSchema() throws Exception { + PropertyDataDefinition testSubject; + SchemaDefinition result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getSchema(); + } + + + @Test + public void testSetSchema() throws Exception { + PropertyDataDefinition testSubject; + SchemaDefinition entrySchema = null; + + // default test + testSubject = createTestSubject(); + testSubject.setSchema(entrySchema); + } + + + @Test + public void testGetLabel() throws Exception { + PropertyDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getLabel(); + } + + + @Test + public void testSetLabel() throws Exception { + PropertyDataDefinition testSubject; + String label = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setLabel(label); + } + + + @Test + public void testIsHidden() throws Exception { + PropertyDataDefinition testSubject; + Boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.isHidden(); + } + + + @Test + public void testSetHidden() throws Exception { + PropertyDataDefinition testSubject; + Boolean hidden = null; + + // default test + testSubject = createTestSubject(); + testSubject.setHidden(hidden); + } + + + @Test + public void testIsImmutable() throws Exception { + PropertyDataDefinition testSubject; + Boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.isImmutable(); + } + + + @Test + public void testSetImmutable() throws Exception { + PropertyDataDefinition testSubject; + Boolean immutable = null; + + // default test + testSubject = createTestSubject(); + testSubject.setImmutable(immutable); + } + + + @Test + public void testGetParentUniqueId() throws Exception { + PropertyDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getParentUniqueId(); + } + + + @Test + public void testSetParentUniqueId() throws Exception { + PropertyDataDefinition testSubject; + String parentUniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setParentUniqueId(parentUniqueId); + } + + + @Test + public void testGetGetInputValues() throws Exception { + PropertyDataDefinition testSubject; + List<GetInputValueDataDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getGetInputValues(); + } + + + @Test + public void testSetGetInputValues() throws Exception { + PropertyDataDefinition testSubject; + List<GetInputValueDataDefinition> getInputValues = null; + + // default test + testSubject = createTestSubject(); + testSubject.setGetInputValues(getInputValues); + } + + + @Test + public void testGetStatus() throws Exception { + PropertyDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getStatus(); + } + + + @Test + public void testSetStatus() throws Exception { + PropertyDataDefinition testSubject; + String status = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setStatus(status); + } + + + @Test + public void testGetInputId() throws Exception { + PropertyDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getInputId(); + } + + + @Test + public void testSetInputId() throws Exception { + PropertyDataDefinition testSubject; + String inputId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setInputId(inputId); + } + + + @Test + public void testGetInstanceUniqueId() throws Exception { + PropertyDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getInstanceUniqueId(); + } + + + @Test + public void testSetInstanceUniqueId() throws Exception { + PropertyDataDefinition testSubject; + String instanceUniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setInstanceUniqueId(instanceUniqueId); + } + + + @Test + public void testGetPropertyId() throws Exception { + PropertyDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getPropertyId(); + } + + + @Test + public void testSetPropertyId() throws Exception { + PropertyDataDefinition testSubject; + String propertyId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setPropertyId(propertyId); + } + + + @Test + public void testToString() throws Exception { + PropertyDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } + + + @Test + public void testHashCode() throws Exception { + PropertyDataDefinition testSubject; + int result; + + // default test + testSubject = createTestSubject(); + result = testSubject.hashCode(); + } + + + @Test + public void testEquals() throws Exception { + PropertyDataDefinition testSubject; + Object obj = null; + boolean result; + + // test 1 + testSubject = createTestSubject(); + obj = null; + result = testSubject.equals(obj); + Assert.assertEquals(false, result); + } + + + + + + + + + + + @Test + public void testConvertPropertyDataToInstancePropertyData() throws Exception { + PropertyDataDefinition testSubject; + + // default test + testSubject = createTestSubject(); + testSubject.convertPropertyDataToInstancePropertyData(); + } +}
\ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/RequirementDataDefinitionTest.java b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/RequirementDataDefinitionTest.java new file mode 100644 index 0000000000..e5da90f2ee --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/RequirementDataDefinitionTest.java @@ -0,0 +1,349 @@ +package org.openecomp.sdc.be.datatypes.elements; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Assert; +import org.junit.Test; + + +public class RequirementDataDefinitionTest { + + private RequirementDataDefinition createTestSubject() { + return new RequirementDataDefinition(); + } + + + @Test + public void testGetUniqueId() throws Exception { + RequirementDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getUniqueId(); + } + + + @Test + public void testSetUniqueId() throws Exception { + RequirementDataDefinition testSubject; + String uniqueId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setUniqueId(uniqueId); + } + + + @Test + public void testGetName() throws Exception { + RequirementDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getName(); + } + + + @Test + public void testSetName() throws Exception { + RequirementDataDefinition testSubject; + String name = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setName(name); + } + + + @Test + public void testGetParentName() throws Exception { + RequirementDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getParentName(); + } + + + @Test + public void testSetParentName() throws Exception { + RequirementDataDefinition testSubject; + String parentName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setParentName(parentName); + } + + + @Test + public void testGetCapability() throws Exception { + RequirementDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCapability(); + } + + + @Test + public void testSetCapability() throws Exception { + RequirementDataDefinition testSubject; + String capability = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setCapability(capability); + } + + + @Test + public void testGetNode() throws Exception { + RequirementDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getNode(); + } + + + @Test + public void testSetNode() throws Exception { + RequirementDataDefinition testSubject; + String node = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setNode(node); + } + + + @Test + public void testGetRelationship() throws Exception { + RequirementDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getRelationship(); + } + + + @Test + public void testSetRelationship() throws Exception { + RequirementDataDefinition testSubject; + String relationship = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setRelationship(relationship); + } + + + @Test + public void testGetOwnerId() throws Exception { + RequirementDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getOwnerId(); + } + + + @Test + public void testSetOwnerId() throws Exception { + RequirementDataDefinition testSubject; + String ownerId = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setOwnerId(ownerId); + } + + + @Test + public void testGetOwnerName() throws Exception { + RequirementDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getOwnerName(); + } + + + @Test + public void testSetOwnerName() throws Exception { + RequirementDataDefinition testSubject; + String ownerName = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setOwnerName(ownerName); + } + + + @Test + public void testGetMinOccurrences() throws Exception { + RequirementDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getMinOccurrences(); + } + + + @Test + public void testSetMinOccurrences() throws Exception { + RequirementDataDefinition testSubject; + String minOccurrences = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setMinOccurrences(minOccurrences); + } + + + @Test + public void testGetLeftOccurrences() throws Exception { + RequirementDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getLeftOccurrences(); + } + + + @Test + public void testSetLeftOccurrences() throws Exception { + RequirementDataDefinition testSubject; + String leftOccurrences = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setLeftOccurrences(leftOccurrences); + } + + + @Test + public void testGetMaxOccurrences() throws Exception { + RequirementDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getMaxOccurrences(); + } + + + @Test + public void testSetMaxOccurrences() throws Exception { + RequirementDataDefinition testSubject; + String maxOccurrences = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setMaxOccurrences(maxOccurrences); + } + + + @Test + public void testSetPath() throws Exception { + RequirementDataDefinition testSubject; + List<String> path = null; + + // default test + testSubject = createTestSubject(); + testSubject.setPath(path); + } + + + @Test + public void testGetPath() throws Exception { + RequirementDataDefinition testSubject; + List<String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getPath(); + } + + + @Test + public void testSetSource() throws Exception { + RequirementDataDefinition testSubject; + String source = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setSource(source); + } + + + @Test + public void testGetSource() throws Exception { + RequirementDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getSource(); + } + + + @Test + public void testAddToPath() throws Exception { + RequirementDataDefinition testSubject; + String elementInPath = ""; + + // default test + testSubject = createTestSubject(); + testSubject.addToPath(elementInPath); + } + + + @Test + public void testHashCode() throws Exception { + RequirementDataDefinition testSubject; + int result; + + // default test + testSubject = createTestSubject(); + result = testSubject.hashCode(); + } + + + @Test + public void testEquals() throws Exception { + RequirementDataDefinition testSubject; + Object obj = null; + boolean result; + + // test 1 + testSubject = createTestSubject(); + obj = null; + result = testSubject.equals(obj); + Assert.assertEquals(false, result); + } + + + @Test + public void testToString() throws Exception { + RequirementDataDefinition testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } +}
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-api/pom.xml b/common/openecomp-common-configuration-management/openecomp-configuration-management-api/pom.xml index 7490ced1ac..ba74f88c6b 100644 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-api/pom.xml +++ b/common/openecomp-common-configuration-management/openecomp-configuration-management-api/pom.xml @@ -2,7 +2,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.openecomp.sdc.common</groupId> <name>openecomp-configuration-management-api</name> <artifactId>openecomp-configuration-management-api</artifactId> @@ -13,36 +12,4 @@ <relativePath>..</relativePath> </parent> - <dependencies> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>${mvn.install.version}</version> - <executions> - <execution> - <id>install-mallet</id> - <phase>install</phase> - <goals> - <goal>install-file</goal> - </goals> - <configuration> - <file>${java.home}/../lib/tools.jar</file> - <groupId>tools</groupId> - <artifactId>tools</artifactId> - <version>1.8</version> - <packaging>jar</packaging> - <createChecksum>true</createChecksum> - <generatePom>true</generatePom> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - </project> diff --git a/common/openecomp-common-configuration-management/pom.xml b/common/openecomp-common-configuration-management/pom.xml index 47e846530a..a53733c515 100644 --- a/common/openecomp-common-configuration-management/pom.xml +++ b/common/openecomp-common-configuration-management/pom.xml @@ -17,7 +17,6 @@ <modules> <module>openecomp-configuration-management-api</module> <module>openecomp-configuration-management-core</module> - <module>openecomp-configuration-management-cli</module> <module>openecomp-configuration-management-test</module> </modules> diff --git a/docs/onap-developer/docs-templates-platform-component-logging.rst b/docs/onap-developer/docs-templates-platform-component-logging.rst index 8d480e2832..eed1568d2b 100644 --- a/docs/onap-developer/docs-templates-platform-component-logging.rst +++ b/docs/onap-developer/docs-templates-platform-component-logging.rst @@ -3,12 +3,36 @@ Logging & Diagnostic Information -------------------------------- -Description of how to interact with and diagnose problems with the components -as delivered. +Description on how to interact with and diagnose problems with the components as delivered. -Where to Access Information -+++++++++++++++++++++++++++ - - -Error / Warning Messages -++++++++++++++++++++++++ ++--------+------------------------------------------+---------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------+ +| Server | Location | Type | Description | Rolling | ++--------+------------------------------------------+---------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------+ +| BE | /data/logs/BE/2017_03_10.stderrout.log | Jetty server log | The log describes info regarding Jetty startup and execution | the log rolls daily | ++ +------------------------------------------+---------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------+ +| | /data/logs/BE/SDC/SDC-BE/audit.log | application audit | An audit record is created for each operation in SDC | rolls at 20 mb | ++ +------------------------------------------+---------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------+ +| | /data/logs/BE/SDC/SDC-BE/debug.log | application logging | We can enable higher logging on demand by editing the logback.xml inside the server docker. | rolls at 20 mb | +| | | | The file is located under:,config/catalog-be/logback.xml. | | +| | | | This log holds the debug and trace level output of the application. | | ++ +------------------------------------------+---------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------+ +| | /data/logs/BE/SDC/SDC-BE/error.log | application logging | This log holds the info and error level output of the application. | rolls at 20 mb | ++ +------------------------------------------+---------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------+ +| | /data/logs/BE/SDC/SDC-BE/transaction.log | application logging | Not currently in use. will be used in future relases. | rolls at 20 mb | ++ +------------------------------------------+---------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------+ +| | /data/logs/BE/SDC/SDC-BE/all.log | application logging | On demand, we can enable log aggregation into one file for easier debugging. This is done by editing the logback.xml inside the server docker. | rolls at 20 mb | +| | | | The file is located under:,config/catalog-be/logback.xml. | | +| | | | To allow this logger, set the value for this property to true This log holds all logging output of the application. | | ++--------+------------------------------------------+---------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------+ +| FE | /data/logs/FE/2017_03_10.stderrout.log | Jetty server log | The log describes info regarding the Jetty startup and execution | the log rolls daily | ++ +------------------------------------------+---------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------+ +| | /data/logs/FE/SDC/SDC-FE/debug.log | application logging | We can enable higher logging on demand by editing the logback.xml inside the server docker. | rolls at 20 mb | +| | | | The file is located,under: config/catalog-fe/logback.xml. | | +| | | | This log holds the debug and trace level output of the application. | | ++ +------------------------------------------+---------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------+ +| | /data/logs/FE/SDC/SDC-FE/error.log | application logging | This log holds the Info and Error level output of the application. | rolls at 20 mb | ++ +------------------------------------------+---------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------+ +| | /data/logs/FE/SDC/SDC-FE/all.log | application logging | On demand we can enable log aggregation into one file for easier debuging, by editing the logback.xml inside the server docker.The file is located under: config/catalog-fe/logback.xml. | rolls | +| | | | To allow this logger set this property to true | | +| | | | This log holds all the logging output of the application. | | ++--------+------------------------------------------+---------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------+
\ No newline at end of file diff --git a/onboarding/pom.xml b/onboarding/pom.xml index 19a74656cb..61a4e14b51 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -112,7 +112,7 @@ <executions> <execution> <id>jxr-generation</id> - <phase>validate</phase> + <phase>verify</phase> <goals> <goal>jxr</goal> <goal>test-jxr</goal> @@ -135,7 +135,7 @@ <executions> <execution> <id>pmd-check</id> - <phase>validate</phase> + <phase>verify</phase> <goals> <!-- violations fail build --> <goal>check</goal> @@ -27,10 +27,10 @@ <jersey-bom.version>2.24</jersey-bom.version> <servlet-api.version>2.5</servlet-api.version> - <artifact-generator-api.version>1.1.0-SNAPSHOT</artifact-generator-api.version> - <artifact-generator-core.version>1.1.0-SNAPSHOT</artifact-generator-core.version> + <artifact-generator-api.version>${project.version}</artifact-generator-api.version> + <artifact-generator-core.version>${project.version}</artifact-generator-core.version> <ecomp.version>1.1.0</ecomp.version> - <dox-common-lib.version>1.1.0-SNAPSHOT</dox-common-lib.version> + <dox-common-lib.version>${project.version}</dox-common-lib.version> <!-- Elastic Search mapper (reference the elastic search version actually). --> <elastic-search.version>2.1.0</elastic-search.version> @@ -109,6 +109,7 @@ <sonar.exclusions>**/scripts/**/*</sonar.exclusions> <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions> <sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java</sonar.inclusions> + <sonar.branch>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</sonar.branch> <!--nexus--> <nexus.proxy>https://nexus.onap.org</nexus.proxy> @@ -123,7 +124,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.4</version> + <version>3.0.0-M1</version> <configuration> <failOnError>false</failOnError> <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet> @@ -272,7 +273,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.4</version> <dependencies> <dependency> <groupId>org.apache.maven.wagon</groupId> diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml index 84e9274acf..eb01a97916 100644 --- a/sdc-os-chef/pom.xml +++ b/sdc-os-chef/pom.xml @@ -4,6 +4,8 @@ <modelVersion>4.0.0</modelVersion> <artifactId>sdc-os-chef</artifactId> + <packaging>pom</packaging> + <parent> <groupId>org.openecomp.sdc</groupId> @@ -32,28 +34,51 @@ <configuration> <filesets> <fileset> - <directory> - ${project.basedir}\sdc-cassandra\chef-repo\cookbooks\cassandra-actions\attributes\ - </directory> + <directory>${project.basedir}\sdc-cassandra\chef-repo\cookbooks\cassandra-actions\attributes\</directory> <followSymlinks>false</followSymlinks> <includes> <include>**/default.rb</include> </includes> </fileset> - <!-- static configuration files --> - <fileset> - <directory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default</directory> - <includes> + <!-- static configuration files --> + <fileset> + <directory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default</directory> + <followSymlinks>false</followSymlinks> + <includes> <include>Artifact-Generator.properties</include> <include>error-configuration.yaml</include> <include>ecomp-error-configuration.yaml</include> <include>logback.xml</include> </includes> </fileset> + <!-- BE WAR's --> + <fileset> + <directory>${project.parent.basedir}/sdc-os-chef/sdc-backend</directory> + <followSymlinks>false</followSymlinks> + <includes> + <include>*.war</include> + </includes> + </fileset> + <!-- FE WAR's --> + <fileset> + <directory>${project.parent.basedir}/sdc-os-chef/sdc-frontend/</directory> + <followSymlinks>false</followSymlinks> + <includes> + <include>*.war</include> + </includes> + </fileset> + <fileset> + <directory>${project.basedir}/sdc-backend/chef-repo/cookbooks/sdc-normatives/files/default</directory> + <followSymlinks>false</followSymlinks> + <includes> + <include>normatives.tar.gz</include> + </includes> + </fileset> <fileset> <directory>${project.basedir}/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/tools</directory> <followSymlinks>false</followSymlinks> </fileset> + </filesets> </configuration> </execution> @@ -71,9 +96,7 @@ ${project.basedir}\sdc-cassandra\chef-repo\cookbooks\cassandra-actions\attributes\default.rb </path> <lines> - <line>normal['version'] = - "${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - </line> + <line>normal['version'] ="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</line> </lines> </file> </files> @@ -163,6 +186,12 @@ <configuration> <outputDirectory>${basedir}/sdc-backend</outputDirectory> <resources> + <resource> + <directory>${project.parent.basedir}/catalog-be/target</directory> + <includes> + <include>catalog-be-${project.version}.war</include> + </includes> + </resource> <resource> <directory> ${project.parent.basedir}/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/target @@ -174,6 +203,7 @@ </resources> </configuration> </execution> + <execution> <id>copy-resources-fe</id> <phase>validate</phase> @@ -183,6 +213,12 @@ <configuration> <outputDirectory>${basedir}/sdc-frontend</outputDirectory> <resources> + <resource> + <directory>${project.parent.basedir}/catalog-fe/target</directory> + <includes> + <include>catalog-fe-${project.version}.war</include> + </includes> + </resource> <resource> <directory>${project.parent.basedir}/openecomp-ui/target</directory> <includes> @@ -192,6 +228,7 @@ </resources> </configuration> </execution> + <execution> <id>copy-tests-suites</id> <phase>validate</phase> @@ -255,7 +292,24 @@ </configuration> </execution> - + <execution> + <id>copy-normatives</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/files/default</outputDirectory> + <resources> + <resource> + <directory>${project.parent.basedir}/catalog-be/target</directory> + <includes> + <include>normatives.tar.gz</include> + </includes> + </resource> + </resources> + </configuration> + </execution> </executions> </plugin> diff --git a/sdc-os-chef/scripts/docker_clean.sh b/sdc-os-chef/scripts/docker_clean.sh deleted file mode 100755 index 3979de6e73..0000000000 --- a/sdc-os-chef/scripts/docker_clean.sh +++ /dev/null @@ -1,8 +0,0 @@ -pat=$1 -docker_ids=`docker ps -a | grep ${pat} | awk '{print $1}'` -for X in ${docker_ids} -do - docker rm -f ${X} -done - - diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh index 02eff2375f..bc24124651 100755 --- a/sdc-os-chef/scripts/docker_run.sh +++ b/sdc-os-chef/scripts/docker_run.sh @@ -22,6 +22,37 @@ function dir_perms { chmod -R 777 /data/logs } +function monitor_docker { + +echo monitor $1 Docker + +TIME_OUT=180 +INTERVAL=20 +TIME=0 +while [ "$TIME" -lt "$TIME_OUT" ]; do + +MATCH=`docker logs --tail 30 $1 | grep "DOCKER STARTED"` +echo MATCH is -- $MATCH + +if [ -n "$MATCH" ] + then + echo DOCKER start finished in $TIME seconds + break + fi + + echo Sleep: $INTERVAL seconds before testing if $1 DOCKER is up. Total wait time up now is: $TIME seconds. Timeout is: $TIME_OUT seconds + sleep $INTERVAL + TIME=$(($TIME+$INTERVAL)) +done + +if [ "$TIME" -ge "$TIME_OUT" ] + then + echo -e "\e[1;31mTIME OUT: DOCKER was NOT fully started in $TIME_OUT seconds... Could cause problems ...\e[0m" +fi + + +} + RELEASE=latest LOCAL=false @@ -57,7 +88,7 @@ while [ "$1" != "" ]; do usage exit ;; - * ) + * ) usage exit 1 esac @@ -97,15 +128,16 @@ docker run --detach --name sdc-cs --env RELEASE="${RELEASE}" --env ENVNAME="${DE echo "please wait while CS is starting..." -echo "" -c=120 # seconds to wait -REWRITE="\e[25D\e[1A\e[K" -while [ $c -gt 0 ]; do - c=$((c-1)) - sleep 1 - echo -e "${REWRITE}$c" -done -echo -e "" +monitor_docker sdc-cs +#echo "" +#c=120 # seconds to wait +#REWRITE="\e[25D\e[1A\e[K" +#while [ $c -gt 0 ]; do +# c=$((c-1)) +# sleep 1 +# echo -e "${REWRITE}$c" +#done +#echo -e " # kibana echo "docker run sdc-kibana..." @@ -124,15 +156,18 @@ fi docker run --detach --name sdc-BE --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env http_proxy=${http_proxy} --env https_proxy=${https_proxy} --env no_proxy=${no_proxy} --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --memory 4g --memory-swap=4g --ulimit nofile=4096:100000 --volume /etc/localtime:/etc/localtime:ro --volume /data/logs/BE/:/var/lib/jetty/logs --volume /data/environments:/root/chef-solo/environments --publish 8443:8443 --publish 8080:8080 ${PREFIX}/sdc-backend:${RELEASE} echo "please wait while BE is starting..." -echo "" -c=45 # seconds to wait -REWRITE="\e[45D\e[1A\e[K" -while [ $c -gt 0 ]; do - c=$((c-1)) - sleep 1 - echo -e "${REWRITE}$c" -done -echo -e "" +monitor_docker sdc-BE +#echo "" +#c=45 # seconds to wait +#REWRITE="\e[45D\e[1A\e[K" +#while [ $c -gt 0 ]; do +# c=$((c-1)) +# sleep 1 +# echo -e "${REWRITE}$c" +#done +#echo -e "" + + # Front-End @@ -142,6 +177,10 @@ if [ ${LOCAL} = false ]; then fi docker run --detach --name sdc-FE --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env http_proxy=${http_proxy} --env https_proxy=${https_proxy} --env no_proxy=${no_proxy} --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --memory 2g --memory-swap=2g --ulimit nofile=4096:100000 --volume /etc/localtime:/etc/localtime:ro --volume /data/logs/FE/:/var/lib/jetty/logs --volume /data/environments:/root/chef-solo/environments --publish 9443:9443 --publish 8181:8181 ${PREFIX}/sdc-frontend:${RELEASE} +echo "docker run sdc-frontend..." +monitor_docker sdc-FE + + # running healthCheck scripts @@ -170,4 +209,4 @@ echo "Triger sanity docker, please wait..." docker pull ${PREFIX}/sdc-sanity:${RELEASE} fi docker run --detach --name sdc-sanity --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env http_proxy=${http_proxy} --env https_proxy=${https_proxy} --env no_proxy=${no_proxy} --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --memory 512m --memory-swap=512m --ulimit nofile=4096:100000 --volume /etc/localtime:/etc/localtime:ro --volume /data/logs/sdc-sanity/target:/var/lib/tests/target --volume /data/logs/sdc-sanity/ExtentReport:/var/lib/tests/ExtentReport --volume /data/environments:/root/chef-solo/environments --publish 9560:9560 ${PREFIX}/sdc-sanity:${RELEASE} -fi +fi
\ No newline at end of file diff --git a/sdc-os-chef/sdc-backend/Dockerfile b/sdc-os-chef/sdc-backend/Dockerfile index 9052e74b52..dd38726be3 100644 --- a/sdc-os-chef/sdc-backend/Dockerfile +++ b/sdc-os-chef/sdc-backend/Dockerfile @@ -4,8 +4,6 @@ COPY chef-solo /root/chef-solo/ COPY chef-repo/cookbooks/. /root/chef-solo/cookbooks/ -#RUN python /root/chef-solo/cookbooks/sdc-normatives/files/default/get-pip.py - ADD onboarding-be-*.war ${JETTY_BASE}/webapps/ ADD catalog-be-*.war ${JETTY_BASE}/webapps/ diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/consumers.py b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/consumers.py index 1bdb3a4981..2b9d50296c 100644 --- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/consumers.py +++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/consumers.py @@ -52,7 +52,7 @@ def createConsumer( consumerName, consumerSalt, consumerPass ): ############################## # Definitions ############################## -consumersList = [ "aai" , "appc" , "dcae" , "mso" , "sdnc" , "vid" , "cognita" ] +consumersList = [ "aai" , "appc" , "dcae" , "mso" , "sdnc" , "vid" , "cognita", "clamp" , "vfc" ] salt = "9cd4c3ad2a6f6ce3f3414e68b5157e63" password = "35371c046f88c603ccba152cb3db34ec4475cb2e5713f2fc0a43bf18a5243495" beStat=0 diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb index 2217fa9346..a4be8b10d0 100644 --- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb +++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb @@ -431,6 +431,9 @@ resourceDeploymentArtifacts: PLAN: acceptedTypes: - xml + validForResourceTypes: + - VF + - VFC resourceInstanceDeploymentArtifacts: HEAT_ENV: diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/import_Normatives.rb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/import_Normatives.rb index 8dff57abe8..ba72dab34b 100644 --- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/import_Normatives.rb +++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/import_Normatives.rb @@ -10,7 +10,8 @@ bash "import-normatives" do tar xvfz /tmp/normatives.tar.gz cd normatives/scripts/import/tosca/ /bin/chmod +x importNormativeAll.py - python importNormativeAll.py -i localhost --debug=true > /var/lib/jetty/logs/importNormativeAll.log +# add --debug=true to the importNormativeAll.py arguments to enable debug + python importNormativeAll.py -i localhost > /var/lib/jetty/logs/importNormativeAll.log EOH end diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/upgrade_Normatives.rb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/upgrade_Normatives.rb index f782ce30fd..52afe4d7b8 100644 --- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/upgrade_Normatives.rb +++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/upgrade_Normatives.rb @@ -10,8 +10,8 @@ bash "upgrade-normatives" do tar xvfz /tmp/normatives.tar.gz cd normatives/scripts/import/tosca/ /bin/chmod +x upgradeNormative.py importGroupTypes.py - python upgradeNormative.py -i localhost --debug=true > /var/lib/jetty/logs/upgradeNormative.log - python importGroupTypes.py -i localhost > /var/lib/jetty/logs/importGroupTypes.log +# add --debug=true to the importNormativeAll.py arguments to enable debug + python upgradeNormative.py -i localhost > /var/lib/jetty/logs/upgradeNormative.log EOH end diff --git a/sdc-os-chef/sdc-backend/startup.sh b/sdc-os-chef/sdc-backend/startup.sh index a0c237da62..87f4ae674d 100644 --- a/sdc-os-chef/sdc-backend/startup.sh +++ b/sdc-os-chef/sdc-backend/startup.sh @@ -6,7 +6,7 @@ cd /root/chef-solo echo "normal['HOST_IP'] = \"${HOST_IP}\"" > /root/chef-solo/cookbooks/sdc-catalog-be/attributes/default.rb chef-solo -c solo.rb -E ${CHEFNAME} -sed -i '/^set -e/aJAVA_OPTIONS=\" -XX:MaxPermSize=256m -Xmx1500m -Dconfig.home=${JETTY_BASE}\/config -Dlog.home=${JETTY_BASE}\/logs -Dlogback.configurationFile=${JETTY_BASE}\/config\/catalog-be\/logback.xml -Dconfiguration.yaml=${JETTY_BASE}\/config\/catalog-be\/configuration.yaml -Dartifactgenerator.config=${JETTY_BASE}\/config\/catalog-be\/Artifact-Generator.properties\ -Donboarding_configuration.yaml=${JETTY_BASE}\/config\/onboarding-be\/onboarding_configuration.yaml" ' /docker-entrypoint.sh +sed -i '/^set -e/aJAVA_OPTIONS=\"-Xdebug -agentlib:jdwp=transport=dt_socket,address=4000,server=y,suspend=n -XX:MaxPermSize=256m -Xmx1500m -Dconfig.home=${JETTY_BASE}\/config -Dlog.home=${JETTY_BASE}\/logs -Dlogback.configurationFile=${JETTY_BASE}\/config\/catalog-be\/logback.xml -Dconfiguration.yaml=${JETTY_BASE}\/config\/catalog-be\/configuration.yaml -Dartifactgenerator.config=${JETTY_BASE}\/config\/catalog-be\/Artifact-Generator.properties\ -Donboarding_configuration.yaml=${JETTY_BASE}\/config\/onboarding-be\/onboarding_configuration.yaml" ' /docker-entrypoint.sh sed -i '/^set -e/aTMPDIR=${JETTY_BASE}\/temp' /docker-entrypoint.sh # executiong the jetty @@ -39,3 +39,5 @@ fi while true; do sleep 2; done +echo "###### DOCKER STARTED #####" + 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 dac5853353..0000000000 --- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb +++ /dev/null @@ -1,2 +0,0 @@ -normal['version'] = - "1.1.0" diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/07-importComformance.rb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/07-importComformance.rb index f60c6977e0..ce1d50b8ea 100644 --- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/07-importComformance.rb +++ b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/07-importComformance.rb @@ -18,6 +18,11 @@ bash "import-Comformance" do ./sdcSchemaFileImport.sh ${tosca_dir} #{cl_release} ${cl_version} ${conf_dir} EOH end +bash "echo status" do + code <<-EOH + echo "DOCKER STARTED" + EOH +end diff --git a/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_5_create_monitoring_template.rb b/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_5_create_monitoring_template.rb index dfb68c1dfa..5b1f9f8180 100644 --- a/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_5_create_monitoring_template.rb +++ b/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_5_create_monitoring_template.rb @@ -20,6 +20,12 @@ ruby_block "check_ElasticSearch_Cluster_Health" do retry_delay 2 end +bash "echo status" do + code <<-EOH + echo "DOCKER STARTED" + EOH +end + bash "create monitoring mapping" do code <<-EOH curl -i -X PUT -d '{ "order": 1, "template": "monitoring_events-*", "settings": {}, "mappings": diff --git a/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_6_create_kibana_dashboard_virtualization.rb b/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_6_create_kibana_dashboard_virtualization.rb index a3b15073a1..216d103fa3 100644 --- a/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_6_create_kibana_dashboard_virtualization.rb +++ b/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_6_create_kibana_dashboard_virtualization.rb @@ -29,6 +29,11 @@ ruby_block "check_ElasticSearch_Cluster_Health" do retry_delay 2 end +bash "echo status" do + code <<-EOH + echo "DOCKER STARTED" + EOH +end bash "create Kibana dashboard" do code <<-EOH @@ -41,7 +46,6 @@ bash "create Kibana dashboard" do EOH end - bash "create Kibana visualization" do code <<-EOH for file in /root/chef-solo/cookbooks/sdc-elasticsearch/files/default/visualization_*.json; do @@ -51,7 +55,4 @@ bash "create Kibana visualization" do echo done EOH -end - - - +end
\ No newline at end of file diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb index fc9dd86f40..5497576f8f 100644 --- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb +++ b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb @@ -43,3 +43,9 @@ template "ssl-ini" do variables :https_port => "#{node['FE'][:https_port]}" end +bash "echo status" do + code <<-EOH + echo "###### DOCKER STARTED #####" + EOH +end + diff --git a/sdc-os-chef/sdc-kibana/chef-repo/cookbooks/sdc-kibana/recipes/setup_kibana.rb b/sdc-os-chef/sdc-kibana/chef-repo/cookbooks/sdc-kibana/recipes/setup_kibana.rb index ee5d5c74e6..b30893c63f 100644 --- a/sdc-os-chef/sdc-kibana/chef-repo/cookbooks/sdc-kibana/recipes/setup_kibana.rb +++ b/sdc-os-chef/sdc-kibana/chef-repo/cookbooks/sdc-kibana/recipes/setup_kibana.rb @@ -17,3 +17,9 @@ template "kibana-yml" do }) end +bash "echo status" do + code <<-EOH + echo "DOCKER STARTED" + EOH +end + diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml index 14e1fc3fcd..b725073ea7 100644 --- a/test-apis-ci/pom.xml +++ b/test-apis-ci/pom.xml @@ -11,6 +11,10 @@ <version>1.1.0-SNAPSHOT</version> </parent> + <properties> + <sonar.skip>true</sonar.skip> + </properties> + <dependencies> <dependency> <groupId>com.google.guava</groupId> diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java index 1817b6e5cb..6b0dc56357 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java @@ -129,6 +129,7 @@ public abstract class ComponentBaseTest { boolean emptyDataProvider = method.getAnnotation(Test.class).dataProvider().isEmpty(); String className = method.getDeclaringClass().getName(); + System.out.println(" method.getName() " + method.getName()); if (!method.getName().equals("onboardVNFShotFlow")) { System.out.println("ExtentReport instance started from BeforeMethod..."); ExtentTestManager.startTest(method.getName()); diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ExtentManager.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ExtentManager.java index ae16f7406e..335b787430 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ExtentManager.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ExtentManager.java @@ -40,12 +40,7 @@ public class ExtentManager { private static ExtentReports extent; private static ExtentHtmlReporter htmlReporter; private static ExtentXReporter extentxReporter; - private static final String icon = "$(document).ready(function() {" +"\n"+ - "$('.brand-logo').html('').prepend(\"<span><img src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQ4AAAB7CAYAAACFKW5jAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAABaAAAAWgBwI7h9AAAAB3RJTUUH3wwXFAQf1clFIAAANNxJREFUeNrtnXeYXVXV/z+n3To101ImvZFGQiCANKUoSBEFebEj1hcb2MWC+lpAbGD5CaKoiL2ggIgoRUIgQAohJCG9TTLJ9Dszt52y9++PfSeZTO6duXfmTkk4n+eZJ5Nbztn7zNnrrL32Wt8NPj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+PgOjjXYDhpX7WgkZMD2qY2qQFtDlSkSvjlsaGJpGUIeQAS1pyb60hMurRrv1Pj5jFnO0G1As9PvbmBiEDkeS8CSmpuEhCOi6FTW0sAYhiTRNTTM8JBoaGmDpSEODoK65EQM7YpLCCCVC97ciAUODuSU6UpO88Jpxo91NH58xwTHtcSx6vJ2DKUlTSlBVVqKVesnqlrSosaWcFTa0eXFX1nmSmrChjTc1qoCIKwlJ1W8NkDoITUPokAQ6U0I2uYL9FZZ+UNfYnvDkhoWlRnNdhIMP7HWcsqDOonKDsK7znzPLRvsS+PiMCsec4VjwWDvNaUFTh8eS8VbFvpSc4Qh5esJjKbBASDnDlZTqGmEpQQ7yPLoGSGxdIx4xtEZbyhdrA/pGIVk+ParveEt9qOH69d3i1AqTcbg8eE71aF8aH58RY8wbjresjbGiCTzpsb/JYUF9oKwpJZekhLzQkfJMIVnkCMoBY7BGIl90DQyNeEjXdhsaz4UN7V9TwvozK88p31Pzzza5uNykOqDzh2Wlo33ZfHyGlTFrOC58opMGT9DuCG6YGdG/ty0xxxby4pTgEkfKpa6gYrgNRX9ogKHhBHVta4WlPR4xtPtmRPXn/7U73XlGfYCoAf8+o2K0L6OPz7AwJg3H/Mc6aEoLFpUawe0J79RuV76525WXuYLpYrQblwUNCOh0Rk3tuQpL/119WHv4yS3O/lNnBji53OQnS6Kj3UQfn6IypgzHOcvb2ZWQnFRpWavbnDM6XfmelJCXOIKq0fQuCsHScKOmtqbE1H41K2r89Yl9qQPvmh3hnqX+9MXn+GHMGI4TH+vgX2eEtLOXJ09sscUHEx5XOUJWHysGoy+mhltmas9OCOl3/E998O9rO9yub82PMLf0uFkB93kFM+qG44HGNF/dnCSoU7s9Lt4bc+UHUp6cdqwajL6EdS01OaI/eOY469t3nxR9PuFJGTX10W6Wj8+QGFXDIaUE0M5d0XnW+k73pg5HnutJjNG+KMVG12Ba2NjzwWnB2z89O/xLDdoANG3U7baPz6AYlUeflLLHaES++nLius1d3m/bbHnB8Wg0AISEnXFvyv0H7Fu2x727gaU918HH51hkxA1Hr8EyrdkW31vZ7n67MSXqj/chJDXY3O1Zrba8HPgN8DYg2MuI+vgcM4yo4eg1QM4B7m1Kyw++2OlFRvsijEznoTaoMyGkA5wA/AT4IlDR59r4+Ix5Rsxw/L4hBWAAbwF+AZz5SprhmzpcPSnIpNChS14GfBa4HZjSYgu+uTkx2s308cmLETEc5yzvoMrSw2khrwN+AMwAmBrROXPc8b88qQNXTQxy3bQgxpHW0gLeCdxZFdAXfn5jguWtzmg318dnQIbdcLz26U7Chla+KuZ+xRbcAtT0vBc1NL4wJ8yp48zBV6ONZSSUmxrXzwzx/UURaoJZL7cGXPTPg/Yvrq4PvursPzT50xafMc+wGo4LVnRQH9LKG5LiyxNC+g0lpnZU7vXicpO7TyrhqkkBwoZ2fBgQCRFD47xai7uXlnDz/Ah1wf4v9ZOt7ikr2pw73v+qstO1n+z3jYfPmGbYwgyvf6aTqREt+uAB58uTw/rH/rSsNNhrfn8Una7kvkabn+5KsabDJeUNdwuLTGacjwtonFppcs3kIBfWBai0Bu5AhyO58rkuHm92mFFirHltrfXedTH3hWfOqRjtXvn4ZGVYhuWtWxK80CmsZ9rsT+9JiC9+bGYo/J2F0bzcm4NpwWPNDvc12qxsd9mXEoieyraxZER6OQSllsacEoPzqi0uGW+xtNyk1MyvsRL4xZ40H30xTsKT6BrMiBj/vaQu8J7tCXfHg6eXj3ZPfXyOouhD8SMvdHLj3BL99c90XrM17t2edGXpdxZG+OSscEHHSQvJ1m7Bs+0uT7Q4rIm57E4IEp7kCC9+JIxJn/OFdI1JYZ1ZUZ1lFSbnVFssLjOoCeoFN+fxFof3v9DN9m5xqC+mBnNLjL9cNSn4walhvfXaqaER6KSPT/4UdUlDSon221bWd3WdtyfpfS3pSVUSOojBHdQ1FpYZLCwzuGZKkH0pwY64x/pOj7Uxl21xwYGUoDktSAiJK6CYYQFNU0uoYV2jOqgxKaQzM2qwoFT9zIoa1Id1FZcZJI81O1y/Pn6E0QBwJWxPiDf+p9nZ8+mZoS883+4ml1Ue/6tPPscORX1ev3ZFDFfI2eu7vN+12PJkACR8dk6Ym+dHinYyiYoLtNmCVluyJynYkxQcTAmaMq/FHElaSBwJXsagmErBK/OvRkCHgK5haRDQIWRolJka5abGuIDG1IjBlLBOVUCjOqBTbmlF6UNaSP683+amTUl2xL2cf4VKS+u+bHzg479aWvJzQPq1LT5jhaLdiQ812fx2T7r0v63OHftT4m09gxUJ59da/PXUUsrynPcPlZQnSQpwhcRD1YqAKjbTAV3T0FEehaH1/CgDMtzsSgh+uCPJz3eniTmy37+ABiwsM3Z+aW7kf66aGFjlGw6fsULR/N/X11jaFzcm3tmUFld6fWICz7e7PN7icPn4wIh0KmRohIzMyccIHY7k/gM2P9ihVo1kHs2TwM6EmL4z7n0RuFZK2e4bD5+xQFHyOKSUfH5jYv7BlPh4WhDs+36nI7llS5It3d5gDn9ME3PUtOStq7r433VxVre7BaWqdDuS3UlxkSO4llGqZvbx6UuxbsRQxNA+1u7IWVnf1WBlu8snNyTYmxyLqqHF50Ba8Ku9af5nVRfXrOnm4YMOSU8OygnalxLBtJAfBZb4iWE+Y4EhT1UyN/IFC8uM/xnolv7HAZuPAN9eEGFOyfEnvZEW8HKXy0NNDvftt1nX6WJ7HN7+aZBICbrGNOB64DopZcKfsviMJkMyHBmjUQVcf3qlWbGk3OCZVjfnIJHA/QdsmtKCr5wQ4fwaixGKlw4bnoQ9ScEzbQ4PHHBY3uqwLyVUZ4doMHqYEtYJ6RrAG4G/PN5s3z/a/fZ5ZTOk2zpjON4P/BAIPnDA5n0vxGlKif6PLKEmpPOeKUHeOzXI7Oix5X2khVoCXtPh8Z9mm+WtLjsSHk6Pd1FEgrrGL5eW8JZJKrAsJI90OOLqXzekO26Y+cqQMvEZewz6Ns8YjQnAfcBpoJ6+9+xNc+PGBAcHMh4ZTigxuHpSgCsmBplXYmCNwfCfI6HdFmzu9lgT81je6rA25tGQ9NRUZEhXsh8kLKs0+ftppT0CQOxLitSdu1Mf+sbWxC/EG2qGeAIfn8ExVMPxQZS+xqF1Vk/CAwdsvrgpwYZOb+AzZFz6yWGdc6stLqixOL3SHHJW5mAREuKepM2WbI17bOzyeCHmsibmsjchaHN6bUg7zM0L6Ro/PjHKtVODh061Nuby4RfjK84cZ17+7QXRVj/W4TMaDCrGkTEa1cDb6WU0QCVTvXFCgFlRg1u2Jrmv0Sbh9rOakHl9b0Jwz540v9+XZmJI56Ryk6UVJovKDE4oMai0NEpMjUiRjIktIOFJ4p6kOS3ZnfTYHvfY1i3YFvfYnvBoSUs63SyGYgTGqga8tT7AVZMCR5zuYFqytds7pdLSzr9xY+KPw98SnwLp+XMd18tfgxoCpz3Zwcqzy98M3APkrF7rdiV/O2Dz4x0pVnW4uCLPM/a65BFTo9zSmBDUmRLRmRDUqQ3q1AY1qgIapaZOqan0L/Q+9R62kKQ96HKVAYi5klZb0pxWaelNaUFDStBqC5KeMiSMdAFdDi6tC/DjxVGmhI+cu31ra5IvbExwQqnxt1sXRt92SV0gOXqt9EEJUy0CFgNTgCjqzkkCDcALmZ+m0W5oMSnY45BS8udGO5ry5NUhQ+u35LXE1HhHfZDzqi3+2mhz7940L8Rc0gMFEXu9l/AkCU/SmBSs6Tj8uqEfrjnpSSXv7bXLjA0QEjzAkxJPcrhEP8f5RjXZVIKlw5snBbl5XuQoo9HpSh5rcfAkHEzLs//YkF4spFypj73pylnANeTOE4qjAupbBzjOFcAlo9D+DuA2YG8/n5kEvBV4MzAfKCH73dMNbAR+B/yW/AxIFfAZlFc/0vwX5RD0S8GG4/vbkzzR6i4bH9Bee1aVldd3JoZ0PjI9xJsnBHik2eEP+2yebXdoTWce7/nc930+4x0qXivQIxxzYyyDhPEhnQ/PCPGh6SHGZSmc+W+Lw8o2tdzd4YhxOxPiMg1WjnbT+2AC1wLvGeBzu4DvDfCZU/M4znDQDPya7IZDQ6n0fw04k4GTKEsy/VgKXAx8HliVx3feBtSPQt8FeRiOgtcw6sO6tqXLu+jZdrdghZnxIZ13TQ7yh1NK+PtpZXx+bpjTxvUSvTmuZ4U5kFBmalw1KcDvl5Vw4+xwVqPRlBb8YEeKTkddJE+i7Ut5F/xkZ2qsLa1MQw2sgbgYGGgn7tGqUXDIfTe+Dvg5cDaFjR8TeC1wF5kNuQbAHaW+53XNC/Y4VnV445psce7L3R5CZTQWTImpceY4kzPHmdwwQ/Bip8cTLQ6rOlw2dnkcSIvDy5wwdr2EwZJZSaoL6rym2uTt9UHOrbYoyZENlxZw+44UT7Q4h66FBNpsuWBlu7tESvnvMbS68mpgah6fOwkVF3hqtBtcADOAbwIzh3CMJShv5RqgZbQ7NFgKMhxSSi5d2XWiLZi3ocuj3ZFUBYZ2w9YEdc6v0Tm/xiLuSfYkBC/EXFbHPF7qVII9TWml/OX1jU+MmbEy0IU7/GvU1JhbYvC6WovLJwRYUm70ZIVmxZFw1+4UP9qRwu3zDOz2ZKTZFucD/x7tLmaIoDyJfOaw44CLgBUcG76mAbwbNfD7w830p79rcAFwGWp/oWOSgj2Odke8KunJ0p78hvNr8otz5EPU0JhXajCv1OCt9Wo1pNVWS6Uvd3lsjwt2Jz12JQSNKUG3K0l6kBIy96030salTztChlr9mVdqsKzC5Owqi5MqDMYHB/Zy0wLu3JXiKy8n1BSlT19cgbY/KZa91OWVA7ER7mk25gJnFPD516HygMbaikO2u6YOuJzc05O9wN+A9aipzhzgysy/fQmgAr9/AHLtwjVaj8W8zluQ4eh2ZUBDe5WUELMlv99nc1aVRR5jYFCUmhqlpsa0iM6rM4HYlJDEXYi5ksaUoCEp2J8SHEyrn6a04GBaJXAlPUlSqFUZZ5hny4aupmAlhkZtUGdmVGdeqcGiMpOFpQaTwnpBQkZtjuS27Ulu256iK4fgj1QrRgufb3enoG7Y0URDGYLaAr6zABU4fDDH+w65B1Y2LLI/6QWQJj/Ppmcpta9/Ox8Vv8lGM/BR4IE+3/s3Ksg6Kct3FqKCn1uyvCcz/U7m2WYdCJJ90DuZn3zQADufDxZkODQYb2rMEJn//L0xzVsmBYrqdQxESNcIBaAqoDEjcqTFcgTYUmILiLuSFlvSYgtabEGbncnhyEgLdjoqt6PLzUgMCnCkxJXZtUsNDayMzGDE0KiwlCcxIaQzMaQf+ndSSOWZRA3lbQyG9Z0e/7c5wd8bbZyeYrkcpDwqyi1toZRy/SjHOcpRU49sj5Fu1I3d90aJoJZb/0n2oNwfgLV5nl+ilkffkuW9PcD/AW15HiuV+U5vJpM7mPtQ5qevsfkvagn201m+U0luw9GCqoTOtxipFvgy2Q3Ub1CeUD5owM58PliQ4Qga2vSpEX0KLeoUzWnJzVuTzC81DtVSjCaWDhYaUQMqLY36MKip6WGEVMlhQspMfgekPUlKQNKTpAXILEY+oGvKaBlKwNjSD8sNDiZAnI1OV4n+fHdbko35pOsDZaYWmBU1lgC/Z3RjBUtRAc++eMAvUUHTRVnePxeVOJXtht2U+cmXE3O83okyTgeG0L8w2f8iHvAI2Z/qAvgPyhvpK1UfILdhSFBY3Koe+DjZDccG4O9D6HdW8jYcmTTzBadVmtF796bp8TqeaHb45pYkN8+P5FwVGEvoGqh4bq+2jnK7XQkr2xxu25HioQOFCf5MDutMi+jzUDdhfJS6oKO8jWxL9C3Ar1BP8WyGYwZqaTOvJ90Q2jdU7Zl0jtcFcLCf7+WaJLvkOS3Is3+5GBZ5/ELdhPkX1lra3FLj0LPNA362O8XXtyTpco+F4PjYQUhY3eHy0RfjXPV8N3/ZZ5MU+RsNTYMl5QZlpjYDKBvFrtShchSysQp4CfXEzxbAtVDTlWJsHpPrBtQZerAxRvaBbgCz+vnePDhaThM1fWsuQp9BGa/++l50CjloGJg5I2rw3inBI8rfU0JllH755YSqHvXpF1eqKtcbNyZ403Nd3LEzxYF0fjIEvSm3tJ74Uh2FBSWLzRmoFZW+COBfKG9jTeYnG2cCs4vQjly6lMWQVNpDdsOno+IqdVneOxGV+Zrt3Ps4Oo4yWCRj2HBUAHUa8O4pIS6sDRzRVFvAj3akuO6F7lekKHE+JDzJ8laHD63r5rKVXdy6LcneROEGAwAJZ42zWFJugjLqkwZxlGLQ4zFkq1tqRAUIQQ26B8nuuo9H5TYMlVyGoxgex2ZUvCAbZwEf43CluI6K3fyM7HEfULGPjiL0GTJlWf30vegUctByMkU3VQGNr84Ls7DMOMJ4OBL+uN/mHau7efCAjfPK0CUekIak4J69ad62ups3PdfFXbvS7OsRbR7k7Rw2Nd45OUipqZEWMrSy3c0nW3M4mIYKfGbjOQ6vGkhUEHF/ls8ZqBjJUKdbw+lxdAJ/JHsQ1AQ+hMrbqEMVqN0DLMtxrPWoZdpiPWFHfKpSSOCkDLWEBMDScpPvLYpy3bo427uPXAF4vt3l3Wu6efvkIB+eHjouhYkHIuZIVnW4/KvJ4ZEmh03dxREuBkDC62stLqpTq5vb48K4ZWuyLiEkkWIt8eTPa1CrIn3xgIdR05QetgJPonRc+nIKKni6YghtGU6PQ6LU7q4mu6GsAG5GTUFOJffY2g18FlUxWyxGfKpSiOGooM86/GtrLH6wKMr16+Ns6208NGh1JD/YkeLRZof3TA1x9aQAk8bAku1wEvckW7o9Hm12+GeTw+oOl5jdqwK4GGNawpSIzqdmhQ8llD3V6vBsmzsupDaoG0k/LwxcSvb7qAFY3ue1NCpJ6kqODoZWoryOpxn8snJ/+cPFuPoHgFuAE8ge05hK/3U661FG4+EitKVvv8es4ajM1oiL6ywiRpRPvpRgTcfRCucbOj0+syHO7xrSvL0+yOUTLKZHjh8PpMuVbO72+G+Ly2MtNms6PA6mhUoiK9bt2ouoqfG52WFOy2xCnfQkDx100DRqV7d7AY58wg83C8jozWZhJbA9y+tPoeIFi/u83pN5+gMGv9ownB5HD0+jvIW6Ar7johLEvgS8WKR29O33mDUc0VyNeE21xT0nl/ClTQkeOGAfWYylqSSrVe1Kt/Onuw3eNCHApXUBFpUZx0TuR2+UiI5gQ5fHilaHFW0uL3Z6NPc2FjAslQaWBh+eEeLdU4KHks7WxjxWtLlEDMpXxdyR3tL+tWRfzXFRy6/Zli8bUSstJ2a5SvNRbv4/Btme4Yxx9PAqVLp4vhwEfgz8P6C1SG3oy9j1OJrSIloTzK01taDU4K4lJdyxK8WPd6Ro7Ktyrqm8hU2dHpu6kvx0V4qlFSavrw1w5jiTuaXGiG1KXQieVBmd2+IeL8Y8VrSpKciOhCqyY5iNRQ+WBh+YFuLG2eFDIs4pIbl7T4qWtGBaVA82pcVIzgUrUZWw2Xq9m9yxCoFaXXk/vWJmGUqA16MMy2D0KIbT4wijYjM3ouQC82U5SrCov+S8bHUmWqY/NgNP3cau4bi3IV37jvqgXttPRVtVQLnRZ44zuX1HikeanKOFijO/t9iSRw6qwGFtUOeEEoNXjTM5rdJkYZnBhKB+lI7ocONJNRjbbMmOuMembo+1MY91MZedCXHYq+jVj2GvYZQQNuBDM0J8cU6Eil4iP/886PCX/XZPM4wRaE1vlpI7xXsFynjkYh3wPGpq0pfzUEvL/X2/n6uVlaF6HJUog/EhlOddCK8D3gXcSXbDthRVZ1KSpc0vomIiafpnIMOhUeRyhLwNx0MHHX121OCyAXacNzQ1dVlaYfLgAZuf7U7zTJtLKlsadeb/TWlBU0rwZItDyNAYH9KYHjFYVGYwt8RgWkRnWsSgKqDqRYIGBLTBGZWeQri0p4KZB9OCPQnBrqRge9xjc7fHnoQqjGvPthXCSA5NCXUhnU/NCnHd9BDRXkVz2+IeX9+SpMOWPdNBGfdGLPlOR+VuZFs+TaOCf/1VZHaigqQXcPQTsScFfTCGo2eu3/evNBSPoxK1WvJeBpe+XYaKbexGxTl6EwA+ALwhx3e3kp/nJRjhPI68L8TBtLAfOODw+rpAXqUdZabG2+qDXFgb4OEmJVT8dJt7SPoulxFJCcmuuGRXXPB4s1K8KsmU15ebGnUhnbqgRpWlUxXQKLNUKXuJqR3RLg9whTpetyuJe9DhqCrZNlsZjGZbEHeh25Mk+6bLj4ah6CGjrPaqKpMvzInwulqL3oW2bbbkpk1J1vYKRnsS1xUjVuQ2ETg/x3s7UQHEgfgPKnNyWp/Xgyij9CcGftL2JZfhGKzHEUZ5Gv0ZjRZUwPfUzHXJxgTUakwjR1b7LiC30WhGCRznk+sxdqcqpkb838223NAV1BaX5W94qwIab68Pctn4AM+0udzXaPNYi8OuuHc4QSyHEemh25V0O5JG4OWuo6+jnlE813p9USJ79CoQ/V3W0TQQfcm0cWpU592Tg7xvWoj6PkvYcU/yrW1J/rw/fUSXBHRPCGkjpVOZK8Uc4AnyS6XeDDxGdjHiM1H1HxvyOE5vih3jeBNwHbnHyUvAF1BG8ApULCNX/GMR8K1Mfxsyr12Eyprti4fSNc3HAMNYNhwBXduzJ+m59+61rYXzTQqVmigzNS6stTi/xmJvUvB4i8M/Dtisjrk0JMVhWcABNm7KhpBgD6R4PhYMQy4yzR4f0nnDhAD/Oy3I4jLzqKlYypN8d1uKH25P0bckKOnJfcsqzZFYig2gcjeyFW45KKOxkPz28NuMcsX73oeTULGOQg1HrgE0GI9jMvAJjo499LAWZVSezfz/d6j4x80cHfTt4Xzgq6gS+HJUPku2dq1AbR+Rb/Xs2F2OnR4x9u+IC/c3DWnryokBTq8c3MqfqcH0iM70KUHeXh9kR1ztxfpYi8MLMY/dCXGkFOBYHvBDJeNUT4noXFwX4JopQU4uN7Pun9vlSm7ZmuT27SlVQdsLS4fqgN68LuaORPLXdFQMIhsmKt36E3key6SvYIqiJ4byC1QVab7kGkCD8Tgu5+hckx52ATdw2GiA8hLuRhmPr5Ld4OjAO1Bp92Vk1y9NAneQPTU/F2M3OPrxmaFYY0p0PdnihL+7LcnPTyoZ8vJpUOeQxui1U0M0JAWbulye7/BY1eGyucujISWUPsXxYkgyxqLM1FhcbnJxncWldQHmlRo5vbiDacHXNif52e4U6SymIaRr4txqs/VjM8JcP/w9OI/c+31oqAzjYnAyyr1/poDvFCuPowS11JxtfLiovIzlWd5zUPkapcDnyC4VEOCwIlg2o7kJeLzAazV2pyqnVZqxyycEmp9td2ofPODw891pPjYjVPCUJRdWjycSCXBxnRLqbUh6bI0L1sVcNnR57Ih77E4q6b+UJ4+W+BuLRiXTRkOHSktnQanB2VUm59VYLC4zGTeASvyGLo8vbkrwQKOdPUomoT6kpy4dH9g1AtKB/Q2oYlMNXEjhhiOXx1EItSgdjWw0oVZHcg3UFPAdlOdxPX32Vs4QzPHdNCq2Uah489idqgAdb54YaL6/0ea/zQ63bk0yp0TnkrpAAYfIn6AOM6MGM6MGF9VaCAntjtIM3ZUQbOry2JXwaEwJ9qWUYHGrrfRD7VyXcTjHVZ/zBQyosHRmZ0SLT64wWVZhMiOqNtAeCEfAPw7afOXlBOtiuWUEdQ1eV2slLqix9g540KEzn9wp5sPBhcCPyH//kWLlcZSTO07RRP+KX6CSvb6BUmX7IPmPs3+gYiWFTjlHvKy+EMPRNSWs7/7YzBBrYy4HUoLPbEgwztJ51bjhfwDpmlqhqQqo3esvqlX1drZQmZ2drlI835sUHEgppfOmzJJrU1qJFic9JUjsCCWm4wglTlzw7C+zV62pKy3SoK4EjCeGdKZFdGZGDeaXGiwoNZkc1hkX0Aq6a3cmPH68M8Uvdqdps/tRBJMwOapz9aRgU8TQBrqZh4qGGsgjuZ/pIlTVbL5FYcWKcVj0e9XzIsbhxK53MvAAPgB8F2gf5LUaiTqdQxQy4iWw+ZI6i/dPC/H9jKDuR9fHuWNxlFMqRrpMQhHQoTqgUR0wmNGneM6VaiUiJSQpT+VrxDLq5j0q5zFHbZ9gS4ntKU0RL4vMuaFphA2lsh42lGhxmalRFdAZZ2lUB3XKTY0SE4KDTHeNOUqs+Ec7k6yLeeoO7edQmgZXTwxySoW5A5VUNZz0bKCUrUVp8pfgz9oV1NO577GjqCDpI+T3FO7P1yzkj5Ikd/5EBdlFi7LRisr8DKFWUPobJLsYeBPugfqejdH1ODRNQ0r5UlDX7E/NDAU2dXk8dMBmdbvL/66Lc9vCKGdVjY7xyNm5TPJYyZgMfhwm7kmebHH4ya40/25ysmfZ9kXCnFKDa5WM4yYK239kMJxC9uIuG7Ut4vMM/skWROVDnJzlvXNRwdh8ckP6C44WMoC6Uepc2aYrFaiktYY8j3UQ+CkqqNxfjcti4COo5dzBLKuPTcORYSvQOD6kT/32gggxR7Ci1WV1u8t71nbztXkRrpyYX2apj0pse7zF4Zd70jza4ijtjjyfjRFT45OzQswtNWzgBYZ3awQDVXyWLcV8F0rFfDAp4r05EVW30bf3s1HSfL/N4xjFyuNoz/Rnepb3ylGJYc+RX57FKcBXgKoBPhdGLWN3A7dRuAc3ZqUDQVnZ7QDzSw1uXxTl5Ew+x9Zujw+t6+abW5JqXu6Tk/0pwa8zUoLvXN3NX/fbxJw8vIwMGvCW+gBvqw8CtKcFw70Z00Rya4I+g1K9GipPkn26FUBNV4J5HKNYqwud5N4ISkeloL+H/h+8Zqbdd5P/zvYlwOdRe9QWIlozpjVHQVnDQ8tjJ1eY3LWkhFdXW6CpGoqvb05wzdpunm5zEb79OETCkzzX7vLVlxNc9mwX73uhmwcabWJu/gYDAKmKCL80J0JY13iyxdl/w/p4sWT2c3EW2Xdod1Dp1sVIdV8PvFzg+fvSXxykkHtdoAKyXTneL0dNzz6BynLtPciDqCnXt1EJbIsojArg68BVFHZnjNngaA9PoebTEYCTyg3uOinKjRszWxYKeLDR5oWYy3unBHn3lBDTIsNi9MY8CU+yMyF4qtXhHwcdnm13aVJbxQ0uCVrCSRUm310YYVpEZ1WHy81bk+v+tTmV73LlYOh54mdLZtrDkdmTQ6EN5XVkW+7tSUEfSKezv+BooTfhSlQtzeU53q8EvobKBH0eZfQqUbKCp5G74I1MG7ei0tqzBVprgVtRD+oHyY+xG+PIBEjXoZSrl/S8PjtqcOfiEuaVJPnRzhQdtqQhobId/9po8+4pQa6aGGRy+Pg3IDFHif482ery72aHlzpd9qcytThDKaiTsLDc4EcnRjmp3KQ5Lbh5S9Le0OU9EqwLuIWWkRbATNQTPxvPoWIcxUCgMiav4+h07Z4Yy6/I7QX0HCMXhd58ncD3UTGKXFtPBFAeRaFexUvA+1Cxkk+QPUlscub8CZQBy+f6FaPfeTEYj+Mgaq+MJb1frApo3DQ3wsIyg1u3plgTU1OV9TGPz25IcO9emysnBrhsfIB5JUbWeoxjkbgn2Z8UrImpNPnn2l1e7vaOFv0ZirMo4eRKk9sWRjljnIkj4Ac7UjzR6uycV2o83XB2xXB2MVeKuYfa33Qoy7B9WQtsI3sNx6moMvSV/V+pomZQLkd5FbdQvFT6nagVpOdQRX4VKDW0bDGNWcDtqJjKcwP0e8wbjp7dud5LnyeDpcPVk4KcXGFy2/YUv21I026rJKu1HS5rYy4/3ZXi3BqLi2pVoVx9WD+mVmE6XaXlsbHTY3XMZW2Hx0tdLo0pSbq3kE6RVC414Nwai+8sjHBSuYmQ8Mu9aX60M0W5pT16UXVw71D2ExiAKKoSNttNvZfC0sHzoRk1FV6S5b1xKDWtZ8ltHIo5Vek53t2ZY97E0Da9kqjB/3kO16LEUCI/JcDbcrRxIapS9n2oOFB/bc3G2DAcmenKs6inQ9YqyVlRg+8ujHJxXYAf7kjyeItDOpNOsych+NXuNL9vsJkW0TljnKrbOKXCZEpYyQWOFWwBLbbKSN3QpSQEN3UrlbCmdB/xn2IrmksIGWrTpS/ODTMlrKuNPRptbtqUICXoPiGk/21n0hvOitglwOk53lsN7Cjy+TyUW/4Bjnbfeypmf0JuFXRJdiNnUNgqRW8c4C7U9PwzqH1k8k0A62E/aoOmn3L05totqIK4EuCNOb5/Kqqw7v0oL6UQ+suCHTSDzdhq73bl/WFDO9PQslu0oK62Tji90uS+Rpu796RY1XF4U6K0kGzu8tjc5XFvQ5rxQZ0Ty0xOrTQ5vdJkdonB+KB2SJh3OJFApyNpslW6+ta4qoXZFvfYmRDsSXh0uZIjitaHYeuD3g2aEVV7p7xzcpASU0MCf2+0+eRLcQ6kBOND+qolZdbzdywpVAKzIKaSe6XjTxRvt/XePIcKCGYLLnZlXs9lONpQXlCkz+tphpZZK1ECRS+i0u6vQsU+xtNnr6FeJFCKX4+jCteeJ3c26j7gk6iM1Z7ckd5ygE6mDZeg8kv6JohJVFVttmncywxDjs+gbn0pJbdsSS4+s8p86Kwqa2I+BzmYFjx00OHXe9M81+4S73la9/5yZrUhYmhMDuvMiOrMLzWYX2oyI6JTG9SpDmiUWxpmRnN0oHMLUEpgUq1yxBxJW0ZCsCEl2BH32BEX7EkKGlKCgymlB+L1NRIjgVSJXZeNt/jkrDDLMmn8noQ/7U/z6ZcSNCQFloE3t8T4yEuNyTt4+8QhnrRfguQeGP2lZQ8FDbWCk8tDSJF7+dfIfLfvX0xmvles9oZQ8Yc5KI3U8ahSeoHyIPagPIvdqOBxvnGg3tfbI/v0I5fqeYjcMgBFF3ga9JCI3t8SvGJS8Ccfnxm69qTy/B2XNlvydJvDn/crCcF9SaHyPbL9qXsaqamNiKosjXEBncqARnVAoyagU2YqvdHenokjJEkhibtk6lFU5WwsU6PS4ajfU57kKOGwUdIYNXU4rdLkuukhLh8fOLTfTMKT3Lkrzc1bEjSnVc5HpaWtP63SvOT2RaV755YeJ1HmY5+eO+cVkb00+GFy135OnxM5a0bU+MvXTgjXzogWNoV0BGzu9ni0xeGxZofnO1TF7VHbD/RmIN3QfD47tF4XF6nK70+uMHlHfZArJwao67X9xL6U4Ftbk/xsd1rFUzSwdLy5UeNzvz+57DsLK46fHfF8ji2GNITu3Jm07tmb/t7EkP6R7y6MDjpPI+FJNnV5PN7i8Eyby+qYy/6kyC1mfCyTMWhllsaZ40yumhTk4jrrCIMhJDze4vDVzUlWtDpH+KuTQvraC2oCb6gL6g23LowUdm4fnyIxpCF5yTMxrpgYXHTXrtR99WF95m0Lo0waYpJX0pPsTgqebXd5ts1lVYfL9oSn6l+OVfnATLutjDjR+TUWl45XO9iV9lmLbkwJ7t6T5ic7U+xLHrkbXoWlpS+osT72p2WlPx0BtS8fn5wM+e6TUmq/3pv+1Pe2p745Oayb318YYWaB05ZcCAltjlp9WRVzWdXusr7TY19K0GqLI6UDx9I46tWusKkCvadVmpxfbXF2tcnU8NH6oklP8kizw/e2pVjR5hyZaYrSAXldrfXgh6eH3vly3O24fobvbfiMHkMebq6QGBoT/rjP/sPnNyXOnhTSuW2RSlYqNraAmCPYFld5FS9ktEj3JQVNtlAVpiNtTPqcL2JoTMgogZ1WqeQCl5SbTAzpBLI4Y46AZ9odfrorzT8O2od2ZuuNDlwxMdD8iZnht57x345HuaKQrUt9fIpPUYbWj3cm+dC00KV/3Gff8/GX4pXVAY1b5ke4sDYwrHu/isxer01pya6E2utV5V8I9ic9mjK7ttkiy+rJEK+anjES1QGNuqCSC1xYarC43GRuic6EUP/JbLaAtTGXe/am+ct+m4N9N+nOoANvmhjwbpwdvvXkCvPLgONPU3xGm6LcgVLNGQKe5Na/N9ofveGluJ7y4OMzQ7xvapCa4MgtGUrUU7zNOaw9ui8l2J3w2JPRI+12JUkBtpBZS/91DSxdI9Dzb0ZTtNzUqA4qQzElrDMprFMbUEai1NTyUnzvdiXPdbjcuzfNPw86HMhhMHr+OFdODPCNeZGn55QYb5GwV/eNhs8YoGh3YcZ4TJbwm4ebnLM/+VKcLV0e59ZYfGJmmPNrrKyu+kjSY1SSGR1SR2TPsOkRIrY0DUtXWzcE9PwSzrIhJOxNCh5tcfjrfptn2pz+RYhRm3e/tT7IN+ZFmqaE9WuE5GFjON03H58CKOqdmDEe5wG/Xt3hTvzcxgT/aXKoDGhcOTHA+6eGWFphHlNFbUOh2Zas7nB5+KDNv5sdtnZn9svtr/+Z7NEPTAvyhTlhpzqgfwP4hqaN2L6wPj4DMhyGQ0cVKX27ISlKbt2W5O7daeKOZGJE500TAry1PsjJFQah4+wJKiQ02YJ1MY8nWx0ebXbY2OXR5WRJr896AWFCSOezc8J8YGqQsKH9Fvgo0ObHNXzGEkW/GzPGI4ySP7s+5Unjj/ttvrMtyfqYKhWoCemcX23x5okBzqoyj0h+OtbodlUMZU2Hy1NtLk+3uWyPF2AsenFqpcn/nRDhtTUWmsYzmtqPY7tvNHzGGsNyR2aMRxVKhORtgLa52+OHO1L8fl+a1rQaVGFTY1GpwWtrLc6ttlhUZlA7xo1IzJEcSAu2dHs835HJLelSwj090gGFaoiWWRrvmBzkU7PCTIvo7E6IXZ2ueNeJZeZy32j4jEWG7a7MGI+pqJ23LwQ0W8CTrQ4/3ZXikSZH5V1kWlFqapxQYnBKhcmrxqnch0lhnUqrsF3QikmXq3aD259SZfYvdqrl3q1xj+bM/rWDzmaVavVmWaXJJ2aGuXyChY7GYy1O2+Mtzg3fumnXvfLP86VvOHzGIsNtOECVH98BnN/zQtyTPNXq8puGNI80OSqHoRemDjVBnRkRnRNKDRaXmcwtMRgf0qkNaoyzdEx96NJGErXbW7crabMFzbakISnYHle5IDsSHnsSgsa0IOX1KrUf6lWTMDWic+3UEO+ZorRYW23Jr/amuh466Hzu0fWpO9+9IOj9cnglAX18Bs2wPs56GY95KPmz83u/nxbwQszlj/tUTsO2hIfT293vcUgyy6FVmWSr2qDap7U6oFNhqbL6qKERMVS+RTCHupArJUlP5Xg0ppSR2J8StNhKn6PZFnS5Eq+vcmWxrpKE2pDOFRMCfGBa8FB27eoOl9t3pGKrO9ybtnaJn9RHDGfn6yqG80/j4zMkht0P7uN53A5cfNRngN0JwdNtDvc12qxoU9sIZH3C903Y0o78VdNU/kXfBRuJ2hPW65270c+xincBVJsmhnQuHR/gXZODLKswsXQVL/ndvjS/2JNubk6LL0wKa7+IpTV3/QUVw/K38PEpFiM2gc4YkCmo1Za3kkO2MOlJtsUFK1od/tXs8Hy7y8G0OCzbdyxM+TMGKWhozCs1eNOEAG8Yb7GgVBkMV8LTbQ7f357iuXZ32+SwfuMPFkf/+vEXu8XT51QO7dw+PiPAiA7DjPEYB3xWwHW6klvLSc+GRk+3uSxvdVjV4bI3oVLGR6cH/XVO/WPoMCmkc8Y4i8vGW7y62mJS6PDEaVOXx527Uvxxv40j5PMLy8xPPn5m2fIbXopz+6KSQZ7cx2dkGfFhJ6Uk4cnQupj3fk9y04Iyo7rSGrgZjlC6pes6XVa2uazucNkSFzSnBZ3u6FbFllqqIvbkCpNXV5mcXWUxI6ofSnCTqL11/7DP5t69afYkPbcupP9lbtS46ZGNiS3fObeCT80qVDjbx2f0GJXntSMk1p2N5gUnRi+dXWJ86dVV5tLzqq2CiuHinqTVlmzp9lgbUzodW7o9DqQELY5UYsi5dtjojwEqaDWl+UlNUGdOZvn41EqThaUGNUGd3l1IC8mLnR5/2mfzt0ab7XGPkKG1zIzqt79hQuD/PdbktN04O8QbJobw8TmWGDVH/9KVncyMaDzc5M60dD5bH9LfcnFdoPSiOouZEaPgcnxHqKlNY1qwOyHYm1QVsbuT6vd2R9Ltqp90piq2x0bomlraNTRVCRvQVVVsMFMVW2oqj2JmRJXPT4voTIsY1AS1o9LmJdCQFDzT5nL/ASXI3JgU6BqyOqivnB7Rv/G3ZSX//MLmpLj7pNLCOunjM0YY1QjBOU910pj0uKDGDD3a4l7W5crPVFraKa+psrh4vMXJFSodfSiN9KQqn+92JR0ZlfOUUEuzPQs+hga6pmFqaj+YoK6WdMO6UlcP6sqo5CrO8yQcSAtejHk83KSMxdZuoXZ206DE1JprgvrP5kb1Hz+8Pbnvo4tL+OGJfjzD59hl1EOLUkres6abX+xIcuXU0ORn2933tdry3YbGlDlRg7OqTM6qsjixzGBKWB+RDZoGQkg1VdqVEKyNufy3Ram0b48LEr32iwkbWrzS0v45Oaz/6OdLS5766Lq4d2qFxbd8kWGfY5zRH4UZ3vp8FwlP8rfTSrXTnoydtDsh3t9qiytcSa2lQ31IZ26JwbJKkxPLTKZHdCaHlYBOQM9PRGcwOEKpjLU5kt0Jj5e7PdbFPF6MuezOJJD1zjfRgJChpSstbfnUiH7XKZXmQw802t03zApz/fQQfgq5z/HAmLuLr9/QzQP7Hc6uMq2Vbe7p7Y54R6fDJSkhJ/UEJQIGjLN0qgIaUyMG0yNK43NCSCly1QQ1yjIGxeonNV2gJPxSQpL2VIxEbeCkpjX7kmqnt+0Jj8aUSkvvcGRWkWQdCBlavNzSnpoS1n89r9T4x1/22x1XTArwKz+W4XOcMeYMRw9nLu9gS7fHOyYHzYcOOItabXlFSshL00LOcwTBbKsflg5hQ+3qFtBV7MLsJzbhSBXr8DJbRLpCrYTYmbiI6CsPluU4GVnBhgpLe3xqxPjz7Kj+xIMHnM4zq0z+cmrZaF9GH59hYcwajh5e/VQH2+OChguf4pQnzpnQ5ohXdzjy9SmPM1wpp9oiy96mgxUlzvNqBFQA9WCJqa2psLR/zY7qj15dH9zy9c1Je3ZU5++nlflTEp/jmmPm7j5neSfNtkeXC5fWBaw1Mbu+xZanJ1zOTgq51BZM9aSsdYSamRRR0BxDBTq7TJ09tQF9o6nxxLSI8Vx9SN9457Z44uzxQWZGDX651J+S+LwyOGYMRw/jH9jH1LIoaaG2PvjdyaXGDRsSEUtjzr6kNytsaEsTnlzQbMvagMYENCpTHkFbSKOnv7n2t5YgLA0R0LUEcCBssH9CSN8LPDcxpG8aH9I3XjUx2HrpEx326yar2dIZ5QG+utDP+vR5ZXHMGY7enL68i1Jd0JiWVFoaqztc4peO47MbEta6Lq+kxNDqW21RtS3uhbtdWV1uaVODulZqaRi9Ku/TmqZ1t9ui5UBatpQYxKdFjXh9SG8I6TT+YVmpo922z3v96aWMD+lIqXFulck1U/1sT59XLse04ejLHTuSbOwSrIo5TI4YmEBTWvByt8fedhfWxeHmBmAb8CJQAcZ58I4aOKMcakyqQio7dGZER5OSoKlzTrXFtVN8Q+Hj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+PzSuP/AzE1e5ONHe7vAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTEyLTIzVDIwOjA0OjMxKzAwOjAwHarZDQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0xMi0yM1QyMDowNDozMSswMDowMGz3YbEAAABNdEVYdHNvZnR3YXJlAEltYWdlTWFnaWNrIDYuOS4yLTcgUTE2IHg4Nl82NCAyMDE1LTEyLTAyIGh0dHA6Ly93d3cuaW1hZ2VtYWdpY2sub3Jnbo4WPwAAAEp0RVh0c3ZnOmJhc2UtdXJpAGZpbGU6Ly8vdG1wL3ZpZ25ldHRlL2MxZDQ0ZGY2LWM1ZDYtNDkwMC04ZDBhLWQ0OWVmMzBiZGE3MS5zdmd90CehAAAAGHRFWHRUaHVtYjo6RG9jdW1lbnQ6OlBhZ2VzADGn/7svAAAAGHRFWHRUaHVtYjo6SW1hZ2U6OkhlaWdodAAyNjLFg9PDAAAAF3RFWHRUaHVtYjo6SW1hZ2U6OldpZHRoADU3Mz0hlMwAAAAZdEVYdFRodW1iOjpNaW1ldHlwZQBpbWFnZS9zdme/73BOAAAAF3RFWHRUaHVtYjo6TVRpbWUAMTQ1MDkwMTA3McPsyX0AAAAPdEVYdFRodW1iOjpTaXplADBCQpSiPuwAAABIdEVYdFRodW1iOjpVUkkAZmlsZTovLy90bXAvdmlnbmV0dGUvYzFkNDRkZjYtYzVkNi00OTAwLThkMGEtZDQ5ZWYzMGJkYTcxLnN2Z4N+SbEAAAAASUVORK5CYII=' style='display: block; margin-left: auto; margin-right: auto; margin-top: 7px; width: 89px;'/></span>\").width(\"120px\").css(\"float\",\"left\").css(\"padding-left\",\"0\");$('.report-name').css(\"font-weight\",\"bold\");"+"\n"+ -// "$('.logo-content' ).remove();"+"\n"+ -// "$('#slide-out li:first-child').on('click', function(){ $('#charts-row').hide() }) ; $('#slide-out li:last-child').on('click', function(){ $('#charts-row').show() });"+"\n"+ -// "$('.charts div:nth-child(2)').remove();"+"\n"+ - "})"; + public enum suiteNameXml { @@ -150,7 +145,7 @@ public class ExtentManager { // htmlReporter.config().setReportName(AutomationUtils.getATTVersion()); htmlReporter.config().setReportName("SDC Automation Report"); htmlReporter.config().setChartVisibilityOnOpen(false); - htmlReporter.config().setJS(icon); +// htmlReporter.config().setJS(icon); return htmlReporter; } diff --git a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactFileContentTest/images/mysql.png b/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactFileContentTest/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactFileContentTest/images/mysql.png +++ /dev/null diff --git a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactFileContentTest/mysql.yml b/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactFileContentTest/mysql.yml deleted file mode 100644 index f512f8071e..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactFileContentTest/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getResourceArtifactFileContentTest -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getResourceArtifactFileContentTest: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactFileContentTest/scripts/install_mysql.sh b/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactFileContentTest/scripts/install_mysql.sh deleted file mode 100644 index 400bcf40cb..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactFileContentTest/scripts/install_mysql.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -echo "Debian based MYSQL install 5..." -LOCK="/tmp/lockaptget" - -while true; do - if mkdir "${LOCK}" &>/dev/null; then - echo "MySQL take the lock" - break; - fi - echo "Waiting the end of one of our recipes..." - sleep 0.5 -done - -while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - echo "Waiting for other software managers to finish..." - sleep 0.5 -done -sudo rm -f /var/lib/dpkg/lock - -sudo apt-get update || (sleep 15; sudo apt-get update || exit ${1}) -sudo DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server-5.5 pwgen || exit ${1} -rm -rf "${LOCK}" - -sudo /etc/init.d/mysql stop -sudo rm -rf /var/lib/apt/lists/* -sudo rm -rf /var/lib/mysql/* -echo "MySQL Installation complete."
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactFileContentTest/scripts/start_mysql.sh b/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactFileContentTest/scripts/start_mysql.sh deleted file mode 100644 index 648bd45756..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactFileContentTest/scripts/start_mysql.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -echo "------------------------ ENV ------------------------" -echo "ENV VAR USED VOLUME_HOME : $VOLUME_HOME" -echo "ENV VAR USED PORT : $PORT" -echo "ENV VAR USED DB_NAME : $DB_NAME" -echo "ENV VAR USED DB_USER : $DB_USER" -echo "ENV VAR USED DB_PASSWORD : $DB_PASSWORD" -echo "---------------------------- ------------------------" - -CURRENT_PATH=`dirname "$0"` - -function StartMySQL { - echo "Starting MYSQL..." - sudo /etc/init.d/mysql stop - sudo /usr/bin/mysqld_safe > /dev/null 2>&1 & - RET=1 - while [[ RET -ne 0 ]]; do - echo "=> Waiting for confirmation of MySQL service startup" - sleep 5 - sudo mysql -uroot -e "status" > /dev/null 2>&1 - RET=$? - done -} - -function AllowFileSystemToMySQL { - MYSQL_DATA_DIR=$VOLUME_HOME/data - MYSQL_LOG=$VOLUME_HOME/logs - - echo "Setting data directory to $MYSQL_DATA_DIR an logs to $MYSQL_LOG ..." - if sudo test ! -d $MYSQL_DATA_DIR; then - echo "Creating DATA dir > $MYSQL_DATA_DIR ..." - sudo mkdir -p $MYSQL_DATA_DIR - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_DATA_DIR - fi - if sudo test ! -d $MYSQL_LOG; then - echo "Creating LOG dir > $MYSQL_LOG ..." - sudo mkdir -p $MYSQL_LOG - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_LOG - fi - - # edit app mysql permission in : /etc/apparmor.d/usr.sbin.mysqld - COUNT_LINE=`sudo cat /etc/apparmor.d/usr.sbin.mysqld | wc -l` - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/** rwk," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/** rwk," /etc/apparmor.d/usr.sbin.mysqld - - # reload app permission manager service - sudo service apparmor reload -} - -function UpdateMySQLConf { - echo "Updating MySQL conf files [DATA, LOGS]..." - sudo sed -i "s:/var/lib/mysql:$MYSQL_DATA_DIR:g" /etc/mysql/my.cnf - sudo sed -i "s:/var/log/mysql/error.log:$MYSQL_LOG/error.log:g" /etc/mysql/my.cnf - sudo sed -i "s:3306:$PORT:g" /etc/mysql/my.cnf - - if sudo test ! -f /usr/share/mysql/my-default.cnf; then - sudo cp /etc/mysql/my.cnf /usr/share/mysql/my-default.cnf - fi - if sudo test ! -f /etc/mysql/conf.d/mysqld_charset.cnf; then - sudo cp $configs/mysqld_charset.cnf /etc/mysql/conf.d/mysqld_charset.cnf - fi - - if [ "$BIND_ADRESS" == "true" ]; then - sudo sed -i "s/bind-address.*/bind-address = 0.0.0.0/" /etc/mysql/my.cnf - fi -} - -function InitMySQLDb { - # create database DB_NAME - if [ "$DB_NAME" ]; then - echo "INIT DATABASE $DB_NAME" - sudo mysql -u root -e "CREATE DATABASE $DB_NAME"; - fi - - # create user and give rights - if [ "$DB_USER" ]; then - echo "CREATE USER $DB_USER WITH PASSWORD $DB_PASSWORD AND GRAND RIGHTS ON $DB_NAME" - sudo mysql -uroot -e "CREATE USER '${DB_USER}'@'%' IDENTIFIED BY '$DB_PASSWORD'" - sudo mysql -uroot -e "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO '${DB_USER}'@'%' WITH GRANT OPTION" - sudo mysql -uroot -e "FLUSH PRIVILEGES" - fi -} - -# Create a new database path to the attched volume -if sudo test ! -d $VOLUME_HOME/data; then - echo "=> An empty or uninitialized MySQL volume is detected in $VOLUME_HOME/data" - AllowFileSystemToMySQL - UpdateMySQLConf - echo "=> Init new database path to $MYSQL_DATA_DIR" - sudo mysql_install_db --basedir=/usr --datadir=$MYSQL_DATA_DIR - echo "=> MySQL database initialized !" -else - echo "=> Using an existing volume of MySQL" - AllowFileSystemToMySQL - UpdateMySQLConf -fi - -# Finally start MySQL with new configuration -StartMySQL -InitMySQLDb
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactListNoContentTest/mysql.yml b/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactListNoContentTest/mysql.yml deleted file mode 100644 index 180e247ea2..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactListNoContentTest/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getResourceArtifactListNoContentTest -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getResourceArtifactListNoContentTest: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactListTest/images/mysql.png b/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactListTest/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactListTest/images/mysql.png +++ /dev/null diff --git a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactListTest/mysql.yml b/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactListTest/mysql.yml deleted file mode 100644 index b8f9bbdc69..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactListTest/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-GetResourceArtifactListTest -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-GetResourceArtifactListTest: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactListTest/scripts/install_mysql.sh b/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactListTest/scripts/install_mysql.sh deleted file mode 100644 index 400bcf40cb..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactListTest/scripts/install_mysql.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -echo "Debian based MYSQL install 5..." -LOCK="/tmp/lockaptget" - -while true; do - if mkdir "${LOCK}" &>/dev/null; then - echo "MySQL take the lock" - break; - fi - echo "Waiting the end of one of our recipes..." - sleep 0.5 -done - -while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - echo "Waiting for other software managers to finish..." - sleep 0.5 -done -sudo rm -f /var/lib/dpkg/lock - -sudo apt-get update || (sleep 15; sudo apt-get update || exit ${1}) -sudo DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server-5.5 pwgen || exit ${1} -rm -rf "${LOCK}" - -sudo /etc/init.d/mysql stop -sudo rm -rf /var/lib/apt/lists/* -sudo rm -rf /var/lib/mysql/* -echo "MySQL Installation complete."
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactListTest/scripts/start_mysql.sh b/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactListTest/scripts/start_mysql.sh deleted file mode 100644 index 648bd45756..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactListTest/scripts/start_mysql.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -echo "------------------------ ENV ------------------------" -echo "ENV VAR USED VOLUME_HOME : $VOLUME_HOME" -echo "ENV VAR USED PORT : $PORT" -echo "ENV VAR USED DB_NAME : $DB_NAME" -echo "ENV VAR USED DB_USER : $DB_USER" -echo "ENV VAR USED DB_PASSWORD : $DB_PASSWORD" -echo "---------------------------- ------------------------" - -CURRENT_PATH=`dirname "$0"` - -function StartMySQL { - echo "Starting MYSQL..." - sudo /etc/init.d/mysql stop - sudo /usr/bin/mysqld_safe > /dev/null 2>&1 & - RET=1 - while [[ RET -ne 0 ]]; do - echo "=> Waiting for confirmation of MySQL service startup" - sleep 5 - sudo mysql -uroot -e "status" > /dev/null 2>&1 - RET=$? - done -} - -function AllowFileSystemToMySQL { - MYSQL_DATA_DIR=$VOLUME_HOME/data - MYSQL_LOG=$VOLUME_HOME/logs - - echo "Setting data directory to $MYSQL_DATA_DIR an logs to $MYSQL_LOG ..." - if sudo test ! -d $MYSQL_DATA_DIR; then - echo "Creating DATA dir > $MYSQL_DATA_DIR ..." - sudo mkdir -p $MYSQL_DATA_DIR - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_DATA_DIR - fi - if sudo test ! -d $MYSQL_LOG; then - echo "Creating LOG dir > $MYSQL_LOG ..." - sudo mkdir -p $MYSQL_LOG - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_LOG - fi - - # edit app mysql permission in : /etc/apparmor.d/usr.sbin.mysqld - COUNT_LINE=`sudo cat /etc/apparmor.d/usr.sbin.mysqld | wc -l` - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/** rwk," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/** rwk," /etc/apparmor.d/usr.sbin.mysqld - - # reload app permission manager service - sudo service apparmor reload -} - -function UpdateMySQLConf { - echo "Updating MySQL conf files [DATA, LOGS]..." - sudo sed -i "s:/var/lib/mysql:$MYSQL_DATA_DIR:g" /etc/mysql/my.cnf - sudo sed -i "s:/var/log/mysql/error.log:$MYSQL_LOG/error.log:g" /etc/mysql/my.cnf - sudo sed -i "s:3306:$PORT:g" /etc/mysql/my.cnf - - if sudo test ! -f /usr/share/mysql/my-default.cnf; then - sudo cp /etc/mysql/my.cnf /usr/share/mysql/my-default.cnf - fi - if sudo test ! -f /etc/mysql/conf.d/mysqld_charset.cnf; then - sudo cp $configs/mysqld_charset.cnf /etc/mysql/conf.d/mysqld_charset.cnf - fi - - if [ "$BIND_ADRESS" == "true" ]; then - sudo sed -i "s/bind-address.*/bind-address = 0.0.0.0/" /etc/mysql/my.cnf - fi -} - -function InitMySQLDb { - # create database DB_NAME - if [ "$DB_NAME" ]; then - echo "INIT DATABASE $DB_NAME" - sudo mysql -u root -e "CREATE DATABASE $DB_NAME"; - fi - - # create user and give rights - if [ "$DB_USER" ]; then - echo "CREATE USER $DB_USER WITH PASSWORD $DB_PASSWORD AND GRAND RIGHTS ON $DB_NAME" - sudo mysql -uroot -e "CREATE USER '${DB_USER}'@'%' IDENTIFIED BY '$DB_PASSWORD'" - sudo mysql -uroot -e "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO '${DB_USER}'@'%' WITH GRANT OPTION" - sudo mysql -uroot -e "FLUSH PRIVILEGES" - fi -} - -# Create a new database path to the attched volume -if sudo test ! -d $VOLUME_HOME/data; then - echo "=> An empty or uninitialized MySQL volume is detected in $VOLUME_HOME/data" - AllowFileSystemToMySQL - UpdateMySQLConf - echo "=> Init new database path to $MYSQL_DATA_DIR" - sudo mysql_install_db --basedir=/usr --datadir=$MYSQL_DATA_DIR - echo "=> MySQL database initialized !" -else - echo "=> Using an existing volume of MySQL" - AllowFileSystemToMySQL - UpdateMySQLConf -fi - -# Finally start MySQL with new configuration -StartMySQL -InitMySQLDb
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactMetadataNoContentTest/mysql.yml b/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactMetadataNoContentTest/mysql.yml deleted file mode 100644 index 72ff4f37e0..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactMetadataNoContentTest/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getResourceArtifactMetadataNoContentTest -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getResourceArtifactMetadataNoContentTest: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactMetadataTest/images/mysql.png b/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactMetadataTest/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactMetadataTest/images/mysql.png +++ /dev/null diff --git a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactMetadataTest/mysql.yml b/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactMetadataTest/mysql.yml deleted file mode 100644 index 527e4a0081..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactMetadataTest/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getResourceArtifactMetadataTest -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getResourceArtifactMetadataTest: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactMetadataTest/scripts/install_mysql.sh b/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactMetadataTest/scripts/install_mysql.sh deleted file mode 100644 index 400bcf40cb..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactMetadataTest/scripts/install_mysql.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -echo "Debian based MYSQL install 5..." -LOCK="/tmp/lockaptget" - -while true; do - if mkdir "${LOCK}" &>/dev/null; then - echo "MySQL take the lock" - break; - fi - echo "Waiting the end of one of our recipes..." - sleep 0.5 -done - -while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - echo "Waiting for other software managers to finish..." - sleep 0.5 -done -sudo rm -f /var/lib/dpkg/lock - -sudo apt-get update || (sleep 15; sudo apt-get update || exit ${1}) -sudo DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server-5.5 pwgen || exit ${1} -rm -rf "${LOCK}" - -sudo /etc/init.d/mysql stop -sudo rm -rf /var/lib/apt/lists/* -sudo rm -rf /var/lib/mysql/* -echo "MySQL Installation complete."
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactMetadataTest/scripts/start_mysql.sh b/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactMetadataTest/scripts/start_mysql.sh deleted file mode 100644 index 648bd45756..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactMetadataTest/scripts/start_mysql.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -echo "------------------------ ENV ------------------------" -echo "ENV VAR USED VOLUME_HOME : $VOLUME_HOME" -echo "ENV VAR USED PORT : $PORT" -echo "ENV VAR USED DB_NAME : $DB_NAME" -echo "ENV VAR USED DB_USER : $DB_USER" -echo "ENV VAR USED DB_PASSWORD : $DB_PASSWORD" -echo "---------------------------- ------------------------" - -CURRENT_PATH=`dirname "$0"` - -function StartMySQL { - echo "Starting MYSQL..." - sudo /etc/init.d/mysql stop - sudo /usr/bin/mysqld_safe > /dev/null 2>&1 & - RET=1 - while [[ RET -ne 0 ]]; do - echo "=> Waiting for confirmation of MySQL service startup" - sleep 5 - sudo mysql -uroot -e "status" > /dev/null 2>&1 - RET=$? - done -} - -function AllowFileSystemToMySQL { - MYSQL_DATA_DIR=$VOLUME_HOME/data - MYSQL_LOG=$VOLUME_HOME/logs - - echo "Setting data directory to $MYSQL_DATA_DIR an logs to $MYSQL_LOG ..." - if sudo test ! -d $MYSQL_DATA_DIR; then - echo "Creating DATA dir > $MYSQL_DATA_DIR ..." - sudo mkdir -p $MYSQL_DATA_DIR - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_DATA_DIR - fi - if sudo test ! -d $MYSQL_LOG; then - echo "Creating LOG dir > $MYSQL_LOG ..." - sudo mkdir -p $MYSQL_LOG - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_LOG - fi - - # edit app mysql permission in : /etc/apparmor.d/usr.sbin.mysqld - COUNT_LINE=`sudo cat /etc/apparmor.d/usr.sbin.mysqld | wc -l` - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/** rwk," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/** rwk," /etc/apparmor.d/usr.sbin.mysqld - - # reload app permission manager service - sudo service apparmor reload -} - -function UpdateMySQLConf { - echo "Updating MySQL conf files [DATA, LOGS]..." - sudo sed -i "s:/var/lib/mysql:$MYSQL_DATA_DIR:g" /etc/mysql/my.cnf - sudo sed -i "s:/var/log/mysql/error.log:$MYSQL_LOG/error.log:g" /etc/mysql/my.cnf - sudo sed -i "s:3306:$PORT:g" /etc/mysql/my.cnf - - if sudo test ! -f /usr/share/mysql/my-default.cnf; then - sudo cp /etc/mysql/my.cnf /usr/share/mysql/my-default.cnf - fi - if sudo test ! -f /etc/mysql/conf.d/mysqld_charset.cnf; then - sudo cp $configs/mysqld_charset.cnf /etc/mysql/conf.d/mysqld_charset.cnf - fi - - if [ "$BIND_ADRESS" == "true" ]; then - sudo sed -i "s/bind-address.*/bind-address = 0.0.0.0/" /etc/mysql/my.cnf - fi -} - -function InitMySQLDb { - # create database DB_NAME - if [ "$DB_NAME" ]; then - echo "INIT DATABASE $DB_NAME" - sudo mysql -u root -e "CREATE DATABASE $DB_NAME"; - fi - - # create user and give rights - if [ "$DB_USER" ]; then - echo "CREATE USER $DB_USER WITH PASSWORD $DB_PASSWORD AND GRAND RIGHTS ON $DB_NAME" - sudo mysql -uroot -e "CREATE USER '${DB_USER}'@'%' IDENTIFIED BY '$DB_PASSWORD'" - sudo mysql -uroot -e "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO '${DB_USER}'@'%' WITH GRANT OPTION" - sudo mysql -uroot -e "FLUSH PRIVILEGES" - fi -} - -# Create a new database path to the attched volume -if sudo test ! -d $VOLUME_HOME/data; then - echo "=> An empty or uninitialized MySQL volume is detected in $VOLUME_HOME/data" - AllowFileSystemToMySQL - UpdateMySQLConf - echo "=> Init new database path to $MYSQL_DATA_DIR" - sudo mysql_install_db --basedir=/usr --datadir=$MYSQL_DATA_DIR - echo "=> MySQL database initialized !" -else - echo "=> Using an existing volume of MySQL" - AllowFileSystemToMySQL - UpdateMySQLConf -fi - -# Finally start MySQL with new configuration -StartMySQL -InitMySQLDb
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactPayloadNoContentTest/mysql.yml b/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactPayloadNoContentTest/mysql.yml deleted file mode 100644 index 7177a65387..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getResourceArtifactPayloadNoContentTest/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getResourceArtifactPayloadNoContentTest -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getResourceArtifactPayloadNoContentTest: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/images/mysql.png b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/images/mysql.png +++ /dev/null diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/mysql.yml b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/mysql.yml deleted file mode 100644 index e0a0c6458e..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getServiceArtifactListTest -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getServiceArtifactListTest: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase-getServiceArtifactListTest - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase-getServiceArtifactListTest: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript-getServiceArtifactListTest: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/scripts/install_mysql.sh b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/scripts/install_mysql.sh deleted file mode 100644 index 400bcf40cb..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/scripts/install_mysql.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -echo "Debian based MYSQL install 5..." -LOCK="/tmp/lockaptget" - -while true; do - if mkdir "${LOCK}" &>/dev/null; then - echo "MySQL take the lock" - break; - fi - echo "Waiting the end of one of our recipes..." - sleep 0.5 -done - -while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - echo "Waiting for other software managers to finish..." - sleep 0.5 -done -sudo rm -f /var/lib/dpkg/lock - -sudo apt-get update || (sleep 15; sudo apt-get update || exit ${1}) -sudo DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server-5.5 pwgen || exit ${1} -rm -rf "${LOCK}" - -sudo /etc/init.d/mysql stop -sudo rm -rf /var/lib/apt/lists/* -sudo rm -rf /var/lib/mysql/* -echo "MySQL Installation complete."
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/scripts/start_mysql.sh b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/scripts/start_mysql.sh deleted file mode 100644 index 648bd45756..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource1/scripts/start_mysql.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -echo "------------------------ ENV ------------------------" -echo "ENV VAR USED VOLUME_HOME : $VOLUME_HOME" -echo "ENV VAR USED PORT : $PORT" -echo "ENV VAR USED DB_NAME : $DB_NAME" -echo "ENV VAR USED DB_USER : $DB_USER" -echo "ENV VAR USED DB_PASSWORD : $DB_PASSWORD" -echo "---------------------------- ------------------------" - -CURRENT_PATH=`dirname "$0"` - -function StartMySQL { - echo "Starting MYSQL..." - sudo /etc/init.d/mysql stop - sudo /usr/bin/mysqld_safe > /dev/null 2>&1 & - RET=1 - while [[ RET -ne 0 ]]; do - echo "=> Waiting for confirmation of MySQL service startup" - sleep 5 - sudo mysql -uroot -e "status" > /dev/null 2>&1 - RET=$? - done -} - -function AllowFileSystemToMySQL { - MYSQL_DATA_DIR=$VOLUME_HOME/data - MYSQL_LOG=$VOLUME_HOME/logs - - echo "Setting data directory to $MYSQL_DATA_DIR an logs to $MYSQL_LOG ..." - if sudo test ! -d $MYSQL_DATA_DIR; then - echo "Creating DATA dir > $MYSQL_DATA_DIR ..." - sudo mkdir -p $MYSQL_DATA_DIR - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_DATA_DIR - fi - if sudo test ! -d $MYSQL_LOG; then - echo "Creating LOG dir > $MYSQL_LOG ..." - sudo mkdir -p $MYSQL_LOG - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_LOG - fi - - # edit app mysql permission in : /etc/apparmor.d/usr.sbin.mysqld - COUNT_LINE=`sudo cat /etc/apparmor.d/usr.sbin.mysqld | wc -l` - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/** rwk," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/** rwk," /etc/apparmor.d/usr.sbin.mysqld - - # reload app permission manager service - sudo service apparmor reload -} - -function UpdateMySQLConf { - echo "Updating MySQL conf files [DATA, LOGS]..." - sudo sed -i "s:/var/lib/mysql:$MYSQL_DATA_DIR:g" /etc/mysql/my.cnf - sudo sed -i "s:/var/log/mysql/error.log:$MYSQL_LOG/error.log:g" /etc/mysql/my.cnf - sudo sed -i "s:3306:$PORT:g" /etc/mysql/my.cnf - - if sudo test ! -f /usr/share/mysql/my-default.cnf; then - sudo cp /etc/mysql/my.cnf /usr/share/mysql/my-default.cnf - fi - if sudo test ! -f /etc/mysql/conf.d/mysqld_charset.cnf; then - sudo cp $configs/mysqld_charset.cnf /etc/mysql/conf.d/mysqld_charset.cnf - fi - - if [ "$BIND_ADRESS" == "true" ]; then - sudo sed -i "s/bind-address.*/bind-address = 0.0.0.0/" /etc/mysql/my.cnf - fi -} - -function InitMySQLDb { - # create database DB_NAME - if [ "$DB_NAME" ]; then - echo "INIT DATABASE $DB_NAME" - sudo mysql -u root -e "CREATE DATABASE $DB_NAME"; - fi - - # create user and give rights - if [ "$DB_USER" ]; then - echo "CREATE USER $DB_USER WITH PASSWORD $DB_PASSWORD AND GRAND RIGHTS ON $DB_NAME" - sudo mysql -uroot -e "CREATE USER '${DB_USER}'@'%' IDENTIFIED BY '$DB_PASSWORD'" - sudo mysql -uroot -e "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO '${DB_USER}'@'%' WITH GRANT OPTION" - sudo mysql -uroot -e "FLUSH PRIVILEGES" - fi -} - -# Create a new database path to the attched volume -if sudo test ! -d $VOLUME_HOME/data; then - echo "=> An empty or uninitialized MySQL volume is detected in $VOLUME_HOME/data" - AllowFileSystemToMySQL - UpdateMySQLConf - echo "=> Init new database path to $MYSQL_DATA_DIR" - sudo mysql_install_db --basedir=/usr --datadir=$MYSQL_DATA_DIR - echo "=> MySQL database initialized !" -else - echo "=> Using an existing volume of MySQL" - AllowFileSystemToMySQL - UpdateMySQLConf -fi - -# Finally start MySQL with new configuration -StartMySQL -InitMySQLDb
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/images/mysql.png b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/images/mysql.png +++ /dev/null diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/mysql.yml b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/mysql.yml deleted file mode 100644 index dc5ff158c8..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getServiceArtifactListTest2 -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getServiceArtifactListTest2: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase-getServiceArtifactListTest2 - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase-getServiceArtifactListTest2: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript-getServiceArtifactListTest2: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/scripts/install_mysql2.sh b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/scripts/install_mysql2.sh deleted file mode 100644 index 400bcf40cb..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/scripts/install_mysql2.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -echo "Debian based MYSQL install 5..." -LOCK="/tmp/lockaptget" - -while true; do - if mkdir "${LOCK}" &>/dev/null; then - echo "MySQL take the lock" - break; - fi - echo "Waiting the end of one of our recipes..." - sleep 0.5 -done - -while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - echo "Waiting for other software managers to finish..." - sleep 0.5 -done -sudo rm -f /var/lib/dpkg/lock - -sudo apt-get update || (sleep 15; sudo apt-get update || exit ${1}) -sudo DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server-5.5 pwgen || exit ${1} -rm -rf "${LOCK}" - -sudo /etc/init.d/mysql stop -sudo rm -rf /var/lib/apt/lists/* -sudo rm -rf /var/lib/mysql/* -echo "MySQL Installation complete."
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/scripts/start_mysql2.sh b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/scripts/start_mysql2.sh deleted file mode 100644 index 648bd45756..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/resource2/scripts/start_mysql2.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -echo "------------------------ ENV ------------------------" -echo "ENV VAR USED VOLUME_HOME : $VOLUME_HOME" -echo "ENV VAR USED PORT : $PORT" -echo "ENV VAR USED DB_NAME : $DB_NAME" -echo "ENV VAR USED DB_USER : $DB_USER" -echo "ENV VAR USED DB_PASSWORD : $DB_PASSWORD" -echo "---------------------------- ------------------------" - -CURRENT_PATH=`dirname "$0"` - -function StartMySQL { - echo "Starting MYSQL..." - sudo /etc/init.d/mysql stop - sudo /usr/bin/mysqld_safe > /dev/null 2>&1 & - RET=1 - while [[ RET -ne 0 ]]; do - echo "=> Waiting for confirmation of MySQL service startup" - sleep 5 - sudo mysql -uroot -e "status" > /dev/null 2>&1 - RET=$? - done -} - -function AllowFileSystemToMySQL { - MYSQL_DATA_DIR=$VOLUME_HOME/data - MYSQL_LOG=$VOLUME_HOME/logs - - echo "Setting data directory to $MYSQL_DATA_DIR an logs to $MYSQL_LOG ..." - if sudo test ! -d $MYSQL_DATA_DIR; then - echo "Creating DATA dir > $MYSQL_DATA_DIR ..." - sudo mkdir -p $MYSQL_DATA_DIR - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_DATA_DIR - fi - if sudo test ! -d $MYSQL_LOG; then - echo "Creating LOG dir > $MYSQL_LOG ..." - sudo mkdir -p $MYSQL_LOG - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_LOG - fi - - # edit app mysql permission in : /etc/apparmor.d/usr.sbin.mysqld - COUNT_LINE=`sudo cat /etc/apparmor.d/usr.sbin.mysqld | wc -l` - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/** rwk," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/** rwk," /etc/apparmor.d/usr.sbin.mysqld - - # reload app permission manager service - sudo service apparmor reload -} - -function UpdateMySQLConf { - echo "Updating MySQL conf files [DATA, LOGS]..." - sudo sed -i "s:/var/lib/mysql:$MYSQL_DATA_DIR:g" /etc/mysql/my.cnf - sudo sed -i "s:/var/log/mysql/error.log:$MYSQL_LOG/error.log:g" /etc/mysql/my.cnf - sudo sed -i "s:3306:$PORT:g" /etc/mysql/my.cnf - - if sudo test ! -f /usr/share/mysql/my-default.cnf; then - sudo cp /etc/mysql/my.cnf /usr/share/mysql/my-default.cnf - fi - if sudo test ! -f /etc/mysql/conf.d/mysqld_charset.cnf; then - sudo cp $configs/mysqld_charset.cnf /etc/mysql/conf.d/mysqld_charset.cnf - fi - - if [ "$BIND_ADRESS" == "true" ]; then - sudo sed -i "s/bind-address.*/bind-address = 0.0.0.0/" /etc/mysql/my.cnf - fi -} - -function InitMySQLDb { - # create database DB_NAME - if [ "$DB_NAME" ]; then - echo "INIT DATABASE $DB_NAME" - sudo mysql -u root -e "CREATE DATABASE $DB_NAME"; - fi - - # create user and give rights - if [ "$DB_USER" ]; then - echo "CREATE USER $DB_USER WITH PASSWORD $DB_PASSWORD AND GRAND RIGHTS ON $DB_NAME" - sudo mysql -uroot -e "CREATE USER '${DB_USER}'@'%' IDENTIFIED BY '$DB_PASSWORD'" - sudo mysql -uroot -e "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO '${DB_USER}'@'%' WITH GRANT OPTION" - sudo mysql -uroot -e "FLUSH PRIVILEGES" - fi -} - -# Create a new database path to the attched volume -if sudo test ! -d $VOLUME_HOME/data; then - echo "=> An empty or uninitialized MySQL volume is detected in $VOLUME_HOME/data" - AllowFileSystemToMySQL - UpdateMySQLConf - echo "=> Init new database path to $MYSQL_DATA_DIR" - sudo mysql_install_db --basedir=/usr --datadir=$MYSQL_DATA_DIR - echo "=> MySQL database initialized !" -else - echo "=> Using an existing volume of MySQL" - AllowFileSystemToMySQL - UpdateMySQLConf -fi - -# Finally start MySQL with new configuration -StartMySQL -InitMySQLDb
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/topology.txt b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/topology.txt deleted file mode 100644 index cb3c3e8546..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/topology.txt +++ /dev/null @@ -1 +0,0 @@ -{"id":"6a4b2f9d-7fe1-482d-af11-97f483dff5b7","delegateId":"9c063349-2259-40fe-97f1-7c40e659e1b0","delegateType":"topologytemplate","dependencies":[{"name":"tosca-normative-types-DBMS","version":"1.0.0.wd03-SNAPSHOT"},{"name":"mysql-getServiceArtifactListTest2","version":"1.1.1-SNAPSHOT"},{"name":"tosca-normative-types-softwareComponent","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-compute","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-root","version":"1.0.0.wd03-SNAPSHOT"},{"name":"mysql-getServiceArtifactListTest","version":"1.1.1-SNAPSHOT"},{"name":"tosca-normative-types-database","version":"1.0.0.wd03-SNAPSHOT"}],"nodeTemplates":[{"key":"Mysql-getServiceArtifactListTest","value":{"type":"alien.nodes.Mysql-getServiceArtifactListTest","name":null,"properties":{"bind_address":"true","storage_path":"/mountedStorage","db_port":"3306","db_name":"wordpress","db_user":"pass","db_password":"pass"},"attributes":{"tosca_id":null,"tosca_name":null},"relationships":{"hostedOnCompute":{"type":"tosca.relationships.HostedOn","target":"Compute","requirementName":"host","requirementType":"tosca.nodes.Compute","targetedCapabilityName":"host"}},"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"host":{"type":"tosca.nodes.Compute","properties":null}},"capabilities":{"database_endpoint":{"type":"tosca.capabilities.DatabaseEndpoint","properties":{"port":null,"protocol":{"value":"tcp","definition":false},"url_path":null,"secure":{"value":"false","definition":false}}},"host":{"type":"alien.capabilities.MysqlDatabase-getServiceArtifactListTest","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null}},"artifacts":{"scripts":{"artifactType":"tosca.artifacts.File","artifactRef":"scripts","artifactName":"scripts","artifactRepository":null}}}},{"key":"Compute","value":{"type":"tosca.nodes.Compute","name":null,"properties":{"disk_size":null,"num_cpus":null,"os_distribution":null,"os_arch":null,"mem_size":null,"os_type":null,"os_version":null},"attributes":{"ip_address":null,"tosca_id":null,"tosca_name":null},"relationships":null,"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"network":{"type":"tosca.capabilities.Connectivity","properties":null}},"capabilities":{"host":{"type":"tosca.capabilities.Container","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null},"attach":{"type":"tosca.capabilities.Attachment","properties":null},"scalable":{"type":"tosca.capabilities.Scalable","properties":{"max_intances":{"value":"1","definition":false},"default_instances":{"value":"1","definition":false},"min_intances":{"value":"1","definition":false}}}},"artifacts":null}},{"key":"Mysql-getServiceArtifactListTest2","value":{"type":"alien.nodes.Mysql-getServiceArtifactListTest2","name":null,"properties":{"bind_address":"true","storage_path":"/mountedStorage","db_port":"3306","db_name":"wordpress","db_user":"pass","db_password":"pass"},"attributes":{"tosca_id":null,"tosca_name":null},"relationships":{"hostedOnCompute":{"type":"tosca.relationships.HostedOn","target":"Compute","requirementName":"host","requirementType":"tosca.nodes.Compute","targetedCapabilityName":"host"}},"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"host":{"type":"tosca.nodes.Compute","properties":null}},"capabilities":{"database_endpoint":{"type":"tosca.capabilities.DatabaseEndpoint","properties":{"port":null,"protocol":{"value":"tcp","definition":false},"url_path":null,"secure":{"value":"false","definition":false}}},"host":{"type":"alien.capabilities.MysqlDatabase-getServiceArtifactListTest2","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null}},"artifacts":{"scripts":{"artifactType":"tosca.artifacts.File","artifactRef":"scripts","artifactName":"scripts","artifactRepository":null}}}}]}
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/topologyTemplate.txt b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/topologyTemplate.txt deleted file mode 100644 index f0d0849db8..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListInvalidVersionNotFoundTest/topologyTemplate.txt +++ /dev/null @@ -1,2 +0,0 @@ -{"id":"9c063349-2259-40fe-97f1-7c40e659e1b0","name":"Andrey","description":null,"topologyId":"6a4b2f9d-7fe1-482d-af11-97f483dff5b7"} - diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource1/images/mysql.png b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource1/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource1/images/mysql.png +++ /dev/null diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource1/mysql.yml b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource1/mysql.yml deleted file mode 100644 index 4ee2c8ca88..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource1/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getServiceArtifactListNoContentTest -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getServiceArtifactListNoContentTest: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase-getServiceArtifactListNoContentTest - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase-getServiceArtifactListNoContentTest: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript-getServiceArtifactListNoContentTest: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource2/images/mysql.png b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource2/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource2/images/mysql.png +++ /dev/null diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource2/mysql.yml b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource2/mysql.yml deleted file mode 100644 index b564dd0c4e..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/resource2/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getServiceArtifactListNoContentTest2 -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getServiceArtifactListNoContentTest2: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase-getServiceArtifactListNoContentTest2 - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase-getServiceArtifactListNoContentTest2: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript-getServiceArtifactListNoContentTest2: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/topology.txt b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/topology.txt deleted file mode 100644 index 279351879a..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/topology.txt +++ /dev/null @@ -1 +0,0 @@ -{"id":"3293c9c8-a162-43fc-b8d1-431399f89cb7","delegateId":"25845cce-05c8-4502-b5fe-abfd6bd6f28e","delegateType":"topologytemplate","dependencies":[{"name":"tosca-normative-types-DBMS","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-softwareComponent","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-compute","version":"1.0.0.wd03-SNAPSHOT"},{"name":"mysql-getServiceArtifactListNoContentTest2","version":"1.1.1-SNAPSHOT"},{"name":"tosca-normative-types-root","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-database","version":"1.0.0.wd03-SNAPSHOT"}],"nodeTemplates":[{"key":"Mysql-getServiceArtifactListNoContentTest2","value":{"type":"alien.nodes.Mysql-getServiceArtifactListNoContentTest2","name":null,"properties":{"bind_address":"true","storage_path":"/mountedStorage","db_port":"3306","db_name":"wordpress","db_user":"pass","db_password":"pass"},"attributes":{"tosca_id":null,"tosca_name":null},"relationships":null,"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"host":{"type":"tosca.nodes.Compute","properties":null}},"capabilities":{"database_endpoint":{"type":"tosca.capabilities.DatabaseEndpoint","properties":{"port":null,"protocol":{"value":"tcp","definition":false},"url_path":null,"secure":{"value":"false","definition":false}}},"host":{"type":"alien.capabilities.MysqlDatabase-getServiceArtifactListNoContentTest2","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null}},"artifacts":{"scripts":{"artifactType":"tosca.artifacts.File","artifactRef":"scripts","artifactName":"scripts","artifactRepository":null}}}},{"key":"Compute","value":{"type":"tosca.nodes.Compute","name":null,"properties":{"disk_size":null,"num_cpus":null,"os_distribution":null,"os_arch":null,"mem_size":null,"os_type":null,"os_version":null},"attributes":{"ip_address":null,"tosca_id":null,"tosca_name":null},"relationships":{"dependsOnMysql-getServiceArtifactListNoContentTest2":{"type":"tosca.relationships.DependsOn","target":"Mysql-getServiceArtifactListNoContentTest2","requirementName":"dependency","requirementType":"tosca.capabilities.Root","targetedCapabilityName":"root"}},"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"network":{"type":"tosca.capabilities.Connectivity","properties":null}},"capabilities":{"host":{"type":"tosca.capabilities.Container","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null},"attach":{"type":"tosca.capabilities.Attachment","properties":null},"scalable":{"type":"tosca.capabilities.Scalable","properties":{"max_intances":{"value":"1","definition":false},"default_instances":{"value":"1","definition":false},"min_intances":{"value":"1","definition":false}}}},"artifacts":null}}]}
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/topologyTemplate.txt b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/topologyTemplate.txt deleted file mode 100644 index 3c342f6cd1..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListNoContentTest/topologyTemplate.txt +++ /dev/null @@ -1,2 +0,0 @@ -{"id":"25845cce-05c8-4502-b5fe-abfd6bd6f28e","name":"ServiceArtListNoContent","description":null,"topologyId":"3293c9c8-a162-43fc-b8d1-431399f89cb7"} - diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/images/mysql.png b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/images/mysql.png +++ /dev/null diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/mysql.yml b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/mysql.yml deleted file mode 100644 index e0a0c6458e..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getServiceArtifactListTest -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getServiceArtifactListTest: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase-getServiceArtifactListTest - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase-getServiceArtifactListTest: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript-getServiceArtifactListTest: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/scripts/install_mysql.sh b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/scripts/install_mysql.sh deleted file mode 100644 index 400bcf40cb..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/scripts/install_mysql.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -echo "Debian based MYSQL install 5..." -LOCK="/tmp/lockaptget" - -while true; do - if mkdir "${LOCK}" &>/dev/null; then - echo "MySQL take the lock" - break; - fi - echo "Waiting the end of one of our recipes..." - sleep 0.5 -done - -while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - echo "Waiting for other software managers to finish..." - sleep 0.5 -done -sudo rm -f /var/lib/dpkg/lock - -sudo apt-get update || (sleep 15; sudo apt-get update || exit ${1}) -sudo DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server-5.5 pwgen || exit ${1} -rm -rf "${LOCK}" - -sudo /etc/init.d/mysql stop -sudo rm -rf /var/lib/apt/lists/* -sudo rm -rf /var/lib/mysql/* -echo "MySQL Installation complete."
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/scripts/start_mysql.sh b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/scripts/start_mysql.sh deleted file mode 100644 index 648bd45756..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource1/scripts/start_mysql.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -echo "------------------------ ENV ------------------------" -echo "ENV VAR USED VOLUME_HOME : $VOLUME_HOME" -echo "ENV VAR USED PORT : $PORT" -echo "ENV VAR USED DB_NAME : $DB_NAME" -echo "ENV VAR USED DB_USER : $DB_USER" -echo "ENV VAR USED DB_PASSWORD : $DB_PASSWORD" -echo "---------------------------- ------------------------" - -CURRENT_PATH=`dirname "$0"` - -function StartMySQL { - echo "Starting MYSQL..." - sudo /etc/init.d/mysql stop - sudo /usr/bin/mysqld_safe > /dev/null 2>&1 & - RET=1 - while [[ RET -ne 0 ]]; do - echo "=> Waiting for confirmation of MySQL service startup" - sleep 5 - sudo mysql -uroot -e "status" > /dev/null 2>&1 - RET=$? - done -} - -function AllowFileSystemToMySQL { - MYSQL_DATA_DIR=$VOLUME_HOME/data - MYSQL_LOG=$VOLUME_HOME/logs - - echo "Setting data directory to $MYSQL_DATA_DIR an logs to $MYSQL_LOG ..." - if sudo test ! -d $MYSQL_DATA_DIR; then - echo "Creating DATA dir > $MYSQL_DATA_DIR ..." - sudo mkdir -p $MYSQL_DATA_DIR - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_DATA_DIR - fi - if sudo test ! -d $MYSQL_LOG; then - echo "Creating LOG dir > $MYSQL_LOG ..." - sudo mkdir -p $MYSQL_LOG - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_LOG - fi - - # edit app mysql permission in : /etc/apparmor.d/usr.sbin.mysqld - COUNT_LINE=`sudo cat /etc/apparmor.d/usr.sbin.mysqld | wc -l` - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/** rwk," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/** rwk," /etc/apparmor.d/usr.sbin.mysqld - - # reload app permission manager service - sudo service apparmor reload -} - -function UpdateMySQLConf { - echo "Updating MySQL conf files [DATA, LOGS]..." - sudo sed -i "s:/var/lib/mysql:$MYSQL_DATA_DIR:g" /etc/mysql/my.cnf - sudo sed -i "s:/var/log/mysql/error.log:$MYSQL_LOG/error.log:g" /etc/mysql/my.cnf - sudo sed -i "s:3306:$PORT:g" /etc/mysql/my.cnf - - if sudo test ! -f /usr/share/mysql/my-default.cnf; then - sudo cp /etc/mysql/my.cnf /usr/share/mysql/my-default.cnf - fi - if sudo test ! -f /etc/mysql/conf.d/mysqld_charset.cnf; then - sudo cp $configs/mysqld_charset.cnf /etc/mysql/conf.d/mysqld_charset.cnf - fi - - if [ "$BIND_ADRESS" == "true" ]; then - sudo sed -i "s/bind-address.*/bind-address = 0.0.0.0/" /etc/mysql/my.cnf - fi -} - -function InitMySQLDb { - # create database DB_NAME - if [ "$DB_NAME" ]; then - echo "INIT DATABASE $DB_NAME" - sudo mysql -u root -e "CREATE DATABASE $DB_NAME"; - fi - - # create user and give rights - if [ "$DB_USER" ]; then - echo "CREATE USER $DB_USER WITH PASSWORD $DB_PASSWORD AND GRAND RIGHTS ON $DB_NAME" - sudo mysql -uroot -e "CREATE USER '${DB_USER}'@'%' IDENTIFIED BY '$DB_PASSWORD'" - sudo mysql -uroot -e "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO '${DB_USER}'@'%' WITH GRANT OPTION" - sudo mysql -uroot -e "FLUSH PRIVILEGES" - fi -} - -# Create a new database path to the attched volume -if sudo test ! -d $VOLUME_HOME/data; then - echo "=> An empty or uninitialized MySQL volume is detected in $VOLUME_HOME/data" - AllowFileSystemToMySQL - UpdateMySQLConf - echo "=> Init new database path to $MYSQL_DATA_DIR" - sudo mysql_install_db --basedir=/usr --datadir=$MYSQL_DATA_DIR - echo "=> MySQL database initialized !" -else - echo "=> Using an existing volume of MySQL" - AllowFileSystemToMySQL - UpdateMySQLConf -fi - -# Finally start MySQL with new configuration -StartMySQL -InitMySQLDb
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/images/mysql.png b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/images/mysql.png +++ /dev/null diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/mysql.yml b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/mysql.yml deleted file mode 100644 index dc5ff158c8..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getServiceArtifactListTest2 -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getServiceArtifactListTest2: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase-getServiceArtifactListTest2 - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase-getServiceArtifactListTest2: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript-getServiceArtifactListTest2: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/scripts/install_mysql2.sh b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/scripts/install_mysql2.sh deleted file mode 100644 index 400bcf40cb..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/scripts/install_mysql2.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -echo "Debian based MYSQL install 5..." -LOCK="/tmp/lockaptget" - -while true; do - if mkdir "${LOCK}" &>/dev/null; then - echo "MySQL take the lock" - break; - fi - echo "Waiting the end of one of our recipes..." - sleep 0.5 -done - -while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - echo "Waiting for other software managers to finish..." - sleep 0.5 -done -sudo rm -f /var/lib/dpkg/lock - -sudo apt-get update || (sleep 15; sudo apt-get update || exit ${1}) -sudo DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server-5.5 pwgen || exit ${1} -rm -rf "${LOCK}" - -sudo /etc/init.d/mysql stop -sudo rm -rf /var/lib/apt/lists/* -sudo rm -rf /var/lib/mysql/* -echo "MySQL Installation complete."
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/scripts/start_mysql2.sh b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/scripts/start_mysql2.sh deleted file mode 100644 index 648bd45756..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/resource2/scripts/start_mysql2.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -echo "------------------------ ENV ------------------------" -echo "ENV VAR USED VOLUME_HOME : $VOLUME_HOME" -echo "ENV VAR USED PORT : $PORT" -echo "ENV VAR USED DB_NAME : $DB_NAME" -echo "ENV VAR USED DB_USER : $DB_USER" -echo "ENV VAR USED DB_PASSWORD : $DB_PASSWORD" -echo "---------------------------- ------------------------" - -CURRENT_PATH=`dirname "$0"` - -function StartMySQL { - echo "Starting MYSQL..." - sudo /etc/init.d/mysql stop - sudo /usr/bin/mysqld_safe > /dev/null 2>&1 & - RET=1 - while [[ RET -ne 0 ]]; do - echo "=> Waiting for confirmation of MySQL service startup" - sleep 5 - sudo mysql -uroot -e "status" > /dev/null 2>&1 - RET=$? - done -} - -function AllowFileSystemToMySQL { - MYSQL_DATA_DIR=$VOLUME_HOME/data - MYSQL_LOG=$VOLUME_HOME/logs - - echo "Setting data directory to $MYSQL_DATA_DIR an logs to $MYSQL_LOG ..." - if sudo test ! -d $MYSQL_DATA_DIR; then - echo "Creating DATA dir > $MYSQL_DATA_DIR ..." - sudo mkdir -p $MYSQL_DATA_DIR - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_DATA_DIR - fi - if sudo test ! -d $MYSQL_LOG; then - echo "Creating LOG dir > $MYSQL_LOG ..." - sudo mkdir -p $MYSQL_LOG - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_LOG - fi - - # edit app mysql permission in : /etc/apparmor.d/usr.sbin.mysqld - COUNT_LINE=`sudo cat /etc/apparmor.d/usr.sbin.mysqld | wc -l` - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/** rwk," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/** rwk," /etc/apparmor.d/usr.sbin.mysqld - - # reload app permission manager service - sudo service apparmor reload -} - -function UpdateMySQLConf { - echo "Updating MySQL conf files [DATA, LOGS]..." - sudo sed -i "s:/var/lib/mysql:$MYSQL_DATA_DIR:g" /etc/mysql/my.cnf - sudo sed -i "s:/var/log/mysql/error.log:$MYSQL_LOG/error.log:g" /etc/mysql/my.cnf - sudo sed -i "s:3306:$PORT:g" /etc/mysql/my.cnf - - if sudo test ! -f /usr/share/mysql/my-default.cnf; then - sudo cp /etc/mysql/my.cnf /usr/share/mysql/my-default.cnf - fi - if sudo test ! -f /etc/mysql/conf.d/mysqld_charset.cnf; then - sudo cp $configs/mysqld_charset.cnf /etc/mysql/conf.d/mysqld_charset.cnf - fi - - if [ "$BIND_ADRESS" == "true" ]; then - sudo sed -i "s/bind-address.*/bind-address = 0.0.0.0/" /etc/mysql/my.cnf - fi -} - -function InitMySQLDb { - # create database DB_NAME - if [ "$DB_NAME" ]; then - echo "INIT DATABASE $DB_NAME" - sudo mysql -u root -e "CREATE DATABASE $DB_NAME"; - fi - - # create user and give rights - if [ "$DB_USER" ]; then - echo "CREATE USER $DB_USER WITH PASSWORD $DB_PASSWORD AND GRAND RIGHTS ON $DB_NAME" - sudo mysql -uroot -e "CREATE USER '${DB_USER}'@'%' IDENTIFIED BY '$DB_PASSWORD'" - sudo mysql -uroot -e "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO '${DB_USER}'@'%' WITH GRANT OPTION" - sudo mysql -uroot -e "FLUSH PRIVILEGES" - fi -} - -# Create a new database path to the attched volume -if sudo test ! -d $VOLUME_HOME/data; then - echo "=> An empty or uninitialized MySQL volume is detected in $VOLUME_HOME/data" - AllowFileSystemToMySQL - UpdateMySQLConf - echo "=> Init new database path to $MYSQL_DATA_DIR" - sudo mysql_install_db --basedir=/usr --datadir=$MYSQL_DATA_DIR - echo "=> MySQL database initialized !" -else - echo "=> Using an existing volume of MySQL" - AllowFileSystemToMySQL - UpdateMySQLConf -fi - -# Finally start MySQL with new configuration -StartMySQL -InitMySQLDb
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/topology.txt b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/topology.txt deleted file mode 100644 index cb3c3e8546..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/topology.txt +++ /dev/null @@ -1 +0,0 @@ -{"id":"6a4b2f9d-7fe1-482d-af11-97f483dff5b7","delegateId":"9c063349-2259-40fe-97f1-7c40e659e1b0","delegateType":"topologytemplate","dependencies":[{"name":"tosca-normative-types-DBMS","version":"1.0.0.wd03-SNAPSHOT"},{"name":"mysql-getServiceArtifactListTest2","version":"1.1.1-SNAPSHOT"},{"name":"tosca-normative-types-softwareComponent","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-compute","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-root","version":"1.0.0.wd03-SNAPSHOT"},{"name":"mysql-getServiceArtifactListTest","version":"1.1.1-SNAPSHOT"},{"name":"tosca-normative-types-database","version":"1.0.0.wd03-SNAPSHOT"}],"nodeTemplates":[{"key":"Mysql-getServiceArtifactListTest","value":{"type":"alien.nodes.Mysql-getServiceArtifactListTest","name":null,"properties":{"bind_address":"true","storage_path":"/mountedStorage","db_port":"3306","db_name":"wordpress","db_user":"pass","db_password":"pass"},"attributes":{"tosca_id":null,"tosca_name":null},"relationships":{"hostedOnCompute":{"type":"tosca.relationships.HostedOn","target":"Compute","requirementName":"host","requirementType":"tosca.nodes.Compute","targetedCapabilityName":"host"}},"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"host":{"type":"tosca.nodes.Compute","properties":null}},"capabilities":{"database_endpoint":{"type":"tosca.capabilities.DatabaseEndpoint","properties":{"port":null,"protocol":{"value":"tcp","definition":false},"url_path":null,"secure":{"value":"false","definition":false}}},"host":{"type":"alien.capabilities.MysqlDatabase-getServiceArtifactListTest","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null}},"artifacts":{"scripts":{"artifactType":"tosca.artifacts.File","artifactRef":"scripts","artifactName":"scripts","artifactRepository":null}}}},{"key":"Compute","value":{"type":"tosca.nodes.Compute","name":null,"properties":{"disk_size":null,"num_cpus":null,"os_distribution":null,"os_arch":null,"mem_size":null,"os_type":null,"os_version":null},"attributes":{"ip_address":null,"tosca_id":null,"tosca_name":null},"relationships":null,"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"network":{"type":"tosca.capabilities.Connectivity","properties":null}},"capabilities":{"host":{"type":"tosca.capabilities.Container","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null},"attach":{"type":"tosca.capabilities.Attachment","properties":null},"scalable":{"type":"tosca.capabilities.Scalable","properties":{"max_intances":{"value":"1","definition":false},"default_instances":{"value":"1","definition":false},"min_intances":{"value":"1","definition":false}}}},"artifacts":null}},{"key":"Mysql-getServiceArtifactListTest2","value":{"type":"alien.nodes.Mysql-getServiceArtifactListTest2","name":null,"properties":{"bind_address":"true","storage_path":"/mountedStorage","db_port":"3306","db_name":"wordpress","db_user":"pass","db_password":"pass"},"attributes":{"tosca_id":null,"tosca_name":null},"relationships":{"hostedOnCompute":{"type":"tosca.relationships.HostedOn","target":"Compute","requirementName":"host","requirementType":"tosca.nodes.Compute","targetedCapabilityName":"host"}},"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"host":{"type":"tosca.nodes.Compute","properties":null}},"capabilities":{"database_endpoint":{"type":"tosca.capabilities.DatabaseEndpoint","properties":{"port":null,"protocol":{"value":"tcp","definition":false},"url_path":null,"secure":{"value":"false","definition":false}}},"host":{"type":"alien.capabilities.MysqlDatabase-getServiceArtifactListTest2","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null}},"artifacts":{"scripts":{"artifactType":"tosca.artifacts.File","artifactRef":"scripts","artifactName":"scripts","artifactRepository":null}}}}]}
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/topologyTemplate.txt b/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/topologyTemplate.txt deleted file mode 100644 index f0d0849db8..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceArtifactListTest/topologyTemplate.txt +++ /dev/null @@ -1,2 +0,0 @@ -{"id":"9c063349-2259-40fe-97f1-7c40e659e1b0","name":"Andrey","description":null,"topologyId":"6a4b2f9d-7fe1-482d-af11-97f483dff5b7"} - diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/images/mysql.png b/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/images/mysql.png +++ /dev/null diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/mysql.yml b/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/mysql.yml deleted file mode 100644 index e0a0c6458e..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getServiceArtifactListTest -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getServiceArtifactListTest: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase-getServiceArtifactListTest - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase-getServiceArtifactListTest: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript-getServiceArtifactListTest: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/scripts/install_mysql.sh b/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/scripts/install_mysql.sh deleted file mode 100644 index 400bcf40cb..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/scripts/install_mysql.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -echo "Debian based MYSQL install 5..." -LOCK="/tmp/lockaptget" - -while true; do - if mkdir "${LOCK}" &>/dev/null; then - echo "MySQL take the lock" - break; - fi - echo "Waiting the end of one of our recipes..." - sleep 0.5 -done - -while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - echo "Waiting for other software managers to finish..." - sleep 0.5 -done -sudo rm -f /var/lib/dpkg/lock - -sudo apt-get update || (sleep 15; sudo apt-get update || exit ${1}) -sudo DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server-5.5 pwgen || exit ${1} -rm -rf "${LOCK}" - -sudo /etc/init.d/mysql stop -sudo rm -rf /var/lib/apt/lists/* -sudo rm -rf /var/lib/mysql/* -echo "MySQL Installation complete."
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/scripts/start_mysql.sh b/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/scripts/start_mysql.sh deleted file mode 100644 index 648bd45756..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource1/scripts/start_mysql.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -echo "------------------------ ENV ------------------------" -echo "ENV VAR USED VOLUME_HOME : $VOLUME_HOME" -echo "ENV VAR USED PORT : $PORT" -echo "ENV VAR USED DB_NAME : $DB_NAME" -echo "ENV VAR USED DB_USER : $DB_USER" -echo "ENV VAR USED DB_PASSWORD : $DB_PASSWORD" -echo "---------------------------- ------------------------" - -CURRENT_PATH=`dirname "$0"` - -function StartMySQL { - echo "Starting MYSQL..." - sudo /etc/init.d/mysql stop - sudo /usr/bin/mysqld_safe > /dev/null 2>&1 & - RET=1 - while [[ RET -ne 0 ]]; do - echo "=> Waiting for confirmation of MySQL service startup" - sleep 5 - sudo mysql -uroot -e "status" > /dev/null 2>&1 - RET=$? - done -} - -function AllowFileSystemToMySQL { - MYSQL_DATA_DIR=$VOLUME_HOME/data - MYSQL_LOG=$VOLUME_HOME/logs - - echo "Setting data directory to $MYSQL_DATA_DIR an logs to $MYSQL_LOG ..." - if sudo test ! -d $MYSQL_DATA_DIR; then - echo "Creating DATA dir > $MYSQL_DATA_DIR ..." - sudo mkdir -p $MYSQL_DATA_DIR - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_DATA_DIR - fi - if sudo test ! -d $MYSQL_LOG; then - echo "Creating LOG dir > $MYSQL_LOG ..." - sudo mkdir -p $MYSQL_LOG - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_LOG - fi - - # edit app mysql permission in : /etc/apparmor.d/usr.sbin.mysqld - COUNT_LINE=`sudo cat /etc/apparmor.d/usr.sbin.mysqld | wc -l` - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/** rwk," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/** rwk," /etc/apparmor.d/usr.sbin.mysqld - - # reload app permission manager service - sudo service apparmor reload -} - -function UpdateMySQLConf { - echo "Updating MySQL conf files [DATA, LOGS]..." - sudo sed -i "s:/var/lib/mysql:$MYSQL_DATA_DIR:g" /etc/mysql/my.cnf - sudo sed -i "s:/var/log/mysql/error.log:$MYSQL_LOG/error.log:g" /etc/mysql/my.cnf - sudo sed -i "s:3306:$PORT:g" /etc/mysql/my.cnf - - if sudo test ! -f /usr/share/mysql/my-default.cnf; then - sudo cp /etc/mysql/my.cnf /usr/share/mysql/my-default.cnf - fi - if sudo test ! -f /etc/mysql/conf.d/mysqld_charset.cnf; then - sudo cp $configs/mysqld_charset.cnf /etc/mysql/conf.d/mysqld_charset.cnf - fi - - if [ "$BIND_ADRESS" == "true" ]; then - sudo sed -i "s/bind-address.*/bind-address = 0.0.0.0/" /etc/mysql/my.cnf - fi -} - -function InitMySQLDb { - # create database DB_NAME - if [ "$DB_NAME" ]; then - echo "INIT DATABASE $DB_NAME" - sudo mysql -u root -e "CREATE DATABASE $DB_NAME"; - fi - - # create user and give rights - if [ "$DB_USER" ]; then - echo "CREATE USER $DB_USER WITH PASSWORD $DB_PASSWORD AND GRAND RIGHTS ON $DB_NAME" - sudo mysql -uroot -e "CREATE USER '${DB_USER}'@'%' IDENTIFIED BY '$DB_PASSWORD'" - sudo mysql -uroot -e "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO '${DB_USER}'@'%' WITH GRANT OPTION" - sudo mysql -uroot -e "FLUSH PRIVILEGES" - fi -} - -# Create a new database path to the attched volume -if sudo test ! -d $VOLUME_HOME/data; then - echo "=> An empty or uninitialized MySQL volume is detected in $VOLUME_HOME/data" - AllowFileSystemToMySQL - UpdateMySQLConf - echo "=> Init new database path to $MYSQL_DATA_DIR" - sudo mysql_install_db --basedir=/usr --datadir=$MYSQL_DATA_DIR - echo "=> MySQL database initialized !" -else - echo "=> Using an existing volume of MySQL" - AllowFileSystemToMySQL - UpdateMySQLConf -fi - -# Finally start MySQL with new configuration -StartMySQL -InitMySQLDb
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/images/mysql.png b/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/images/mysql.png +++ /dev/null diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/mysql.yml b/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/mysql.yml deleted file mode 100644 index dc5ff158c8..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getServiceArtifactListTest2 -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getServiceArtifactListTest2: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase-getServiceArtifactListTest2 - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase-getServiceArtifactListTest2: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript-getServiceArtifactListTest2: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/scripts/install_mysql2.sh b/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/scripts/install_mysql2.sh deleted file mode 100644 index 400bcf40cb..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/scripts/install_mysql2.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -echo "Debian based MYSQL install 5..." -LOCK="/tmp/lockaptget" - -while true; do - if mkdir "${LOCK}" &>/dev/null; then - echo "MySQL take the lock" - break; - fi - echo "Waiting the end of one of our recipes..." - sleep 0.5 -done - -while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - echo "Waiting for other software managers to finish..." - sleep 0.5 -done -sudo rm -f /var/lib/dpkg/lock - -sudo apt-get update || (sleep 15; sudo apt-get update || exit ${1}) -sudo DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server-5.5 pwgen || exit ${1} -rm -rf "${LOCK}" - -sudo /etc/init.d/mysql stop -sudo rm -rf /var/lib/apt/lists/* -sudo rm -rf /var/lib/mysql/* -echo "MySQL Installation complete."
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/scripts/start_mysql2.sh b/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/scripts/start_mysql2.sh deleted file mode 100644 index 648bd45756..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/resource2/scripts/start_mysql2.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -echo "------------------------ ENV ------------------------" -echo "ENV VAR USED VOLUME_HOME : $VOLUME_HOME" -echo "ENV VAR USED PORT : $PORT" -echo "ENV VAR USED DB_NAME : $DB_NAME" -echo "ENV VAR USED DB_USER : $DB_USER" -echo "ENV VAR USED DB_PASSWORD : $DB_PASSWORD" -echo "---------------------------- ------------------------" - -CURRENT_PATH=`dirname "$0"` - -function StartMySQL { - echo "Starting MYSQL..." - sudo /etc/init.d/mysql stop - sudo /usr/bin/mysqld_safe > /dev/null 2>&1 & - RET=1 - while [[ RET -ne 0 ]]; do - echo "=> Waiting for confirmation of MySQL service startup" - sleep 5 - sudo mysql -uroot -e "status" > /dev/null 2>&1 - RET=$? - done -} - -function AllowFileSystemToMySQL { - MYSQL_DATA_DIR=$VOLUME_HOME/data - MYSQL_LOG=$VOLUME_HOME/logs - - echo "Setting data directory to $MYSQL_DATA_DIR an logs to $MYSQL_LOG ..." - if sudo test ! -d $MYSQL_DATA_DIR; then - echo "Creating DATA dir > $MYSQL_DATA_DIR ..." - sudo mkdir -p $MYSQL_DATA_DIR - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_DATA_DIR - fi - if sudo test ! -d $MYSQL_LOG; then - echo "Creating LOG dir > $MYSQL_LOG ..." - sudo mkdir -p $MYSQL_LOG - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_LOG - fi - - # edit app mysql permission in : /etc/apparmor.d/usr.sbin.mysqld - COUNT_LINE=`sudo cat /etc/apparmor.d/usr.sbin.mysqld | wc -l` - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/** rwk," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/** rwk," /etc/apparmor.d/usr.sbin.mysqld - - # reload app permission manager service - sudo service apparmor reload -} - -function UpdateMySQLConf { - echo "Updating MySQL conf files [DATA, LOGS]..." - sudo sed -i "s:/var/lib/mysql:$MYSQL_DATA_DIR:g" /etc/mysql/my.cnf - sudo sed -i "s:/var/log/mysql/error.log:$MYSQL_LOG/error.log:g" /etc/mysql/my.cnf - sudo sed -i "s:3306:$PORT:g" /etc/mysql/my.cnf - - if sudo test ! -f /usr/share/mysql/my-default.cnf; then - sudo cp /etc/mysql/my.cnf /usr/share/mysql/my-default.cnf - fi - if sudo test ! -f /etc/mysql/conf.d/mysqld_charset.cnf; then - sudo cp $configs/mysqld_charset.cnf /etc/mysql/conf.d/mysqld_charset.cnf - fi - - if [ "$BIND_ADRESS" == "true" ]; then - sudo sed -i "s/bind-address.*/bind-address = 0.0.0.0/" /etc/mysql/my.cnf - fi -} - -function InitMySQLDb { - # create database DB_NAME - if [ "$DB_NAME" ]; then - echo "INIT DATABASE $DB_NAME" - sudo mysql -u root -e "CREATE DATABASE $DB_NAME"; - fi - - # create user and give rights - if [ "$DB_USER" ]; then - echo "CREATE USER $DB_USER WITH PASSWORD $DB_PASSWORD AND GRAND RIGHTS ON $DB_NAME" - sudo mysql -uroot -e "CREATE USER '${DB_USER}'@'%' IDENTIFIED BY '$DB_PASSWORD'" - sudo mysql -uroot -e "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO '${DB_USER}'@'%' WITH GRANT OPTION" - sudo mysql -uroot -e "FLUSH PRIVILEGES" - fi -} - -# Create a new database path to the attched volume -if sudo test ! -d $VOLUME_HOME/data; then - echo "=> An empty or uninitialized MySQL volume is detected in $VOLUME_HOME/data" - AllowFileSystemToMySQL - UpdateMySQLConf - echo "=> Init new database path to $MYSQL_DATA_DIR" - sudo mysql_install_db --basedir=/usr --datadir=$MYSQL_DATA_DIR - echo "=> MySQL database initialized !" -else - echo "=> Using an existing volume of MySQL" - AllowFileSystemToMySQL - UpdateMySQLConf -fi - -# Finally start MySQL with new configuration -StartMySQL -InitMySQLDb
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/topology.txt b/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/topology.txt deleted file mode 100644 index cb3c3e8546..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/topology.txt +++ /dev/null @@ -1 +0,0 @@ -{"id":"6a4b2f9d-7fe1-482d-af11-97f483dff5b7","delegateId":"9c063349-2259-40fe-97f1-7c40e659e1b0","delegateType":"topologytemplate","dependencies":[{"name":"tosca-normative-types-DBMS","version":"1.0.0.wd03-SNAPSHOT"},{"name":"mysql-getServiceArtifactListTest2","version":"1.1.1-SNAPSHOT"},{"name":"tosca-normative-types-softwareComponent","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-compute","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-root","version":"1.0.0.wd03-SNAPSHOT"},{"name":"mysql-getServiceArtifactListTest","version":"1.1.1-SNAPSHOT"},{"name":"tosca-normative-types-database","version":"1.0.0.wd03-SNAPSHOT"}],"nodeTemplates":[{"key":"Mysql-getServiceArtifactListTest","value":{"type":"alien.nodes.Mysql-getServiceArtifactListTest","name":null,"properties":{"bind_address":"true","storage_path":"/mountedStorage","db_port":"3306","db_name":"wordpress","db_user":"pass","db_password":"pass"},"attributes":{"tosca_id":null,"tosca_name":null},"relationships":{"hostedOnCompute":{"type":"tosca.relationships.HostedOn","target":"Compute","requirementName":"host","requirementType":"tosca.nodes.Compute","targetedCapabilityName":"host"}},"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"host":{"type":"tosca.nodes.Compute","properties":null}},"capabilities":{"database_endpoint":{"type":"tosca.capabilities.DatabaseEndpoint","properties":{"port":null,"protocol":{"value":"tcp","definition":false},"url_path":null,"secure":{"value":"false","definition":false}}},"host":{"type":"alien.capabilities.MysqlDatabase-getServiceArtifactListTest","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null}},"artifacts":{"scripts":{"artifactType":"tosca.artifacts.File","artifactRef":"scripts","artifactName":"scripts","artifactRepository":null}}}},{"key":"Compute","value":{"type":"tosca.nodes.Compute","name":null,"properties":{"disk_size":null,"num_cpus":null,"os_distribution":null,"os_arch":null,"mem_size":null,"os_type":null,"os_version":null},"attributes":{"ip_address":null,"tosca_id":null,"tosca_name":null},"relationships":null,"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"network":{"type":"tosca.capabilities.Connectivity","properties":null}},"capabilities":{"host":{"type":"tosca.capabilities.Container","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null},"attach":{"type":"tosca.capabilities.Attachment","properties":null},"scalable":{"type":"tosca.capabilities.Scalable","properties":{"max_intances":{"value":"1","definition":false},"default_instances":{"value":"1","definition":false},"min_intances":{"value":"1","definition":false}}}},"artifacts":null}},{"key":"Mysql-getServiceArtifactListTest2","value":{"type":"alien.nodes.Mysql-getServiceArtifactListTest2","name":null,"properties":{"bind_address":"true","storage_path":"/mountedStorage","db_port":"3306","db_name":"wordpress","db_user":"pass","db_password":"pass"},"attributes":{"tosca_id":null,"tosca_name":null},"relationships":{"hostedOnCompute":{"type":"tosca.relationships.HostedOn","target":"Compute","requirementName":"host","requirementType":"tosca.nodes.Compute","targetedCapabilityName":"host"}},"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"host":{"type":"tosca.nodes.Compute","properties":null}},"capabilities":{"database_endpoint":{"type":"tosca.capabilities.DatabaseEndpoint","properties":{"port":null,"protocol":{"value":"tcp","definition":false},"url_path":null,"secure":{"value":"false","definition":false}}},"host":{"type":"alien.capabilities.MysqlDatabase-getServiceArtifactListTest2","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null}},"artifacts":{"scripts":{"artifactType":"tosca.artifacts.File","artifactRef":"scripts","artifactName":"scripts","artifactRepository":null}}}}]}
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/topologyTemplate.txt b/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/topologyTemplate.txt deleted file mode 100644 index f0d0849db8..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service1/topologyTemplate.txt +++ /dev/null @@ -1,2 +0,0 @@ -{"id":"9c063349-2259-40fe-97f1-7c40e659e1b0","name":"Andrey","description":null,"topologyId":"6a4b2f9d-7fe1-482d-af11-97f483dff5b7"} - diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service2/resource1/images/mysql.png b/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service2/resource1/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service2/resource1/images/mysql.png +++ /dev/null diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service2/resource1/mysql.yml b/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service2/resource1/mysql.yml deleted file mode 100644 index 4ee2c8ca88..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service2/resource1/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getServiceArtifactListNoContentTest -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getServiceArtifactListNoContentTest: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase-getServiceArtifactListNoContentTest - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase-getServiceArtifactListNoContentTest: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript-getServiceArtifactListNoContentTest: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service2/resource2/images/mysql.png b/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service2/resource2/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service2/resource2/images/mysql.png +++ /dev/null diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service2/resource2/mysql.yml b/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service2/resource2/mysql.yml deleted file mode 100644 index b564dd0c4e..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service2/resource2/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-getServiceArtifactListNoContentTest2 -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-getServiceArtifactListNoContentTest2: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase-getServiceArtifactListNoContentTest2 - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase-getServiceArtifactListNoContentTest2: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript-getServiceArtifactListNoContentTest2: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service2/topology.txt b/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service2/topology.txt deleted file mode 100644 index 279351879a..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service2/topology.txt +++ /dev/null @@ -1 +0,0 @@ -{"id":"3293c9c8-a162-43fc-b8d1-431399f89cb7","delegateId":"25845cce-05c8-4502-b5fe-abfd6bd6f28e","delegateType":"topologytemplate","dependencies":[{"name":"tosca-normative-types-DBMS","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-softwareComponent","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-compute","version":"1.0.0.wd03-SNAPSHOT"},{"name":"mysql-getServiceArtifactListNoContentTest2","version":"1.1.1-SNAPSHOT"},{"name":"tosca-normative-types-root","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-database","version":"1.0.0.wd03-SNAPSHOT"}],"nodeTemplates":[{"key":"Mysql-getServiceArtifactListNoContentTest2","value":{"type":"alien.nodes.Mysql-getServiceArtifactListNoContentTest2","name":null,"properties":{"bind_address":"true","storage_path":"/mountedStorage","db_port":"3306","db_name":"wordpress","db_user":"pass","db_password":"pass"},"attributes":{"tosca_id":null,"tosca_name":null},"relationships":null,"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"host":{"type":"tosca.nodes.Compute","properties":null}},"capabilities":{"database_endpoint":{"type":"tosca.capabilities.DatabaseEndpoint","properties":{"port":null,"protocol":{"value":"tcp","definition":false},"url_path":null,"secure":{"value":"false","definition":false}}},"host":{"type":"alien.capabilities.MysqlDatabase-getServiceArtifactListNoContentTest2","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null}},"artifacts":{"scripts":{"artifactType":"tosca.artifacts.File","artifactRef":"scripts","artifactName":"scripts","artifactRepository":null}}}},{"key":"Compute","value":{"type":"tosca.nodes.Compute","name":null,"properties":{"disk_size":null,"num_cpus":null,"os_distribution":null,"os_arch":null,"mem_size":null,"os_type":null,"os_version":null},"attributes":{"ip_address":null,"tosca_id":null,"tosca_name":null},"relationships":{"dependsOnMysql-getServiceArtifactListNoContentTest2":{"type":"tosca.relationships.DependsOn","target":"Mysql-getServiceArtifactListNoContentTest2","requirementName":"dependency","requirementType":"tosca.capabilities.Root","targetedCapabilityName":"root"}},"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"network":{"type":"tosca.capabilities.Connectivity","properties":null}},"capabilities":{"host":{"type":"tosca.capabilities.Container","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null},"attach":{"type":"tosca.capabilities.Attachment","properties":null},"scalable":{"type":"tosca.capabilities.Scalable","properties":{"max_intances":{"value":"1","definition":false},"default_instances":{"value":"1","definition":false},"min_intances":{"value":"1","definition":false}}}},"artifacts":null}}]}
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service2/topologyTemplate.txt b/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service2/topologyTemplate.txt deleted file mode 100644 index 3c342f6cd1..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/getServiceListTest/Service2/topologyTemplate.txt +++ /dev/null @@ -1,2 +0,0 @@ -{"id":"25845cce-05c8-4502-b5fe-abfd6bd6f28e","name":"ServiceArtListNoContent","description":null,"topologyId":"3293c9c8-a162-43fc-b8d1-431399f89cb7"} - diff --git a/test-apis-ci/src/test/resources/CI/tests/uploadComponent/images/mysql.png b/test-apis-ci/src/test/resources/CI/tests/uploadComponent/images/mysql.png Binary files differdeleted file mode 100644 index 8e02f49b7b..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/uploadComponent/images/mysql.png +++ /dev/null diff --git a/test-apis-ci/src/test/resources/CI/tests/uploadComponent/mysql.yml b/test-apis-ci/src/test/resources/CI/tests/uploadComponent/mysql.yml deleted file mode 100644 index a2eb4d423a..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/uploadComponent/mysql.yml +++ /dev/null @@ -1,85 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03 -description: MySQL RDBMS installation on a specific mounted volume path. -template_name: mysql-uploadComponent -template_version: 1.1.1-SNAPSHOT -template_author: FastConnect - -imports: - - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-compute:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-database:1.0.0.wd03-SNAPSHOT" - - "tosca-normative-types-DBMS:1.0.0.wd03-SNAPSHOT" - -node_types: - alien.nodes.Mysql-uploadComponent: - derived_from: tosca.nodes.Database - description: > - A node to install MySQL v5.5 database with data - on a specific attached volume. - capabilities: - host: - type: alien.capabilities.MysqlDatabase - properties: - valid_node_types: [ tosca.nodes.WebApplication ] - requirements: - - host: tosca.nodes.Compute - type: tosca.relationships.HostedOn - tags: - icon: /images/mysql.png - properties: - db_port: - type: integer - default: 3306 - description: The port on which the underlying database service will listen to data. - db_name: - type: string - required: true - default: wordpress - description: The logical name of the database. - db_user: - type: string - default: pass - description: The special user account used for database administration. - db_password: - type: string - default: pass - description: The password associated with the user account provided in the ‘db_user’ property. - bind_address: - type: boolean - default: true - required: false - description: If true,the server accepts TCP/IP connections on all server host IPv4 interfaces. - storage_path: - type: string - default: /mountedStorage - constraints: - - valid_values: [ "/mountedStorage", "/var/mysql" ] - interfaces: - Standard: - create: scripts/install_mysql.sh - start: - inputs: - VOLUME_HOME: { get_property: [SELF, storage_path] } - PORT: { get_property: [SELF, db_port] } - DB_NAME: { get_property: [SELF, db_name] } - DB_USER: { get_property: [SELF, db_user] } - DB_PASSWORD: { get_property: [SELF, db_password] } - BIND_ADRESS: { get_property: [SELF, bind_address] } - implementation: scripts/start_mysql.sh - fastconnect.cloudify.extensions: - start_detection: - inputs: - PORT: { get_property: [SELF, db_port] } - implementation: scripts/mysql_start_detection.groovy - artifacts: - - scripts: scripts - type: tosca.artifacts.File - -capability_types: - alien.capabilities.MysqlDatabase: - derived_from: tosca.capabilities.Container - -artifact_types: - tosca.artifacts.GroovyScript: - description: A groovy script (.groovy file) - file_ext: [groovy] diff --git a/test-apis-ci/src/test/resources/CI/tests/uploadComponent/scripts/install_mysql.sh b/test-apis-ci/src/test/resources/CI/tests/uploadComponent/scripts/install_mysql.sh deleted file mode 100644 index 400bcf40cb..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/uploadComponent/scripts/install_mysql.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -echo "Debian based MYSQL install 5..." -LOCK="/tmp/lockaptget" - -while true; do - if mkdir "${LOCK}" &>/dev/null; then - echo "MySQL take the lock" - break; - fi - echo "Waiting the end of one of our recipes..." - sleep 0.5 -done - -while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - echo "Waiting for other software managers to finish..." - sleep 0.5 -done -sudo rm -f /var/lib/dpkg/lock - -sudo apt-get update || (sleep 15; sudo apt-get update || exit ${1}) -sudo DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server-5.5 pwgen || exit ${1} -rm -rf "${LOCK}" - -sudo /etc/init.d/mysql stop -sudo rm -rf /var/lib/apt/lists/* -sudo rm -rf /var/lib/mysql/* -echo "MySQL Installation complete."
\ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/uploadComponent/scripts/start_mysql.sh b/test-apis-ci/src/test/resources/CI/tests/uploadComponent/scripts/start_mysql.sh deleted file mode 100644 index 648bd45756..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/uploadComponent/scripts/start_mysql.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -echo "------------------------ ENV ------------------------" -echo "ENV VAR USED VOLUME_HOME : $VOLUME_HOME" -echo "ENV VAR USED PORT : $PORT" -echo "ENV VAR USED DB_NAME : $DB_NAME" -echo "ENV VAR USED DB_USER : $DB_USER" -echo "ENV VAR USED DB_PASSWORD : $DB_PASSWORD" -echo "---------------------------- ------------------------" - -CURRENT_PATH=`dirname "$0"` - -function StartMySQL { - echo "Starting MYSQL..." - sudo /etc/init.d/mysql stop - sudo /usr/bin/mysqld_safe > /dev/null 2>&1 & - RET=1 - while [[ RET -ne 0 ]]; do - echo "=> Waiting for confirmation of MySQL service startup" - sleep 5 - sudo mysql -uroot -e "status" > /dev/null 2>&1 - RET=$? - done -} - -function AllowFileSystemToMySQL { - MYSQL_DATA_DIR=$VOLUME_HOME/data - MYSQL_LOG=$VOLUME_HOME/logs - - echo "Setting data directory to $MYSQL_DATA_DIR an logs to $MYSQL_LOG ..." - if sudo test ! -d $MYSQL_DATA_DIR; then - echo "Creating DATA dir > $MYSQL_DATA_DIR ..." - sudo mkdir -p $MYSQL_DATA_DIR - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_DATA_DIR - fi - if sudo test ! -d $MYSQL_LOG; then - echo "Creating LOG dir > $MYSQL_LOG ..." - sudo mkdir -p $MYSQL_LOG - # mysql as owner and group owner - sudo chown -R mysql:mysql $MYSQL_LOG - fi - - # edit app mysql permission in : /etc/apparmor.d/usr.sbin.mysqld - COUNT_LINE=`sudo cat /etc/apparmor.d/usr.sbin.mysqld | wc -l` - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_DATA_DIR/** rwk," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/ r," /etc/apparmor.d/usr.sbin.mysqld - sudo sed -i "$(($COUNT_LINE)) i $MYSQL_LOG/** rwk," /etc/apparmor.d/usr.sbin.mysqld - - # reload app permission manager service - sudo service apparmor reload -} - -function UpdateMySQLConf { - echo "Updating MySQL conf files [DATA, LOGS]..." - sudo sed -i "s:/var/lib/mysql:$MYSQL_DATA_DIR:g" /etc/mysql/my.cnf - sudo sed -i "s:/var/log/mysql/error.log:$MYSQL_LOG/error.log:g" /etc/mysql/my.cnf - sudo sed -i "s:3306:$PORT:g" /etc/mysql/my.cnf - - if sudo test ! -f /usr/share/mysql/my-default.cnf; then - sudo cp /etc/mysql/my.cnf /usr/share/mysql/my-default.cnf - fi - if sudo test ! -f /etc/mysql/conf.d/mysqld_charset.cnf; then - sudo cp $configs/mysqld_charset.cnf /etc/mysql/conf.d/mysqld_charset.cnf - fi - - if [ "$BIND_ADRESS" == "true" ]; then - sudo sed -i "s/bind-address.*/bind-address = 0.0.0.0/" /etc/mysql/my.cnf - fi -} - -function InitMySQLDb { - # create database DB_NAME - if [ "$DB_NAME" ]; then - echo "INIT DATABASE $DB_NAME" - sudo mysql -u root -e "CREATE DATABASE $DB_NAME"; - fi - - # create user and give rights - if [ "$DB_USER" ]; then - echo "CREATE USER $DB_USER WITH PASSWORD $DB_PASSWORD AND GRAND RIGHTS ON $DB_NAME" - sudo mysql -uroot -e "CREATE USER '${DB_USER}'@'%' IDENTIFIED BY '$DB_PASSWORD'" - sudo mysql -uroot -e "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO '${DB_USER}'@'%' WITH GRANT OPTION" - sudo mysql -uroot -e "FLUSH PRIVILEGES" - fi -} - -# Create a new database path to the attched volume -if sudo test ! -d $VOLUME_HOME/data; then - echo "=> An empty or uninitialized MySQL volume is detected in $VOLUME_HOME/data" - AllowFileSystemToMySQL - UpdateMySQLConf - echo "=> Init new database path to $MYSQL_DATA_DIR" - sudo mysql_install_db --basedir=/usr --datadir=$MYSQL_DATA_DIR - echo "=> MySQL database initialized !" -else - echo "=> Using an existing volume of MySQL" - AllowFileSystemToMySQL - UpdateMySQLConf -fi - -# Finally start MySQL with new configuration -StartMySQL -InitMySQLDb
\ No newline at end of file diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml index 03b3f155bb..edf8a4be48 100644 --- a/ui-ci/pom.xml +++ b/ui-ci/pom.xml @@ -11,6 +11,10 @@ <artifactId>sdc-main</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> + + <properties> + <sonar.skip>true</sonar.skip> + </properties> <dependencies> <dependency> |
