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
Commits
dcfde304
Commit
dcfde304
authored
2 years ago
by
Lluis Gifre Renom
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix/device-p4' into 'develop'
Fix/device p4 See merge request
!105
parents
0e40bd49
df89f810
No related branches found
No related tags found
2 merge requests
!142
Release TeraFlowSDN 2.1
,
!105
Fix/device p4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/device/service/drivers/p4/p4_driver.py
+1
-1
1 addition, 1 deletion
src/device/service/drivers/p4/p4_driver.py
src/tests/p4/setup.sh
+3
-3
3 additions, 3 deletions
src/tests/p4/setup.sh
with
4 additions
and
4 deletions
src/device/service/drivers/p4/p4_driver.py
+
1
−
1
View file @
dcfde304
...
@@ -81,7 +81,7 @@ class P4Driver(_Driver):
...
@@ -81,7 +81,7 @@ class P4Driver(_Driver):
self
.
__endpoint
=
None
self
.
__endpoint
=
None
self
.
__settings
=
settings
self
.
__settings
=
settings
self
.
__id
=
None
self
.
__id
=
None
self
.
__name
=
None
self
.
__name
=
DRIVER_NAME
self
.
__vendor
=
P4_VAL_DEF_VENDOR
self
.
__vendor
=
P4_VAL_DEF_VENDOR
self
.
__hw_version
=
P4_VAL_DEF_HW_VER
self
.
__hw_version
=
P4_VAL_DEF_HW_VER
self
.
__sw_version
=
P4_VAL_DEF_SW_VER
self
.
__sw_version
=
P4_VAL_DEF_SW_VER
...
...
This diff is collapsed.
Click to expand it.
src/tests/p4/setup.sh
+
3
−
3
View file @
dcfde304
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
export
POD_NAME
=
$(
kubectl get pods
-n
=
tfs |
grep
device |
awk
'{print $1}'
)
export
POD_NAME
=
$(
kubectl get pods
-n
=
tfs |
grep
device |
awk
'{print $1}'
)
kubectl
exec
${
POD_NAME
}
-n
=
tfs
--
mkdir
/root/p4
kubectl
exec
${
POD_NAME
}
-n
=
tfs
-c
=
server
--
mkdir
/root/p4
kubectl
cp
src/tests/p4/p4/p4info.txt tfs/
${
POD_NAME
}
:/root/p4
kubectl
cp
src/tests/p4/p4/p4info.txt tfs/
${
POD_NAME
}
:/root/p4
-c
=
server
kubectl
cp
src/tests/p4/p4/bmv2.json tfs/
${
POD_NAME
}
:/root/p4
kubectl
cp
src/tests/p4/p4/bmv2.json tfs/
${
POD_NAME
}
:/root/p4
-c
=
server
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment