Commit Graph

3612 Commits

Author SHA1 Message Date
Tamer Ahmed
dd3e7a6fa8 [hostcfgd] Handle Both Service And Timer Units (#5228)
Commit e484ae9dd introduced systemd .timer unit to hostcfgd.
However, when stopping service that has timer, there is possibility that
timer is not running and the service would not be stopped. This PR
address this situation by handling both .timer and .service units.

signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
2020-08-22 09:29:54 -07:00
abdosi
8437f4a6c3 Fix unwanted python exception in syslog during database container (#5227)
startup when doing redis PING since database_config.json getting
generated from jinja2 template is still not ready.

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
2020-08-21 07:41:32 -07:00
abdosi
427382b54b
[201911] Multiasic cleanup of get_npu_device_id() (#5229)
* [201911] skip_thermalctld for VS platform as it is
not supported

root@vlab-01:/# supervisorctl status
dependent-startup                EXITED    Aug 18 06:22 AM
rsyslogd                         RUNNING   pid 18, uptime 0:12:26
start                            EXITED    Aug 18 06:22 AM
supervisor-proc-exit-listener    RUNNING   pid 13, uptime 0:12:27

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

* [201911] after PR #https://github.com/Azure/sonic-buildimage/pull/5204
this function is no more needed so cleaning up.

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
2020-08-20 17:47:04 -07:00
Tamer Ahmed
9decadfed2 [services] Fix Delay Start of SNMP And Telemetry (#5211)
SNMP and Telemetry services are not critical to switch startup.
They also cause fast-reboot not to meet timing requirements.
In order to delay start those service are associated with systemd
timer units, however when hostcfgd initiate service start, it start
the service and not the timer. This PR fixes this issue by
starting the timer associated with systemd unit.

signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
2020-08-20 16:26:08 -07:00
Abhishek Dosi
b0dd43d700 Fix cherry-pick f785a0a270
w.r.t 201911 image change.
Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
2020-08-20 16:24:18 -07:00
abdosi
f785a0a270 [caclmgrd] Add support for multi-ASIC platforms (#5022)
* Support for Control Plane ACL's for Multi-asic Platforms.
Following changes were done:
 1) Moved from using blocking listen() on Config DB to the select() model
 via python-swsscommon since we have to wait on event from multiple
 config db's
 2) Since  python-swsscommon is not available on host added libswsscommon and python-swsscommon
    and dependent packages in the base image (host enviroment)
 3) Made iptables programmed in all namespace using ip netns exec

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

* Address Review Comments

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

* Fix Review Comments

* Fix Comments

* Added Change for Multi-asic to have iptables
rules to accept internal docker tcp/udp traffic
needed for syslog and redis-tcp connection.

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

* Fix Review Comments

* Added more comments on logic.

* Fixed all warning/errors reported by http://pep8online.com/
other than line > 80 characters.

* Fix Comment
Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

* Verified with swsscommon package. Fix issue for single asic platforms.

* Moved to new python package

* Address Review Comments.

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

* Address Review Comments.
2020-08-20 16:01:12 -07:00
Abhishek Dosi
c079b0d644 [submodule update] sonic-swss
Fix for compile error
2020-08-20 09:35:32 -07:00
Tamer Ahmed
9514932ed5 [telemetry] Fix telemetry vars template path (#4938)
The template is referenced relative to the script path and this could
results in errors in case script is run from root. Add explicit
path to the template file name.
Also, moving telemetry_var template to template dir.
And remove double quotes from around json dict.

signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
2020-08-19 16:59:32 -07:00
Mahesh Maddikayala
42ab5d43fa + Modified buffer config template to include internal ASIC with 5m ca… (#4959)
+ Modified buffer config template to include internal ASIC with 5m cable length
+ added unit test to verify the changes.
2020-08-19 15:07:44 -07:00
SuvarnaMeenakshi
8b2fb7cdf6 [multi-asic]: Update port_config files for multi-asic vs image (#5121)
Modify port_config.ini files multi-asic vs platform. Changes done:
- Add new columns: index, asic_port_name, role(Int/Ext)
- Modify alias of interface names. Alias should match the interface names present in minigraph file.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
2020-08-19 15:06:48 -07:00
SuvarnaMeenakshi
5b90f69238 [systemd-generator]: Remove creation of NUM_ASIC environment (#5122)
NUM_ASIC environment variable was added so that it could be used by other utilities.
This is not being used by any other utility or docker, hence removing the addition of NUM_ASIC environment variable.
Also, the environment variable was added by adding the variable value to /etc/environ file.
Upon each reboot, this file gets updated with the NUM_ASIC value but the existing value was not removed.
This causes multiple lines getting appended in /etc/environ file upon each reboot.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
2020-08-19 15:06:04 -07:00
arlakshm
fe8ee92f83 Fix to prevent classification all portchannels is External (#5202)
Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <arlakshm@microsoft.com>
Fix the checks in the API is_port_channel_internal
2020-08-19 15:04:14 -07:00
Abhishek Dosi
b105b5a0fc [submodule update] sonic-swss-common
Dbconnector namespace support (#376)

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
2020-08-19 14:58:52 -07:00
Abhishek Dosi
87f975bf42 [Submodule update sonic-swss
[sonic-swsss] Fix the issue of field "next_hop_ip" not getting updated
 in state DB in ERSPAN Mirror (#1375)
[vlanmgr] Support Jumbo Frame By Default (#1393)
[fec] added logic that put port down before applying fec
onfiguration (#1399)
 [fec] Get FEC mode when port is already admin down (#1403)
 Refine getDbId() calling to fix build after swss-common change
 (#1245)
2020-08-19 14:57:35 -07:00
Aravind Mani
fef4626804
Dell S6100 Port I2C changes to 201911 branch (#5148) 2020-08-18 14:39:36 -07:00
abdosi
e115f7273e
Fix the makefile to use include for restapi and telemetry. (#5209)
As part of cherry-pick from master into 201911 conflict
was not handled correctly.

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
2020-08-18 10:46:15 -07:00
judyjoseph
91c61e31ad
Updates to move the function get_asic_device_id() into the sonic-py-common. (#5204)
Update the name from get_npu_device_id() -to get_asic_device_id() and move from device_info.py, to the new file multi_asic.py in sonic-py-common so that it references to the correct valid constants.
2020-08-18 10:18:07 -07:00
abdosi
04aaeb1390
[201911] skip_thermalctld for VS platform as it is (#5207)
not supported

root@vlab-01:/# supervisorctl status
dependent-startup                EXITED    Aug 18 06:22 AM
rsyslogd                         RUNNING   pid 18, uptime 0:12:26
start                            EXITED    Aug 18 06:22 AM
supervisor-proc-exit-listener    RUNNING   pid 13, uptime 0:12:27

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
2020-08-18 07:56:55 -07:00
xumia
1abf7be730 Simplify the function to covert pfx certificate (#5086) 2020-08-17 22:36:32 +00:00
xumia
17fd575b66 Support to convert certificate from pfx to pem format (#5073)
* Support to convert certificate from pfx to pem format

* Fix code issue
2020-08-17 22:36:25 +00:00
Abhishek Dosi
87fa88052b [submodule update] sonic-utilities
Common functions for show CLI support on multi ASIC (#999)
2020-08-16 08:27:33 -07:00
lguohan
92270544c5 [docker-orchagent]: start portsyncd before orchagent (#4845)
when portsyncd starts, it first enumerates all front panel ports
and marks them as old interfaces. Then, for new front panel ports
it checks if their indexes exist in previous sets. If yes, it will
treats them as old interfaces and ignore them.

The reason we have this check is because broadcom SAI only removes
front panel ports after sai switch init.

So, if portsyncd starts after orchagent, new interfaces could be
created before portsyncd and treated as old interface.

Signed-off-by: Guohan Lu <lguohan@gmail.com>
2020-08-16 08:25:36 -07:00
Joe LeVeque
802e77c3f1 [docker-pmon] Fix copy of fancontrol config file (#5037)
Copy proper fancontrol config file to the proper destination. Also some minor refactoring for code reuse to help prevent issues like this in the future.

Fixes a bug introduced by #4599
2020-08-15 22:35:02 -07:00
Guohan Lu
42f9be1de3 [docker-database]: do not generate pidfile for rsyslogd
Signed-off-by: Guohan Lu <lguohan@gmail.com>
2020-08-15 22:32:25 -07:00
Guohan Lu
569766f698 [docker-snmp-sv2]: use service dependency in supervisord to start services
Signed-off-by: Guohan Lu <lguohan@gmail.com>
2020-08-15 22:32:19 -07:00
Guohan Lu
cf3260861b [docker-syncd-nephos]: use service dependency in supervisord to start services 2020-08-15 22:32:12 -07:00
Guohan Lu
8d3fd18162 [docker-syncd-mrvl]: use service dependency in supervisord to start services 2020-08-15 22:32:05 -07:00
Guohan Lu
82adac4926 [docker-syncd-centec]: use service dependency in supervisord to start services
Signed-off-by: Guohan Lu <lguohan@gmail.com>
2020-08-15 22:31:55 -07:00
Guohan Lu
8de1e8de28 [docker-syncd-invm]: use service dependency in supervisord to start services 2020-08-15 22:31:46 -07:00
Guohan Lu
0936e9abc5 [docker-syncd-bfn]: use service dependency in supervisord to start services 2020-08-15 22:31:39 -07:00
Guohan Lu
b52b9c12cf [docker-syncd-mlnx]: use service dependency in supervisord to start services 2020-08-15 22:31:32 -07:00
Guohan Lu
da7e36e869 [docker-syncd-brcm]: use service dependency in supervisord to start services 2020-08-15 22:31:23 -07:00
Guohan Lu
6909170c3e [docker-syncd-vs]: use service dependency in supervisord to start services 2020-08-15 22:31:13 -07:00
Guohan Lu
b378b4d249 [docker-dhcp-relay]: use service dependency in supervisord to start services 2020-08-15 22:25:52 -07:00
Guohan Lu
7158ccd30d [docker-teamd]: use service dependency in supervisord to start services 2020-08-15 22:25:46 -07:00
Guohan Lu
1b6b6055e7 [docker-mgmt-framework]: use service dependency in supervisord to start services
Signed-off-by: Guohan Lu <lguohan@gmail.com>
2020-08-15 22:25:38 -07:00
Guohan Lu
4d2f9d1245 [docker-telemetry]: use service dependency in supervisord to start services
Signed-off-by: Guohan Lu <lguohan@gmail.com>
2020-08-15 22:25:32 -07:00
Guohan Lu
9f5c5c7a4a [docker-restapi]: use service dependency in supervisord to start services 2020-08-15 22:25:24 -07:00
Guohan Lu
763673993e [docker-pmon]: use service dependency in supervisord to start services 2020-08-15 22:23:50 -07:00
Guohan Lu
aa0b875b03 [docker-sflow]: use service dependency in supervisord to start services 2020-08-15 22:22:00 -07:00
Guohan Lu
5be374c746 [docker-orchagent]: use service dependency in supervisord to start services 2020-08-15 22:21:52 -07:00
Guohan Lu
db5a979247 [docker-radvd]: use service dependency in supervisord to start services 2020-08-15 22:21:44 -07:00
Guohan Lu
685041a66a [docker-lldp-sv2]: use service dependency in supervisord to start services 2020-08-15 22:21:33 -07:00
Guohan Lu
eb41fd5df6 [docker-nat]: use service dependency in supervisord to start servicesx
Signed-off-by: Guohan Lu <lguohan@gmail.com>
2020-08-15 22:20:35 -07:00
Guohan Lu
397517d449 [docker-base]: remove dummy password for supervisord control
Signed-off-by: Guohan Lu <lguohan@gmail.com>
2020-08-15 22:20:23 -07:00
Guohan Lu
ebd1915356 [docker-base]: add supervisord-dependent-startup plugin for supervisord 2020-08-15 22:19:39 -07:00
Stephen Sun
f6a8678d8f
Support single ingress pool for MSFT SKUs and optimize headroom calculation (#5194)
This is to backport the #4886 to 201911

Calculate pool size in t1 as 24 * downlink port + 8 * uplink port

- Take both port and peer MTU into account when calculating headroom
- Worst case factor is decreased to 50%
- Mellanox-SN2700-C28D8 t0, assume 48 * 50G/5m + 8 * 100G/40m ports
- Mellanox-SN2700 (C32)
  - t0: 16 * 100G/5m + 16 * 100G/40m
  - t1: 16 * 100G/40m + 16 * 100G/300m

Signed-off-by: Stephen Sun <stephens@nvidia.com>
2020-08-15 07:52:28 -07:00
arlakshm
7ca24c3580
[201911] Common functions for Multi ASIC CLIs (#5193)
* Port Multi Asic common changes to 201911

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <arlakshm@microsoft.com>

* fix compilation issue

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <arlakshm@microsoft.com>

* fix compilation issue

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <arlakshm@microsoft.com>
2020-08-15 07:16:58 -07:00
Abhishek Dosi
203e854184 [submodule update] sonic-utilities
[201911] fix show version #1055
2020-08-14 18:31:58 -07:00
abdosi
ef4d85855f
Two fixes: (#5191)
a) we should use get_platform() with new sonic_py-common package
b) In 201911 DB Connector is still using db id based constructor
as following PR https://github.com/Azure/sonic-buildimage/pull/4549
is not cherry-picked yet. So revert the change to use db is insatead of
db_name for now.

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
2020-08-14 18:10:20 -07:00