preparation for setup.py

JIRA: DOVETAIL-26

1)change the directory scripts to dovetail, to make it unified in OPNFV and for setup.py
2)change the paths accordingly
3)this should be first merged, since docker is changed, then to add setup.py and run the local test

Change-Id: I65974bde17f310ebbfe3c025532b05dae8752945
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>

5 files changed, 0 insertions, 103 deletions

diff --git a/scripts/conf/__init__.py b/scripts/conf/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/scripts/conf/__init__.py
+++ /dev/null
diff --git a/scripts/conf/dovetail_config.py b/scripts/conf/dovetail_config.py
deleted file mode 100644
index e7942f52..00000000
--- a/scripts/conf/dovetail_config.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env python
-#
-# grakiss.wanglei@huawei.com
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-
-CERT_PATH = './cert/'
-TESTCASE_PATH = './testcase/'
-SCENARIO_NAMING_FMT = 'certification_%s'
-
-import yaml
-import os
-
-with open(os.path.join(os.getcwd(),'conf','dovetail_config.yml')) as f:
-    dovetail_config = yaml.safe_load(f)
-
-for extra_config_file in dovetail_config['include_config']:
-    with open(os.path.join(os.getcwd(),'conf',extra_config_file)) as f:
-        extra_config = yaml.safe_load(f)
-        dovetail_config.update(extra_config)
-
-container_config = {}
-
-container_config['functest'] = dovetail_config['functest']
-container_config['yardstick'] = dovetail_config['yardstick']
diff --git a/scripts/conf/dovetail_config.yml b/scripts/conf/dovetail_config.yml
deleted file mode 100644
index 901988f8..00000000
--- a/scripts/conf/dovetail_config.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-work_dir: /home/opnfv/dovetail
-result_dir: /home/opnfv/dovetail/results
-report_file: 'dovetail_report.txt'
-
-# used for testcase cmd template in jinja2 format
-# we have two variables available now
-# parameter path, use this path to walk through python object and get value
-# and the python object is "testcase" object by hard-coded
-parameters:
-  - name: testcase
-    path: '("name",)'
-  - name: script_testcase
-    path: '("scripts", "testcase")'
-
-include_config:
-  - functest_config.yml
-  - yardstick_config.yml
-
-
diff --git a/scripts/conf/functest_config.yml b/scripts/conf/functest_config.yml
deleted file mode 100644
index cd33dc59..00000000
--- a/scripts/conf/functest_config.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-functest:
-  image_name: opnfv/functest
-  docker_tag: latest
-  envs: '-e INSTALLER_TYPE=compass -e INSTALLER_IP=192.168.200.2
-         -e NODE_NAME=dovetail-pod -e DEPLOY_SCENARIO=ha_nosdn
-         -e BUILD_TAG=dovetail -e CI_DEBUG=true -e DEPLOY_TYPE=baremetal'
-  opts: '-id --privileged=true'
-  result_dir: '/home/opnfv/functest/results'
-  pre_condition:
-    cmds:
-      - 'echo test for precondition'
-  testcase:
-    pre_cmd: 'python /home/opnfv/repos/functest/ci/prepare_env.py start'
-    exec_cmd: 'python /home/opnfv/repos/functest/ci/run_tests.py -t {{script_testcase}} -r'
-    post_cmd: ''
-    cmds:
-      - 'python /home/opnfv/repos/functest/ci/prepare_env.py start'
-      - 'python /home/opnfv/repos/functest/ci/run_tests.py -t {{script_testcase}} -r'
-  post_condition:
-    cmds:
-      - ''
-  result:
-    dir: '/home/opnfv/functest/results'
-    store_type: 'file'
-    file_path: 'tempest/tempest.log'
-    db_url: 'http://testresults.opnfv.org/test/api/v1/results?case=%s&last=1'
diff --git a/scripts/conf/yardstick_config.yml b/scripts/conf/yardstick_config.yml
deleted file mode 100644
index f7f05bcc..00000000
--- a/scripts/conf/yardstick_config.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-yardstick:
-  image_name: opnfv/yardstick
-  docker_tag: latest
-  envs: '-e INSTALLER_TYPE=compass -e INSTALLER_IP=192.168.200.2
-         -e NODE_NAME=dovetail-pod -e DEPLOY_SCENARIO=ha_nosdn
-         -e BUILD_TAG=dovetail -e CI_DEBUG=true -e DEPLOY_TYPE=baremetal
-         -e EXTERNAL_NETWORK=ext-net'
-  opts: '-id --privileged=true'
-  pre_condition:
-    cmds:
-      - 'source /home/opnfv/repos/yardstick/tests/ci/prepare_env.sh &&
-         source /home/opnfv/repos/yardstick/tests/ci/clean_images.sh && cleanup'
-      - 'source /home/opnfv/repos/yardstick/tests/ci/prepare_env.sh &&
-         cd /home/opnfv/repos/yardstick && source tests/ci/load_images.sh'
-  testcase:
-    cmds:
-      - 'mkdir -p /home/opnfv/yardstick/results/'
-      - 'cd /home/opnfv/repos/yardstick && source tests/ci/prepare_env.sh &&
-         yardstick task start tests/opnfv/test_cases/{{script_testcase}}.yaml
-         --output-file /home/opnfv/yardstick/results/{{script_testcase}}.out &>
-         /home/opnfv/yardstick/results/yardstick.log'
-  post_condition:
-    cmds:
-      - ''
-  result:
-    dir: '/home/opnfv/yardstick/results'
-    store_type: 'file'
-    file_path: 'yardstick.log'
-    db_url: 'http://testresults.opnfv.org/test/api/v1/results?case=%s&last=1'