Skip to content
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.

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

Add DHCP Relay #38

Merged
merged 13 commits into from
Nov 24, 2016
Merged

Add DHCP Relay #38

merged 13 commits into from
Nov 24, 2016

Conversation

mbrar
Copy link
Contributor

@mbrar mbrar commented Oct 21, 2016

-added Dhcp Relay Docker
-added isc-dhcp-server package to ptf docker to avoid manually installing server for testing


INTERFACES=""

#-a provides option 82 circuit id information
Copy link
Collaborator

@qiluo-msft qiluo-msft Oct 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment does not make sense. #Closed

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think Manny is explaining that the -a option enables the relay agent to use DHCP's option82 function.
Manny, I think you need to actually specify OPTIONS="-a", right?

Copy link
Contributor Author

@mbrar mbrar Oct 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the -a option enables the use of DHCP Option 82. I left Option 82 off by default but it might make more sense to set OPTIONS="-a"

ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && apt-get -y install \
isc-dhcp-relay
Copy link
Collaborator

@qiluo-msft qiluo-msft Oct 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clean up apt in the same 'RUN' command to save disk space. #Closed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do

@@ -35,6 +35,7 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /
python-dev \
wget \
cmake \
isc-dhcp-server \
Copy link
Collaborator

@qiluo-msft qiluo-msft Oct 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. indentation not aligned.
  2. why install in ptf docker? #Closed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DHCP server is used for DHCP testing. One option was to create a seperate Docker container for the server but after discussion with Pavel and Darren it seems ok to just install isc-dhcp-server in the ptf docker. The client (ptf code) and server run on the same docker container.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is better to remove this package from ptf docker since ptf docker is generic docker for testing purpose, what if some other one want to use ptf docker to test another dhcp server implementation?

It is better to move this into the ansible playbook of the test itself.


In reply to: 84995018 [](ancestors = 84995018)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, that's an easy change. I will install and start dhcp server from playbook instead.

Copy link
Contributor

@dplore dplore left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leave a comment


INTERFACES=""

#-a provides option 82 circuit id information
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think Manny is explaining that the -a option enables the relay agent to use DHCP's option82 function.
Manny, I think you need to actually specify OPTIONS="-a", right?

Copy link
Contributor Author

@mbrar mbrar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added clean up in dockerfile, fixed indentation, and added option 82 "-a" flag as default for relay config

COPY isc-dhcp-relay /etc/default/isc-dhcp-relay

ENTRYPOINT service isc-dhcp-relay start \
&& /bin/bash
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need to start rsyslog in the docker? how do we provide logging functionaility?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addressed in latest iteration, used rsyslog

Copy link
Collaborator

@lguohan lguohan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

requested changes

## Clean up
RUN apt-get update && apt-get -y install \
isc-dhcp-relay && \
apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
Copy link
Collaborator

@qiluo-msft qiluo-msft Oct 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mix tabs with spaces. Several times in this PR. #Closed

@@ -35,6 +35,7 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /
python-dev \
wget \
cmake \
isc-dhcp-server \
Copy link
Collaborator

@qiluo-msft qiluo-msft Oct 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tab and space mixing #Closed

@stcheng stcheng changed the title Manny Dhcp Relay Add DHCP Relay Oct 26, 2016
@stcheng
Copy link
Contributor

stcheng commented Nov 1, 2016

@lguohan lguohan force-pushed the master branch 2 times, most recently from b36a160 to dc84c41 Compare November 15, 2016 14:17
Copy link
Contributor

@dplore dplore left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@stcheng stcheng merged commit 691b787 into master Nov 24, 2016
@stcheng stcheng deleted the manny_dhcp_relay branch November 28, 2016 20:23
stcheng pushed a commit that referenced this pull request Sep 26, 2017
[rfc4363]: Add key check logic for SAI bridge port objects (#38)
volodymyrsamotiy pushed a commit to volodymyrsamotiy/sonic-buildimage that referenced this pull request Aug 9, 2018
* [device] Update arista driver submodule

* Set Arista scd driver config

Set ARISTA_SCD_DRIVER_CONFIG config to build and
include scd driver to resulting Arista deb packages
lguohan pushed a commit that referenced this pull request Aug 12, 2018
* [device] Update arista driver submodule

* Set Arista scd driver config

Set ARISTA_SCD_DRIVER_CONFIG config to build and
include scd driver to resulting Arista deb packages
Kalimuthu-Velappan pushed a commit to Kalimuthu-Velappan/sonic-buildimage that referenced this pull request Sep 12, 2019
improve app/sai/counter db dump performance

get bgp neighbor received routes
samaity pushed a commit to samaity/sonic-buildimage that referenced this pull request Feb 14, 2020
* [_sonic_yang_ext.py]: Parse multilist in YANG Container.

This is needed to support VRF feature in SONiC.

Signed-off-by: Praveen Chaudhary [email protected]

* [sonic-vlan.yang]: Change Vlan yang models to remove admin-status as mandatory attribute.

Signed-off-by: Praveen Chaudhary [email protected]

* [_sonic_yang_ext.py]: Minor fix in _sonic_yang_ext.py

Signed-off-by: Praveen Chaudhary [email protected]
jleveque added a commit that referenced this pull request Jul 22, 2020
* src/sonic-telemetry fa8d498...3bd7ca3 (4):
  > Update gnmi deps (#40)
  > [testdata] Update SFP keys to align with new standard (#39)
  > Fixed the parameters for subscribe APIs (#38)
  > Azure ro mode (#34)

* src/sonic-mgmt-common 444aa9a...cc01ce4 (4):
  > Make gnmi dep version the same as in telemetry repo (#17)
  > Cleanup translib and cvl go test cases (#13)
  > Package update and enhancements/fixes in YGOT, and Request Binder (#12)
  > Translib phase I changes (#11)

Note: sonic-telemetry submodule update is dependent upon sonic-mgmt-common submodule update, thus updating both in this patch
dmytroxshevchuk pushed a commit to dmytroxshevchuk/sonic-buildimage that referenced this pull request Aug 31, 2020
vdahiya12 pushed a commit to vdahiya12/sonic-buildimage that referenced this pull request Oct 2, 2020
  1. add parsing for: dom_control_bytes_masks, dom_option_value_masks and dom_module_monitor
  2. adjust indent
xumia referenced this pull request in xumia/sonic-buildimage-1 Feb 16, 2021
abdosi added a commit to abdosi/sonic-buildimage that referenced this pull request Apr 3, 2021
df46ed418e661a9bccdb2639d8873def356f8ba0 (HEAD -> master, origin/master, origin/HEAD) Fix the LLDP_LOC_CHASSIS not getting populated if no remote neighbors are present (sonic-net#39)
e487532e11cc0e97cfce573b6b997fdd0beeb660 [CI] Set up CI&PR with Azure Pipelines (sonic-net#38)
3c9f488490a1dbded20dbf2d8a88a5ab4dbda8df Replace swsssdk's SonicV2Connector with swsscommon's implementation (sonic-net#35)

Signed-off-by: Abhishek Dosi <[email protected]>
abdosi added a commit that referenced this pull request Apr 3, 2021
df46ed418e661a9bccdb2639d8873def356f8ba0 (HEAD -> master, origin/master, origin/HEAD) Fix the LLDP_LOC_CHASSIS not getting populated if no remote neighbors are present (#39)
e487532e11cc0e97cfce573b6b997fdd0beeb660 [CI] Set up CI&PR with Azure Pipelines (#38)
3c9f488490a1dbded20dbf2d8a88a5ab4dbda8df Replace swsssdk's SonicV2Connector with swsscommon's implementation (#35)

Signed-off-by: Abhishek Dosi <[email protected]>
raphaelt-nvidia pushed a commit to raphaelt-nvidia/sonic-buildimage that referenced this pull request May 23, 2021
df46ed418e661a9bccdb2639d8873def356f8ba0 (HEAD -> master, origin/master, origin/HEAD) Fix the LLDP_LOC_CHASSIS not getting populated if no remote neighbors are present (sonic-net#39)
e487532e11cc0e97cfce573b6b997fdd0beeb660 [CI] Set up CI&PR with Azure Pipelines (sonic-net#38)
3c9f488490a1dbded20dbf2d8a88a5ab4dbda8df Replace swsssdk's SonicV2Connector with swsscommon's implementation (sonic-net#35)

Signed-off-by: Abhishek Dosi <[email protected]>
SuvarnaMeenakshi pushed a commit to SuvarnaMeenakshi/sonic-buildimage that referenced this pull request Jun 16, 2021
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
df46ed418e661a9bccdb2639d8873def356f8ba0 (HEAD -> master, origin/master, origin/HEAD) Fix the LLDP_LOC_CHASSIS not getting populated if no remote neighbors are present (sonic-net#39)
e487532e11cc0e97cfce573b6b997fdd0beeb660 [CI] Set up CI&PR with Azure Pipelines (sonic-net#38)
3c9f488490a1dbded20dbf2d8a88a5ab4dbda8df Replace swsssdk's SonicV2Connector with swsscommon's implementation (sonic-net#35)

Signed-off-by: Abhishek Dosi <[email protected]>
mlok-nokia pushed a commit to mlok-nokia/sonic-buildimage that referenced this pull request Jan 24, 2022
…-net#38)

1. wrap the apis that are supported by new platform api in a way that to call npapi first and to call sfputil if the former returns NotImplementError.
2. for the functions that only available in sfputil, a helper
module is introduced to replace sfputil.
SuvarnaMeenakshi pushed a commit to SuvarnaMeenakshi/sonic-buildimage that referenced this pull request Mar 16, 2022
)

It is possible that some ASIC_STATE:SAI_OBJECT_TYPE_BRIDGE_PORT
doesn't have the attribute SAI_BRIDGE_PORT_ATTR_PORT_ID. We
need to exclude it.
lguohan pushed a commit that referenced this pull request Mar 18, 2022
f00efef Longxiang Lyu Wed Mar 16 09:12:46 2022 +0800 Add a command line option to store logs into a separate file (#41)
ff2e67d Longxiang Lyu Tue Mar 15 09:10:59 2022 +0800 Add default port cable type (#39)
ebbb4d8 Jing Zhang Mon Mar 14 15:41:11 2022 -0700 Prevent switching MUX to "Unknown" (#36)
c779b8f Longxiang Lyu Thu Mar 10 21:35:11 2022 +0800 [nonfunctional] Use LinkProberStateMachineBase (#38)
b9fedd0 Longxiang Lyu Wed Mar 9 13:03:58 2022 +0800 [NONFUNCTIONAL] Add LinkProberStateMachineBase (#37)
bedd42b Longxiang Lyu Wed Mar 9 10:03:00 2022 +0800 Add .clang-format file to format code (#28)
9fe4fc6 Guohan Lu Thu Mar 3 17:51:43 2022 -0800 [doc]: add lgtm badge in README.md
c1249d9 Longxiang Lyu Wed Mar 2 18:05:18 2022 +0800 Enable lgtm (#33)
b8514c6 Longxiang Lyu Wed Mar 2 13:34:39 2022 +0800 Collect port cable type to use corresponding state machine (#31)
9b59ef9 Longxiang Lyu Wed Mar 2 07:19:33 2022 +0800 Improve make clean (#32)
sg893052 pushed a commit to sg893052/sonic-buildimage that referenced this pull request Apr 25, 2022
renukamanavalan referenced this pull request in renukamanavalan/sonic-buildimage Sep 4, 2022
* 3beaadc (HEAD, origin/master, origin/HEAD, master) Improve unit test for gnmi (#38)
*   a12fcd8 Merge pull request #13 from renukamanavalan/statistics
* |   28b2f27 Enable unit test
* |   65e3c8f Add log for authentication and add unit test. #12
* |   1b3b838 Merge pull request #8 from ganglyu/fix_pipeline
zbud-msft added a commit to zbud-msft/sonic-buildimage that referenced this pull request Oct 6, 2022
shanshri pushed a commit to shanshri/sonic-buildimage-sonic-net that referenced this pull request Oct 24, 2023
mlok-nokia pushed a commit to mlok-nokia/sonic-buildimage that referenced this pull request Jun 5, 2024
[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants