diff options
| -rwxr-xr-x | test/csit/plans/optf-has/has/setup.sh (renamed from test/csit/plans/optf/has/setup.sh) | 2 | ||||
| -rwxr-xr-x | test/csit/plans/optf-has/has/teardown.sh (renamed from test/csit/plans/optf/has/teardown.sh) | 4 | ||||
| -rw-r--r-- | test/csit/plans/optf-has/has/testplan.txt (renamed from test/csit/plans/optf/has/testplan.txt) | 2 | ||||
| -rw-r--r-- | test/csit/plans/optf-has/osdf/sample.txt (renamed from test/csit/plans/optf/osdf/sample.txt) | 0 | ||||
| -rw-r--r-- | test/csit/scripts/optf-has/has/has-properties/cert.cer (renamed from test/csit/scripts/optf/has/has-properties/cert.cer) | 0 | ||||
| -rw-r--r-- | test/csit/scripts/optf-has/has/has-properties/cert.key (renamed from test/csit/scripts/optf/has/has-properties/cert.key) | 0 | ||||
| -rw-r--r-- | test/csit/scripts/optf-has/has/has-properties/cert.pem | 36 | ||||
| -rw-r--r-- | test/csit/scripts/optf-has/has/has-properties/conductor.conf.onap (renamed from test/csit/scripts/optf/has/has-properties/conductor.conf.onap) | 2 | ||||
| -rwxr-xr-x | test/csit/scripts/optf-has/has/has_script.sh (renamed from test/csit/scripts/optf/has/has_script.sh) | 20 | ||||
| -rw-r--r-- | test/csit/scripts/optf-has/osdf/testsample.txt (renamed from test/csit/scripts/optf/osdf/testsample.txt) | 0 | ||||
| -rw-r--r-- | test/csit/tests/optf-has/has/__init__.robot (renamed from test/csit/tests/optf/has/__init__.robot) | 0 | ||||
| -rw-r--r-- | test/csit/tests/optf-has/has/data/plan_with_wrong_version.json (renamed from test/csit/tests/optf/has/data/plan_with_wrong_version.json) | 0 | ||||
| -rw-r--r-- | test/csit/tests/optf-has/has/data/plan_without_demand_section.json (renamed from test/csit/tests/optf/has/data/plan_without_demand_section.json) | 0 | ||||
| -rw-r--r-- | test/csit/tests/optf-has/has/optf_has_test.robot (renamed from test/csit/tests/optf/has/optf_has_test.robot) | 19 | ||||
| -rw-r--r-- | test/csit/tests/optf-has/osdf/data/sampletest.txt (renamed from test/csit/tests/optf/osdf/data/sampletest.txt) | 0 |
15 files changed, 65 insertions, 20 deletions
diff --git a/test/csit/plans/optf/has/setup.sh b/test/csit/plans/optf-has/has/setup.sh index b2c81433c..347399bf8 100755 --- a/test/csit/plans/optf/has/setup.sh +++ b/test/csit/plans/optf-has/has/setup.sh @@ -23,7 +23,7 @@ echo "#"; echo "# optf/has scripts calling"; echo "#"; echo "##########################################################"; -source ${WORKSPACE}/test/csit/scripts/optf/has/has_script.sh +source ${WORKSPACE}/test/csit/scripts/optf-has/has/has_script.sh # # add here below the start of all docker containers needed for optf/has CSIT testing diff --git a/test/csit/plans/optf/has/teardown.sh b/test/csit/plans/optf-has/has/teardown.sh index c586d92ca..80a85f9a9 100755 --- a/test/csit/plans/optf/has/teardown.sh +++ b/test/csit/plans/optf-has/has/teardown.sh @@ -32,12 +32,12 @@ echo "##########################################################"; docker stop cond-api docker stop cond-solv docker stop cond-cont -#docker stop cond-data +docker stop cond-data docker stop cond-resv docker rm cond-api docker rm cond-solv docker rm cond-cont -#docker rm cond-data +docker rm cond-data docker rm cond-resv diff --git a/test/csit/plans/optf/has/testplan.txt b/test/csit/plans/optf-has/has/testplan.txt index 0f9f84dfe..980050c90 100644 --- a/test/csit/plans/optf/has/testplan.txt +++ b/test/csit/plans/optf-has/has/testplan.txt @@ -1,3 +1,3 @@ # Test suites are relative paths under [integration.git]/test/csit/tests/. # Place the suites in run order. -optf/has +optf-has/has diff --git a/test/csit/plans/optf/osdf/sample.txt b/test/csit/plans/optf-has/osdf/sample.txt index 9f4e8d7d6..9f4e8d7d6 100644 --- a/test/csit/plans/optf/osdf/sample.txt +++ b/test/csit/plans/optf-has/osdf/sample.txt diff --git a/test/csit/scripts/optf/has/has-properties/cert.cer b/test/csit/scripts/optf-has/has/has-properties/cert.cer index 67bb1303a..67bb1303a 100644 --- a/test/csit/scripts/optf/has/has-properties/cert.cer +++ b/test/csit/scripts/optf-has/has/has-properties/cert.cer diff --git a/test/csit/scripts/optf/has/has-properties/cert.key b/test/csit/scripts/optf-has/has/has-properties/cert.key index b8a957ff8..b8a957ff8 100644 --- a/test/csit/scripts/optf/has/has-properties/cert.key +++ b/test/csit/scripts/optf-has/has/has-properties/cert.key diff --git a/test/csit/scripts/optf-has/has/has-properties/cert.pem b/test/csit/scripts/optf-has/has/has-properties/cert.pem new file mode 100644 index 000000000..5ecf38234 --- /dev/null +++ b/test/csit/scripts/optf-has/has/has-properties/cert.pem @@ -0,0 +1,36 @@ +Bag Attributes + friendlyName: mso-client + localKeyID: 54 69 6D 65 20 31 35 31 39 32 39 37 30 37 31 32 33 33 +subject=/C=US/ST=Michigan/L=Southfield/O=AT&T Services, Inc./OU=mso-bpel-client-mtanj/CN=msobpel-client.mtanj.aic.cip.att.com +issuer=/C=US/O=DigiCert Inc/CN=DigiCert SHA2 Secure Server CA +-----BEGIN CERTIFICATE----- +MIIFZDCCBEygAwIBAgIQCDZ0gBbsclD2Ino3w+NqPDANBgkqhkiG9w0BAQsFADBN +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E +aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTgwMTE5MDAwMDAwWhcN +MTkwMTE5MTIwMDAwWjCBojELMAkGA1UEBhMCVVMxETAPBgNVBAgTCE1pY2hpZ2Fu +MRMwEQYDVQQHEwpTb3V0aGZpZWxkMRwwGgYDVQQKDBNBVCZUIFNlcnZpY2VzLCBJ +bmMuMR4wHAYDVQQLExVtc28tYnBlbC1jbGllbnQtbXRhbmoxLTArBgNVBAMTJG1z +b2JwZWwtY2xpZW50Lm10YW5qLmFpYy5jaXAuYXR0LmNvbTCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAOJtbcWtMUYCIgIvdqm2CPN/cVTD8j3fDAsd42vn +7I3PYJ4aBu8tiJVRheJhj9mejfwjBd5f5E2z9kWfNMPZU/9q0RB+cYbKWv0lP+q5 +q/RkbXN7iRtGUkXUyNpekvxNT3IKYfXK3P29qVDVhvUSey2ngIALRvBrRIKRTmb8 +gzrvcavJSwm8oQw2JXE1+Da+8PYR3TjJ19nfmoTmKbO+QDD58I5+2TgNqd/b7zhN +GLaS3oiVONDmJ1b5iWwKg31otPDP8AJb7cNtl8vgfnGK2zvFIWnF2TRzMb6FePbn +JBLaEyi7+c1iKJafj61t5nn27I2psbJloT9/2fmb6l4NU8MCAwEAAaOCAegwggHk +MB8GA1UdIwQYMBaAFA+AYRyCMWHVLyjnjUY4tCzhxtniMB0GA1UdDgQWBBSQcljn +BCxIKpisBfyoNgGCdtPzBzAvBgNVHREEKDAmgiRtc29icGVsLWNsaWVudC5tdGFu +ai5haWMuY2lwLmF0dC5jb20wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsG +AQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5k +aWdpY2VydC5jb20vc3NjYS1zaGEyLWc2LmNybDAvoC2gK4YpaHR0cDovL2NybDQu +ZGlnaWNlcnQuY29tL3NzY2Etc2hhMi1nNi5jcmwwTAYDVR0gBEUwQzA3BglghkgB +hv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQ +UzAIBgZngQwBAgIwfAYIKwYBBQUHAQEEcDBuMCQGCCsGAQUFBzABhhhodHRwOi8v +b2NzcC5kaWdpY2VydC5jb20wRgYIKwYBBQUHMAKGOmh0dHA6Ly9jYWNlcnRzLmRp +Z2ljZXJ0LmNvbS9EaWdpQ2VydFNIQTJTZWN1cmVTZXJ2ZXJDQS5jcnQwCQYDVR0T +BAIwADANBgkqhkiG9w0BAQsFAAOCAQEAxkadmzFcpA3f3qc9PbzMWfV2lJCXWxfr +/6z4RXotl255GBZFR2zLn56k8J3hAJGWRc0WeSgSsLH1fxrxF60fWk+cmYCrMC9t +C5ha5zWav/kz+dkZvJVbUxIFdx0Cd5uqBsLFnAaGrnSR6WzJkZHQ2rQUvwvQXwdP +XL01FleDSNbV8jtHXvzmcdnVQWeLjcVOeOeBF3dW6lSvDRV0G6fe6+R9U+Gz0MwK +x93XbsIAMTCJKUBkV7QdHwHzis3fhKJHwJUrb1p2Byhn/RwYUmFbjkamFiEfAyzw ++KdkwripOgYHnmGyLBJ16FdO/8kGhn4URW/qL1FO/sN2loGGlyA82w== +-----END CERTIFICATE----- diff --git a/test/csit/scripts/optf/has/has-properties/conductor.conf.onap b/test/csit/scripts/optf-has/has/has-properties/conductor.conf.onap index 9770f5194..43a7453db 100644 --- a/test/csit/scripts/optf/has/has-properties/conductor.conf.onap +++ b/test/csit/scripts/optf-has/has/has-properties/conductor.conf.onap @@ -154,7 +154,7 @@ certificate_key_file = /usr/local/bin/cert.key # Certificate Authority Bundle file in pem format. Must contain the appropriate # trust chain for theCertificate file. (string value) -# certificate_authority_bundle_file = ~/certs/ca-bundle.pem +certificate_authority_bundle_file = /usr/local/bin/cert.pem [api] diff --git a/test/csit/scripts/optf/has/has_script.sh b/test/csit/scripts/optf-has/has/has_script.sh index 3da7e04c6..3404cbb23 100755 --- a/test/csit/scripts/optf/has/has_script.sh +++ b/test/csit/scripts/optf-has/has/has_script.sh @@ -14,14 +14,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -echo "### This is ${WORKSPACE}/test/csit/scripts/optf/has/has_script.sh" +echo "### This is ${WORKSPACE}/test/csit/scripts/optf-has/has/has_script.sh" # # add here whatever commands is needed to prepare the optf/has CSIT testing # -# assume the base is /opt -DIR=/opt -#cd /opt +# assume the base is /tmp dir +DIR=/tmp # the directory of the script #DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" @@ -46,6 +45,7 @@ git clone https://gerrit.onap.org/r/optf/has cd has cd conductor/docker +# Comment sed for true integration lab #sed -i -e "s%FROM python:2\.7%FROM python:2\.7\\nENV http_proxy http:\/\/one\.proxy\.att\.com:8080\\nENV https_proxy http:\/\/one\.proxy\.att\.com:8080%g" api/Dockerfile #sed -i -e "s%FROM python:2\.7%FROM python:2\.7\\nENV http_proxy http:\/\/one\.proxy\.att\.com:8080\\nENV https_proxy http:\/\/one\.proxy\.att\.com:8080%g" controller/Dockerfile #sed -i -e "s%FROM python:2\.7%FROM python:2\.7\\nENV http_proxy http:\/\/one\.proxy\.att\.com:8080\\nENV https_proxy http:\/\/one\.proxy\.att\.com:8080%g" data/Dockerfile @@ -63,14 +63,14 @@ docker build -t reservation reservation/ # create directory for volume and copy configuration file mkdir -p /tmp/conductor/properties -cp ${WORKSPACE}/test/csit/scripts/optf/has/has-properties/conductor.conf.onap /tmp/conductor/properties/conductor.conf -cp ${WORKSPACE}/test/csit/scripts/optf/has/has-properties/cert.cer /tmp/conductor/properties/cert.cer -cp ${WORKSPACE}/test/csit/scripts/optf/has/has-properties/cert.key /tmp/conductor/properties/cert.key - - +cp ${WORKSPACE}/test/csit/scripts/optf-has/has/has-properties/conductor.conf.onap /tmp/conductor/properties/conductor.conf +cp ${WORKSPACE}/test/csit/scripts/optf-has/has/has-properties/cert.cer /tmp/conductor/properties/cert.cer +cp ${WORKSPACE}/test/csit/scripts/optf-has/has/has-properties/cert.key /tmp/conductor/properties/cert.key +cp ${WORKSPACE}/test/csit/scripts/optf-has/has/has-properties/cert.pem /tmp/conductor/properties/cert.pem +chmod -R 777 /tmp/conductor/properties # run docker containers -#docker run -d --name cond-data -v /tmp/conductor/properties/conductor.conf:/usr/local/bin/conductor.conf -v /tmp/conductor/properties/cert.key:/usr/local/bin/cert.key -v /tmp/conductor/properties/cert.cer:/usr/local/bin/cert.cer data +docker run -d --name cond-data -v /tmp/conductor/properties/conductor.conf:/usr/local/bin/conductor.conf -v /tmp/conductor/properties/cert.key:/usr/local/bin/cert.key -v /tmp/conductor/properties/cert.cer:/usr/local/bin/cert.cer -v /tmp/conductor/properties/cert.pem:/usr/local/bin/cert.pem data #docker run -d --name cond-data -v /tmp/conductor/properties/conductor.conf:/usr/local/bin/conductor.conf data docker run -d --name cond-cont -v /tmp/conductor/properties/conductor.conf:/usr/local/bin/conductor.conf controller docker run -d --name cond-api -p 8091:8091 -v /tmp/conductor/properties/conductor.conf:/usr/local/bin/conductor.conf api diff --git a/test/csit/scripts/optf/osdf/testsample.txt b/test/csit/scripts/optf-has/osdf/testsample.txt index 9f4e8d7d6..9f4e8d7d6 100644 --- a/test/csit/scripts/optf/osdf/testsample.txt +++ b/test/csit/scripts/optf-has/osdf/testsample.txt diff --git a/test/csit/tests/optf/has/__init__.robot b/test/csit/tests/optf-has/has/__init__.robot index fb654d7bb..fb654d7bb 100644 --- a/test/csit/tests/optf/has/__init__.robot +++ b/test/csit/tests/optf-has/has/__init__.robot diff --git a/test/csit/tests/optf/has/data/plan_with_wrong_version.json b/test/csit/tests/optf-has/has/data/plan_with_wrong_version.json index 9471fbf82..9471fbf82 100644 --- a/test/csit/tests/optf/has/data/plan_with_wrong_version.json +++ b/test/csit/tests/optf-has/has/data/plan_with_wrong_version.json diff --git a/test/csit/tests/optf/has/data/plan_without_demand_section.json b/test/csit/tests/optf-has/has/data/plan_without_demand_section.json index 87a459d87..87a459d87 100644 --- a/test/csit/tests/optf/has/data/plan_without_demand_section.json +++ b/test/csit/tests/optf-has/has/data/plan_without_demand_section.json diff --git a/test/csit/tests/optf/has/optf_has_test.robot b/test/csit/tests/optf-has/has/optf_has_test.robot index f939bd91a..ab5ded6ca 100644 --- a/test/csit/tests/optf/has/optf_has_test.robot +++ b/test/csit/tests/optf-has/has/optf_has_test.robot @@ -14,7 +14,7 @@ ${generatedPlanId} *** Test Cases *** Check ConductorApi Docker Container - [Documentation] It checks cassandra docker container is running + [Documentation] It checks conductor-api docker container is running ${rc} ${output}= Run and Return RC and Output docker ps Log To Console ********************* Log To Console retrurn_code = ${rc} @@ -23,7 +23,7 @@ Check ConductorApi Docker Container Should Contain ${output} cond-api Check ConductorController Docker Container - [Documentation] It checks zookeeper docker container is running + [Documentation] It checks conductor-controller docker container is running ${rc} ${output}= Run and Return RC and Output docker ps Log To Console ********************* Log To Console retrurn_code = ${rc} @@ -32,7 +32,7 @@ Check ConductorController Docker Container Should Contain ${output} cond-cont Check ConductorSolver Docker Container - [Documentation] It checks tomcat docker container is running + [Documentation] It checks conductor-solver docker container is running ${rc} ${output}= Run and Return RC and Output docker ps Log To Console ********************* Log To Console retrurn_code = ${rc} @@ -40,8 +40,8 @@ Check ConductorSolver Docker Container Should Be Equal As Integers ${rc} 0 Should Contain ${output} cond-solv -Check ConductorReservation War Docker Container - [Documentation] It checks music.war docker container is running +Check ConductorReservation Docker Container + [Documentation] It checks conductor-reservation docker container is running ${rc} ${output}= Run and Return RC and Output docker ps Log To Console ********************* Log To Console retrurn_code = ${rc} @@ -49,6 +49,15 @@ Check ConductorReservation War Docker Container Should Be Equal As Integers ${rc} 0 Should Contain ${output} cond-resv +Check ConductorData Docker Container + [Documentation] It checks conductor-data docker container is running + ${rc} ${output}= Run and Return RC and Output docker ps + Log To Console ********************* + Log To Console retrurn_code = ${rc} + Log To Console output = ${output} + Should Be Equal As Integers ${rc} 0 + Should Contain ${output} cond-data + Get Root Url [Documentation] It sends a REST GET request to root url Create Session optf-cond ${COND_HOSTNAME}:${COND_PORT} diff --git a/test/csit/tests/optf/osdf/data/sampletest.txt b/test/csit/tests/optf-has/osdf/data/sampletest.txt index 9f4e8d7d6..9f4e8d7d6 100644 --- a/test/csit/tests/optf/osdf/data/sampletest.txt +++ b/test/csit/tests/optf-has/osdf/data/sampletest.txt |