[dts] [PATCH V1] fix virt conf path issue in framework
Fangfang Wei
fangfangx.wei at intel.com
Fri Aug 11 04:21:55 CEST 2017
From: fangfangwei <fangfangx.wei at intel.com>
It missed slash for virt conf path.
Signed-off-by: fangfangwei <fangfangx.wei at intel.com>
---
framework/virt_base.py | 3 ++-
framework/virt_scene.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/framework/virt_base.py b/framework/virt_base.py
index 78e3334..1838ca1 100644
--- a/framework/virt_base.py
+++ b/framework/virt_base.py
@@ -28,6 +28,7 @@
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+import os
import sys
import traceback
from random import randint
@@ -128,7 +129,7 @@ class VirtBase(object):
Load local configure in the path DTS_ROOT_PATH/conf.
"""
# load local configuration by suite and vm name
- conf = VirtConf(CONFIG_ROOT_PATH + suite_name + '.cfg')
+ conf = VirtConf(CONFIG_ROOT_PATH + os.sep + suite_name + '.cfg')
conf.load_virt_config(self.vm_name)
local_conf = conf.get_virt_config()
# replace global configurations with local configurations
diff --git a/framework/virt_scene.py b/framework/virt_scene.py
index fd7497d..5fead7e 100644
--- a/framework/virt_scene.py
+++ b/framework/virt_scene.py
@@ -77,7 +77,7 @@ class VirtScene(object):
def load_config(self):
try:
self.vm_confs = {}
- conf = VirtConf(CONFIG_ROOT_PATH + 'scene/' + self.name + '.cfg')
+ conf = VirtConf(CONFIG_ROOT_PATH + '/scene/' + self.name + '.cfg')
self.sections = conf.virt_conf.get_sections()
for vm in self.sections:
conf.load_virt_config(vm)
--
2.7.4
More information about the dts
mailing list