merge with master

.gitignore

@@ -28,6 +28,8 @@ src/lldpd/*
 !src/lldpd/patch/
 src/mpdecimal/*
 !src/mpdecimal/Makefile
+src/python-click/*
+!src/python-click/Makefile
 src/python3/*
 !src/python3/Makefile
 src/redis/*

.gitmodules

@@ -77,3 +77,6 @@
 [submodule "platform/broadcom/sonic-platform-modules-mitac"]
 	path = platform/broadcom/sonic-platform-modules-mitac
 	url = https://github.com/MiTAC-EBU/sonic-platform-modules-mitac.git
+[submodule "platform/p4/sonic-platform-modules-arista"]
+	path = platform/p4/sonic-platform-modules-arista
+	url = https://github.com/aristanetworks/sonic

Makefile

@@ -107,6 +107,10 @@ sonic-slave-bash :
 	    $(DOCKER_BUILD) ; }
 	@$(DOCKER_RUN) -t $(SLAVE_IMAGE):$(SLAVE_TAG) bash
 
+showtag:
+	@echo $(SLAVE_IMAGE):$(SLAVE_TAG)
+	@echo $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG)
+
 init :
 	@git submodule update --init --recursive
 	@git submodule foreach --recursive '[ -f .git ] && echo "gitdir: $$(realpath --relative-to=. $$(cut -d" " -f2 .git))" > .git'

build_debian.sh

@@ -3,26 +3,22 @@
 ## an ONIE installer image.
 ##
 ## USAGE:
-##   ./build_debian USERNAME PASSWORD_ENCRYPTED
-## PARAMETERS:
+##   USERNAME=username PASSWORD=password ./build_debian
+## ENVIRONMENT:
 ##   USERNAME
 ##          The name of the default admin user
-##   PASSWORD_ENCRYPTED
-##          The encrypted password, expected by chpasswd command
+##   PASSWORD
+##          The password, expected by chpasswd command
 
 ## Default user
-USERNAME=$1
 [ -n "$USERNAME" ] || {
-    echo "Error: no or empty USERNAME argument"
+    echo "Error: no or empty USERNAME"
     exit 1
 }
 
-## Password for the default user, customizable by environment variable
-## By default it is an empty password
-## You may get a crypted password by: perl -e 'print crypt("YourPaSsWoRd", "salt"),"\n"'
-PASSWORD_ENCRYPTED=$2
-[ -n "$PASSWORD_ENCRYPTED" ] || {
-    echo "Error: no or empty PASSWORD_ENCRYPTED argument"
+## Password for the default user
+[ -n "$PASSWORD" ] || {
+    echo "Error: no or empty PASSWORD"
     exit 1
 }
 
@@ -178,7 +174,7 @@ sudo cp files/docker/docker.service.conf $_
 ## Note: user should be in the group with the same name, and also in sudo/docker group
 sudo LANG=C chroot $FILESYSTEM_ROOT useradd -G sudo,docker $USERNAME -c "$DEFAULT_USERINFO" -m -s /bin/bash
 ## Create password for the default user
-echo $USERNAME:$PASSWORD_ENCRYPTED | sudo LANG=C chroot $FILESYSTEM_ROOT chpasswd -e
+echo "$USERNAME:$PASSWORD" | sudo LANG=C chroot $FILESYSTEM_ROOT chpasswd
 
 ## Pre-install hardware drivers
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install      \
@@ -226,7 +222,11 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     sysfsutils              \
     grub2-common            \
     ethtool                 \
-    screen
+    screen                  \
+    hping3                  \
+    python-scapy            \
+    tcptraceroute           \
+    mtr-tiny
 
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y download \
     grub-pc-bin
@@ -269,6 +269,8 @@ sudo sed -i '
 sudo tee -a $FILESYSTEM_ROOT/etc/monit/monitrc > /dev/null <<'EOF'
 check filesystem root-aufs with path /
   if space usage > 90% for 5 times within 10 cycles then alert
+check filesystem var-log with path /var/log
+  if space usage > 90% for 5 times within 10 cycles then alert
 check system $HOST
   if memory usage > 90% for 5 times within 10 cycles then alert
   if cpu usage (user) > 90% for 5 times within 10 cycles then alert

device/accton/x86_64-accton_as7312_54xs-r0/Accton-AS7312-54XS/port_config.ini

@@ -0,0 +1,55 @@
+# name          lanes                 alias             index
+Ethernet0       41                    twentyfiveGigE1   0
+Ethernet1       42                    twentyfiveGigE2   1
+Ethernet2       43                    twentyfiveGigE3   2
+Ethernet3       44                    twentyfiveGigE4   3
+Ethernet4       49                    twentyfiveGigE5   4
+Ethernet5       50                    twentyfiveGigE6   5
+Ethernet6       51                    twentyfiveGigE7   6
+Ethernet7       52                    twentyfiveGigE8   7
+Ethernet8       53                    twentyfiveGigE9   8
+Ethernet9       54                    twentyfiveGigE10  9
+Ethernet10      55                    twentyfiveGigE11  10
+Ethernet11      56                    twentyfiveGigE12  11
+Ethernet12      65                    twentyfiveGigE13  12
+Ethernet13      66                    twentyfiveGigE14  13
+Ethernet14      67                    twentyfiveGigE15  14
+Ethernet15      68                    twentyfiveGigE16  15
+Ethernet16      33                    twentyfiveGigE17  16
+Ethernet17      34                    twentyfiveGigE18  17
+Ethernet18      35                    twentyfiveGigE19  18
+Ethernet19      36                    twentyfiveGigE20  19
+Ethernet20      37                    twentyfiveGigE21  20
+Ethernet21      38                    twentyfiveGigE22  21
+Ethernet22      39                    twentyfiveGigE23  22
+Ethernet23      40                    twentyfiveGigE24  23
+Ethernet24      69                    twentyfiveGigE25  24
+Ethernet25      70                    twentyfiveGigE26  25
+Ethernet26      71                    twentyfiveGigE27  26
+Ethernet27      72                    twentyfiveGigE28  27
+Ethernet28      81                    twentyfiveGigE29  28
+Ethernet29      82                    twentyfiveGigE30  29
+Ethernet30      83                    twentyfiveGigE31  30
+Ethernet31      84                    twentyfiveGigE32  31
+Ethernet32      85                    twentyfiveGigE33  32
+Ethernet33      86                    twentyfiveGigE34  33
+Ethernet34      87                    twentyfiveGigE35  34
+Ethernet35      88                    twentyfiveGigE36  35
+Ethernet36      97                    twentyfiveGigE37  36
+Ethernet37      98                    twentyfiveGigE38  37
+Ethernet38      99                    twentyfiveGigE39  38
+Ethernet39      100                   twentyfiveGigE40  39
+Ethernet40      101                   twentyfiveGigE41  40
+Ethernet41      102                   twentyfiveGigE42  41
+Ethernet42      103                   twentyfiveGigE43  42
+Ethernet43      104                   twentyfiveGigE44  43
+Ethernet44      105                   twentyfiveGigE45  44
+Ethernet45      106                   twentyfiveGigE46  45
+Ethernet46      107                   twentyfiveGigE47  46
+Ethernet47      108                   twentyfiveGigE48  47
+Ethernet48      5,6,7,8               hundredGigE49     48
+Ethernet52      1,2,3,4               hundredGigE50     52
+Ethernet56      109,110,111,112       hundredGigE51     56
+Ethernet60      21,22,23,24           hundredGigE52     60
+Ethernet64      9,10,11,12            hundredGigE53     64
+Ethernet68      117,118,119,120       hundredGigE54     68

device/accton/x86_64-accton_as7312_54xs-r0/Accton-AS7312-54XS/sai.profile

@@ -0,0 +1 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-as7312-48x25G+6x100G.config.bcm