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

Merge master to v1.0.3 #778

Merged
merged 46 commits into from
Jun 30, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
9041288
[build_debian]: Add dbus package to update timezone (#702)
hzheng5 Jun 15, 2017
c1c8a12
[Accton]: Add a new supported device and platform, AS7712-32X (#662)
pollyhsu2git Jun 15, 2017
7472cd3
[image]: load platform specific settings in sonic-to-sonic upgrade (#…
lguohan Jun 16, 2017
7267da3
[submodule]: Update sairedis submodule (#712)
andriymoroz-mlnx Jun 16, 2017
6867458
[docker-ptf]: Install exabgp in docker ptf (#709)
sihuihan88 Jun 16, 2017
897cc2b
[platform]: fix file mode for acction platform to create clean build …
lguohan Jun 18, 2017
2f231f3
[image]: expand dockerfs.tar.gz directly on to disk without intermedi…
lguohan Jun 18, 2017
4a780f4
[submodule]: update swss/sairedis/swss-common submodule (#716)
lguohan Jun 18, 2017
35cec02
[submodule]: update sonic-swss (#719)
lguohan Jun 19, 2017
493edb4
[image]: add debian security update in the apt source list (#724)
lguohan Jun 20, 2017
fe56389
[submodule]: update sonic-platform-daemons (#722)
lguohan Jun 20, 2017
894976e
[platform]: turn on/off four leds for breakout-able front panel ports…
lguohan Jun 20, 2017
cc218b3
[sonic-quagga]:update submodule (#718)
sihuihan88 Jun 20, 2017
c2c232a
Add Broadcom LED microprocessor initialization for Dell S6000 (#726)
jleveque Jun 20, 2017
6feef14
[platform]: Update sonic-platform-modules-arista (#727)
Staphylo Jun 21, 2017
c4133e1
[Broadcom]: Update SAI package to support Accton-AS7712-C32 (#720)
Jun 21, 2017
6685938
Remove exsiting sonic-platform-modules-accton and apply submodule add…
roylee123 Jun 21, 2017
dd104e1
[submodule]: update sonic-platform-daemons submodule (#731)
lguohan Jun 21, 2017
95906a6
[installer] Copy old config files rather than only minigraph (#730)
taoyl-ms Jun 21, 2017
3268946
[BGPD]: add bgp dynamic neighbor configuration (#708)
sihuihan88 Jun 22, 2017
629362c
[docker-syncd-brcm]: Sleep to allow syncd to create socket before cal…
jleveque Jun 22, 2017
a8e3d97
[sonic-cfggen]: Support multiple input yaml files with -y option (#729)
taoyl-ms Jun 22, 2017
5c85270
[sonic-cfggen]: Fix minigraph.py when port_alias_map absent (#738)
Jun 22, 2017
4bdcac8
[bgp]: move allowas-in into ipv6 section to enable allowas-in for ipv…
lguohan Jun 23, 2017
d1b12dc
[swss]: Sleep 5 min regardless of arp_update return code (#743)
Jun 23, 2017
350718e
[Mellanox]: Update SAI version (#740)
oleksandrivantsiv Jun 23, 2017
00c494f
[sonic-cfggen]: Add default IP deny rule in translate_acl (#734)
taoyl-ms Jun 23, 2017
22819d9
[docker-platform-monitor]: Add fancontrol (#735)
jleveque Jun 23, 2017
0cdad94
Fix typo in README (#750)
qiluo-msft Jun 24, 2017
017eea8
[DHCP Relay]: Add support for custom Option 82 circuit_id of the form…
jleveque Jun 24, 2017
fbb2e41
[Accton]: Add a new supported device and platform AS7716-32X (#732)
pollyhsu2git Jun 24, 2017
b92fc2a
[.gitignore]: Update src, config engine (#754)
marian-pritsak Jun 26, 2017
fd730d8
[submodule]: update sonic-swss (#755)
oleksandrivantsiv Jun 26, 2017
2d97c6a
[sonic-swss-common]: Submodule update (#759)
pavel-shirshov Jun 27, 2017
5310e7a
[mgmt slave] Install correct version of python-cffi (#760)
taoyl-ms Jun 27, 2017
3798262
[DHCP Relay]: Fix Option 82 string - Remove quotes; add MAC address o…
jleveque Jun 28, 2017
15f245c
[platform]: add front panel index in port_config.ini for s6100 (#752)
lguohan Jun 28, 2017
e68d9a2
[igb]: change download url to azure storage url (#770)
lguohan Jun 29, 2017
3ac724e
[baseimage]: Increase net.core.rmem_max to 2097152 (#767)
pavel-shirshov Jun 29, 2017
3f570a4
Update Ingrasys platform submodule (#764)
wadelnn Jun 29, 2017
39bd495
[Broadcom]: Update SAI package to support Celestica Seastone DX010 an…
Jun 29, 2017
bce5446
[LLDP]: Port description (TLV 4) now contains '<neighbor_host_name>:<…
jleveque Jun 29, 2017
e31e1f7
[sonic-slave]: install docker-ce 17.03.02 stable version (#774)
lguohan Jun 30, 2017
e904b3b
[device]: add minigraph and LED support for Arista 7050 QX32S (#773)
lguohan Jun 30, 2017
bce4b70
Update submodules: sairedis, swss
qiluo-msft Jun 30, 2017
0585249
Merge branch 'github_master' into qiluo/v1.0.3
qiluo-msft Jun 30, 2017
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
13 changes: 13 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,19 @@ src/snmpd/*
src/thrift/*
!src/thrift/Makefile
src/sonic-device-data/src/device/
src/sonic-device-data/src/debian/
src/igb/*
!src/igb/Makefile
src/mpdecimal/*
!src/mpdecimal/Makefile
src/python3/*
!src/python3/Makefile

# Autogenerated Dockerfiles
dockers/docker-base/Dockerfile
dockers/docker-config-engine/Dockerfile
dockers/docker-database/Dockerfile
dockers/docker-dhcp-relay/Dockerfile
dockers/docker-fpm-frr/Dockerfile
dockers/docker-fpm-gobgp/Dockerfile
dockers/docker-fpm-quagga/Dockerfile
Expand All @@ -42,3 +50,8 @@ platform/*/docker-syncd-*-rpc/Dockerfile

# Installer-related files and directories
installer/x86_64/platforms/

# Config engine
src/sonic-config-engine/**/*.pyc
src/sonic-config-engine/build
src/sonic-config-engine/sonic_config_engine.egg-info
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,6 @@
[submodule "src/sonic-platform-daemons"]
path = src/sonic-platform-daemons
url = https://github.com/Azure/sonic-platform-daemons
[submodule "platform/broadcom/sonic-platform-modules-accton"]
path = platform/broadcom/sonic-platform-modules-accton
url = https://github.com/edge-core/sonic-platform-modules-accton.git
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ To build SONiC installer image and docker images, run the following commands:

**NOTE**: We recommend reserving 50G free space to build one platform.

The SONIiC installer contains all docker images needed. SONiC use one image for all switches devices of a same ASIC vendor. The supported ASIC vendors are:
The SONiC installer contains all docker images needed. SONiC uses one image for all devices of a same ASIC vendor. The supported ASIC vendors are:

- PLATFORM=broadcom
- PLATFORM=marvell (*pending*)
Expand Down
3 changes: 3 additions & 0 deletions build_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
sudo \
vim \
tcpdump \
dbus \
ntp \
ntpstat \
openssh-server \
Expand Down Expand Up @@ -264,6 +265,8 @@ set /files/etc/sysctl.conf/net.ipv6.conf.default.accept_dad 0
set /files/etc/sysctl.conf/net.ipv6.conf.all.accept_dad 0

set /files/etc/sysctl.conf/net.ipv6.conf.eth0.accept_ra_defrtr 0

set /files/etc/sysctl.conf/net.core.rmem_max 2097152
" -r $FILESYSTEM_ROOT

## docker-py is needed by Ansible docker module
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# name lanes alias
Ethernet0 49,50,51,52 hundredGigE1
Ethernet4 53,54,55,56 hundredGigE2
Ethernet8 57,58,59,60 hundredGigE3
Ethernet12 61,62,63,64 hundredGigE4
Ethernet16 65,66,67,68 hundredGigE5
Ethernet20 69,70,71,72 hundredGigE6
Ethernet24 73,74,75,76 hundredGigE7
Ethernet28 77,78,79,80 hundredGigE8
Ethernet32 33,34,35,36 hundredGigE9
Ethernet36 37,38,39,40 hundredGigE10
Ethernet40 41,42,43,44 hundredGigE11
Ethernet44 45,46,47,48 hundredGigE12
Ethernet48 81,82,83,84 hundredGigE13
Ethernet52 85,86,87,88 hundredGigE14
Ethernet56 89,90,91,92 hundredGigE15
Ethernet60 93,94,95,96 hundredGigE16
Ethernet64 97,98,99,100 hundredGigE17
Ethernet68 101,102,103,104 hundredGigE18
Ethernet72 105,106,107,108 hundredGigE19
Ethernet76 109,110,111,112 hundredGigE20
Ethernet80 17,18,19,20 hundredGigE21
Ethernet84 21,22,23,24 hundredGigE22
Ethernet88 25,26,27,28 hundredGigE23
Ethernet92 29,30,31,32 hundredGigE24
Ethernet96 113,114,115,116 hundredGigE25
Ethernet100 117,118,119,120 hundredGigE26
Ethernet104 121,122,123,124 hundredGigE27
Ethernet108 125,126,127,128 hundredGigE28
Ethernet112 1,2,3,4 hundredGigE29
Ethernet116 5,6,7,8 hundredGigE30
Ethernet120 9,10,11,12 hundredGigE31
Ethernet124 13,14,15,16 hundredGigE32
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
SAI_INIT_CONFIG_FILE=/etc/bcm/th-as7712-32x100G.config.bcm

3 changes: 3 additions & 0 deletions device/accton/x86_64-accton_as7712_32x-r0/installer.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CONSOLE_PORT=0x2f8
CONSOLE_DEV=1
CONSOLE_SPEED=115200
Loading