diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2015-09-01 09:53:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-09-01 09:53:20 +0000 |
| commit | 55c1cf75d7315e550c8e97692f6c35ff159d7c12 (patch) | |
| tree | 22eed3cad2dbca590c27dda1a0396a6c03a2c69b | |
| parent | 3f65dc2c849c8368ae6867de1075ef69dba3e656 (diff) | |
| parent | 75124a19a187242f57b4b4e0267e40a0b11cbfdf (diff) | |
Merge changes I9d9ad0d9,Ifebcbcda
* changes:
workaround order of env settings to all ODL tests to be run
README for vIMS testcase Note that vIMS shall be also documented in the global functest rst guideline.
| -rw-r--r-- | commons/traffic-profile-guidelines.rst | 10 | ||||
| -rw-r--r-- | testcases/config_functest.py | 12 | ||||
| -rw-r--r-- | testcases/vIMS/vIMS.md | 3 |
3 files changed, 16 insertions, 9 deletions
diff --git a/commons/traffic-profile-guidelines.rst b/commons/traffic-profile-guidelines.rst index ffef50fe..0b965b15 100644 --- a/commons/traffic-profile-guidelines.rst +++ b/commons/traffic-profile-guidelines.rst @@ -10,9 +10,13 @@ OPNFV traffic profile guidelines Introduction ------------ -In order to have consistent profiles for testing, it has been suggested to define and store traffic profiles based on operator representative scenario. +In order to have consistent testing profiles, it has been suggested to define and store traffic profiles. +These profiles shall be based on operator representative scenario. -These reference profiles may be used by any test projects, unitary, functional or performance tests. It is possible to adapt them to specific testcases. It is recommended to use them in order to avoid getting as many profiles as tests. It should be helpful to compare the results of test scenario. +These reference profiles may be used by any test projects, unitary, functional or performance tests. +It is possible to adapt them to specific testcases. +It is recommended to use them in order to avoid getting as many profiles as tests. +It should be helpful to compare the results of test scenario. .. _howto: @@ -21,7 +25,7 @@ How to use these profiles ------------------------- The directory of the traffic profiles may be described as follow:: - + ├── commons ├── ims │ └── readme.rst diff --git a/testcases/config_functest.py b/testcases/config_functest.py index 3c608344..9268aa61 100644 --- a/testcases/config_functest.py +++ b/testcases/config_functest.py @@ -90,6 +90,12 @@ def action_start(): logger.debug("Cleaning possible functest environment leftovers.") action_clean() + logger.info("Installing ODL environment...") + if not install_odl(): + logger.error("There has been a problem while installing Robot.") + action_clean() + exit(-1) + logger.info("Starting installation of functest environment") logger.info("Installing Rally...") if not install_rally(): @@ -97,12 +103,6 @@ def action_start(): action_clean() exit(-1) - logger.info("Installing ODL environment...") - if not install_odl(): - logger.error("There has been a problem while installing Robot.") - action_clean() - exit(-1) - # Create result folder under functest if necessary if not os.path.exists(RALLY_RESULT_DIR): os.makedirs(RALLY_RESULT_DIR) diff --git a/testcases/vIMS/vIMS.md b/testcases/vIMS/vIMS.md new file mode 100644 index 00000000..68f86d9f --- /dev/null +++ b/testcases/vIMS/vIMS.md @@ -0,0 +1,3 @@ +# vIMS README + + |