From 869efd5a12224bf9cc2bd05934cac82d50d6a3e7 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Tue, 28 May 2019 08:50:38 +0200 Subject: HC2VPP-411: fix revisions for updated models Change-Id: I3ac251b1229a08d2c3c909697a6158e5996e6c9b Signed-off-by: Michal Cmarada --- .../src/main/yang/interface-nat@2017-08-16.yang | 97 ------------------- .../src/main/yang/interface-nat@2019-05-27.yang | 103 +++++++++++++++++++++ .../src/main/yang/subinterface-nat@2017-06-15.yang | 53 ----------- .../src/main/yang/subinterface-nat@2019-05-27.yang | 59 ++++++++++++ 4 files changed, 162 insertions(+), 150 deletions(-) delete mode 100644 nat/nat-api/src/main/yang/interface-nat@2017-08-16.yang create mode 100644 nat/nat-api/src/main/yang/interface-nat@2019-05-27.yang delete mode 100644 nat/nat-api/src/main/yang/subinterface-nat@2017-06-15.yang create mode 100644 nat/nat-api/src/main/yang/subinterface-nat@2019-05-27.yang (limited to 'nat/nat-api/src/main/yang') diff --git a/nat/nat-api/src/main/yang/interface-nat@2017-08-16.yang b/nat/nat-api/src/main/yang/interface-nat@2017-08-16.yang deleted file mode 100644 index 848b2f6ae..000000000 --- a/nat/nat-api/src/main/yang/interface-nat@2017-08-16.yang +++ /dev/null @@ -1,97 +0,0 @@ -module interface-nat { - yang-version 1; - namespace "http://fd.io/hc2vpp/yang/interface-nat"; - prefix "ifc-nat"; - - import ietf-interfaces { - prefix "if"; - } - import yang-ext { - prefix "ext"; - } - - organization - "FD.io - The Fast Data Project"; - - contact - "Hc2vpp Wiki - Mailing List "; - - description - "This module contains a collection of YANG definitions for - applying NAT configuration on VPP interfaces. - - Copyright (c) 2016-2017 Cisco and/or its affiliates. - - Licensed under the Apache License, Version 2.0 (the 'License'); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at: - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an 'AS IS' BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License."; - - revision "2017-08-16" { - description "Added support for NAT64."; - } - - revision "2017-08-01" { - description "Added support for nat_interface_add_del_output_feature."; - } - - revision "2016-12-14" { - description "Initial revision of interface-nat model."; - } - - grouping interface-nat-vpp-feature-attributes { - leaf post-routing { - type boolean; - default false; - description - "Indicates whether NAT translation should be applied after routing. - If true, nat_interface_add_del_output_feature message is used to enable NAT. - By default nat_interface_add_del_feature is used."; - reference - "https://git.fd.io/vpp/tree/src/plugins/nat/nat.api"; - } - - leaf nat44-support { - type boolean; - default true; - description - "Indicates NAT44 support. Enabled by default in order to preserve compatibility with previous versions of the model."; - } - - leaf nat64-support { - type boolean; - description - "Indicates NAT64 support"; - } - - reference - "https://wiki.fd.io/view/VPP/SNAT"; - } - - grouping interface-nat-attributes { - container nat { - container inbound { - presence "Enables inbound NAT"; - uses interface-nat-vpp-feature-attributes; - } - container outbound { - presence "Enables outbound NAT"; - uses interface-nat-vpp-feature-attributes; - } - } - } - - augment /if:interfaces/if:interface { - ext:augment-identifier "nat-interface-augmentation"; - - uses interface-nat-attributes; - } -} diff --git a/nat/nat-api/src/main/yang/interface-nat@2019-05-27.yang b/nat/nat-api/src/main/yang/interface-nat@2019-05-27.yang new file mode 100644 index 000000000..df679c362 --- /dev/null +++ b/nat/nat-api/src/main/yang/interface-nat@2019-05-27.yang @@ -0,0 +1,103 @@ +module interface-nat { + yang-version 1; + namespace "http://fd.io/hc2vpp/yang/interface-nat"; + prefix "ifc-nat"; + + import ietf-interfaces { + prefix "if"; + } + import yang-ext { + prefix "ext"; + } + + organization + "FD.io - The Fast Data Project"; + + contact + "Hc2vpp Wiki + Mailing List "; + + description + "This module contains a collection of YANG definitions for + applying NAT configuration on VPP interfaces. + + Copyright (c) 2016-2017 Cisco and/or its affiliates. + + Licensed under the Apache License, Version 2.0 (the 'License'); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at: + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an 'AS IS' BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License."; + + revision "2019-05-27" { + description + "Removed interfaces-state augmentations due to its deprecation + in ietf-interfaces model"; + } + + revision "2017-08-16" { + description "Added support for NAT64."; + } + + revision "2017-08-01" { + description "Added support for nat_interface_add_del_output_feature."; + } + + revision "2016-12-14" { + description "Initial revision of interface-nat model."; + } + + grouping interface-nat-vpp-feature-attributes { + leaf post-routing { + type boolean; + default false; + description + "Indicates whether NAT translation should be applied after routing. + If true, nat_interface_add_del_output_feature message is used to enable NAT. + By default nat_interface_add_del_feature is used."; + reference + "https://git.fd.io/vpp/tree/src/plugins/nat/nat.api"; + } + + leaf nat44-support { + type boolean; + default true; + description + "Indicates NAT44 support. Enabled by default in order to preserve compatibility with previous versions of the model."; + } + + leaf nat64-support { + type boolean; + description + "Indicates NAT64 support"; + } + + reference + "https://wiki.fd.io/view/VPP/SNAT"; + } + + grouping interface-nat-attributes { + container nat { + container inbound { + presence "Enables inbound NAT"; + uses interface-nat-vpp-feature-attributes; + } + container outbound { + presence "Enables outbound NAT"; + uses interface-nat-vpp-feature-attributes; + } + } + } + + augment /if:interfaces/if:interface { + ext:augment-identifier "nat-interface-augmentation"; + + uses interface-nat-attributes; + } +} diff --git a/nat/nat-api/src/main/yang/subinterface-nat@2017-06-15.yang b/nat/nat-api/src/main/yang/subinterface-nat@2017-06-15.yang deleted file mode 100644 index 0d910178a..000000000 --- a/nat/nat-api/src/main/yang/subinterface-nat@2017-06-15.yang +++ /dev/null @@ -1,53 +0,0 @@ -module subinterface-nat { - yang-version 1; - namespace "http://fd.io/hc2vpp/yang/subinterface-nat"; - prefix "sub-ifc-nat"; - - import ietf-interfaces { - prefix "if"; - } - import vpp-vlan { - prefix "vpp-vlan"; - } - import interface-nat { - prefix "ifc-nat"; - } - import yang-ext { - prefix "ext"; - } - - organization - "FD.io - The Fast Data Project"; - - contact - "Hc2vpp Wiki - Mailing List "; - - description - "This module contains a collection of YANG definitions for - applying NAT configuration on VPP subinterfaces. - - Copyright (c) 2017 Cisco and/or its affiliates. - - Licensed under the Apache License, Version 2.0 (the 'License'); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at: - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an 'AS IS' BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License."; - - revision "2017-06-15" { - description "Initial revision of subinterface-nat model"; - } - - augment /if:interfaces/if:interface/vpp-vlan:sub-interfaces/vpp-vlan:sub-interface { - ext:augment-identifier "nat-subinterface-augmentation"; - - uses ifc-nat:interface-nat-attributes; - } -} diff --git a/nat/nat-api/src/main/yang/subinterface-nat@2019-05-27.yang b/nat/nat-api/src/main/yang/subinterface-nat@2019-05-27.yang new file mode 100644 index 000000000..08c7ca513 --- /dev/null +++ b/nat/nat-api/src/main/yang/subinterface-nat@2019-05-27.yang @@ -0,0 +1,59 @@ +module subinterface-nat { + yang-version 1; + namespace "http://fd.io/hc2vpp/yang/subinterface-nat"; + prefix "sub-ifc-nat"; + + import ietf-interfaces { + prefix "if"; + } + import vpp-vlan { + prefix "vpp-vlan"; + } + import interface-nat { + prefix "ifc-nat"; + } + import yang-ext { + prefix "ext"; + } + + organization + "FD.io - The Fast Data Project"; + + contact + "Hc2vpp Wiki + Mailing List "; + + description + "This module contains a collection of YANG definitions for + applying NAT configuration on VPP subinterfaces. + + Copyright (c) 2017 Cisco and/or its affiliates. + + Licensed under the Apache License, Version 2.0 (the 'License'); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at: + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an 'AS IS' BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License."; + + revision "2019-05-27" { + description + "Removed interfaces-state augmentations due to its deprecation + in ietf-interfaces model"; + } + + revision "2017-06-15" { + description "Initial revision of subinterface-nat model"; + } + + augment /if:interfaces/if:interface/vpp-vlan:sub-interfaces/vpp-vlan:sub-interface { + ext:augment-identifier "nat-subinterface-augmentation"; + + uses ifc-nat:interface-nat-attributes; + } +} -- cgit 1.2.3-korg