Skip to content

Commit

Permalink
Merge branch '202205' into 202205
Browse files Browse the repository at this point in the history
  • Loading branch information
gechiang authored Apr 19, 2024
2 parents 462c618 + 2fc6aa9 commit 9497bb1
Show file tree
Hide file tree
Showing 14 changed files with 449 additions and 14 deletions.
4 changes: 2 additions & 2 deletions files/scripts/startup_tsa_tsb.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ def get_tsa_config(asic_ns):
def get_tsa_status(num_asics):
if num_asics > 1:
counter = 0
for asic_id in range(int(asic_num)):
for asic_id in range(int(num_asics)):
asic_ns = 'asic{}'.format(asic_id)
sub_role = get_sub_role(asic_ns)
if sub_role == 'FrontEnd':
tsa_enabled = get_tsa_config(asic_ns)
if tsa_enabled == 'false':
counter += 1
if counter == int(asic_num):
if counter == int(num_asics):
return True;
else:
tsa_enabled = get_tsa_config("")
Expand Down
2 changes: 1 addition & 1 deletion platform/broadcom/platform-modules-nokia.mk
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ $(NOKIA_IXR7250_PLATFORM_MODULE)_PLATFORM = x86_64-nokia_ixr7250e_sup-r0
$(NOKIA_IXR7250_PLATFORM_MODULE)_PLATFORM += x86_64-nokia_ixr7250e_36x400g-r0
SONIC_DPKG_DEBS += $(NOKIA_IXR7250_PLATFORM_MODULE)

NDK_VERSION = 22.9.25
NDK_VERSION = 22.9.26
NOKIA_NDK_DEBIAN = ndk_$(NDK_VERSION)_amd64.deb
$(NOKIA_NDK_DEBIAN)_URL = "https://github.com/Nokia-ION/ndk-releases/releases/download/v$(NDK_VERSION)/$(NOKIA_NDK_DEBIAN)"
SONIC_ONLINE_DEBS += $(NOKIA_NDK_DEBIAN)
7 changes: 1 addition & 6 deletions src/sonic-config-engine/portconfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,7 @@ def db_connect_configdb(namespace=None):
"""
Connect to configdb
"""
try:
if namespace is not None:
swsscommon.SonicDBConfig.load_sonic_global_db_config(namespace=namespace)
config_db = swsscommon.ConfigDBConnector(use_unix_socket_path=True, namespace=namespace)
except Exception as e:
return None
config_db = swsscommon.ConfigDBConnector(use_unix_socket_path=True, namespace=namespace)
if config_db is None:
return None
try:
Expand Down
16 changes: 13 additions & 3 deletions src/sonic-config-engine/sonic-cfggen
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ from config_samples import generate_sample_config, get_available_config
from functools import partial
from minigraph import minigraph_encoder, parse_xml, parse_device_desc_xml, parse_asic_sub_role, parse_asic_switch_type
from portconfig import get_port_config, get_breakout_mode
from sonic_py_common.multi_asic import get_asic_id_from_name, get_asic_device_id
from sonic_py_common.multi_asic import get_asic_id_from_name, get_asic_device_id, is_multi_asic
from sonic_py_common import device_info
from swsscommon.swsscommon import ConfigDBConnector, SonicDBConfig, ConfigDBPipeConnector

Expand Down Expand Up @@ -137,6 +137,14 @@ def ip_network(value):
return "Invalid ip address %s" % value
return r_v.network

def load_namespace_config():
if is_multi_asic():
if not SonicDBConfig.isGlobalInit():
SonicDBConfig.initializeGlobalConfig()
else:
if not SonicDBConfig.isInit():
SonicDBConfig.initialize()

