From a5e47c8e227a1914cd380a993e03c2fe07b0e3d8 Mon Sep 17 00:00:00 2001 From: Hongjun Ni Date: Fri, 24 Jun 2016 23:44:03 +0800 Subject: HONEYCOMB-46: Add NSH feature in Honeycomb PatchSet 14: Refactor NSH Plugin based on new code organization PatchSet 13: merge Change 1796: Add nsh-entry Yang Model PatchSet 12:augment with vxlan-encap-type PatchSet 11: rebase and make nsh yang model visible to ODL netconf PatchSet 8: move vpp-nsh.yang to v3po/nsh folder PatchSet 7: split two patches: nsh-entry and nsh-map PatchSet 6: support md-type1 and md-type2 PatchSet 5: Use encap-type and parameters PatchSet 4: Use identity instead of enum PatchSet 3: consolidate comments from Ed PatchSet 2: fix indent issue. Change-Id: I18353b714d39199ffa346fd39da6cafdbcc1b30c Signed-off-by: Hongjun Ni Signed-off-by: Ed Warnicke --- nsh/api/pom.xml | 70 ++++++++++ nsh/api/src/main/yang/vpp-nsh.yang | 265 +++++++++++++++++++++++++++++++++++++ 2 files changed, 335 insertions(+) create mode 100644 nsh/api/pom.xml create mode 100644 nsh/api/src/main/yang/vpp-nsh.yang (limited to 'nsh/api') diff --git a/nsh/api/pom.xml b/nsh/api/pom.xml new file mode 100644 index 000000000..44119a992 --- /dev/null +++ b/nsh/api/pom.xml @@ -0,0 +1,70 @@ + + + + + io.fd.honeycomb.common + api-parent + 1.0.0-SNAPSHOT + ../../common/api-parent + + + 4.0.0 + io.fd.honeycomb.v3po + nsh-api + 1.0.0-SNAPSHOT + bundle + + + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + 0.8.2-Beryllium-SR2 + pom + import + + + + + + + org.opendaylight.mdsal.model + iana-if-type-2014-05-08 + + + org.opendaylight.mdsal.model + ietf-yang-types-20130715 + + + org.opendaylight.mdsal.model + ietf-interfaces + + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + + org.opendaylight.mdsal.model + yang-ext + + + ${project.groupId} + v3po-api + ${project.version} + + + diff --git a/nsh/api/src/main/yang/vpp-nsh.yang b/nsh/api/src/main/yang/vpp-nsh.yang new file mode 100644 index 000000000..50dfe8e68 --- /dev/null +++ b/nsh/api/src/main/yang/vpp-nsh.yang @@ -0,0 +1,265 @@ +module vpp-nsh { + yang-version 1; + namespace "urn:opendaylight:params:xml:ns:yang:vpp:nsh"; + prefix "vpp-nsh"; + + revision "2016-06-24" { + description "Initial revision of vpp-nsh model"; + } + + import iana-if-type { + prefix "ianaift"; + } + import ietf-interfaces { + prefix "if"; + } + import ietf-yang-types { + prefix "yang"; + } + import ietf-inet-types { + prefix "inet"; + } + import yang-ext { + prefix "ext"; + } + import v3po { + prefix "v3po"; + } + /* + * Defines the supported next protocols that can be used for + * NSH next-protocol field. + */ + identity next-protocol { + description "Base identity from which all nsh next protocols + are derived from"; + } + + identity ipv4 { + base next-protocol; + description + "Support ipv4 to act as next protocol"; + } + + identity ipv6 { + base next-protocol; + description + "Support ipv6 to act as next protocol"; + } + + identity ethernet { + base next-protocol; + description + "Support ethernet to act as next protocol"; + } + + typedef nsh-next-protocol { + type identityref { + base "next-protocol"; + } + description "Identifies a specific next protocol for nsh"; + } + + /* + * Defines the supported encap type. + */ + identity encap-type { + description "encap type"; + } + + identity vxlan-gpe-encap-type { + base "encap-type"; + description "vxlan-gpe encap type"; + } + + identity vxlan-encap-type { + base "encap-type"; + description "vxlan encap type"; + } + + typedef nsh-encap-type { + type identityref { + base "encap-type"; + } + } + + /* + * Defines the supported MD-types. + */ + identity md-type { + description "md type"; + } + + identity md-type1 { + base "md-type"; + description "nsh md-type1"; + } + + identity md-type2 { + base "md-type"; + description "nsh md-type2"; + } + + typedef nsh-md-type { + type identityref { + base "md-type"; + } + } + + grouping nsh-md-type1-attributes { + leaf c1 { + type uint32; + } + leaf c2 { + type uint32; + } + leaf c3 { + type uint32; + } + leaf c4 { + type uint32; + } + } + + grouping nsh-md-type2-attributes { + + } + + grouping nsh-entry-base-attributes { + leaf name { + type string; + description "NSH Entry Name"; + } + leaf nsp { + type uint32 { + range "0..16777215"; + } + } + leaf nsi { + type uint8 { + range "1..255"; + } + } + leaf md-type { + type nsh-md-type; + } + leaf version { + type uint8; + } + leaf length { + type uint8; + } + leaf next-protocol { + type nsh-next-protocol; + } + } + + grouping nsh-map-base-attributes { + leaf name { + type string; + description "NSH Map Name"; + } + leaf nsp { + type uint32 { + range "0..16777215"; + } + } + leaf nsi { + type uint8 { + range "1..255"; + } + } + leaf mapped-nsp { + type uint32 { + range "0..16777215"; + } + } + leaf mapped-nsi { + type uint8 { + range "1..255"; + } + } + leaf encap-type { + type nsh-encap-type; + } + } + + container nsh { + description + "NSH config data"; + + container nsh-entries { + list nsh-entry { + key "name"; + + uses nsh-entry-base-attributes; + + description + "nsh-entry configuration"; + } + } + + container nsh-maps { + list nsh-map { + key "name"; + + uses nsh-map-base-attributes; + + description + "nsh-map configuration"; + } + } + } + + augment /nsh/nsh-entries/nsh-entry { + ext:augment-identifier nsh-entry-md-type-augment; + when "/md-type = 'vpp-nsh:md-type1' "; + uses nsh-md-type1-attributes; + } + + augment /nsh/nsh-entries/nsh-entry { + ext:augment-identifier nsh-entry-md-type-augment; + when "/md-type = 'vpp-nsh:md-type2' "; + uses nsh-md-type2-attributes; + } + + augment /nsh/nsh-maps/nsh-map { + ext:augment-identifier nsh-vxlan-gpe-encap-augment; + when "/encap-type = 'vpp-nsh:vxlan-gpe-encap-type' "; + uses v3po:vxlan-gpe-base-attributes; + } + + augment /nsh/nsh-maps/nsh-map { + ext:augment-identifier vxlan-encap-augment; + when "/encap-type = 'vpp-nsh:vxlan-encap-type' "; + uses v3po:vxlan-base-attributes; + } + + container nsh-state { + config false; + + description + "NSH operational data"; + + container nsh-entries { + list nsh-entry { + key "name"; + + uses nsh-entry-base-attributes; + + description + "nsh-entry operational data"; + } + } + + container nsh-maps { + list nsh-map { + key "name"; + + uses nsh-map-base-attributes; + + description + "nsh-map operational data"; + } + } + } +} \ No newline at end of file -- cgit 1.2.3-korg