Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix device plugin bug and allow bcm config #9

Merged
merged 2 commits into from Nov 30, 2018
Merged

Fix device plugin bug and allow bcm config #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
877bccd
Update device plugins to support null fru data
Nov 30, 2018
3b1bfea
Update device config permitted list to allow specific bcm config
Nov 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions device/alibaba/x86_64-alibaba_as13-32h-cl-r0/plugins/fanutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ def get_all(self):

# Get the number of fans
n_fan = self.get_num_fans()
all_fan_dict["Number"] = len(self.fru_data_list)
all_fan_dict["Number"] = n_fan

# Set fan FRU data.
fan_fru_dict = dict()
Expand All @@ -254,12 +254,7 @@ def get_all(self):
continue
fru_dict = dict()
fan_key = fan_fru[0].split()
fan_sn = "N/A"
fan_pn = "N/A"
fan_speed = "N/A"
fan_ht = "N/A"
fan_ps = False
fan_lt = "N/A"

if str(fan_key[-1]).lower() == "absent":
fan_idx = int(re.findall('\d+', fan_key[0])[0])
Expand All @@ -268,11 +263,11 @@ def get_all(self):
fan_ps = True
pn = [s for s in fan_fru if "Part" in s]
sn = [s for s in fan_fru if "Serial" in s]
fan_pn = pn[0].split()[-1] if len(pn) > 0 else 'N/A'
fan_sn = sn[0].split()[-1] if len(sn) > 0 else 'N/A'
fan_pn = pn[0].split(":")[-1].strip() if len(pn) > 0 else 'N/A'
fan_sn = sn[0].split(":")[-1].strip() if len(sn) > 0 else 'N/A'

fru_dict["PN"] = fan_pn
fru_dict["SN"] = fan_sn
fru_dict["PN"] = "N/A" if not fan_pn or fan_pn == "" else fan_pn
fru_dict["SN"] = "N/A" if not fan_sn or fan_sn == "" else fan_sn
fru_dict["Present"] = fan_ps
fan_fru_dict[fan_idx] = fru_dict

Expand Down
10 changes: 6 additions & 4 deletions device/alibaba/x86_64-alibaba_as13-32h-cl-r0/plugins/psuutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,12 @@ def get_all(self):
psu_info_dict = dict()
for psu_fru in self.psu_info_list:
psu_data = dict()
psu_data["PN"] = str(psu_fru.get(psu_pn_key)).strip(
) if psu_fru.get(psu_pn_key) is not None else "N/A"
psu_data["SN"] = str(psu_fru.get(psu_sn_key)).strip(
) if psu_fru.get(psu_sn_key) is not None else "N/A"
pn = psu_fru.get(psu_pn_key)
sn = psu_fru.get(psu_sn_key)
psu_data["PN"] = "N/A" if not pn or str(
pn).strip() == "" else str(pn).strip()
psu_data["SN"] = "N/A" if not pn or str(
pn).strip() == "" else str(sn).strip()
raw_key = [v for v in psu_fru.keys() if 'PSU' in v]
if len(raw_key) > 0:
psu_idx = int(re.findall('\d+', raw_key[0])[0])
Expand Down
15 changes: 5 additions & 10 deletions device/alibaba/x86_64-alibaba_as13-48f8h-cl-r0/plugins/fanutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ def get_all(self):

# Get the number of fans
n_fan = self.get_num_fans()
all_fan_dict["Number"] = len(self.fru_data_list)
all_fan_dict["Number"] = n_fan

# Set fan FRU data.
fan_fru_dict = dict()
Expand All @@ -254,12 +254,7 @@ def get_all(self):
continue
fru_dict = dict()
fan_key = fan_fru[0].split()
fan_sn = "N/A"
fan_pn = "N/A"
fan_speed = "N/A"
fan_ht = "N/A"
fan_ps = False
fan_lt = "N/A"

if str(fan_key[-1]).lower() == "absent":
fan_idx = int(re.findall('\d+', fan_key[0])[0])
Expand All @@ -268,11 +263,11 @@ def get_all(self):
fan_ps = True
pn = [s for s in fan_fru if "Part" in s]
sn = [s for s in fan_fru if "Serial" in s]
fan_pn = pn[0].split()[-1] if len(pn) > 0 else 'N/A'
fan_sn = sn[0].split()[-1] if len(sn) > 0 else 'N/A'
fan_pn = pn[0].split(":")[-1].strip() if len(pn) > 0 else 'N/A'
fan_sn = sn[0].split(":")[-1].strip() if len(sn) > 0 else 'N/A'

