From: Fangfang Wei <fangfangx.wei@intel.com>
To: dts@dpdk.org
Cc: fangfangwei <fangfangx.wei@intel.com>
Subject: [dts] [PATCH V1] fix virt conf path issue in framework
Date: Fri, 11 Aug 2017 10:21:55 +0800 [thread overview]
Message-ID: <1502418115-63425-1-git-send-email-fangfangx.wei@intel.com> (raw)
From: fangfangwei <fangfangx.wei@intel.com>
It missed slash for virt conf path.
Signed-off-by: fangfangwei <fangfangx.wei@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
next reply other threads:[~2017-08-11 2:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-11 2:21 Fangfang Wei [this message]
2017-08-11 15:31 ` Liu, Yong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1502418115-63425-1-git-send-email-fangfangx.wei@intel.com \
--to=fangfangx.wei@intel.com \
--cc=dts@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).