From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt0-f228.google.com (mail-qt0-f228.google.com [209.85.216.228]) by dpdk.org (Postfix) with ESMTP id AFB525F22 for ; Tue, 20 Mar 2018 23:21:28 +0100 (CET) Received: by mail-qt0-f228.google.com with SMTP id n11so3102729qti.4 for ; Tue, 20 Mar 2018 15:21:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OdrlyxVehvZf+B5VgLprEMK6pHRWoEUCX/XUjF1M/7s=; b=Jl+pJ+Kyc4oDcJPhcyrBuJzWU+I0qeXm2CFo8qAgc5EIVmBkqwFBjk5qo6NI4dqaz9 cWirYbjBc7RYX7YyoJAVRQ+ndSJs3rzkj4fQ1GqchEE5toQ+M8tjjI98Q4A8/U/6Ly5M O3uCmTWSOj0D4v3L3zx+DJXr43G/bi4Zg1YEI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OdrlyxVehvZf+B5VgLprEMK6pHRWoEUCX/XUjF1M/7s=; b=Y25SB1ojczTAuKIcG7VpHZOPfWy0NfGa0L5THuekyWyE8uSdrBqOyy8BH/RDPgqW0l 8wVIiAf0c9OqQa+Unco5U0NRmDlaQ48OhJ3HIHJteMqjN1wtAwTMwDu8KHzUXslDtwRa kdBObFKiokRpSgBzuC7geHT8NS+rBNyJgtoGpqWOAH31CVubWQDrcwKAyo6XcVqoV+uO FF3qnOaQGsipkEd/CgQzeDWUmfdy/aZOd0SzrkoaXAq6I72IpC7ChbCS1FFcTIrp5izs iyh/VYQu5qsKB60wuc+r8XWIGQi6PEpj4kqFe1jElHAPFLeBeTBvkcgvwgyCA7gqUOfq nLkg== X-Gm-Message-State: AElRT7F/Gax2TBRellWXLZDZ5QnXMuL3+I90n5z0qs6L0apbQWq9zPpj A0xQAtxsv9bC6sZTU9GKdlBfPDWdiQvq5DitKIsyzLXWOxAPRUVQnheJ9M94+u/1tdg9Tc5G2ZP wcFp1uzsZ0aI62Ly1KIMLYG24+qgtymS66+7Hgqq5tjDqjVD5tgZNIdrT6s9+UrR8d2LPXEFhBA == X-Google-Smtp-Source: AG47ELsTJv923tAVYTglF0VnNZQOLJvjCt8CG942PqCpD59+Kc0kNLdEagHU+/NHoDgKyu0Y1/suvQywUZa+ X-Received: by 10.200.39.210 with SMTP id x18mr24913969qtx.266.1521584488024; Tue, 20 Mar 2018 15:21:28 -0700 (PDT) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id 125sm658297qkd.9.2018.03.20.15.21.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Mar 2018 15:21:28 -0700 (PDT) X-Relaying-Domain: iol.unh.edu Received: from groose.iol.unh.edu (unknown [IPv6:2606:4100:3880:1240:40f9:44b9:fa0e:efd3]) by postal.iol.unh.edu (Postfix) with ESMTP id 58E976038483; Tue, 20 Mar 2018 18:21:27 -0400 (EDT) From: Patrick MacArthur To: dts@dpdk.org Cc: dpdklab@iol.unh.edu Date: Tue, 20 Mar 2018 18:20:39 -0400 Message-Id: <20180320222041.17303-4-pmacarth@iol.unh.edu> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180320222041.17303-1-pmacarth@iol.unh.edu> References: <20180320222041.17303-1-pmacarth@iol.unh.edu> Subject: [dts] [PATCH for-next v2 3/5] tests/TestSuite_nic_single_core_perf: Fix config parsing 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: Tue, 20 Mar 2018 22:21:29 -0000 The configuration values in test suite configuration are already eval()'d as of commit 081fbf69fe20 ("framework/config: utilize eval to parse configurations") so we don't need to do any special parsing here. This also changes the expected_throughput dictionary keys and values from strings to floats, which is more convenient. Tested-by: Ali Alnubani Signed-off-by: Patrick MacArthur --- tests/TestSuite_nic_single_core_perf.py | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/tests/TestSuite_nic_single_core_perf.py b/tests/TestSuite_nic_single_core_perf.py index 3411a31b7532..21de93624cb4 100644 --- a/tests/TestSuite_nic_single_core_perf.py +++ b/tests/TestSuite_nic_single_core_perf.py @@ -59,8 +59,8 @@ class TestNicSingleCorePerf(TestCase): self.trafficDuration = 60 #load the expected throughput for required nic - self.expected_throughput_nnt = self.parse_string(self.get_suite_cfg()["throughput_nnt"]) - self.expected_throughput_fvl25g = self.parse_string(self.get_suite_cfg()["throughput_fvl25g"]) + self.expected_throughput_nnt = self.get_suite_cfg()["throughput_nnt"] + self.expected_throughput_fvl25g = self.get_suite_cfg()["throughput_fvl25g"] # The acdepted gap between expected throughput and actual throughput, 1 Mpps self.gap = 1 @@ -169,9 +169,9 @@ class TestNicSingleCorePerf(TestCase): ret_data[header[2]] = str(float("%.3f" % throughput)) + " Mpps" ret_data[header[3]] = str(float("%.3f" % (throughput * 100 / wirespeed))) + "%" if self.nic == "niantic": - ret_data[header[4]] = self.expected_throughput_nnt[str(frame_size)][str(descriptor)] + " Mpps" + ret_data[header[4]] = str(self.expected_throughput_nnt[frame_size][descriptor]) + " Mpps" elif self.nic == "fortville_25g": - ret_data[header[4]] = self.expected_throughput_fvl25g[str(frame_size)][str(descriptor)] + " Mpps" + ret_data[header[4]] = str(self.expected_throughput_fvl25g[frame_size][descriptor]) + " Mpps" ret_datas[descriptor] = deepcopy(ret_data) self.test_result[frame_size] = deepcopy(ret_datas) @@ -248,25 +248,6 @@ class TestNicSingleCorePerf(TestCase): file_to_save.write(str(table)) file_to_save.close() - def parse_string(self, string): - ''' - Parse a string in the formate of a dictionary and convert it into a real dictionary. - ''' - element_pattern = re.compile(".\d+:.*?}") - string_elements = element_pattern.findall(string) - ret = {} - for element in string_elements: - ex_pattern = re.compile("(\d+): *{(.*)}") - ex_ret = ex_pattern.search(element) - ret[ex_ret.groups()[0]] = ex_ret.groups()[1] - inner_datas = ex_ret.groups()[1].split(",") - ret_inner = {} - for data in inner_datas: - match_inner = data.split(":") - ret_inner[match_inner[0].strip()] = match_inner[1].strip() - ret[ex_ret.groups()[0]] = deepcopy(ret_inner) - return ret - def tear_down(self): """ Run after each test case. -- 2.14.1