Skip to content

Add DHCP Relay#38

Merged
stcheng merged 13 commits intomasterfrom
manny_dhcp_relay
Nov 24, 2016
Merged

Add DHCP Relay#38
stcheng merged 13 commits intomasterfrom
manny_dhcp_relay

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

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

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
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 <abdosi@microsoft.com>
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 <abdosi@microsoft.com>
SuvarnaMeenakshi pushed a commit to SuvarnaMeenakshi/sonic-buildimage that referenced this pull request Jun 16, 2021
Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
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 <abdosi@microsoft.com>
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
…tches (sonic-net#38)

Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
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
dprital referenced this pull request in dprital/sonic-buildimage Feb 20, 2025
…lly (sonic-net#639)

#### Why I did it
src/sonic-swss
```
* 4baf54f - (HEAD -> 202412, origin/202412) SRv6: add dscp_mode configuration for MySID entry (#38) (6 hours ago) [mssonicbld]
* ff491ba - [SRv6] Add support for SRv6 VPN (#37) (9 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
tshalvi referenced this pull request in tshalvi/sonic-buildimage Mar 12, 2025
… automatically (sonic-net#702)

#### Why I did it
src/sonic-platform-common
```
* c8eac22 - (HEAD -> 202412, origin/202412) [code sync] Merge code from sonic-net/sonic-platform-common:202411 to 202412 (#38) (21 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Apr 1, 2025
…#22193)

#### Why I did it
src/dhcpmon
```
* 749c7e5 - (HEAD -> master, origin/master, origin/HEAD) Update DB separator for per-interface counter (#38) (23 hours ago) [Yaqiang Zhu]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Gfrom2016 pushed a commit to Gfrom2016/sonic-buildimage that referenced this pull request Apr 5, 2025
…tomatically (sonic-net#899)

#### Why I did it
src/sonic-linux-kernel
```
* b1aeb41 - (HEAD -> 202412, origin/HEAD, origin/202412) [code sync] Merge code from sonic-net/sonic-linux-kernel:202411 to 202412 (sonic-net#38) (20 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Gfrom2016 pushed a commit to Gfrom2016/sonic-buildimage that referenced this pull request Apr 5, 2025
…omatically (sonic-net#928)

#### Why I did it
src/sonic-swss-common
```
* 0087183 - (HEAD -> 202412, origin/HEAD, origin/202412) Merge pull request sonic-net#38 from mssonicbld/sonicbld/202412-merge (35 hours ago) [mssonicbld]
* e32b71e - Merge branch '202411' of https://github.com/sonic-net/sonic-swss-common into 202412 (2 days ago) [Sonic Automation]
* 3bc4141 - [FC] remove FLEX_COUNTER_DELAY_STATUS_FIELD (sonic-net#982) (3 weeks ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Gfrom2016 pushed a commit to Gfrom2016/sonic-buildimage that referenced this pull request Apr 5, 2025
…tically (sonic-net#937)

#### Why I did it
src/sonic-sairedis
```
* 8930167 - (HEAD -> 202412, origin/HEAD, origin/202412) [FC] Fix the update failure in switch debug counters (sonic-net#38) (3 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
jianyuewu pushed a commit to jianyuewu/sonic-buildimage that referenced this pull request May 7, 2025
… 202412 (sonic-net#38)

```<br>* b232d6b - (HEAD -> 202412) Merge branch '202411' of https://github.com/sonic-net/sonic-platform-common into 202412 (2025-02-25) [Sonic Automation]
* c735073 - (origin/202411) [202411][cmis] Fix cmis.get_error_description speed for passive module (sonic-net#538) (2025-02-12) [Aryeh Feigin]
* b7e75d8 - Add 800G innolight PNs (sonic-net#540) (2025-02-07) [mssonicbld]<br>```
mssonicbld added a commit that referenced this pull request Jun 6, 2025
…tically (#22803)

#### Why I did it
src/sonic-dash-api
```
* 573485d - (HEAD -> master, origin/master, origin/HEAD) Update pipeline to use Bookworm and Ubuntu 24.04 (#38) (6 days ago) [Saikrishna Arcot]
```
#### How I did it
#### How to verify it
#### Description for the changelog
croos12 pushed a commit to croos12/sonic-buildimage that referenced this pull request Sep 29, 2025
…test HEAD automatically (sonic-net#1554)

#### Why I did it
src/sonic-platform-daemons
```
* b68357c - (HEAD -> 202412, origin/202412) [xcvrd] Create TRANSCEIVER_FIRMWARE_INFO table for all subports (sonic-net#38) (9 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
tirupatihemanth pushed a commit to tirupatihemanth/sonic-buildimage that referenced this pull request Oct 21, 2025
* issue:Failedtoload MMP firmware qat_c3xxx_mmp.bin

* disabled dirver

* disable pinctrl_denverton
rchandramouli pushed a commit to rchandramouli/sonic-buildimage that referenced this pull request Nov 4, 2025
* issue:Failedtoload MMP firmware qat_c3xxx_mmp.bin

* disabled dirver

* disable pinctrl_denverton
nonodark pushed a commit to nonodark/sonic-buildimage that referenced this pull request Nov 18, 2025
* issue:Failedtoload MMP firmware qat_c3xxx_mmp.bin

* disabled dirver

* disable pinctrl_denverton
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