matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[sonic-yang] fix the feature state type (#9587)

Browse Source 
- Why I did it
The feature state can be a jinja template, like in this file - https://github.com/Azure/sonic-buildimage/blob/master/files/build_templates/init_cfg.json.j2#L39.
Without this change it is not possible to validate a configuration file.

- How I did it
Relaxes the constraint on feature state. Feature state leaf can be any string.

- How to verify it
Run UT.

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
This commit is contained in:
Stepan Blyshchak 2021-12-28 09:42:05 +02:00 committed by GitHub
parent 36d866002a
commit 13582aaa6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sonic-yang-models/tests/files/sample_config_db.json
View File

@ -1280,6 +1280,15 @@
"high_mem_alert": "disabled",
"state": "enabled",
"set_owner": "kube"
},
"dhcp_relay": {
"auto_restart": "enabled",
"has_global_scope": "false",
"has_per_asic_scope": "true",
"has_timer": "false",
"high_mem_alert": "disabled",
"state": "{% if not (DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['type'] is defined and DEVICE_METADATA['localhost']['type'] != 'ToRRouter') %}enabled{% else %}disabled{% endif %}",
"set_owner": "kube"
}
},
"DHCP_RELAY": {

5
src/sonic-yang-models/tests/yang_model_tests/tests/feature.json
View File

@ -2,11 +2,6 @@
"FEATURE_WITH_CORRECT_VALUES": {
"desc": "CONFIG FEATURE TABLE WITH ALL THE CORRECT VALUES"
},
"FEATURE_WITH_INVALID_STATE" : {
"desc": "Referring invalid feature state.",
"eStrKey": "Pattern",
"eStr": ["enabled|disabled|always_enabled|always_disabled"]
},
"FEATURE_WITH_INVALID_BOOLEAN_TYPE" : {
"desc": "Referring invalid feature boolean types.",
"eStrKey": "Pattern",

18
src/sonic-yang-models/tests/yang_model_tests/tests_config/feature.json
View File

@ -47,23 +47,15 @@
"has_global_scope": "false",
"has_per_asic_scope": "true",
"set_owner": "kube"
}
]
}
}
},
"FEATURE_WITH_INVALID_STATE": {
"sonic-feature:sonic-feature": {
"sonic-feature:FEATURE": {
"FEATURE_LIST": [
{
"name": "database",
"state": "dontcare",
"auto_restart": "always_enabled",
"name": "dhcp_relay",
"state": "{% if not (DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['type'] is defined and DEVICE_METADATA['localhost']['type'] != 'ToRRouter') %}enabled{% else %}disabled{% endif %}",
"auto_restart": "disabled",
"has_timer": "false",
"has_global_scope": "true",
"has_global_scope": "false",
"has_per_asic_scope": "true",
"set_owner": "local"
"set_owner": "kube"
}
]
}

4
src/sonic-yang-models/yang-models/sonic-feature.yang
View File

@ -13,9 +13,7 @@ module sonic-feature{
typedef feature-state {
description "configuration to set the feature running state";
type string {
pattern "enabled|disabled|always_enabled|always_disabled";
}
type string;
}
typedef feature-owner {