fru_dict["PN"] = fan_pn
fru_dict["SN"] = fan_sn
fru_dict["PN"] = "N/A" if not fan_pn or fan_pn == "" else fan_pn
fru_dict["SN"] = "N/A" if not fan_sn or fan_sn == "" else fan_sn
fru_dict["Present"] = fan_ps
fan_fru_dict[fan_idx] = fru_dict

Expand Down
10 changes: 6 additions & 4 deletions device/alibaba/x86_64-alibaba_as13-48f8h-cl-r0/plugins/psuutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,12 @@ def get_all(self):
psu_info_dict = dict()
for psu_fru in self.psu_info_list:
psu_data = dict()
psu_data["PN"] = str(psu_fru.get(psu_pn_key)).strip(
) if psu_fru.get(psu_pn_key) is not None else "N/A"
psu_data["SN"] = str(psu_fru.get(psu_sn_key)).strip(
) if psu_fru.get(psu_sn_key) is not None else "N/A"
pn = psu_fru.get(psu_pn_key)
sn = psu_fru.get(psu_sn_key)
psu_data["PN"] = "N/A" if not pn or str(
pn).strip() == "" else str(pn).strip()
psu_data["SN"] = "N/A" if not pn or str(
pn).strip() == "" else str(sn).strip()
raw_key = [v for v in psu_fru.keys() if 'PSU' in v]
if len(raw_key) > 0:
psu_idx = int(re.findall('\d+', raw_key[0])[0])
Expand Down
17 changes: 6 additions & 11 deletions device/alibaba/x86_64-alibaba_as23-128h-cl-r0/plugins/fanutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ def get_all(self):

# Get the number of fans
n_fan = self.get_num_fans()
all_fan_dict["Number"] = len(self.fru_data_list)
all_fan_dict["Number"] = n_fan

# Set fan FRU data.
fan_fru_dict = dict()
Expand All @@ -249,12 +249,7 @@ def get_all(self):
continue
fru_dict = dict()
fan_key = fan_fru[0].split()
fan_sn = "N/A"
fan_pn = "N/A"
fan_speed = "N/A"
fan_ht = "N/A"
fan_ps = False
fan_lt = "N/A"

if str(fan_key[-1]).lower() == "absent":
fan_idx = int(re.findall('\d+', fan_key[0])[0])
Expand All @@ -263,11 +258,11 @@ def get_all(self):
fan_ps = True
pn = [s for s in fan_fru if "Part" in s]
sn = [s for s in fan_fru if "Serial" in s]
fan_pn = pn[0].split()[-1] if len(pn) > 0 else 'N/A'
fan_sn = sn[0].split()[-1] if len(sn) > 0 else 'N/A'
fan_pn = pn[0].split(":")[-1].strip() if len(pn) > 0 else 'N/A'
fan_sn = sn[0].split(":")[-1].strip() if len(sn) > 0 else 'N/A'

fru_dict["PN"] = fan_pn
fru_dict["SN"] = fan_sn
fru_dict["PN"] = "N/A" if not fan_pn or fan_pn == "" else fan_pn
fru_dict["SN"] = "N/A" if not fan_sn or fan_sn == "" else fan_sn
fru_dict["Present"] = fan_ps
fan_fru_dict[fan_idx] = fru_dict

Expand Down Expand Up @@ -295,4 +290,4 @@ def get_all(self):
all_fan_dict[fan_name] = fan_dict
break

return all_fan_dict
return all_fan_dict
10 changes: 6 additions & 4 deletions device/alibaba/x86_64-alibaba_as23-128h-cl-r0/plugins/psuutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,12 @@ def get_all(self):
psu_info_dict = dict()
for psu_fru in self.psu_info_list:
psu_data = dict()
psu_data["PN"] = str(psu_fru.get(psu_pn_key)).strip(
) if psu_fru.get(psu_pn_key) is not None else "N/A"
psu_data["SN"] = str(psu_fru.get(psu_sn_key)).strip(
) if psu_fru.get(psu_sn_key) is not None else "N/A"
pn = psu_fru.get(psu_pn_key)
sn = psu_fru.get(psu_sn_key)
psu_data["PN"] = "N/A" if not pn or str(
pn).strip() == "" else str(pn).strip()
psu_data["SN"] = "N/A" if not pn or str(
pn).strip() == "" else str(sn).strip()
raw_key = [v for v in psu_fru.keys() if 'PSU' in v]
if len(raw_key) > 0:
psu_idx = int(re.findall('\d+', raw_key[0])[0])
Expand Down
4 changes: 3 additions & 1 deletion src/sonic-device-data/tests/permitted_list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,4 +148,6 @@ ifp_inports_support_enable
memlist_enable
pbmp_gport_stack.0
reglist_enable
cls_cmd_daemon
cls_cmd_daemon
serdes_lane_config_dfe
serdes_fec_enable