Skip to content

Add the meter spec.type #149

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add the meter spec.type #149

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 20 additions & 12 deletions p4runtime_sh/shell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1251,8 +1251,9 @@ class _MeterConfig:
def attrs():
return ["cir", "cburst", "pir", "pburst", "eburst"]

def __init__(self, meter_name, meter_type):
def __init__(self, meter_name, meter_unit, meter_type):
self._meter_name = meter_name
self._meter_unit = meter_unit
self._meter_type = meter_type
self._msg = p4runtime_pb2.MeterConfig()
self._attrs = _MeterConfig.attrs()
Expand Down Expand Up @@ -1288,18 +1289,18 @@ def _repr_pretty_(self, p, cycle):
p.text(str(self.msg()))

@classmethod
def set_param(cls, instance, meter_name, meter_type, name, value):
def set_param(cls, instance, meter_name, meter_unit, meter_type, name, value):
if instance is None:
d = cls(meter_name, meter_type)
d = cls(meter_name, meter_unit, meter_type)
else:
d = instance
setattr(d, name, value)
return d

@classmethod
def get_param(cls, instance, meter_name, meter_type, name):
def get_param(cls, instance, meter_name, meter_unit, meter_type, name):
if instance is None:
d = cls(meter_name, meter_type)
d = cls(meter_name, meter_unit, meter_type)
else:
d = instance
r = getattr(d, name)
Expand Down Expand Up @@ -1662,7 +1663,10 @@ def __getattr__(self, name):
raise UserError("Table has no direct meter")
if self._meter_config is None:
self._meter_config = _MeterConfig(
self._direct_meter.preamble.name, self._direct_meter.spec.unit)
self._direct_meter.preamble.name,
self._direct_meter.spec.unit,
self._direct_meter.spec.type
)
return self._meter_config
if name == "time_since_last_hit":
if self._idle_timeout_behavior is None:
Expand Down Expand Up @@ -1716,7 +1720,10 @@ def _from_msg(self, msg):
self._counter_data = None
if msg.HasField('meter_config'):
self._meter_config = _MeterConfig(
self._direct_meter.preamble.name, self._direct_meter.spec.unit)
self._direct_meter.preamble.name,
self._direct_meter.spec.unit,
self._direct_meter.spec.type
)
self._meter_config._from_msg(msg.meter_config)
else:
self._meter_config = None
Expand Down Expand Up @@ -2012,7 +2019,8 @@ def read(self, function=None):
class _MeterEntryBase(_P4EntityBase):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self._meter_type = self._info.spec.unit
self._meter_unit = self._info.spec.unit
self._meter_type = self._info.spec.type
self._config = None

def __dir__(self):
Expand All @@ -2031,7 +2039,7 @@ def __setattr__(self, name, value):
raise UserError("Cannot change meter name")
if name in _MeterConfig.attrs():
self._config = _MeterConfig.set_param(
self._config, self.name, self._meter_type, name, value)
self._config, self.name, self._meter_unit, self._meter_type, name, value)
return
if name == "config":
if value is None:
Expand All @@ -2043,18 +2051,18 @@ def __setattr__(self, name, value):
def __getattr__(self, name):
if name in _MeterConfig.attrs():
self._config, r = _MeterConfig.get_param(
self._config, self.name, self._meter_type, name)
self._config, self.name, self._meter_unit, self._meter_type, name)
return r
if name == "config":
if self._config is None:
self._config = _MeterConfig(self.name, self._meter_type)
self._config = _MeterConfig(self.name, self._meter_unit, self._meter_type)
return self._config
return super().__getattr__(name)

def _from_msg(self, msg):
self._entry.CopyFrom(msg)
if msg.HasField('config'):
self._config = _MeterConfig(self.name, self._meter_type)
self._config = _MeterConfig(self.name, self._meter_unit, self._meter_type)
self._config._from_msg(msg.config)
else:
self._config = None
Expand Down
Loading