yang models fixed to make config apply-patch work

[MaratGubaiev]

Why I did it

fixing sonic-net/sonic-utilities#1935 Running "sudo config apply-patch ..." in latest (as of 11/15) master image applied in SONiC switches fails with inability to parse config for given yang models.

Note that the updates described in the issue are not actual any more because of new changes in the yang models.

How I did it

I improved yang models to make them correspond to config.

TODO

"collector_vrf" type is set to "string". It should be more accurate type.

How to verify it

Perform sudo config apply-patch <some_patch>.json-patch
Patch should be applied and there should be no errors*.

Example of a dummy patch

[
    { "op": "replace", "path": "/PORT/Ethernet124/admin_status", "value": "up" }
]

Example of an empty patch

[]

NOTE that errors might be caused by improper config.

E.g. I changed

    "ACL_TABLE": {
        "1": {
            "policy_desc": "Mirror Session",
            "ports": "Ethernet16",
            "stage": "INGRESS",
            "type": "MIRROR"
        },
        "2": {
            "policy_desc": "Mirror Session",
            "ports": "Ethernet16,Ethernet20",
            "stage": "INGRESS",
            "type": "MIRROR"
        },
.........................................
.........................................
.........................................

to

    "ACL_TABLE": {
        "1": {
            "policy_desc": "Mirror Session",
            "ports": ["Ethernet16"],
            "stage": "INGRESS",
            "type": "MIRROR"
        },
        "2": {
            "policy_desc": "Mirror Session",
            "ports": ["Ethernet16", "Ethernet20"],
            "stage": "INGRESS",
            "type": "MIRROR"
        },
.........................................
.........................................
.........................................

to avoid libyang error

libyang[0]: Duplicated instance of "ports" leaf-list ("e"). (path: /sonic-acl:sonic-acl/ACL_TABLE/ACL_TABLE_LIST[ACL_TABLE_NAME='1']/ports[.='e'])
sonic_yang(3):Data Loading Failed:Duplicated instance of "ports" leaf-list ("e").

[ganglyu]

Please add UT for these changes.

[qiluo-msft]

   [](http://example.com/codeflow?start=0&length=2)

Mixing tabs and spaces in the same file. We prefer 4 spaces than 1 tab.

[MaratGubaiev]

fixed

[qiluo-msft]

LGTM. Please check with other reviewers.

Sorry, dismiss. Wrong page.

[MaratGubaiev]

Please add UT for these changes.

done

[ganglyu]

please check indentation

[MaratGubaiev]

done

[zhangyanzhao]

@MaratGubaiev can you please fix the build failure? So that we can merge. Thanks.

[zhangyanzhao]

@MaratGubaiev can you please help to sign the EasyCLA and address the conflicts? Thanks.

[zhangyanzhao]

Long time no response from the submitter, we will duplicate a new PR to track and close this one.

[zhangyanzhao]

@qiluo-msft will help to create a new PR. Thanks.