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

Apply port configurations after ports are created #49

Merged
merged 3 commits into from
Oct 31, 2016
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dockers/docker-lldp-sv2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ RUN apt-get update && \
rm -rf /deps ~/.cache

COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY reconfigure.sh /opt/reconfigure.sh

ENTRYPOINT ["/usr/bin/supervisord"]
61 changes: 61 additions & 0 deletions dockers/docker-lldp-sv2/reconfigure.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
#!/bin/bash

set -e

num_of_interfaces=32
if_step=4
last_if_idx=$((num_of_interfaces*if_step - if_step))

function wait_until_if_exists
{
while /bin/true ;
Copy link
Collaborator

@qiluo-msft qiluo-msft Oct 31, 2016

Choose a reason for hiding this comment

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

/bin/true [](start = 8, length = 9)

while [ -L ... ] ? #Closed

do
if [ -L /sys/class/net/"$if" ];
Copy link
Collaborator

@qiluo-msft qiluo-msft Oct 31, 2016

Choose a reason for hiding this comment

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

$if [](start = 28, length = 3)

Use $1 instead of global variable #Closed

then
break
fi
sleep 1
done
echo interface "$if" is up
}


function wait_until_if_not_exists
{
while /bin/true ;
do
if [ ! -L /sys/class/net/"$if" ];
Copy link
Collaborator

@qiluo-msft qiluo-msft Oct 31, 2016

Choose a reason for hiding this comment

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

$if [](start = 30, length = 3)

The same. #Closed

then
break
fi
sleep 1
done
echo interface "$if" is down
}


while /bin/true ;
do
# wait until all interfaces are up
Copy link
Collaborator

@qiluo-msft qiluo-msft Oct 31, 2016

Choose a reason for hiding this comment

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

wait until all interfaces are up [](start = 2, length = 34)

What happens if not waiting? #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.

lldpd doesn't store a configuration for ports which aren't exist.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Is it possible that some interface will never be up, then we wait forever here?


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

echo Wait until all ifaces are up
for i in $(seq 0 $if_step $last_if_idx)
do
if=Ethernet${i}
wait_until_if_exists
done

echo Wait 10 seconds
sleep 10

# apply lldpd configuration
echo apply lldpd configuration
lldpcli -c /etc/lldpd.conf

# wait until all interfaces are down
Copy link
Collaborator

Choose a reason for hiding this comment

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

wait until all interfaces are down [](start = 4, length = 34)

Why waiting?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

To find the time when we need to check that the interfaces are created.

echo Wait until all ifaces are down
for i in $(seq 0 $if_step $last_if_idx)
do
if=Ethernet${i}
wait_until_if_not_exists
done
done
4 changes: 4 additions & 0 deletions dockers/docker-lldp-sv2/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ nodaemon=true
command=/usr/sbin/lldpd -d -I Ethernet*,eth*
priority=100

[program:lldpd-conf-reload]
command=/opt/reconfigure.sh
priority=150

[program:lldp-syncd]
command=/usr/bin/env python2 -m lldp_syncd
priority=200
Expand Down