Merge "improve drivers with enumerate()"

This commit is contained in:
Zuul 2021-03-08 01:16:20 +00:00 committed by Gerrit Code Review
commit ea3d599a7e
3 changed files with 8 additions and 11 deletions

View File

@ -314,7 +314,6 @@ def _generate_attach_handle(fpga):
def _generate_attribute_list(fpga):
attr_list = []
index = 0
for k, v in fpga.items():
if k == "rc":
driver_attr = driver_attribute.DriverAttribute()
@ -322,19 +321,17 @@ def _generate_attribute_list(fpga):
attr_list.append(driver_attr)
if k == "traits":
values = fpga.get(k, [])
for val in values:
for index_pf, val in enumerate(values):
driver_attr = driver_attribute.DriverAttribute()
driver_attr.key = "trait" + str(index)
index = index + 1
driver_attr.key = "trait" + str(index_pf)
driver_attr.value = val
attr_list.append(driver_attr)
if fpga.get("regions"):
for vf in fpga["regions"]:
for k, values in vf.items():
if k == "traits":
for val in values:
for index_vf, val in enumerate(values):
driver_attr = driver_attribute.DriverAttribute(
key="trait" + str(index), value=val)
index = index + 1
key="trait" + str(index_vf + index_pf), value=val)
attr_list.append(driver_attr)
return attr_list

View File

@ -244,9 +244,9 @@ def _generate_attribute_list(nic):
attr_list.append(driver_attr)
if k == "traits":
values = nic.get(k, [])
for idx, val in enumerate(values):
for index, val in enumerate(values):
driver_attr = driver_attribute.DriverAttribute()
driver_attr.key = "trait" + str(idx)
driver_attr.key = "trait" + str(index)
driver_attr.value = val
attr_list.append(driver_attr)

View File

@ -195,10 +195,10 @@ def _generate_attach_handle(qat):
def _generate_attribute_list(qat):
attr_list = []
for k, _ in qat.items():
for k, v in qat.items():
if k == "rc":
driver_attr = driver_attribute.DriverAttribute()
driver_attr.key = k
driver_attr.value = qat.get(k, None)
driver_attr.value = v
attr_list.append(driver_attr)
return attr_list