diff options
author | Yuli Shlosberg <ys9693@att.com> | 2017-10-11 10:13:14 +0300 |
---|---|---|
committer | Yuli Shlosberg <ys9693@att.com> | 2017-10-11 07:51:14 +0000 |
commit | bb77698412d88a95c0b34eccb920e7de10f08be5 (patch) | |
tree | 74b830ea600ebb806496147f5b3fdc2ebf1e2ca3 /asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest | |
parent | 1060c08258ef38d70aeed794d167a820ed28cc7f (diff) |
remove mysql png from sdc code
Change-Id: Iafa81a8b8496eb60ade3f6c840776c65f69ee2e0
Issue-Id: SDC-450
Signed-off-by: Yuli Shlosberg <ys9693@att.com>
Diffstat (limited to 'asdc-tests/src/test/resources/CI/tests/getServiceArtifactListTest')
10 files changed, 0 insertions, 439 deletions
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"} - |