Skip to content

Commit a3fdc79

Browse files
author
simon
committed
changed variable declarations from parent to self
1 parent 21035f6 commit a3fdc79

File tree

1 file changed

+21
-18
lines changed

1 file changed

+21
-18
lines changed

crc_errors/CRC_Count_check.py

+21-18
Original file line numberDiff line numberDiff line change
@@ -61,61 +61,63 @@ class CRC_count_Check(aetest.Testcase):
6161
def setup(self, dev):
6262
#Setup has been marked for looping in Common Setup(create_testcases) with the argument dev
6363
#dev is the list of devices in the current testbed
64+
self.dev = dev
6465
log.info(banner(f"Gathering Interface Information from {dev.name}"))
6566
self.interface_info = dev.learn('interface')
6667

67-
6868
list_of_interfaces=self.interface_info.info.keys()
69-
mega_dict = {}
70-
mega_dict[dev.name] = {}
71-
mega_tabular = []
72-
passing=0
69+
self.mega_dict = {}
70+
self.mega_dict[dev.name] = {}
71+
self.mega_tabular = []
72+
self.passing=0
7373

7474

7575
for ints, props in self.interface_info.info.items():
7676
counters = props.get('counters')
7777
if counters:
7878
smaller_tabular = []
7979
if 'in_crc_errors' in counters:
80-
mega_dict[dev.name][ints] = counters['in_crc_errors']
80+
self.mega_dict[dev.name][ints] = counters['in_crc_errors']
8181
smaller_tabular.append(dev.name)
8282
smaller_tabular.append(ints)
8383
smaller_tabular.append(str(counters['in_crc_errors']))
8484
if counters['in_crc_errors']:
8585
smaller_tabular.append('Failed')
86-
passing=1
86+
self.passing=1
8787
else:
8888
smaller_tabular.append('Passed')
8989

9090
else:
91-
mega_dict[dev.name][ints] = None
91+
self.mega_dict[dev.name][ints] = None
9292
smaller_tabular.append(dev.name)
9393
smaller_tabular.append(ints)
9494
smaller_tabular.append('N/A')
9595
smaller_tabular.append('N/A')
96-
mega_tabular.append(smaller_tabular)
97-
mega_tabular.append(['-' * sum(len(i) for i in smaller_tabular)])
96+
self.mega_tabular.append(smaller_tabular)
97+
self.mega_tabular.append(['-' * sum(len(i) for i in smaller_tabular)])
9898

9999
#pass megadict to interface test function
100-
self.parent.parameters.update(mega=mega_dict[dev.name])
100+
#self.parent.parameters.update(mega=mega_dict[dev.name])
101+
#self.megadictname=self.mega_dict[dev.name])
101102
#pass megatable list to table_display test function
102-
self.parent.parameters.update(megatable=mega_tabular)
103-
#pass passing variable to table_display function in order indicate pass or fail - 0=pass 1=fail
104-
self.parent.parameters.update(passing=passing)
103+
# self.parent.parameters.update(megatable=self.mega_tabular)
104+
#pass self.passing variable to table_display function in order indicate pass or fail - 0=pass 1=fail
105+
#self.parent.parameters.update(passing=self.passing)
105106

106107
aetest.loop.mark(self.interface_check, intf=list_of_interfaces)
107108

108109
# create table and display. Test fails if variable 'passing' = 1.
109110
# which means there are some CRC errors
110111
@aetest.test
111112
def table_display(self):
112-
log.info(tabulate(self.parent.parameters['megatable'],
113+
#log.info(tabulate(self.parent.parameters['megatable'],
114+
log.info(tabulate(self.mega_tabular,
113115
headers=['Device', 'Interface',
114116
'CRC Errors Counter',
115117
'Passed/Failed'],
116118
tablefmt='orgtbl'))
117119

118-
if self.parent.parameters['passing']==1:
120+
if self.passing==1:
119121
self.failed('Some interfaces have CRC errors')
120122
else:
121123
self.passed
@@ -125,7 +127,8 @@ def table_display(self):
125127
def interface_check(self, intf):
126128
# This test has been marked for loop. intf is the looping argument (list of interfaces)
127129
# Thus this test is run for each interface in the intf list.
128-
for int, errors in self.parent.parameters['mega'].items():
130+
#for int, errors in self.parent.parameters['mega'].items():
131+
for int, errors in self.mega_dict[self.dev.name].items():
129132
if errors:
130133
self.failed(f'Interface {int} has crc errors {errors}')
131134
else:
@@ -157,4 +160,4 @@ def disconnect(self):
157160

158161

159162
if __name__ == '__main__': # pragma: no cover
160-
aetest.main()
163+
aetest.main()

0 commit comments

Comments
 (0)