Bugfix: Move userconfig directory into dovetail/dovetail

JITA: DOVETAIL-449

1. Dovetail cvp.0.1.0 link dovetail/dovetail to
   /usr/local/lib/python2.7/dist-packages/dovetail/
2. The directory dovetail/userconfig is lost in this image
3. Move dovetail/userconfig into dovetail/dovetail/userconfig

Change-Id: I9da8389e02d92f35879ff5c6a1db1b7d984dd862
Signed-off-by: xudan <xudan16@huawei.com>

diff --git a/dovetail/container.py b/dovetail/container.py
index dd73096..a1e213d 100644 (file)
--- a/dovetail/container.py
+++ b/dovetail/container.py
@@ -158,7 +158,7 @@ class Container(object):
 
         hosts_config = ""
         hosts_config_path = os.path.abspath(
-            os.path.join(os.path.dirname(__file__), os.pardir, 'userconfig'))
+            os.path.join(os.path.dirname(__file__), 'userconfig'))
         try:
             with open(os.path.join(hosts_config_path, 'hosts.yaml')) as f:
                 hosts_info = yaml.safe_load(f)

diff --git a/dovetail/run.py b/dovetail/run.py
index 80cb098..a8fa647 100755 (executable)
--- a/dovetail/run.py
+++ b/dovetail/run.py
@@ -195,7 +195,7 @@ def get_result_path():
 
 
 def copy_userconfig_files(logger):
-    dovetail_home = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    dovetail_home = os.path.dirname(os.path.abspath(__file__))
     userconfig_path = os.path.join(dovetail_home, 'userconfig')
     pre_config_path = dt_cfg.dovetail_config['config_dir']
     if not os.path.isdir(pre_config_path):

diff --git a/userconfig/hosts.yaml b/dovetail/userconfig/hosts.yaml
similarity index 100%
rename from userconfig/hosts.yaml
rename to dovetail/userconfig/hosts.yaml

diff --git a/userconfig/pod.yaml.sample b/dovetail/userconfig/pod.yaml.sample
similarity index 100%
rename from userconfig/pod.yaml.sample
rename to dovetail/userconfig/pod.yaml.sample

diff --git a/userconfig/sdnvpn_config_testcase1.yaml b/dovetail/userconfig/sdnvpn_config_testcase1.yaml
similarity index 100%
rename from userconfig/sdnvpn_config_testcase1.yaml
rename to dovetail/userconfig/sdnvpn_config_testcase1.yaml

diff --git a/userconfig/sdnvpn_config_testcase2.yaml b/dovetail/userconfig/sdnvpn_config_testcase2.yaml
similarity index 100%
rename from userconfig/sdnvpn_config_testcase2.yaml
rename to dovetail/userconfig/sdnvpn_config_testcase2.yaml

diff --git a/userconfig/sdnvpn_config_testcase3.yaml b/dovetail/userconfig/sdnvpn_config_testcase3.yaml
similarity index 100%
rename from userconfig/sdnvpn_config_testcase3.yaml
rename to dovetail/userconfig/sdnvpn_config_testcase3.yaml

diff --git a/userconfig/sdnvpn_config_testcase4.yaml b/dovetail/userconfig/sdnvpn_config_testcase4.yaml
similarity index 100%
rename from userconfig/sdnvpn_config_testcase4.yaml
rename to dovetail/userconfig/sdnvpn_config_testcase4.yaml

diff --git a/userconfig/sdnvpn_config_testcase8.yaml b/dovetail/userconfig/sdnvpn_config_testcase8.yaml
similarity index 100%
rename from userconfig/sdnvpn_config_testcase8.yaml
rename to dovetail/userconfig/sdnvpn_config_testcase8.yaml