Changes to the metrics names to align all adapters to the same names.
Also a fix to a typo in the cli help for perfconfig.
Change-Id: I9231d60b5b4a5598eead25677bd9a56ae1561136
diff --git a/cli/device.py b/cli/device.py
index fc7c4ec..ee93b89 100644
--- a/cli/device.py
+++ b/cli/device.py
@@ -102,7 +102,7 @@
specified.
-d: disable collection of the specified metric, more than on -d may be
specified.
--o override the collection frequency of the specified metric, more than one -o
+-o: override the collection frequency of the specified metric, more than one -o
may be specified. Note that -o isn't valid unless
frequency_override is set to True for the device.
diff --git a/dashd/dash_template.py b/dashd/dash_template.py
index 1fc28d2..9177cee 100755
--- a/dashd/dash_template.py
+++ b/dashd/dash_template.py
@@ -27,75 +27,75 @@
self.panels = [
dict(
title = "%port% Packet Receive Statistics",
- rx_64 = \
- ("alias(perSecond(voltha.%device%.%deviceId%.%port%.rx_64), "
+ rx_64_pkts = \
+ ("alias(perSecond(voltha.%device%.%deviceId%.%port%.rx_64_pkts), "
"'64b pkts/sec')"
),
- rx_65_127 = \
+ rx_65_127_pkts = \
("alias(perSecond("
- "voltha.%device%.%deviceId%.%port%.rx_65_127),"
+ "voltha.%device%.%deviceId%.%port%.rx_65_127_pkts), "
" '65-127b pkts/sec')"
),
- rx_128_255 = \
+ rx_128_255_pkts = \
("alias(perSecond("
- "voltha.%device%.%deviceId%.%port%.rx_128_255), "
+ "voltha.%device%.%deviceId%.%port%.rx_128_255_pkts), "
"'128-255b pkts/sec')"
),
- rx_256_511 = \
+ rx_256_511_pkts = \
("alias(perSecond"
- "(voltha.%device%.%deviceId%.%port%.rx_256_511), "
+ "(voltha.%device%.%deviceId%.%port%.rx_256_511_pkts), "
"'256-511b pkts/sec')"
),
- rx_512_1023 = \
+ rx_512_1023_pkts = \
("alias(perSecond("
- "voltha.%device%.%deviceId%.%port%.rx_512_1023), "
+ "voltha.%device%.%deviceId%.%port%.rx_512_1023_pkts), "
"'512-1023b pkts/sec')"
),
- rx_1024_1518 = \
+ rx_1024_1518_pkts = \
("alias(perSecond("
- "voltha.%device%.%deviceId%.%port%.rx_1024_1518), "
+ "voltha.%device%.%deviceId%.%port%.rx_1024_1518_pkts), "
"'1024-1518b pkts/sec')"
),
- rx_1519_9k = \
+ rx_1519_9k_pkts = \
("alias(perSecond("
- "voltha.%device%.%deviceId%.%port%.rx_1519_9k), "
+ "voltha.%device%.%deviceId%.%port%.rx_1519_9k_pkts), "
"'1519b-9kb pkts/sec')"
)
),
dict(
title = "%port% Packet Send Statistics",
- tx_64 = \
- ("alias(perSecond(voltha.%device%.%deviceId%.%port%.tx_64), "
+ tx_64_pkts = \
+ ("alias(perSecond(voltha.%device%.%deviceId%.%port%.tx_64_pkts), "
"'64b pkts/sec')"
),
- tx_65_127 = \
+ tx_65_127_pkts = \
("alias(perSecond("
- "voltha.%device%.%deviceId%.%port%.tx_65_127), "
+ "voltha.%device%.%deviceId%.%port%.tx_65_127_pkts), "
"'65-127b pkts/sec')"
),
- tx_128_255 = \
+ tx_128_255_pkts = \
("alias(perSecond("
- "voltha.%device%.%deviceId%.%port%.tx_128_255), "
+ "voltha.%device%.%deviceId%.%port%.tx_128_255_pkts), "
"'128-255b pkts/sec')"
),
- tx_256_511 = \
+ tx_256_511_pkts = \
("alias(perSecond("
- "voltha.%device%.%deviceId%.%port%.tx_256_511), "
+ "voltha.%device%.%deviceId%.%port%.tx_256_511_pkts), "
"'256-511b pkts/sec')"
),
- tx_512_1023 = \
+ tx_512_1023_pkts = \
("alias(perSecond("
- "voltha.%device%.%deviceId%.%port%.tx_512_1023), "
+ "voltha.%device%.%deviceId%.%port%.tx_512_1023_pkts), "
"'512-1023b pkts/sec')"
),
- tx_1024_1518 = \
+ tx_1024_1518_pkts = \
("alias(perSecond("
- "voltha.%device%.%deviceId%.%port%.tx_1024_1518), "
+ "voltha.%device%.%deviceId%.%port%.tx_1024_1518_pkts), "
"'1024-1518b pkts/sec')"
),
- tx_1519_9k = \
+ tx_1519_9k_pkts = \
("alias(perSecond("
- "voltha.%device%.%deviceId%.%port%.tx_1519_9k), "
+ "voltha.%device%.%deviceId%.%port%.tx_1519_9k_pkts), "
"'1519b-9kb pkts/sec')"
)
)
diff --git a/voltha/adapters/ponsim_olt/ponsim_olt.py b/voltha/adapters/ponsim_olt/ponsim_olt.py
index 3213a29..f2b3b76 100644
--- a/voltha/adapters/ponsim_olt/ponsim_olt.py
+++ b/voltha/adapters/ponsim_olt/ponsim_olt.py
@@ -65,11 +65,13 @@
class AdapterPmMetrics:
def __init__(self, device):
- self.pm_names = {'tx_64', 'tx_65_127', 'tx_128_255', 'tx_256_511',
- 'tx_512_1023', 'tx_1024_1518', 'tx_1519_9k', 'rx_64',
- 'rx_65_127', 'rx_128_255', 'rx_256_511',
- 'rx_512_1023',
- 'rx_1024_1518', 'rx_1519_9k'}
+ self.pm_names = {'tx_64_pkts', 'tx_65_127_pkts', 'tx_128_255_pkts',
+ 'tx_256_511_pkts', 'tx_512_1023_pkts',
+ 'tx_1024_1518_pkts', 'tx_1519_9k_pkts',
+ 'rx_64_pkts', 'rx_65_127_pkts',
+ 'rx_128_255_pkts', 'rx_256_511_pkts',
+ 'rx_512_1023_pkts', 'rx_1024_1518_pkts',
+ 'rx_1519_9k_pkts'}
self.device = device
self.id = device.id
self.name = 'ponsim_olt'
diff --git a/voltha/adapters/simulated_olt/simulated_olt.py b/voltha/adapters/simulated_olt/simulated_olt.py
index 39ea2c3..01d448f 100644
--- a/voltha/adapters/simulated_olt/simulated_olt.py
+++ b/voltha/adapters/simulated_olt/simulated_olt.py
@@ -59,28 +59,30 @@
self.value = value
def __init__(self,device):
- self.pm_names = {'tx_64','tx_65_127', 'tx_128_255', 'tx_256_511',
- 'tx_512_1023', 'tx_1024_1518', 'tx_1519_9k', 'rx_64',
- 'rx_65_127', 'rx_128_255', 'rx_256_511', 'rx_512_1023',
- 'rx_1024_1518', 'rx_1519_9k', 'tx_pkts', 'rx_pkts',
+ self.pm_names = {'tx_64_pkts','tx_65_127_pkts', 'tx_128_255_pkts',
+ 'tx_256_511_pkts', 'tx_512_1023_pkts',
+ 'tx_1024_1518_pkts', 'tx_1519_9k_pkts', 'rx_64_pkts',
+ 'rx_65_127_pkts', 'rx_128_255_pkts', 'rx_256_511_pkts',
+ 'rx_512_1023_pkts', 'rx_1024_1518_pkts',
+ 'rx_1519_9k_pkts', 'tx_pkts', 'rx_pkts',
'tx_bytes', 'rx_bytes'}
# This is just to generate more realistic looking values. This would
# not be implemented in a normal adapter.
self.rand_ranges = dict (
- tx_64=[50, 55],
- tx_65_127=[55,60],
- tx_128_255=[60,65],
- tx_256_511=[85,90],
- tx_512_1023=[90,95],
- tx_1024_1518=[60,65],
- tx_1519_9k=[50,55],
- rx_64=[50, 55],
- rx_65_127=[55,60],
- rx_128_255=[60,65],
- rx_256_511=[85,90],
- rx_512_1023=[90,95],
- rx_1024_1518=[60,65],
- rx_1519_9k=[50,55],
+ tx_64_pkts=[50, 55],
+ tx_65_127_pkts=[55,60],
+ tx_128_255_pkts=[60,65],
+ tx_256_511_pkts=[85,90],
+ tx_512_1023_pkts=[90,95],
+ tx_1024_1518_pkts=[60,65],
+ tx_1519_9k_pkts=[50,55],
+ rx_64_pkts=[50, 55],
+ rx_65_127_pkts=[55,60],
+ rx_128_255_pkts=[60,65],
+ rx_256_511_pkts=[85,90],
+ rx_512_1023_pkts=[90,95],
+ rx_1024_1518_pkts=[60,65],
+ rx_1519_9k_pkts=[50,55],
tx_pkts=[90,100],
rx_pkts=[90,100],
rx_bytes=[90000,100000],