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/__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 ---- 12 files changed, 136 insertions(+), 114 deletions(-) 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 (limited to 'test/csit/tests') 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