From 5aa18ee6a61c0ac76c4c6a0fe767ce4f610f7597 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Thu, 22 Mar 2018 14:55:10 +0100 Subject: Update metadata of hc2vpp YANG models Adds organization and contact statements. Includes copyright in the description of modules. Fixes minor formatting issues. Change-Id: I9fa90c24e956d5cb2c3fde8621ed289f383501ac Signed-off-by: Marek Gradzki --- v3po/api/src/main/yang/pbb-types@2016-12-14.yang | 82 ++++++++++++++-------- .../main/yang/subinterface-span@2017-06-07.yang | 42 ++++++++--- .../yang/unnumbered-interfaces@2018-01-03.yang | 25 +++++++ .../api/src/main/yang/v3po-context@2016-09-09.yang | 24 +++++++ v3po/api/src/main/yang/v3po@2017-06-07.yang | 25 +++++++ v3po/api/src/main/yang/vpp-pbb@2016-12-14.yang | 30 +++++++- v3po/api/src/main/yang/vpp-vlan@2018-03-19.yang | 28 +++++++- 7 files changed, 213 insertions(+), 43 deletions(-) (limited to 'v3po/api/src/main/yang') diff --git a/v3po/api/src/main/yang/pbb-types@2016-12-14.yang b/v3po/api/src/main/yang/pbb-types@2016-12-14.yang index cb9fbb1bb..047215e98 100644 --- a/v3po/api/src/main/yang/pbb-types@2016-12-14.yang +++ b/v3po/api/src/main/yang/pbb-types@2016-12-14.yang @@ -4,31 +4,53 @@ module pbb-types { prefix "pbb-types"; import ietf-yang-types { - prefix yang; + prefix yang; } - description "Common types used for defining Pbb based subinterfaces"; + organization + "FD.io - The Fast Data Project"; + + contact + "Hc2vpp Wiki + Mailing List "; + + description + "This module contains a collection of YANG definitions + used for defining PBB based subinterfaces. + + Copyright (c) 2016-2018 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 "2016-12-14" { - description - "Initial revision."; + description + "Initial revision."; } typedef operation { - type enumeration { - // NOTE - Does not specify disabled enum value(0), because its used internally to delete/disable rewrite - enum "push-2" { - value 2; - } - - enum "pop-2" { - value 4; - description "Encapsulate/Decapsulate pbb packet according to incoming/outcoming direction"; - } - enum "translate-2-1" { - value 7; + type enumeration { + // NOTE - Does not specify disabled enum value(0), because its used internally to delete/disable rewrite + enum "push-2" { + value 2; + } + enum "pop-2" { + value 4; + description "Encapsulate/Decapsulate pbb packet according to incoming/outcoming direction"; } + enum "translate-2-1" { + value 7; } + } } grouping pbb-rewrite-attributes { @@ -45,29 +67,29 @@ module pbb-types { } leaf outer-tag { - type uint16; + type uint16; } leaf b-vlan-tag-vlan-id { - type uint16 { - //12 bit range - range "1..4095"; - } - description "backbone vlan id"; + type uint16 { + //12 bit range + range "1..4095"; + } + description "backbone vlan id"; } leaf i-tag-isid { - type uint32 { - //24 bit range - range "1..16777215"; - } - description "identifier of the backbone service instance "; + type uint32 { + //24 bit range + range "1..16777215"; + } + description "identifier of the backbone service instance "; } leaf interface-operation { - type operation; - default pop-2; - description "Define operation that will pbb interface perform while processing packets"; + type operation; + default pop-2; + description "Define operation that will pbb interface perform while processing packets"; } } } diff --git a/v3po/api/src/main/yang/subinterface-span@2017-06-07.yang b/v3po/api/src/main/yang/subinterface-span@2017-06-07.yang index 22f8ee1b3..0141c1a42 100644 --- a/v3po/api/src/main/yang/subinterface-span@2017-06-07.yang +++ b/v3po/api/src/main/yang/subinterface-span@2017-06-07.yang @@ -19,6 +19,31 @@ module subinterface-span { prefix "v3po"; } + organization + "FD.io - The Fast Data Project"; + + contact + "Hc2vpp Wiki + Mailing List "; + + description + "This model contains a collection of YANG definitions for + span interface management in VPP. + + Copyright (c) 2017-2018 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-07" { description "Eliminated config leafrefs in operational tree"; } @@ -32,17 +57,16 @@ module subinterface-span { } augment /if:interfaces/if:interface/vpp-vlan:sub-interfaces/vpp-vlan:sub-interface { - ext:augment-identifier "vpp-subinterface-span-augmentation"; - - container span { - uses v3po:span-attributes; - } + ext:augment-identifier "vpp-subinterface-span-augmentation"; + container span { + uses v3po:span-attributes; + } } augment /if:interfaces-state/if:interface/vpp-vlan:sub-interfaces/vpp-vlan:sub-interface { - ext:augment-identifier "vpp-subinterface-span-state-augmentation"; - container span-state { - uses v3po:span-state-attributes; - } + ext:augment-identifier "vpp-subinterface-span-state-augmentation"; + container span-state { + uses v3po:span-state-attributes; + } } } \ No newline at end of file diff --git a/v3po/api/src/main/yang/unnumbered-interfaces@2018-01-03.yang b/v3po/api/src/main/yang/unnumbered-interfaces@2018-01-03.yang index 515573e8c..babb959cb 100644 --- a/v3po/api/src/main/yang/unnumbered-interfaces@2018-01-03.yang +++ b/v3po/api/src/main/yang/unnumbered-interfaces@2018-01-03.yang @@ -15,6 +15,31 @@ module unnumbered-interfaces { prefix "ext"; } + organization + "FD.io - The Fast Data Project"; + + contact + "Hc2vpp Wiki + Mailing List "; + + description + "This module contains a collection of YANG definitions + providing IP unnumbered feature for VPP interfaces and subinterfaces. + + Copyright (c) 2017-2018 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 "2018-01-03" { description "Use if:interface-ref for name of the interface which provides IP."; diff --git a/v3po/api/src/main/yang/v3po-context@2016-09-09.yang b/v3po/api/src/main/yang/v3po-context@2016-09-09.yang index ae35be5dd..75ec8c137 100644 --- a/v3po/api/src/main/yang/v3po-context@2016-09-09.yang +++ b/v3po/api/src/main/yang/v3po-context@2016-09-09.yang @@ -3,6 +3,30 @@ module v3po-context { namespace "urn:opendaylight:params:xml:ns:yang:v3po:context"; prefix "v3po-ctx"; + organization + "FD.io - The Fast Data Project"; + + contact + "Hc2vpp Wiki + Mailing List "; + + description + "This module contains data definition for v3po module metadata. + + Copyright (c) 2016-2018 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 "2016-09-09" { description "Initial revision of v3po specific context"; diff --git a/v3po/api/src/main/yang/v3po@2017-06-07.yang b/v3po/api/src/main/yang/v3po@2017-06-07.yang index e05c804b6..abdf5b578 100644 --- a/v3po/api/src/main/yang/v3po@2017-06-07.yang +++ b/v3po/api/src/main/yang/v3po@2017-06-07.yang @@ -19,6 +19,31 @@ module v3po { prefix "ext"; } + organization + "FD.io - The Fast Data Project"; + + contact + "Hc2vpp Wiki + Mailing List "; + + description + "This module contains a collection of YANG definitions + that extend ietf-interfaces module with VPP specific interface types. + + Copyright (c) 2015-2018 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-07" { description "Eliminated config leafrefs in operational tree"; } diff --git a/v3po/api/src/main/yang/vpp-pbb@2016-12-14.yang b/v3po/api/src/main/yang/vpp-pbb@2016-12-14.yang index 7301b86a9..36dd12387 100644 --- a/v3po/api/src/main/yang/vpp-pbb@2016-12-14.yang +++ b/v3po/api/src/main/yang/vpp-pbb@2016-12-14.yang @@ -15,20 +15,46 @@ module vpp-pbb { prefix "ext"; } + organization + "FD.io - The Fast Data Project"; + + contact + "Hc2vpp Wiki + Mailing List "; + + description + "This module contains a collection of YANG definitions + that extend ietf-interfaces module + with support for PBB based subinterfaces. + + Copyright (c) 2016-2018 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 "2016-12-14" { description "Initial revision of pbb model"; } augment /if:interfaces/if:interface { ext:augment-identifier "pbb-rewrite-interface-augmentation"; - container pbb-rewrite{ + container pbb-rewrite { uses pbb-types:pbb-rewrite-attributes; } } augment /if:interfaces-state/if:interface { ext:augment-identifier "pbb-rewrite-state-interface-augmentation"; - container pbb-rewrite-state{ + container pbb-rewrite-state { uses pbb-types:pbb-rewrite-attributes; config false; } diff --git a/v3po/api/src/main/yang/vpp-vlan@2018-03-19.yang b/v3po/api/src/main/yang/vpp-vlan@2018-03-19.yang index 53d657e29..34425aa99 100644 --- a/v3po/api/src/main/yang/vpp-vlan@2018-03-19.yang +++ b/v3po/api/src/main/yang/vpp-vlan@2018-03-19.yang @@ -22,6 +22,31 @@ module vpp-vlan { prefix v3po; } + organization + "FD.io - The Fast Data Project"; + + contact + "Hc2vpp Wiki + Mailing List "; + + description + "This module contains a collection of YANG definitions + for managing VPP VLANs. + + Copyright (c) 2016-2018 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 "2018-03-19" { description "Prefix invalid 802dot1q and 802dot1ad identifiers with underscore."; } @@ -47,7 +72,7 @@ module vpp-vlan { - ingress/egress ACLs support"; } - revision "2015-05-27" { + revision "2016-05-27" { description "Initial revision of vlan model for VPP. Reuses some concepts from draft-wilton-netmod-intf-vlan-yang-02 model."; @@ -461,5 +486,4 @@ module vpp-vlan { } } } - } -- cgit 1.2.3-korg