From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id BC571214A for ; Mon, 11 Jul 2016 07:11:31 +0200 (CEST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP; 10 Jul 2016 22:11:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,345,1464678000"; d="scan'208";a="732381164" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by FMSMGA003.fm.intel.com with ESMTP; 10 Jul 2016 22:11:30 -0700 Received: from shecgisg003.sh.intel.com (shecgisg003.sh.intel.com [10.239.29.90]) by shvmail01.sh.intel.com with ESMTP id u6B5BSA2003679; Mon, 11 Jul 2016 13:11:28 +0800 Received: from shecgisg003.sh.intel.com (localhost [127.0.0.1]) by shecgisg003.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id u6B5BQ56018200; Mon, 11 Jul 2016 13:11:28 +0800 Received: (from yliu84x@localhost) by shecgisg003.sh.intel.com (8.13.6/8.13.6/Submit) id u6B5BQ5o018196; Mon, 11 Jul 2016 13:11:26 +0800 From: Marvin Liu To: dts@dpdk.org Cc: Marvin Liu Date: Mon, 11 Jul 2016 13:11:25 +0800 Message-Id: <1468213885-18164-1-git-send-email-yong.liu@intel.com> X-Mailer: git-send-email 1.7.4.1 Subject: [dts] [PATCH] nics: allow tester init fm10k netdev object X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2016 05:11:32 -0000 Allow tester initialize fm10k netdev object. When host and tester on the same platform, host fm10k netdev objects will inherit from tester. Fm10k require domain id in port configuration, keep pace with normal pci device. Signed-off-by: Marvin Liu diff --git a/nics/atwood.py b/nics/atwood.py index e2fe458..76a94bd 100644 --- a/nics/atwood.py +++ b/nics/atwood.py @@ -90,7 +90,7 @@ class Atwood(NetDevice): # load port config portconf = PortConf(PORTCONF) portconf.load_ports_config(host.crb['IP']) - pci_addr = ':'.join((bus_id, devfun_id)) + pci_addr = ':'.join((domain_id, bus_id, devfun_id)) if not portconf.check_port_available(pci_addr): raise PortConfigParseException("Atwood must configured") diff --git a/nics/br.py b/nics/br.py index 86c4d95..5b6e778 100644 --- a/nics/br.py +++ b/nics/br.py @@ -101,9 +101,6 @@ class BoulderRapid(NetDevice): def __init__(self, host, domain_id, bus_id, devfun_id): super(BoulderRapid, self).__init__(host, domain_id, bus_id, devfun_id) - if host.NAME == "tester": - return - self.tp_path = "~" self.sec_port = False self.host = host @@ -111,7 +108,7 @@ class BoulderRapid(NetDevice): # load port config portconf = PortConf(PORTCONF) portconf.load_ports_config(host.crb['IP']) - pci_addr = ':'.join((bus_id, devfun_id)) + pci_addr = ':'.join((domain_id, bus_id, devfun_id)) if not portconf.check_port_available(pci_addr): raise PortConfigParseException("BoulderRapid must configured") diff --git a/nics/rrc.py b/nics/rrc.py index a498b7a..02fe6c5 100644 --- a/nics/rrc.py +++ b/nics/rrc.py @@ -102,9 +102,6 @@ class RedRockCanyou(NetDevice): def __init__(self, host, domain_id, bus_id, devfun_id): super(RedRockCanyou, self).__init__(host, domain_id, bus_id, devfun_id) - if host.NAME == "tester": - return - self.tp_path = "~" self.sec_port = False self.host = host @@ -112,7 +109,7 @@ class RedRockCanyou(NetDevice): # load port config portconf = PortConf(PORTCONF) portconf.load_ports_config(host.crb['IP']) - pci_addr = ':'.join((bus_id, devfun_id)) + pci_addr = ':'.join((domain_id, bus_id, devfun_id)) if not portconf.check_port_available(pci_addr): raise PortConfigParseException("RRC must configured") -- 1.9.3