From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 12EE75921 for ; Thu, 10 Dec 2015 07:10:28 +0100 (CET) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 09 Dec 2015 22:10:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,407,1444719600"; d="scan'208";a="870620430" Received: from shilc102.sh.intel.com ([10.239.39.44]) by fmsmga002.fm.intel.com with ESMTP; 09 Dec 2015 22:10:26 -0800 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shilc102.sh.intel.com with ESMTP id tBA6ALpP012636; Thu, 10 Dec 2015 14:10:21 +0800 Received: from shecgisg004.sh.intel.com (localhost [127.0.0.1]) by shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id tBA6AHxp022341; Thu, 10 Dec 2015 14:10:19 +0800 Received: (from hengdinx@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id tBA6AHmC022337; Thu, 10 Dec 2015 14:10:17 +0800 From: Ding Heng To: dts@dpdk.org Date: Thu, 10 Dec 2015 14:10:15 +0800 Message-Id: <1449727815-22305-1-git-send-email-hengx.ding@intel.com> X-Mailer: git-send-email 1.7.4.1 Cc: Ding Heng Subject: [dts] [PATCH] framework: enable RFC2544 support 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: Thu, 10 Dec 2015 06:10:29 -0000 Enable RFC2544 support for dts framework, add "delay" parameter for some of the functions in file etgen.py and tester.py to make sure that test cases could control the time to run. Signed-off-by: Ding Heng diff --git a/framework/etgen.py b/framework/etgen.py index 508439b..37c4ff3 100644 --- a/framework/etgen.py +++ b/framework/etgen.py @@ -476,18 +476,18 @@ class IxiaPacketGenerator(SSHConnection): return {'card': int(m.group(1)), 'port': int(m.group(2))} - def loss(self, portList, ratePercent): + def loss(self, portList, ratePercent, delay=5): """ Run loss performance test and return loss rate. """ rxPortlist, txPortlist = self._configure_everything(portList, ratePercent) - return self.get_loss_packet_rate(rxPortlist, txPortlist) + return self.get_loss_packet_rate(rxPortlist, txPortlist, delay) - def get_loss_packet_rate(self, rxPortlist, txPortlist): + def get_loss_packet_rate(self, rxPortlist, txPortlist, delay=5): """ Get RX/TX packet statistics and calculate loss rate. """ - time.sleep(3) + time.sleep(delay) self.send_expect("ixStopTransmit portList", "%", 10) time.sleep(2) @@ -507,7 +507,7 @@ class IxiaPacketGenerator(SSHConnection): revNumber += self.get_frames_received() self.logger.info("rev :%f" % revNumber) - return float(sendNumber - revNumber) / sendNumber + return float(sendNumber - revNumber) / sendNumber, sendNumber, revNumber def latency(self, portList, ratePercent, delay=5): """ @@ -801,7 +801,10 @@ class IxiaPacketGenerator(SSHConnection): Returns the number of packets captured by IXIA on a previously set port. Call self.stat_get_stat_all_stats(port) before. """ - return self._stat_cget_value('framesReceived') + if self._stat_cget_value('framesReceived') !=0: + return self._stat_cget_value('framesReceived') + else: + return self._stat_cget_value('oversize') def get_flow_control_frames(self): """ diff --git a/framework/tester.py b/framework/tester.py index b102065..9446854 100644 --- a/framework/tester.py +++ b/framework/tester.py @@ -413,8 +413,33 @@ class Tester(Crb): self.logger.warning("exception by mixed port types") return None return self.packet_gen.throughput(portList, rate_percent) + def run_rfc2544(self, portlist, delay=120): + """ + zero_rate: dpdk will not lost packet in this line rate. + loss_rate: dpdk will loss packet in this line rate. + test_rate: the line rate we are going to test. + """ + zero_rate = 0.0 + loss_rate = 100.0 + test_rate = 100.0 + + while (loss_rate - zero_rate) > 0.002: + self.logger.info("test rate: %f " % test_rate) + if test_rate == 100: + lost, tx_num, rx_num = self.traffic_generator_loss(portlist, test_rate, delay) + else: + lost, _, _ = self.traffic_generator_loss(portlist, test_rate, delay) + if lost != 0: + loss_rate = test_rate + test_rate = (test_rate + zero_rate)/2 + else: + zero_rate = test_rate + test_rate = (test_rate + loss_rate)/2 + + self.logger.info("zero loss rate is %s" % test_rate) + return test_rate, tx_num, rx_num - def traffic_generator_loss(self, portList, ratePercent): + def traffic_generator_loss(self, portList, ratePercent, delay=60): """ Run loss performance test on specified ports. """ @@ -423,7 +448,7 @@ class Tester(Crb): elif not self.check_port_list(portList): self.logger.warning("exception by mixed port types") return None - return self.packet_gen.loss(portList, ratePercent) + return self.packet_gen.loss(portList, ratePercenti, delay) def traffic_generator_latency(self, portList, ratePercent=100, delay=5): """ -- 1.9.3