Merge "Fix URL in README"
authorGary Wu <gary.i.wu@huawei.com>
Wed, 25 Oct 2017 23:29:48 +0000 (23:29 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 25 Oct 2017 23:29:48 +0000 (23:29 +0000)
14 files changed:
test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/setup.sh [moved from test/csit/plans/modeling/javatoscachecker/APIs/setup.sh with 87% similarity]
test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/teardown.sh [moved from test/csit/plans/modeling/javatoscachecker/APIs/teardown.sh with 87% similarity]
test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/testplan.txt [new file with mode: 0644]
test/csit/scripts/modeling-toscaparsers-javatoscachecker/setup_containers.sh [moved from test/csit/scripts/modeling/javatoscachecker/setup_containers.sh with 94% similarity]
test/csit/scripts/modeling-toscaparsers-javatoscachecker/teardown_containers.sh [moved from test/csit/scripts/modeling/javatoscachecker/teardown_containers.sh with 91% similarity]
test/csit/scripts/sdc/clone_and_setup_sdc_data.sh
test/csit/scripts/sdc/start_sdc_containers.sh
test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/__init__.robot [moved from test/csit/tests/modeling/javatoscachecker/APIs/__init__.robot with 100% similarity]
test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/basics.robot [new file with mode: 0644]
test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/data/standalone.yaml [moved from test/csit/tests/modeling/javatoscachecker/APIs/data/standalone.yaml with 100% similarity]
test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/data/standalone_with_errors.yaml [moved from test/csit/tests/modeling/javatoscachecker/APIs/data/standalone_with_errors.yaml with 100% similarity]
test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/data/test_schema.yaml [moved from test/csit/tests/modeling/javatoscachecker/APIs/data/test_schema.yaml with 100% similarity]
test/csit/tests/modeling-toscaparsers-javatoscachecker/APIs/data/test_template.yaml [moved from test/csit/tests/modeling/javatoscachecker/APIs/data/test_template.yaml with 100% similarity]
test/csit/tests/modeling/javatoscachecker/APIs/basics.robot [deleted file]

@@ -18,5 +18,5 @@
 #
 # Place the scripts in run order:
 
-source ${WORKSPACE}/test/csit/scripts/modeling/javatoscachecker/setup_containers.sh
+source ${WORKSPACE}/test/csit/scripts/modeling-toscaparsers-javatoscachecker/setup_containers.sh
 
@@ -17,5 +17,5 @@
 # Modifications copyright (c) 2017 AT&T Intellectual Property
 #
 
-source ${WORKSPACE}/test/csit/scripts/modeling/javatoscachecker/teardown_containers.sh
+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 (file)
index 0000000..f59237b
--- /dev/null
@@ -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
@@ -20,7 +20,7 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
-echo "This is ${WORKSPACE}/test/csit/modeling/javatoscachecker/setup_containers.sh"
+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"
@@ -20,7 +20,7 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
-echo "This is ${WORKSPACE}/test/csit/modeling/javatoscachecker/teardown_containers.sh"
+echo "This is ${WORKSPACE}/test/csit/scripts/modeling-toscaparsers-javatoscachecker/teardown_containers.sh"
 
 kill-instance.sh modeling_javatoscachecker_1
 
index a889812..c78ffe3 100644 (file)
@@ -30,12 +30,13 @@ mkdir -p ${WORKSPACE}/data/clone/
 mkdir -p ${WORKSPACE}/data/logs/BE/SDC/SDC-BE
 mkdir -p ${WORKSPACE}/data/logs/FE/SDC/SDC-FE
 chmod -R 777 ${WORKSPACE}/data/logs
+ls -lR ${WORKSPACE}/data/logs/
 
 
 cd ${WORKSPACE}/data/clone
 git clone --depth 1 http://gerrit.onap.org/r/sdc -b master
 
-chmod -R 775 ${WORKSPACE}/data/
+chmod -R 777 ${WORKSPACE}/data/clone
 
 # set enviroment variables
 
index a1ac28b..4db0485 100644 (file)
@@ -54,7 +54,7 @@ echo -e ""
 
 
 #start kibana
-docker run --detach --name sdc-kbn --env ENVNAME="${DEP_ENV}" --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 ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 5601:5601 ${PREFIX}/sdc-kibana:${RELEASE}
+#docker run --detach --name sdc-kbn --env ENVNAME="${DEP_ENV}" --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 ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 5601:5601 ${PREFIX}/sdc-kibana:${RELEASE}
 
 #start sdc-backend
 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 ${WORKSPACE}/data/logs/BE/:/var/lib/jetty/logs  --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 8443:8443 --publish 8080:8080 ${PREFIX}/sdc-backend:${RELEASE}
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 (file)
index 0000000..053b282
--- /dev/null
@@ -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/javatoscachecker/APIs/basics.robot b/test/csit/tests/modeling/javatoscachecker/APIs/basics.robot
deleted file mode 100644 (file)
index b940708..0000000
+++ /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