Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into multiasic_feature…
Browse files Browse the repository at this point in the history 
…table
  • Loading branch information
Abhishek Dosi committed Sep 19, 2020
2 parents 383aecd + 2de3afa commit 75fa914
Show file tree
Hide file tree
Showing 95 changed files with 2,227 additions and 1,423 deletions.
1 change: 1 addition & 0 deletions Makefile.work
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ SONIC_BUILD_INSTRUCTION := make \
PLATFORM_ARCH=$(PLATFORM_ARCH) \
BUILD_NUMBER=$(BUILD_NUMBER) \
BUILD_TIMESTAMP=$(BUILD_TIMESTAMP) \
SONIC_IMAGE_VERSION=$(SONIC_IMAGE_VERSION) \
ENABLE_DHCP_GRAPH_SERVICE=$(ENABLE_DHCP_GRAPH_SERVICE) \
ENABLE_ZTP=$(ENABLE_ZTP) \
SHUTDOWN_BGP_ON_START=$(SHUTDOWN_BGP_ON_START) \
Expand Down
5 changes: 3 additions & 2 deletions build_debian.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,8 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
python-pip \
python3-pip \
cron \
haveged
haveged \
jq


if [[ $CONFIGURED_ARCH == amd64 ]]; then
Expand Down Expand Up @@ -449,7 +450,7 @@ fi
## Version file
sudo mkdir -p $FILESYSTEM_ROOT/etc/sonic
sudo tee $FILESYSTEM_ROOT/etc/sonic/sonic_version.yml > /dev/null <<EOF
build_version: '$(sonic_get_version)'
build_version: '${SONIC_IMAGE_VERSION}'
debian_version: '$(cat $FILESYSTEM_ROOT/etc/debian_version)'
kernel_version: '$kversion'
asic_type: $sonic_asic_platform
Expand Down
2 changes: 1 addition & 1 deletion build_image.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fi
exit 1
}

IMAGE_VERSION=$(. functions.sh && sonic_get_version)
IMAGE_VERSION="${SONIC_IMAGE_VERSION}"

generate_onie_installer_image()
{
Expand Down
0 ...x86_64-accton_as9516bf_32d-r0/default_sku → ...t/x86_64-accton_as9516_32d-r0/default_sku
View file
File renamed without changes.
0 ..._64-accton_as9516bf_32d-r0/installer.conf → ...86_64-accton_as9516_32d-r0/installer.conf
View file
File renamed without changes.
0 ...n_as9516bf_32d-r0/newport/buffers.json.j2 → ...ton_as9516_32d-r0/newport/buffers.json.j2
View file
File renamed without changes.
0 ...6bf_32d-r0/newport/buffers_defaults_t0.j2 → ...516_32d-r0/newport/buffers_defaults_t0.j2
View file
File renamed without changes.
0 ...6bf_32d-r0/newport/buffers_defaults_t1.j2 → ...516_32d-r0/newport/buffers_defaults_t1.j2
View file
File renamed without changes.
0 ...16bf_32d-r0/newport/pg_profile_lookup.ini → ...9516_32d-r0/newport/pg_profile_lookup.ini
View file
File renamed without changes.
0 ...n_as9516bf_32d-r0/newport/port_config.ini → ...ton_as9516_32d-r0/newport/port_config.ini
View file
File renamed without changes.
0 ...ccton_as9516bf_32d-r0/newport/qos.json.j2 → ...-accton_as9516_32d-r0/newport/qos.json.j2
View file
File renamed without changes.
0 ...ccton_as9516bf_32d-r0/newport/sai.profile → ...-accton_as9516_32d-r0/newport/sai.profile
View file
File renamed without changes.
0 ...9516bf_32d-r0/newport/switch-tna-sai.conf → ...as9516_32d-r0/newport/switch-tna-sai.conf
View file
File renamed without changes.
0 ...oot/x86_64-accton_as9516bf_32d-r0/plugins → ...efoot/x86_64-accton_as9516_32d-r0/plugins
View file
File renamed without changes.
0 ..._as9516bf_32d-r0/pmon_daemon_control.json → ...on_as9516_32d-r0/pmon_daemon_control.json
View file
File renamed without changes.
1 change: 1 addition & 0 deletions device/barefoot/x86_64-accton_as9516bf_32d-r0
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
x86_64-accton_as9516_32d-r0
100 changes: 100 additions & 0 deletions device/celestica/x86_64-cel_seastone-r0/Seastone-DX010-10-50/hwsku.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
{
"interfaces": {
"Ethernet0": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet4": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet8": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet12": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet16": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet20": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet24": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet28": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet32": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet36": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet40": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet44": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet48": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet52": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet56": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet60": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet64": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet68": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet72": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet76": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet80": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet84": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet88": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet92": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet96": {
"default_brkout_mode": "2x50G"
},
"Ethernet100": {
"default_brkout_mode": "2x50G"
},
"Ethernet104": {
"default_brkout_mode": "2x50G"
},
"Ethernet108": {
"default_brkout_mode": "2x50G"
},
"Ethernet112": {
"default_brkout_mode": "2x50G"
},
"Ethernet116": {
"default_brkout_mode": "2x50G"
},
"Ethernet120": {
"default_brkout_mode": "2x50G"
},
"Ethernet124": {
"default_brkout_mode": "2x50G"
}
}
}
100 changes: 100 additions & 0 deletions device/celestica/x86_64-cel_seastone-r0/Seastone-DX010-25-50/hwsku.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
{
"interfaces": {
"Ethernet0": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet4": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet8": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet12": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet16": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet20": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet24": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet28": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet32": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet36": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet40": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet44": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet48": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet52": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet56": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet60": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet64": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet68": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet72": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet76": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet80": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet84": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet88": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet92": {
"default_brkout_mode": "4x25G[10G]"
},
"Ethernet96": {
"default_brkout_mode": "2x50G"
},
"Ethernet100": {
"default_brkout_mode": "2x50G"
},
"Ethernet104": {
"default_brkout_mode": "2x50G"
},
"Ethernet108": {
"default_brkout_mode": "2x50G"
},
"Ethernet112": {
"default_brkout_mode": "2x50G"
},
"Ethernet116": {
"default_brkout_mode": "2x50G"
},
"Ethernet120": {
"default_brkout_mode": "2x50G"
},
"Ethernet124": {
"default_brkout_mode": "2x50G"
}
}
}
100 changes: 100 additions & 0 deletions device/celestica/x86_64-cel_seastone-r0/Seastone-DX010-50-40/hwsku.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
{
"interfaces": {
"Ethernet0": {
"default_brkout_mode": "2x50G"
},
"Ethernet4": {
"default_brkout_mode": "2x50G"
},
"Ethernet8": {
"default_brkout_mode": "2x50G"
},
"Ethernet12": {
"default_brkout_mode": "2x50G"
},
"Ethernet16": {
"default_brkout_mode": "2x50G"
},
"Ethernet20": {
"default_brkout_mode": "2x50G"
},
"Ethernet24": {
"default_brkout_mode": "2x50G"
},
"Ethernet28": {
"default_brkout_mode": "2x50G"
},
"Ethernet32": {
"default_brkout_mode": "2x50G"
},
"Ethernet36": {
"default_brkout_mode": "2x50G"
},
"Ethernet40": {
"default_brkout_mode": "2x50G"
},
"Ethernet44": {
"default_brkout_mode": "2x50G"
},
"Ethernet48": {
"default_brkout_mode": "2x50G"
},
"Ethernet52": {
"default_brkout_mode": "2x50G"
},
"Ethernet56": {
"default_brkout_mode": "2x50G"
},
"Ethernet60": {
"default_brkout_mode": "2x50G"
},
"Ethernet64": {
"default_brkout_mode": "1x100G[40G]"
},
"Ethernet68": {
"default_brkout_mode": "1x100G[40G]"
},
"Ethernet72": {
"default_brkout_mode": "1x100G[40G]"
},
"Ethernet76": {
"default_brkout_mode": "1x100G[40G]"
},
"Ethernet80": {
"default_brkout_mode": "1x100G[40G]"
},
"Ethernet84": {
"default_brkout_mode": "1x100G[40G]"
},
"Ethernet88": {
"default_brkout_mode": "1x100G[40G]"
},
"Ethernet92": {
"default_brkout_mode": "1x100G[40G]"
},
"Ethernet96": {
"default_brkout_mode": "1x100G[40G]"
},
"Ethernet100": {
"default_brkout_mode": "1x100G[40G]"
},
"Ethernet104": {
"default_brkout_mode": "1x100G[40G]"
},
"Ethernet108": {
"default_brkout_mode": "1x100G[40G]"
},
"Ethernet112": {
"default_brkout_mode": "1x100G[40G]"
},
"Ethernet116": {
"default_brkout_mode": "1x100G[40G]"
},
"Ethernet120": {
"default_brkout_mode": "1x100G[40G]"
},
"Ethernet124": {
"default_brkout_mode": "1x100G[40G]"
}
}
}
Loading

0 comments on commit 75fa914

Please sign in to comment.