diff options
| -rw-r--r-- | data/hosts | 4 | ||||
| -rw-r--r-- | data/my_key.pem | 50 | ||||
| -rw-r--r-- | docs/how-to-use-docs/documentation-example.rst | 7 | ||||
| -rw-r--r-- | docs/qtip/index.rst | 32 | ||||
| -rw-r--r-- | docs/qtip/opnfv_qtip_tc001.rst | 0 | ||||
| -rw-r--r-- | docs/qtip/opnfv_qtip_tc002.rst | 0 | ||||
| -rw-r--r-- | docs/qtip/opnfv_qtip_tc003.rst | 0 | ||||
| -rw-r--r-- | docs/templates/index.rst | 30 | ||||
| -rw-r--r-- | docs/templates/testcase_description_v2_template.rst | 47 | ||||
| -rw-r--r-- | docs/user_guides/framework/index.rst | 1 | ||||
| -rw-r--r-- | docs/user_guides/framework/installation.rst | 1 | ||||
| -rw-r--r-- | func/cli.py | 3 | ||||
| -rw-r--r-- | func/driver.py | 2 | ||||
| -rw-r--r-- | func/env_setup.py | 3 | ||||
| -rw-r--r-- | test_cases/dell_santa_clara/compute/ssl_serial.yaml | 11 |
15 files changed, 151 insertions, 40 deletions
@@ -1,4 +1,4 @@ [2-host] -172.18.0.112 +172.18.0.104 [1-server] -172.18.0.113 +172.18.0.105 diff --git a/data/my_key.pem b/data/my_key.pem index 701beaf5..ddf097e0 100644 --- a/data/my_key.pem +++ b/data/my_key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/docs/how-to-use-docs/documentation-example.rst b/docs/how-to-use-docs/documentation-example.rst index afcf7581..89b95075 100644 --- a/docs/how-to-use-docs/documentation-example.rst +++ b/docs/how-to-use-docs/documentation-example.rst @@ -1,5 +1,5 @@ .. two dots create a comment. please leave this logo at the top of each of your rst files. -.. image:: ../etc/opnfv-logo.png +.. image:: ../etc/opnfv-logo.png :height: 40 :width: 200 :alt: OPNFV @@ -21,7 +21,8 @@ this is the directory structure of the docs/ directory that can be found in the ./how-to-use-docs/documentation-example.rst ./how-to-use-docs/index.rst -To create your own documentation, Create any number of directories (depending on your need) and place in each of them an index.rst. +To create your own documentation, Create any number of directories (depending on your need) +and place in each of them an index.rst. This index file must refence your other rst files. * Here is an example index.rst @@ -59,7 +60,7 @@ For verify jobs a link to the documentation will show up as a comment in gerrit * Merge jobs -Once you are happy with the look of your documentation you can submit the patchset the merge job will +Once you are happy with the look of your documentation you can submit the patchset the merge job will copy the output of each documentation directory to http://artifacts.opnfv.org/$project/docs/$name_of_your_folder/index.html Here are some quick examples of how to use rst markup diff --git a/docs/qtip/index.rst b/docs/qtip/index.rst new file mode 100644 index 00000000..a8cb43e0 --- /dev/null +++ b/docs/qtip/index.rst @@ -0,0 +1,32 @@ +.. OPNFV Release Engineering documentation, created by + sphinx-quickstart on Tue Jun 9 19:12:31 2015. + You can adapt this file completely to your liking, but it should at least + contain the root `toctree` directive. + +.. image:: ../etc/opnfv-logo.png + :height: 40 + :width: 200 + :alt: OPNFV + :align: left + +Example Documentation table of contents +======================================= + +Contents: + +.. toctree:: + :numbered: + :maxdepth: 4 + + opnfv_qtip_tc001.rst + opnfv_qtip_tc002.rst + opnfv_qtip_tc003.rst + +Indices and tables +================== + +* :ref:`search` + +Revision: _sha1_ + +Build date: |today| diff --git a/docs/qtip/opnfv_qtip_tc001.rst b/docs/qtip/opnfv_qtip_tc001.rst new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/docs/qtip/opnfv_qtip_tc001.rst diff --git a/docs/qtip/opnfv_qtip_tc002.rst b/docs/qtip/opnfv_qtip_tc002.rst new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/docs/qtip/opnfv_qtip_tc002.rst diff --git a/docs/qtip/opnfv_qtip_tc003.rst b/docs/qtip/opnfv_qtip_tc003.rst new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/docs/qtip/opnfv_qtip_tc003.rst diff --git a/docs/templates/index.rst b/docs/templates/index.rst new file mode 100644 index 00000000..c893df6f --- /dev/null +++ b/docs/templates/index.rst @@ -0,0 +1,30 @@ +.. OPNFV Release Engineering documentation, created by + sphinx-quickstart on Tue Jun 9 19:12:31 2015. + You can adapt this file completely to your liking, but it should at least + contain the root `toctree` directive. + +.. image:: ../etc/opnfv-logo.png + :height: 40 + :width: 200 + :alt: OPNFV + :align: left + +Example Documentation table of contents +======================================= + +Contents: + +.. toctree:: + :numbered: + :maxdepth: 4 + + testcase_description_v2_template.rst + +Indices and tables +================== + +* :ref:`search` + +Revision: _sha1_ + +Build date: |today| diff --git a/docs/templates/testcase_description_v2_template.rst b/docs/templates/testcase_description_v2_template.rst new file mode 100644 index 00000000..d68509f8 --- /dev/null +++ b/docs/templates/testcase_description_v2_template.rst @@ -0,0 +1,47 @@ +.. Template to be used for test case descriptions in QTIP Project. + Write one .rst per test case. + Borrowed Heavily from Yardstick + Upload the .rst for the test case in /docs/ directory. + Review in Gerrit. + +************************************* +QTIP Test Case Description TCXXX +************************************* + ++-----------------------------------------------------------------------------+ +|test case slogan e.g. Network throughput | ++==============+==============================================================+ +|test case id | e.g. qtip_throughput | ++--------------+--------------------------------------------------------------+ +|metric | what will be measured, e.g. latency | ++--------------+--------------------------------------------------------------+ +|test purpose | describe what is the purpose of the test case | ++--------------+--------------------------------------------------------------+ +|configuration | what .yaml file to use, state SLA if applicable, state | +| | test duration, list and describe the scenario options used in| +| | this TC and also list the options using default values. | ++--------------+--------------------------------------------------------------+ +|test tool | e.g. ping | ++--------------+--------------------------------------------------------------+ +|references | e.g. RFCxxx, ETSI-NFVyyy | ++--------------+--------------------------------------------------------------+ +|applicability | describe variations of the test case which can be | +| | performend, e.g. run the test for different packet sizes | ++--------------+--------------------------------------------------------------+ +|pre-test | describe configuration in the tool(s) used to perform | +|conditions | the measurements (e.g. fio, pktgen), POD-specific | +| | configuration required to enable running the test | ++--------------+------+----------------------------------+--------------------+ +|test sequence | step | description | result | +| +------+----------------------------------+--------------------+ +| | 1 | use this to describe tests that | what happens in | +| | | require several steps e.g. | this step | +| | | step 1 collect logs | e.g. logs collected| +| +------+----------------------------------+--------------------+ +| | 2 | remove interface | interface down | +| +------+----------------------------------+--------------------+ +| | N | what is done in step N | what happens | ++--------------+------+----------------------------------+--------------------+ +|test verdict | expected behavior, or SLA, pass/fail criteria | ++--------------+--------------------------------------------------------------+ + diff --git a/docs/user_guides/framework/index.rst b/docs/user_guides/framework/index.rst new file mode 100644 index 00000000..b4817d1b --- /dev/null +++ b/docs/user_guides/framework/index.rst @@ -0,0 +1 @@ +.. populate before the deadline diff --git a/docs/user_guides/framework/installation.rst b/docs/user_guides/framework/installation.rst new file mode 100644 index 00000000..ebe23471 --- /dev/null +++ b/docs/user_guides/framework/installation.rst @@ -0,0 +1 @@ +.. Populate this before the deadline diff --git a/func/cli.py b/func/cli.py index 87b205a0..833e3740 100644 --- a/func/cli.py +++ b/func/cli.py @@ -28,6 +28,7 @@ class cli(): xindex= filepath[suites].find('.') filepath[suites]=filepath[suites][0:xindex] return filepath + def __init__(self): suite=[] parser = argparse.ArgumentParser() @@ -50,7 +51,7 @@ class cli(): if os.path.isfile('./test_cases/'+args.lab.lower()+'/'+suite[0]+'/' +benchmarks[items]): [benchmark, roles, vm_info, benchmark_details, pip] = obj.parse('./test_cases/' +args.lab.lower()+'/'+suite[0]+'/'+benchmarks[items]) - + if len(vm_info) != 0: vmObj ='' vmObj = SpawnVM(vm_info) diff --git a/func/driver.py b/func/driver.py index 318c67b3..2cdddba5 100644 --- a/func/driver.py +++ b/func/driver.py @@ -43,7 +43,7 @@ class Driver: index= index+1 dic_json = json.dumps(dict(self.dic_json.items())) print dic_json - run_play = 'ansible-playbook -s ./benchmarks/playbooks/{0} --private-key=./data/QtipKey -i ./data/hosts --extra-vars \'{1}\' '.format(benchmark_name, dic_json) + run_play = 'ansible-playbook -s ./benchmarks/playbooks/{0} --private-key=./data/QtipKey -i ./data/hosts --extra-vars \'{1}\' -v '.format(benchmark_name, dic_json) # run_play = 'ansible-playbook -s $PWD/benchmarks/playbooks/{0} --extra-vars "Dest_dir={1} role={2}" -vvv'.format( # benchmark_name, result_dir, k) status = os.system(run_play) diff --git a/func/env_setup.py b/func/env_setup.py index c0e1b539..5676d05b 100644 --- a/func/env_setup.py +++ b/func/env_setup.py @@ -56,7 +56,6 @@ class Env_setup(): time.sleep(2) ssh_c = 'ssh-keyscan {0} >> ~/.ssh/known_hosts'.format(k) - os.system(ssh_c) ssh_cmd = './data/qtip_creds.sh {0}'.format(ipvar) print ssh_cmd @@ -70,7 +69,7 @@ class Env_setup(): print('SSH successful') break except: - print 'Retrying SSH' + print 'Retrying aSSH' time.sleep(1) if v == '': print ('SSH->>>>>', k) diff --git a/test_cases/dell_santa_clara/compute/ssl_serial.yaml b/test_cases/dell_santa_clara/compute/ssl_serial.yaml index 756951bf..4d92526e 100644 --- a/test_cases/dell_santa_clara/compute/ssl_serial.yaml +++ b/test_cases/dell_santa_clara/compute/ssl_serial.yaml @@ -6,17 +6,16 @@ Scenario: Context: Host_Machines: machine_1: - ip: 172.18.0.16 - pw: Op3nStack + ip: 10.20.0.7 + pw: r00tme role: 1Run Virtual_Machines: virtualmachine_1: availability_zone: compute1 - public_network: 'net04_ext' - OS_image: QTIP_CentOS + public_network: net04_ext + OS_image: QTIP_Centos flavor: m1.large - role: 2Run - + role: 1Run Test_Description: Test_category: "Compute" Benchmark: "ssl" |