From 7d961bf199719410b2e4111c830fbf35b41c83c2 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Wed, 30 May 2018 13:45:41 +0200 Subject: HC2VPP-325: use ip-prefix instead of ip-address in ietf-nat@2018-02-23.yang Only /32 prefix for IPv4 and /128 for IPv6 are supported. Change-Id: I875b1eb6c2cb43da54de0a731aeeb9757b39c39c Signed-off-by: Marek Gradzki --- nat/nat-api/src/main/yang/ietf-nat@2018-02-23.yang | 12 ++++-------- nat/nat-api/src/main/yang/nat-context@2016-12-14.yang | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) (limited to 'nat/nat-api/src/main/yang') diff --git a/nat/nat-api/src/main/yang/ietf-nat@2018-02-23.yang b/nat/nat-api/src/main/yang/ietf-nat@2018-02-23.yang index 77e2d7be7..5eec4c609 100644 --- a/nat/nat-api/src/main/yang/ietf-nat@2018-02-23.yang +++ b/nat/nat-api/src/main/yang/ietf-nat@2018-02-23.yang @@ -420,8 +420,7 @@ module ietf-nat { } leaf internal-src-address { - // TODO(HC2VPP-325): original model uses inet:ip-prefix; - type inet:ip-address; + type inet:ip-prefix; description "Corresponds to the source IPv4/IPv6 address/prefix of the packet received on an internal @@ -444,8 +443,7 @@ module ietf-nat { } leaf external-src-address { - // TODO(HC2VPP-325): original model uses inet:ip-prefix; - type inet:ipv4-address; + type inet:ip-prefix; description "Source IP address/prefix of the packet sent on an external interface of the NAT."; @@ -462,8 +460,7 @@ module ietf-nat { } leaf internal-dst-address { - // TODO(HC2VPP-325): original model uses inet:ip-prefix; - type inet:ipv4-prefix; + type inet:ip-prefix; description "Corresponds to the destination IP address/prefix of the packet received on an internal interface @@ -487,8 +484,7 @@ module ietf-nat { } leaf external-dst-address { - // TODO(HC2VPP-325): original model uses inet:ip-prefix; - type inet:ipv4-address; + type inet:ip-prefix; description "Corresponds to the destination IP address/prefix of the packet sent on an external interface diff --git a/nat/nat-api/src/main/yang/nat-context@2016-12-14.yang b/nat/nat-api/src/main/yang/nat-context@2016-12-14.yang index de9436878..a99e65f17 100644 --- a/nat/nat-api/src/main/yang/nat-context@2016-12-14.yang +++ b/nat/nat-api/src/main/yang/nat-context@2016-12-14.yang @@ -65,12 +65,12 @@ module nat-context { unique "index"; leaf internal { - type inet:ip-address; + type inet:ip-prefix; description "Local IP address set in VPP"; } leaf external { - type inet:ip-address; + type inet:ip-prefix; description "Extarnal IP address set in VPP"; } -- cgit 1.2.3-korg