class FormatConverter:
"""Convert config DB based schema to legacy minigraph based schema for backward capability.
We will move to DB schema and remove this class when the config templates are modified.
Expand Down Expand Up @@ -301,6 +309,7 @@ def main():
deep_update(data, hardware_data)
if args.port_config is None:
args.port_config = device_info.get_path_to_port_config_file(hwsku)
load_namespace_config()
(ports, _, _) = get_port_config(hwsku, platform, args.port_config, asic_id)
if ports is None:
print('Failed to get port config', file=sys.stderr)
Expand All @@ -326,6 +335,7 @@ def main():

if args.minigraph is not None:
minigraph = args.minigraph
load_namespace_config()
if platform:
if args.port_config is not None:
deep_update(data, parse_xml(minigraph, platform, args.port_config, asic_name=asic_name, hwsku_config_file=args.hwsku_config))
Expand Down Expand Up @@ -353,7 +363,7 @@ def main():
if args.namespace is None:
configdb = ConfigDBPipeConnector(use_unix_socket_path=use_unix_sock, **db_kwargs)
else:
SonicDBConfig.load_sonic_global_db_config(namespace=args.namespace)
load_namespace_config()
configdb = ConfigDBPipeConnector(use_unix_socket_path=use_unix_sock, namespace=args.namespace, **db_kwargs)

configdb.connect()
Expand Down Expand Up @@ -425,7 +435,7 @@ def main():
if args.namespace is None:
configdb = ConfigDBPipeConnector(use_unix_socket_path=True, **db_kwargs)
else:
SonicDBConfig.load_sonic_global_db_config(namespace=args.namespace)
load_namespace_config()
configdb = ConfigDBPipeConnector(use_unix_socket_path=True, namespace=args.namespace, **db_kwargs)

configdb.connect(False)
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-utilities
46 changes: 45 additions & 1 deletion src/sonic-yang-models/doc/Configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Table of Contents
* [Cable length](#cable-length)
* [Chassis module](#chassis-module)
* [COPP_TABLE](#copp_table)
* [Console](#console)
* [CRM](#crm)
* [Data Plane L3 Interfaces](#data-plane-l3-interfaces)
* [DEFAULT_LOSSLESS_BUFFER_PARAMETER](#DEFAULT_LOSSLESS_BUFFER_PARAMETER)
Expand Down Expand Up @@ -51,7 +52,8 @@ Table of Contents
* [Scheduler](#scheduler)
* [Port QoS Map](#port-qos-map)
* [Queue](#queue)
* [Sflow](#sflow)
* [Sflow](#sflow)
* [Restapi](#restapi)
* [Tacplus Server](#tacplus-server)
* [TC to Priority group map](#tc-to-priority-group-map)
* [TC to Queue map](#tc-to-queue-map)
Expand Down Expand Up @@ -714,6 +716,29 @@ It currently allows user to administratively bring down a line-card or fabric-ca
}
```

### Console

```
{
"CONSOLE_PORT": {
"1": {
"baud_rate": "115200",
"flow_control": "0",
"remote_device": "host-1"
},
"2": {
"baud_rate": "9600",
"flow_control": "1"
}
},
"CONSOLE_SWITCH": {
"console_mgmt": {
"enabled": "yes"
}
}
}
```

### CRM

```
Expand Down Expand Up @@ -1509,6 +1534,25 @@ name as object key and member list as attribute.
}
```

### Restapi
```
{
"RESTAPI": {
"certs": {
"ca_crt": "/etc/sonic/credentials/ame_root.pem",
"server_key": "/etc/sonic/credentials/restapiserver.key",
"server_crt": "/etc/sonic/credentials/restapiserver.crt",
"client_crt_cname": "client.sonic.net"
},
"config": {
"client_auth": "true",
"log_level": "trace",
"allow_insecure": "false"
}
}
```

### Sflow

The below are the tables and their schema for SFLOW feature
Expand Down
2 changes: 2 additions & 0 deletions src/sonic-yang-models/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ def run(self):
'./yang-models/sonic-cable-length.yang',
'./yang-models/sonic-chassis-module.yang',
'./yang-models/sonic-copp.yang',
'./yang-models/sonic-console.yang',
'./yang-models/sonic-crm.yang',
'./yang-models/sonic-default-lossless-buffer-parameter.yang',
'./yang-models/sonic-device_metadata.yang',
Expand Down Expand Up @@ -130,6 +131,7 @@ def run(self):
'./yang-models/sonic-policer.yang',
'./yang-models/sonic-portchannel.yang',
'./yang-models/sonic-pfcwd.yang',
'./yang-models/sonic-restapi.yang',
'./yang-models/sonic-route-common.yang',
'./yang-models/sonic-route-map.yang',
'./yang-models/sonic-routing-policy-sets.yang',
Expand Down
29 changes: 29 additions & 0 deletions src/sonic-yang-models/tests/files/sample_config_db.json
Original file line number Diff line number Diff line change
Expand Up @@ -1122,6 +1122,19 @@
"lanes": "1"
}
},
"RESTAPI": {
"certs": {
"ca_crt": "/etc/sonic/credentials/ame_root.pem",
"server_key": "/etc/sonic/credentials/restapiserver.key",
"server_crt": "/etc/sonic/credentials/restapiserver.crt",
"client_crt_cname": "client.sonic.net"
},
"config": {
"client_auth": "true",
"log_level": "trace",
"allow_insecure": "false"
}
},
"FLEX_COUNTER_TABLE": {
"PFCWD": {
"FLEX_COUNTER_STATUS": "enable"
Expand Down Expand Up @@ -2036,6 +2049,22 @@
"default_dynamic_th": "0",
"over_subscribe_ratio": "0"
}
},
"CONSOLE_PORT": {
"1": {
"baud_rate": "115200",
"flow_control": "0",
"remote_device": "host-1"
},
"2": {
"baud_rate": "9600",
"flow_control": "1"
}
},
"CONSOLE_SWITCH": {
"console_mgmt": {
"enabled": "yes"
}
}
},
"SAMPLE_CONFIG_DB_UNKNOWN": {
Expand Down
40 changes: 40 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests/console.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"CONSOLE_DISABLED": {
"desc": "Verifying CONSOLE_SWITCH configuration."
},
"CONSOLE_DEFAULT_CONSOLE_MGMT": {
"desc": "CONSOLE_SWITCH default value for console_mgmt enabled field.",
"eStrKey": "Verify",
"verify": {
"xpath": "/sonic-console:sonic-console/CONSOLE_SWITCH/console_mgmt/enabled",
"key": "sonic-console:enabled",
"value": "no"
}
},
"CONSOLE_DISABLED_INCORRECT_PATTERN": {
"desc": "CONSOLE_SWITCH configuration pattern failure.",
"eStrKey": "Pattern"
},
"CONSOLE_PORT_DEFAULT_FLOW_CONTROL": {
"desc": "CONSOLE_PORT default value for flow_control field.",
"eStrKey": "Verify",
"verify": {
"xpath": "/sonic-console:sonic-console/CONSOLE_PORT/CONSOLE_PORT_LIST[name='1']/flow_control",
"key": "sonic-console:flow_control",
"value": "0"
}
},
"CONSOLE_PORT_INVALID_NAME": {
"desc": "CONSOLE_PORT invalid name failure.",
"eStrKey": "InvalidValue",
"eStr": ["name"]
},
"CONSOLE_PORT_INVALID_BAUD": {
"desc": "CONSOLE_PORT invalid baud failure.",
"eStrKey": "InvalidValue",
"eStr": ["baud"]
},
"CONSOLE_PORT_VALID": {
"desc": "Verifying CONSOLE_PORT configuration no failure."
}
}
16 changes: 16 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests/restapi.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"RESTAPI_TABLE_WITH_INCORRECT_CERT": {
"desc": "RESTAPI TABLE_WITH_INCORRECT_CERT failure.",
"eStr": ["Value", "does not satisfy the constraint"]
},
"RESTAPI_TABLE_WITH_INCORRECT_CLIENT": {
"desc": "RESTAPI TABLE_WITH_INCORRECT_CLIENT failure.",
"eStr": ["Value", "does not satisfy the constraint"]
},
"RESTAPI_TABLE_WITH_VALID_CONFIG": {
"desc": "RESTAPI TABLE WITH VALID CONFIG."
},
"RESTAPI_TABLE_WITH_MULTIPLE_CERTS": {
"desc": "RESTAPI TABLE WITH MULTIPLE CERTS."
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
{
"CONSOLE_DISABLED": {
"sonic-console:sonic-console": {
"sonic-console:CONSOLE_SWITCH": {
"sonic-console:console_mgmt": {
"enabled": "no"
}
}
}
},
"CONSOLE_DEFAULT_CONSOLE_MGMT": {
"sonic-console:sonic-console": {
"sonic-console:CONSOLE_SWITCH": {
"sonic-console:console_mgmt": {
}
}
}
},
"CONSOLE_DISABLED_INCORRECT_PATTERN": {
"sonic-console:sonic-console": {
"sonic-console:CONSOLE_SWITCH": {
"sonic-console:console_mgmt": {
"enabled": "false"
}
}
}
},
"CONSOLE_PORT_DEFAULT_FLOW_CONTROL": {
"sonic-console:sonic-console": {
"sonic-console:CONSOLE_PORT": {
"CONSOLE_PORT_LIST": [
{
"name": "1",
"baud_rate": "9600"
}
]
}
}
},
"CONSOLE_PORT_INVALID_NAME": {
"sonic-console:sonic-console": {
"sonic-console:CONSOLE_PORT": {
"CONSOLE_PORT_LIST": [
{
"name": "invalid",
"baud_rate": "9600"
}
]
}
}
},
"CONSOLE_PORT_INVALID_BAUD": {
"sonic-console:sonic-console": {
"sonic-console:CONSOLE_PORT": {
"CONSOLE_PORT_LIST": [
{
"name": "1",
"baud_rate": "invalid"
}
]
}
}
},
"CONSOLE_PORT_VALID": {
"sonic-console:sonic-console": {
"sonic-console:CONSOLE_PORT": {
"CONSOLE_PORT_LIST": [
{
"name": "1",
"baud_rate": "9600",
"flow_control": "1",
"remote_device": "remote_host_1"
},
{
"name": "2",
"baud_rate": "9600",
"flow_control": "0",
"remote_device": "remote_host_2"
},
{
"name": "3",
"baud_rate": "9600"
}
]
}
}
}
}
Loading

0 comments on commit 9497bb1

Please sign in to comment.