graffy
/
concho
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added current dell poweredge r660xs configurator 

work related to [https://bugzilla.ipr.univ-rennes.fr/show_bug.cgi?id=4171]
This commit is contained in:
Guillaume Raffy 2025-10-23 16:59:53 +02:00
parent b2e305eef5
commit f34bb3965d
4 changed files with 11363 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11360
catalogs/dell/2025-10/20251023 - Cat2 Conf 2-2-01_ Dell Poweredge R660xs.html Normal file
View File

File diff suppressed because one or more lines are too long

2
concho/dell.py
View File

@ -1062,7 +1062,7 @@ class DellConfiguratorParser2025(DellConfiguratorParser):
assert title_span_element is not None assert title_span_element is not None
title = title_span_element.text_content().replace('\n', '').strip() # eg 'Cat2 Conf 2-2-07: Dell Poweredge R670' title = title_span_element.text_content().replace('\n', '').strip() # eg 'Cat2 Conf 2-2-07: Dell Poweredge R670'
# Cat3 Conf 3-2-01 : Poweredge R760xa # Cat3 Conf 3-2-01 : Poweredge R760xa
match = re.match(r'^cat[0-9]+ conf\s+[0-9\-]+\s*:\s*(dell )?poweredge (?P<chassis_type>[cr][0-9][0-9][0-9][0-9]?[xa]*).*', title.lower()) match = re.match(r'^cat[0-9]+ conf\s+[0-9\-]+\s*:\s*(dell )?poweredge (?P<chassis_type>[cr][0-9][0-9][0-9][0-9]?[xas]*).*', title.lower())
assert match, 'unhandled title : %s' % title assert match, 'unhandled title : %s' % title
# print(match['cpu_class'], match['cpu_number']) # print(match['cpu_class'], match['cpu_number'])
chassis_id = "dell-poweredge-%s" % (match['chassis_type'].lower(), ) # eg "dell-poweredge-r670" chassis_id = "dell-poweredge-%s" % (match['chassis_type'].lower(), ) # eg "dell-poweredge-r670"

1
concho/procs_chooser.py
View File

@ -176,6 +176,7 @@ def plot_configs(configs: List[Config], xaxis_def: ConfigAxisDef, yaxis_def: Con
'dell-poweredge-r640': 0.6, 'dell-poweredge-r640': 0.6,
'dell-poweredge-r6525': 0.5, 'dell-poweredge-r6525': 0.5,
'dell-poweredge-r660': 0.55, 'dell-poweredge-r660': 0.55,
'dell-poweredge-r660xs': 0.55,
'dell-poweredge-r760xa': 0.55, 'dell-poweredge-r760xa': 0.55,
'dell-poweredge-r670': 0.6, 'dell-poweredge-r670': 0.6,
'dell-poweredge-r6725': 0.0, 'dell-poweredge-r6725': 0.0,

1
tests/test_dell_2025.py
View File

@ -19,6 +19,7 @@ class Test(unittest.TestCase):
def test_dell2_configs(self): def test_dell2_configs(self):
logging.info('Starting test_dell2_configs') logging.info('Starting test_dell2_configs')
configurators = [ configurators = [
HtmlConfigurator(Path('catalogs/dell/2025-10/20251023 - Cat2 Conf 2-2-01_ Dell Poweredge R660xs.html'), DellConfiguratorParser2025()),
HtmlConfigurator(Path('catalogs/dell/2025-10/20251023 - Cat2 Conf 2-2-03_ DELL Poweredge R660.html'), DellConfiguratorParser2025()), HtmlConfigurator(Path('catalogs/dell/2025-10/20251023 - Cat2 Conf 2-2-03_ DELL Poweredge R660.html'), DellConfiguratorParser2025()),
HtmlConfigurator(Path('catalogs/dell/2025-10/20251020 - Cat2 Conf 2-2-07_ Dell Poweredge R670.html'), DellConfiguratorParser2025()), HtmlConfigurator(Path('catalogs/dell/2025-10/20251020 - Cat2 Conf 2-2-07_ Dell Poweredge R670.html'), DellConfiguratorParser2025()),
HtmlConfigurator(Path('catalogs/dell/2025-10/20251022 - Cat3 Conf 3-2-01 _ Poweredge R760xa.html'), DellConfiguratorParser2025()), HtmlConfigurator(Path('catalogs/dell/2025-10/20251022 - Cat3 Conf 3-2-01 _ Poweredge R760xa.html'), DellConfiguratorParser2025()),