Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
controller
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TFS
controller
Compare revisions
657912ce082db69882c6722128abd7b70c15a80f to ee55358f6f8ae3942748b166ed67359c5727211d
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
tfs/controller
Select target project
No results found
ee55358f6f8ae3942748b166ed67359c5727211d
Select Git revision
Swap
Target
tfs/controller
Select target project
tfs/controller
1 result
657912ce082db69882c6722128abd7b70c15a80f
Select Git revision
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
fix: _MeterEntryBase should pass p4_client to its super
· 8a0dc4fd
famelis
authored
1 year ago
8a0dc4fd
fix: controller_packet_metadata should not throw exception
· ee55358f
famelis
authored
1 year ago
ee55358f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/device/service/drivers/p4/p4_driver.py
+2
-3
2 additions, 3 deletions
src/device/service/drivers/p4/p4_driver.py
src/device/service/drivers/p4/p4_manager.py
+1
-1
1 addition, 1 deletion
src/device/service/drivers/p4/p4_manager.py
with
3 additions
and
4 deletions
src/device/service/drivers/p4/p4_driver.py
View file @
ee55358f
...
@@ -455,9 +455,8 @@ class P4Driver(_Driver):
...
@@ -455,9 +455,8 @@ class P4Driver(_Driver):
#Not Supported for P4 devices
#Not Supported for P4 devices
pass
pass
elif
KEY_CTL_PKT_METADATA
==
resource_key
:
elif
KEY_CTL_PKT_METADATA
==
resource_key
:
msg
=
f
"
{
resource_key
.
capitalize
()
}
is not a
"
\
#To-Do: Check what we should do with controller_packet_metadata
f
"
retrievable resource
"
LOGGER
.
warning
(
f
"
{
resource_key
.
capitalize
()
}
is not a not a retreivable source
"
)
raise
Exception
(
msg
)
else
:
else
:
msg
=
f
"
GetConfig failed due to invalid
"
\
msg
=
f
"
GetConfig failed due to invalid
"
\
f
"
resource key:
{
resource_key
}
"
f
"
resource key:
{
resource_key
}
"
...
...
This diff is collapsed.
Click to expand it.
src/device/service/drivers/p4/p4_manager.py
View file @
ee55358f
...
@@ -5213,7 +5213,7 @@ class _MeterEntryBase(_P4EntityBase):
...
@@ -5213,7 +5213,7 @@ class _MeterEntryBase(_P4EntityBase):
"""
"""
def
__init__
(
self
,
p4_client
,
*
args
,
**
kwargs
):
def
__init__
(
self
,
p4_client
,
*
args
,
**
kwargs
):
super
().
__init__
(
*
args
,
**
kwargs
)
super
().
__init__
(
p4_client
,
*
args
,
**
kwargs
)
self
.
_meter_type
=
self
.
_info
.
spec
.
unit
self
.
_meter_type
=
self
.
_info
.
spec
.
unit
self
.
index
=
-
1
self
.
index
=
-
1
self
.
cir
=
-
1
self
.
cir
=
-
1
...
...
This diff is collapsed.
Click to expand it.