diff options
| -rwxr-xr-x | ci/exec_test.sh | 4 | ||||
| -rw-r--r-- | docs/userguide/introduction.rst | 7 | ||||
| -rwxr-xr-x | testcases/features/copper.py | 170 |
3 files changed, 91 insertions, 90 deletions
diff --git a/ci/exec_test.sh b/ci/exec_test.sh index 1acf7e01c..92c02dc35 100755 --- a/ci/exec_test.sh +++ b/ci/exec_test.sh @@ -36,8 +36,8 @@ if [[ "${CI_DEBUG,,}" == "true" ]];then debug="--debug" fi -FUNCTEST_REPO_DIR=${repos_dir}/functest/ -FUNCTEST_CONF_DIR=/home/opnfv/functest/conf/ +FUNCTEST_REPO_DIR=${repos_dir}/functest +FUNCTEST_CONF_DIR=/home/opnfv/functest/conf function odl_tests(){ diff --git a/docs/userguide/introduction.rst b/docs/userguide/introduction.rst index 065213a6f..ce84a9c43 100644 --- a/docs/userguide/introduction.rst +++ b/docs/userguide/introduction.rst @@ -81,12 +81,13 @@ Features and VNF (Virtual Network Functions). | | | | details. | | | +----------------+----------------------------------+ | | | Doctor | Doctor platform, as of Colorado | -| | | | release, provides the two | +| | | | release, provides the three | | | | | features: | | | | | * Immediate Notification | | | | | * Consistent resource state | -| | | | awareness (compute) | -| | | | * Get Valid Server state | +| | | | awareness for compute host down | +| | | | * Valid compute host status | +| | | | given to VM owner | | | | | See `Doctor User Guide`_ for | | | | | details | | | +----------------+----------------------------------+ diff --git a/testcases/features/copper.py b/testcases/features/copper.py index 74ef43902..c312643eb 100755 --- a/testcases/features/copper.py +++ b/testcases/features/copper.py @@ -1,85 +1,85 @@ -#!/usr/bin/python
-#
-# Copyright 2016 AT&T Intellectual Property, Inc
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-import argparse
-import os
-import sys
-import time
-import functest.utils.functest_logger as ft_logger
-import functest.utils.functest_utils as functest_utils
-import yaml
-
-parser = argparse.ArgumentParser()
-parser.add_argument("-r", "--report",
- help="Create json result file",
- action="store_true")
-args = parser.parse_args()
-
-with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:
- functest_yaml = yaml.safe_load(f)
-
-dirs = functest_yaml.get('general').get('directories')
-FUNCTEST_REPO = dirs.get('dir_repo_functest')
-COPPER_REPO = dirs.get('dir_repo_copper')
-
-logger = ft_logger.Logger("copper").getLogger()
-
-
-def main():
- cmd = "%s/tests/run.sh %s/tests" % (COPPER_REPO, COPPER_REPO)
-
- start_time = time.time()
-
- ret_val = functest_utils.execute_command(cmd, logger, exit_on_error=False)
-
- stop_time = time.time()
- duration = round(stop_time - start_time, 1)
- if ret_val == 0:
- logger.info("COPPER PASSED")
- test_status = 'PASS'
- else:
- logger.info("COPPER FAILED")
- test_status = 'FAIL'
-
- details = {
- 'timestart': start_time,
- 'duration': duration,
- 'status': test_status,
- }
- functest_utils.logger_test_results(logger, "Copper",
- "copper-notification",
- details['status'], details)
- try:
- if args.report:
- functest_utils.push_results_to_db("copper",
- "copper-notification",
- logger,
- start_time,
- stop_time,
- details['status'],
- details)
- logger.info("COPPER results pushed to DB")
- except:
- logger.error("Error pushing results into Database '%s'"
- % sys.exc_info()[0])
-
- if ret_val != 0:
- sys.exit(-1)
-
- sys.exit(0)
-
-if __name__ == '__main__':
- main()
+#!/usr/bin/python +# +# Copyright 2016 AT&T Intellectual Property, Inc +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +import argparse +import os +import sys +import time +import functest.utils.functest_logger as ft_logger +import functest.utils.functest_utils as functest_utils +import yaml + +parser = argparse.ArgumentParser() +parser.add_argument("-r", "--report", + help="Create json result file", + action="store_true") +args = parser.parse_args() + +with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: + functest_yaml = yaml.safe_load(f) + +dirs = functest_yaml.get('general').get('directories') +FUNCTEST_REPO = dirs.get('dir_repo_functest') +COPPER_REPO = dirs.get('dir_repo_copper') + +logger = ft_logger.Logger("copper").getLogger() + + +def main(): + cmd = "%s/tests/run.sh %s/tests" % (COPPER_REPO, COPPER_REPO) + + start_time = time.time() + + ret_val = functest_utils.execute_command(cmd, logger, exit_on_error=False) + + stop_time = time.time() + duration = round(stop_time - start_time, 1) + if ret_val == 0: + logger.info("COPPER PASSED") + test_status = 'PASS' + else: + logger.info("COPPER FAILED") + test_status = 'FAIL' + + details = { + 'timestart': start_time, + 'duration': duration, + 'status': test_status, + } + functest_utils.logger_test_results(logger, "Copper", + "copper-notification", + details['status'], details) + try: + if args.report: + functest_utils.push_results_to_db("copper", + "copper-notification", + logger, + start_time, + stop_time, + details['status'], + details) + logger.info("COPPER results pushed to DB") + except: + logger.error("Error pushing results into Database '%s'" + % sys.exc_info()[0]) + + if ret_val != 0: + sys.exit(-1) + + sys.exit(0) + +if __name__ == '__main__': + main() |