From 2f9813e98e3d3826629c1d6d1e73ad7d1d502667 Mon Sep 17 00:00:00 2001 From: Serban Jora Date: Mon, 23 Oct 2017 22:56:09 -0400 Subject: Re-structure csit test folder for javatoscachecker Initial strcture was based around wrong project name. Change-Id: If6f00a224d884264476342cd7e7090ece88823f6 Issue-Id: MODELING-26 Signed-off-by: Serban Jora --- .../APIs/setup.sh | 22 ++++++++ .../APIs/teardown.sh | 21 ++++++++ .../APIs/testplan.txt | 3 ++ .../plans/modeling/javatoscachecker/APIs/setup.sh | 22 -------- .../modeling/javatoscachecker/APIs/teardown.sh | 21 -------- .../setup_containers.sh | 49 +++++++++++++++++ .../teardown_containers.sh | 27 ++++++++++ .../modeling/javatoscachecker/setup_containers.sh | 49 ----------------- .../javatoscachecker/teardown_containers.sh | 27 ---------- .../APIs/__init__.robot | 2 + .../APIs/basics.robot | 62 ++++++++++++++++++++++ .../APIs/data/standalone.yaml | 21 ++++++++ .../APIs/data/standalone_with_errors.yaml | 23 ++++++++ .../APIs/data/test_schema.yaml | 17 ++++++ .../APIs/data/test_template.yaml | 11 ++++ .../modeling/javatoscachecker/APIs/__init__.robot | 2 - .../modeling/javatoscachecker/APIs/basics.robot | 40 -------------- .../javatoscachecker/APIs/data/standalone.yaml | 21 -------- .../APIs/data/standalone_with_errors.yaml | 23 -------- .../javatoscachecker/APIs/data/test_schema.yaml | 17 ------ .../javatoscachecker/APIs/data/test_template.yaml | 11 ---- 21 files changed, 258 insertions(+), 233 deletions(-) create mode 100644 test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/setup.sh create mode 100644 test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/teardown.sh create mode 100644 test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/testplan.txt delete mode 100644 test/csit/plans/modeling/javatoscachecker/APIs/setup.sh delete mode 100644 test/csit/plans/modeling/javatoscachecker/APIs/teardown.sh create mode 100644 test/csit/scripts/modeling-toscaparsers-javatoscachecker/setup_containers.sh create mode 100644 test/csit/scripts/modeling-toscaparsers-javatoscachecker/teardown_containers.sh delete mode 100644 test/csit/scripts/modeling/javatoscachecker/setup_containers.sh delete mode 100644 test/csit/scripts/modeling/javatoscachecker/teardown_containers.sh create mode 100644 test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/__init__.robot create mode 100644 test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/basics.robot create mode 100644 test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/data/standalone.yaml create mode 100644 test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/data/standalone_with_errors.yaml create mode 100644 test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/data/test_schema.yaml create mode 100644 test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/data/test_template.yaml delete mode 100644 test/csit/tests/modeling/javatoscachecker/APIs/__init__.robot delete mode 100644 test/csit/tests/modeling/javatoscachecker/APIs/basics.robot delete mode 100644 test/csit/tests/modeling/javatoscachecker/APIs/data/standalone.yaml delete mode 100644 test/csit/tests/modeling/javatoscachecker/APIs/data/standalone_with_errors.yaml delete mode 100644 test/csit/tests/modeling/javatoscachecker/APIs/data/test_schema.yaml delete mode 100644 test/csit/tests/modeling/javatoscachecker/APIs/data/test_template.yaml diff --git a/test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/setup.sh b/test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/setup.sh new file mode 100644 index 000000000..03d07defb --- /dev/null +++ b/test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/setup.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# +# Copyright 2017 AT&T +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Modifications copyright (c) 2017 AT&T Intellectual Property +# +# Place the scripts in run order: + +source ${WORKSPACE}/test/csit/scripts/modeling-toscaparsers-javatoscachecker/setup_containers.sh + diff --git a/test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/teardown.sh b/test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/teardown.sh new file mode 100644 index 000000000..1ecaad4d2 --- /dev/null +++ b/test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/teardown.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# +# Copyright 2016-2017 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Modifications copyright (c) 2017 AT&T Intellectual Property +# + +source ${WORKSPACE}/test/csit/scripts/modeling-toscaparsers-javatoscachecker/teardown_containers.sh + diff --git a/test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/testplan.txt b/test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/testplan.txt new file mode 100644 index 000000000..f59237bd4 --- /dev/null +++ b/test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/testplan.txt @@ -0,0 +1,3 @@ +# Test suites are relative paths under [integration.git]/test/csit/tests/. +# Place the suites in run order. +modeling-toscaparsers-javatoscachecker/APIs diff --git a/test/csit/plans/modeling/javatoscachecker/APIs/setup.sh b/test/csit/plans/modeling/javatoscachecker/APIs/setup.sh deleted file mode 100644 index 19fc5ed79..000000000 --- a/test/csit/plans/modeling/javatoscachecker/APIs/setup.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# -# Copyright 2017 AT&T -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Modifications copyright (c) 2017 AT&T Intellectual Property -# -# Place the scripts in run order: - -source ${WORKSPACE}/test/csit/scripts/modeling/javatoscachecker/setup_containers.sh - diff --git a/test/csit/plans/modeling/javatoscachecker/APIs/teardown.sh b/test/csit/plans/modeling/javatoscachecker/APIs/teardown.sh deleted file mode 100644 index 0e149c028..000000000 --- a/test/csit/plans/modeling/javatoscachecker/APIs/teardown.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# -# Copyright 2016-2017 Huawei Technologies Co., Ltd. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Modifications copyright (c) 2017 AT&T Intellectual Property -# - -source ${WORKSPACE}/test/csit/scripts/modeling/javatoscachecker/teardown_containers.sh - diff --git a/test/csit/scripts/modeling-toscaparsers-javatoscachecker/setup_containers.sh b/test/csit/scripts/modeling-toscaparsers-javatoscachecker/setup_containers.sh new file mode 100644 index 000000000..3521ff1cb --- /dev/null +++ b/test/csit/scripts/modeling-toscaparsers-javatoscachecker/setup_containers.sh @@ -0,0 +1,49 @@ +#!/bin/bash +# +# ============LICENSE_START======================================================= +# Copyright (C) 2017 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END============================================ +# =================================================================== +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# + +echo "This is ${WORKSPACE}/test/csit/scripts/modeling-toscaparsers-javatoscachecker/setup_containers.sh" + +#start docker image +run-instance.sh nexus3.onap.org:10001/onap/modeling/javatoscachecker:latest modeling_javatoscachecker_1 "-p 8080:8080" + +#checker docker image is accesible: picked from clamp, some common script would be good +TIME_OUT=1200 +INTERVAL=5 +TIME=0 +while [ "$TIME" -lt "$TIME_OUT" ]; do + response=$(curl --write-out '%{http_code}' --silent --output /dev/null http://localhost:8080/check_template/test_me); echo $response + + if [ "$response" == "404" ]; then + echo javatoscachecker service started in $TIME seconds + break; + fi + + echo Sleep: $INTERVAL seconds before testing if javatoscachecker service 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 TIME OUT: Docker containers not started in $TIME_OUT seconds... Could cause problems for tests... +fi + + diff --git a/test/csit/scripts/modeling-toscaparsers-javatoscachecker/teardown_containers.sh b/test/csit/scripts/modeling-toscaparsers-javatoscachecker/teardown_containers.sh new file mode 100644 index 000000000..cca4fe193 --- /dev/null +++ b/test/csit/scripts/modeling-toscaparsers-javatoscachecker/teardown_containers.sh @@ -0,0 +1,27 @@ +#!/bin/bash +# +# ============LICENSE_START======================================================= +# Copyright (C) 2017 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END============================================ +# =================================================================== +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# + +echo "This is ${WORKSPACE}/test/csit/scripts/modeling-toscaparsers-javatoscachecker/teardown_containers.sh" + +kill-instance.sh modeling_javatoscachecker_1 + + diff --git a/test/csit/scripts/modeling/javatoscachecker/setup_containers.sh b/test/csit/scripts/modeling/javatoscachecker/setup_containers.sh deleted file mode 100644 index 0b22f6197..000000000 --- a/test/csit/scripts/modeling/javatoscachecker/setup_containers.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -# -# ============LICENSE_START======================================================= -# Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END============================================ -# =================================================================== -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# - -echo "This is ${WORKSPACE}/test/csit/modeling/javatoscachecker/setup_containers.sh" - -#start docker image -run-instance.sh nexus3.onap.org:10001/onap/modeling/javatoscachecker:latest modeling_javatoscachecker_1 "-p 8080:8080" - -#checker docker image is accesible: picked from clamp, some common script would be good -TIME_OUT=1200 -INTERVAL=5 -TIME=0 -while [ "$TIME" -lt "$TIME_OUT" ]; do - response=$(curl --write-out '%{http_code}' --silent --output /dev/null http://localhost:8080/check_template/test_me); echo $response - - if [ "$response" == "404" ]; then - echo javatoscachecker service started in $TIME seconds - break; - fi - - echo Sleep: $INTERVAL seconds before testing if javatoscachecker service 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 TIME OUT: Docker containers not started in $TIME_OUT seconds... Could cause problems for tests... -fi - - diff --git a/test/csit/scripts/modeling/javatoscachecker/teardown_containers.sh b/test/csit/scripts/modeling/javatoscachecker/teardown_containers.sh deleted file mode 100644 index c3292fb30..000000000 --- a/test/csit/scripts/modeling/javatoscachecker/teardown_containers.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# -# ============LICENSE_START======================================================= -# Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END============================================ -# =================================================================== -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# - -echo "This is ${WORKSPACE}/test/csit/modeling/javatoscachecker/teardown_containers.sh" - -kill-instance.sh modeling_javatoscachecker_1 - - diff --git a/test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/__init__.robot b/test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/__init__.robot new file mode 100644 index 000000000..8064d6b0c --- /dev/null +++ b/test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/__init__.robot @@ -0,0 +1,2 @@ +*** Settings *** +Documentation javatoscachecker - APIs diff --git a/test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/basics.robot b/test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/basics.robot new file mode 100644 index 000000000..053b2824d --- /dev/null +++ b/test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/basics.robot @@ -0,0 +1,62 @@ +*** Settings *** +Library Collections +Library RequestsLibrary +Library OperatingSystem +Library json + + +*** Test Cases *** +Check service up/non existent namespace + CreateSession checkerservice http://localhost:8080 + &{headers}= Create Dictionary Accept=application/json + ${resp}= Get Request checkerservice /check_template/nosuchcatalog headers=${headers} + Should Be Equal As Strings ${resp.status_code} 404 + +Check standalone template + CreateSession checkerservice http://localhost:8080 + ${data}= Get Binary File ${CURDIR}${/}data${/}standalone.yaml + &{headers}= Create Dictionary Accept=application/json + ${resp}= Post Request checkerservice /check_template/ data=${data} headers=${headers} + Log Response received from checker ${resp.text} + Should Be Equal As Strings ${resp.status_code} 200 + Should Be Equal As Strings ${resp.text} [] + +Check standalone template with errors + CreateSession checkerservice http://localhost:8080 + ${data}= Get Binary File ${CURDIR}${/}data${/}standalone_with_errors.yaml + &{headers}= Create Dictionary Accept=application/json + ${resp}= Post Request checkerservice /check_template/ data=${data} headers=${headers} + Log Response received from checker ${resp.text} + Should Be Equal As Strings ${resp.status_code} 200 + Should Not Be Equal As Strings ${resp.text} [] + +Check schema new namespace + CreateSession checkerservice http://localhost:8080 + ${data}= Get Binary File ${CURDIR}${/}data${/}test_schema.yaml + &{headers}= Create Dictionary Accept=application/json + ${resp}= Post Request checkerservice /check_template/test/schema.yaml data=${data} headers=${headers} + Log Response received from checker ${resp.text} + Should Be Equal As Strings ${resp.status_code} 200 + Should Be Equal As Strings ${resp.text} [] + +Check template in namespace + CreateSession checkerservice http://localhost:8080 + ${data}= Get Binary File ${CURDIR}${/}data${/}test_template.yaml + &{headers}= Create Dictionary Accept=application/json + ${resp}= Post Request checkerservice /check_template/test/ data=${data} headers=${headers} + Log Response received from checker ${resp.text} + Should Be Equal As Strings ${resp.status_code} 200 + Should Be Equal As Strings ${resp.text} [] + +Check named template does not exist + CreateSession checkerservice http://localhost:8080 + &{headers}= Create Dictionary Accept=application/json + ${resp}= Get Request checkerservice /check_template/test/nosuchtemplate.yaml headers=${headers} + Should Be Equal As Strings ${resp.status_code} 404 + +Check delete existing namespace + CreateSession checkerservice http://localhost:8080 + &{headers}= Create Dictionary Accept=application/json + ${resp}= Delete Request checkerservice /check_template/test/ headers=${headers} + Log Response received from checker ${resp.text} + Should Be Equal As Strings ${resp.status_code} 200 diff --git a/test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/data/standalone.yaml b/test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/data/standalone.yaml new file mode 100644 index 000000000..26797aba3 --- /dev/null +++ b/test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/data/standalone.yaml @@ -0,0 +1,21 @@ +tosca_definitions_version: tosca_simple_yaml_1_0 + +topology_template: + node_templates: + my_server: + type: tosca.nodes.Compute + capabilities: + # Host container properties + host: + properties: + num_cpus: 1 + disk_size: 10 GB + mem_size: 4096 MB + # Guest Operating System properties + os: + properties: + # host Operating System image properties + architecture: x86_64 + type: linux + distribution: rhel + version: 6.5 diff --git a/test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/data/standalone_with_errors.yaml b/test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/data/standalone_with_errors.yaml new file mode 100644 index 000000000..d5c1a1586 --- /dev/null +++ b/test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/data/standalone_with_errors.yaml @@ -0,0 +1,23 @@ +tosca_definitions_version: tosca_simple_yaml_1_0 +description: uses unknown capability propertya to trigger an error + +topology_template: + node_templates: + my_server: + type: tosca.nodes.Compute + capabilities: + # Host container properties + host: + properties: + num_cpus: 1 + disk_size: 10 GB + mem_size: 4096 MB + virtualization_support: true + # Guest Operating System properties + os: + properties: + # host Operating System image properties + architecture: x86_64 + type: linux + distribution: rhel + version: 6.5 diff --git a/test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/data/test_schema.yaml b/test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/data/test_schema.yaml new file mode 100644 index 000000000..9575e27c9 --- /dev/null +++ b/test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/data/test_schema.yaml @@ -0,0 +1,17 @@ +tosca_definitions_version: tosca_simple_yaml_1_1 + +data_types: + org.onap.tosca.checker.service.Person: + properties: + firstName: + type: string + required: true + lastName: + type: string + required: true + +node_types: + org.onap.tosca.checker.service.Residence: + properties: + owner: + type: org.onap.tosca.checker.service.Person diff --git a/test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/data/test_template.yaml b/test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/data/test_template.yaml new file mode 100644 index 000000000..478aec05e --- /dev/null +++ b/test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/data/test_template.yaml @@ -0,0 +1,11 @@ +tosca_definitions_version: tosca_simple_yaml_1_0 + +imports: + - schema: schema.yaml + +topology_template: + node_templates: + my_house: + type: org.onap.tosca.checker.service.Residence + properties: + owner: {firstName: "Serban", lastName: "Jora"} diff --git a/test/csit/tests/modeling/javatoscachecker/APIs/__init__.robot b/test/csit/tests/modeling/javatoscachecker/APIs/__init__.robot deleted file mode 100644 index 8064d6b0c..000000000 --- a/test/csit/tests/modeling/javatoscachecker/APIs/__init__.robot +++ /dev/null @@ -1,2 +0,0 @@ -*** Settings *** -Documentation javatoscachecker - APIs diff --git a/test/csit/tests/modeling/javatoscachecker/APIs/basics.robot b/test/csit/tests/modeling/javatoscachecker/APIs/basics.robot deleted file mode 100644 index b9407088a..000000000 --- a/test/csit/tests/modeling/javatoscachecker/APIs/basics.robot +++ /dev/null @@ -1,40 +0,0 @@ -*** Settings *** -Library Collections -Library RequestsLibrary -Library OperatingSystem -Library json - - -*** Test Cases *** -Check service up - CreateSession checkerservice http://localhost:8080 - &{headers}= Create Dictionary Content-Type=application/json Accept=application/json - ${resp}= Get Request checkerservice /check_template/nosuchcatalog headers=${headers} - Should Be Equal As Strings ${resp.status_code} 404 - -Check standalone template - CreateSession checkerservice http://localhost:8080 - ${data}= Get Binary File ${CURDIR}${/}data${/}standalone.yaml - &{headers}= Create Dictionary Content-Type=application/json Accept=application/json - ${resp}= Post Request checkerservice /check_template data=${data} headers=${headers} - Should Be Equal As Strings ${resp.status_code} 200 - -Check schema new namespace - CreateSession checkerservice http://localhost:8080 - ${data}= Get Binary File ${CURDIR}${/}data${/}test_schema.yaml - &{headers}= Create Dictionary Content-Type=application/json Accept=application/json - ${resp}= Post Request checkerservice /check_template/test/schema.yaml data=${data} headers=${headers} - Should Be Equal As Strings ${resp.status_code} 200 - -Check template in namespace - CreateSession checkerservice http://localhost:8080 - ${data}= Get Binary File ${CURDIR}${/}data${/}test_template.yaml - &{headers}= Create Dictionary Content-Type=application/json Accept=application/json - ${resp}= Post Request checkerservice /check_template/test/ data=${data} headers=${headers} - Should Be Equal As Strings ${resp.status_code} 200 - -Check delete existing namespace - CreateSession checkerservice http://localhost:8080 - &{headers}= Create Dictionary Content-Type=application/json Accept=application/json - ${resp}= Delete Request checkerservice /check_template/test/ headers=${headers} - Should Be Equal As Strings ${resp.status_code} 200 diff --git a/test/csit/tests/modeling/javatoscachecker/APIs/data/standalone.yaml b/test/csit/tests/modeling/javatoscachecker/APIs/data/standalone.yaml deleted file mode 100644 index 26797aba3..000000000 --- a/test/csit/tests/modeling/javatoscachecker/APIs/data/standalone.yaml +++ /dev/null @@ -1,21 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0 - -topology_template: - node_templates: - my_server: - type: tosca.nodes.Compute - capabilities: - # Host container properties - host: - properties: - num_cpus: 1 - disk_size: 10 GB - mem_size: 4096 MB - # Guest Operating System properties - os: - properties: - # host Operating System image properties - architecture: x86_64 - type: linux - distribution: rhel - version: 6.5 diff --git a/test/csit/tests/modeling/javatoscachecker/APIs/data/standalone_with_errors.yaml b/test/csit/tests/modeling/javatoscachecker/APIs/data/standalone_with_errors.yaml deleted file mode 100644 index d5c1a1586..000000000 --- a/test/csit/tests/modeling/javatoscachecker/APIs/data/standalone_with_errors.yaml +++ /dev/null @@ -1,23 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0 -description: uses unknown capability propertya to trigger an error - -topology_template: - node_templates: - my_server: - type: tosca.nodes.Compute - capabilities: - # Host container properties - host: - properties: - num_cpus: 1 - disk_size: 10 GB - mem_size: 4096 MB - virtualization_support: true - # Guest Operating System properties - os: - properties: - # host Operating System image properties - architecture: x86_64 - type: linux - distribution: rhel - version: 6.5 diff --git a/test/csit/tests/modeling/javatoscachecker/APIs/data/test_schema.yaml b/test/csit/tests/modeling/javatoscachecker/APIs/data/test_schema.yaml deleted file mode 100644 index 9575e27c9..000000000 --- a/test/csit/tests/modeling/javatoscachecker/APIs/data/test_schema.yaml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_1 - -data_types: - org.onap.tosca.checker.service.Person: - properties: - firstName: - type: string - required: true - lastName: - type: string - required: true - -node_types: - org.onap.tosca.checker.service.Residence: - properties: - owner: - type: org.onap.tosca.checker.service.Person diff --git a/test/csit/tests/modeling/javatoscachecker/APIs/data/test_template.yaml b/test/csit/tests/modeling/javatoscachecker/APIs/data/test_template.yaml deleted file mode 100644 index 478aec05e..000000000 --- a/test/csit/tests/modeling/javatoscachecker/APIs/data/test_template.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0 - -imports: - - schema: schema.yaml - -topology_template: - node_templates: - my_house: - type: org.onap.tosca.checker.service.Residence - properties: - owner: {firstName: "Serban", lastName: "Jora"} -- cgit 1.2.3-korg