Add ptf docker with saithrift installed #54
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| FROM docker-ptf | ||
|
|
||
| RUN apt-get update | ||
|
|
||
| COPY ["deps/saithrift-0.9.tar.gz", "/deps/"] | ||
| COPY ["*.ini", "/etc/ptf/"] | ||
| COPY ["deps/SAI/test/saithrift/tests/*", "/usr/share/ptf-tests/"] | ||
|
|
||
| RUN tar xzf /deps/saithrift-0.9.tar.gz -C /usr/share/; \ | ||
| cd usr/share/saithrift-0.9; \ | ||
| python setup.py install; \ | ||
| rm -rf /deps | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| # ptf host interface @ switch front port name | ||
|
|
||
| 0@Ethernet0 | ||
| 1@Ethernet4 | ||
| 2@Ethernet8 | ||
| 3@Ethernet12 | ||
| 4@Ethernet16 | ||
| 5@Ethernet20 | ||
| 6@Ethernet24 | ||
| 7@Ethernet28 | ||
| 8@Ethernet32 | ||
| 9@Ethernet36 | ||
| 10@Ethernet40 | ||
| 11@Ethernet44 | ||
| 12@Ethernet48 | ||
| 13@Ethernet52 | ||
| 14@Ethernet56 | ||
| 15@Ethernet60 | ||
| 16@Ethernet64 | ||
| 17@Ethernet68 | ||
| 18@Ethernet72 | ||
| 19@Ethernet76 | ||
| 20@Ethernet80 | ||
| 21@Ethernet84 | ||
| 22@Ethernet88 | ||
| 23@Ethernet92 | ||
| 24@Ethernet96 | ||
| 25@Ethernet100 | ||
| 26@Ethernet104 | ||
| 27@Ethernet108 | ||
| 28@Ethernet112 | ||
| 29@Ethernet116 | ||
| 30@Ethernet120 | ||
| 31@Ethernet124 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| # ptf host interface @ switch front port name | ||
|
|
||
| 0@Ethernet1 | ||
| 1@Ethernet2 | ||
| 2@Ethernet3 | ||
| 3@Ethernet4 | ||
| 4@Ethernet5 | ||
| 5@Ethernet6 | ||
| 6@Ethernet7 | ||
| 7@Ethernet8 | ||
| 8@Ethernet9 | ||
| 9@Ethernet10 | ||
| 10@Ethernet11 | ||
| 11@Ethernet12 | ||
| 12@Ethernet13 | ||
| 13@Ethernet14 | ||
| 14@Ethernet15 | ||
| 15@Ethernet16 | ||
| 16@Ethernet17 | ||
| 17@Ethernet18 | ||
| 18@Ethernet19 | ||
| 19@Ethernet20 | ||
| 20@Ethernet21 | ||
| 21@Ethernet22 | ||
| 22@Ethernet23 | ||
| 23@Ethernet24 | ||
| 24@Ethernet25 | ||
| 25@Ethernet26 | ||
| 26@Ethernet27 | ||
| 27@Ethernet28 | ||
| 28@Ethernet29 | ||
| 29@Ethernet30 | ||
| 30@Ethernet31 | ||
| 31@Ethernet32 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,6 +16,7 @@ RUN apt-get update \ | |
| python-dev \ | ||
| wget \ | ||
| cmake \ | ||
| supervisor \ | ||
| && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \ | ||
| && tar xvfz 1.0.0.tar.gz \ | ||
| && cd nanomsg-1.0.0 \ | ||
|
|
@@ -44,5 +45,4 @@ COPY ptf_nn_agent.conf /etc/supervisor/conf.d/ptf_nn_agent.conf | |
|
|
||
| ENTRYPOINT service rsyslog start \ | ||
| && service syncd start \ | ||
|
There was a problem hiding this comment. @lguohan This is not in this pull request. It is a commit aed2ab5 pushed by @pavel-shirshov. There was a problem hiding this comment. so the PR is not based on the latest master. better to generate PR based on latest master. |
||
| && /usr/bin/supervisord | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
suggest to put all these into docker-ptf since there are the same for different platforms.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should keep them in an independent docker though the dockerfile itself is not platform-specific. As else we will introduce a dependency of saithrift package into docker-ptf.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am trying to limit the number of docker types we have to manage.