Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

yang models fixed to make config apply-patch work #9517

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 40 additions & 0 deletions src/sonic-yang-models/yang-models/sonic-crm.yang
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,46 @@ module sonic-crm {
type threshold;
}

leaf srv6_my_sid_entry_threshold_type{
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

must "(((current()='PERCENTAGE' or current()='percentage') and
../srv6_my_sid_entry_high_threshold<100 and
../srv6_my_sid_entry_low_threshold<100) or
(current()!='PERCENTAGE' and current()!='percentage'))";
type stypes:crm_threshold_type;
}

leaf srv6_my_sid_entry_high_threshold {
must "(current() > ../srv6_my_sid_entry_low_threshold)"
{
error-message "high_threshold should be more than low_threshold";
}
type threshold;
}

leaf srv6_my_sid_entry_low_threshold {
type threshold;
}


leaf srv6_nexthop_threshold_type{
must "(((current()='PERCENTAGE' or current()='percentage') and
../srv6_nexthop_high_threshold<100 and
../srv6_nexthop_low_threshold<100) or
(current()!='PERCENTAGE' and current()!='percentage'))";
type stypes:crm_threshold_type;
}

leaf srv6_nexthop_high_threshold {
must "(current() > ../srv6_nexthop_low_threshold)"
{
error-message "high_threshold should be more than low_threshold";
}
type threshold;
}

leaf srv6_nexthop_low_threshold {
type threshold;
}
}
/* end of Config */
}
Expand Down
4 changes: 4 additions & 0 deletions src/sonic-yang-models/yang-models/sonic-sflow.yang
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ module sonic-sflow{
default 6343;
}

leaf collector_vrf {
type string; //TODO
}

} /* end of list SFLOW_COLLECTOR_LIST */
} /* end of container SFLOW_COLLECTOR */

Expand Down