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 --- .../src/test/resources/nat44/static-mapping-address-update.json | 4 ++-- .../src/test/resources/nat44/static-mapping-unsupported-proto.json | 4 ++-- nat/nat2vpp/src/test/resources/nat44/static-mapping.json | 4 ++-- .../src/test/resources/nat64/static-mapping-address-update.json | 4 ++-- .../src/test/resources/nat64/static-mapping-unsupported-proto.json | 4 ++-- nat/nat2vpp/src/test/resources/nat64/static-mapping.json | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'nat/nat2vpp/src/test/resources') diff --git a/nat/nat2vpp/src/test/resources/nat44/static-mapping-address-update.json b/nat/nat2vpp/src/test/resources/nat44/static-mapping-address-update.json index 224a62a6b..6fe329db0 100644 --- a/nat/nat2vpp/src/test/resources/nat44/static-mapping-address-update.json +++ b/nat/nat2vpp/src/test/resources/nat44/static-mapping-address-update.json @@ -4,8 +4,8 @@ "index": 22, "type": "static", "transport-protocol": 17, - "internal-src-address": "192.168.1.86", - "external-src-address": "45.1.5.6" + "internal-src-address": "192.168.1.86/32", + "external-src-address": "45.1.5.6/32" } } } diff --git a/nat/nat2vpp/src/test/resources/nat44/static-mapping-unsupported-proto.json b/nat/nat2vpp/src/test/resources/nat44/static-mapping-unsupported-proto.json index 455465d20..a701e263d 100644 --- a/nat/nat2vpp/src/test/resources/nat44/static-mapping-unsupported-proto.json +++ b/nat/nat2vpp/src/test/resources/nat44/static-mapping-unsupported-proto.json @@ -4,8 +4,8 @@ "index": 22, "type": "static", "transport-protocol": 123, - "internal-src-address": "192.168.1.87", - "external-src-address": "45.1.5.7" + "internal-src-address": "192.168.1.87/32", + "external-src-address": "45.1.5.7/32" } } } diff --git a/nat/nat2vpp/src/test/resources/nat44/static-mapping.json b/nat/nat2vpp/src/test/resources/nat44/static-mapping.json index b1561a46b..a5b5caa4d 100644 --- a/nat/nat2vpp/src/test/resources/nat44/static-mapping.json +++ b/nat/nat2vpp/src/test/resources/nat44/static-mapping.json @@ -4,8 +4,8 @@ "index": 22, "type": "static", "transport-protocol": 17, - "internal-src-address": "192.168.1.87", - "external-src-address": "45.1.5.7" + "internal-src-address": "192.168.1.87/32", + "external-src-address": "45.1.5.7/32" } } } diff --git a/nat/nat2vpp/src/test/resources/nat64/static-mapping-address-update.json b/nat/nat2vpp/src/test/resources/nat64/static-mapping-address-update.json index 2e836ce91..32bfface1 100644 --- a/nat/nat2vpp/src/test/resources/nat64/static-mapping-address-update.json +++ b/nat/nat2vpp/src/test/resources/nat64/static-mapping-address-update.json @@ -4,8 +4,8 @@ "index": 58, "type": "static", "transport-protocol": 58, - "internal-src-address": "2001:db8:85a3::8a2e:370:7334", - "external-src-address": "10.1.1.4", + "internal-src-address": "2001:db8:85a3::8a2e:370:7334/128", + "external-src-address": "10.1.1.4/32", "internal-src-port" : { "start-port-number" : 1234 }, diff --git a/nat/nat2vpp/src/test/resources/nat64/static-mapping-unsupported-proto.json b/nat/nat2vpp/src/test/resources/nat64/static-mapping-unsupported-proto.json index bbe8a20d3..44432c55b 100644 --- a/nat/nat2vpp/src/test/resources/nat64/static-mapping-unsupported-proto.json +++ b/nat/nat2vpp/src/test/resources/nat64/static-mapping-unsupported-proto.json @@ -4,8 +4,8 @@ "index": 58, "type": "static", "transport-protocol": 123, - "internal-src-address": "2001:db8:85a3::8a2e:370:7333", - "external-src-address": "10.1.1.3" + "internal-src-address": "2001:db8:85a3::8a2e:370:7333/128", + "external-src-address": "10.1.1.3/32" } } } diff --git a/nat/nat2vpp/src/test/resources/nat64/static-mapping.json b/nat/nat2vpp/src/test/resources/nat64/static-mapping.json index 9fff452a2..4312a8841 100644 --- a/nat/nat2vpp/src/test/resources/nat64/static-mapping.json +++ b/nat/nat2vpp/src/test/resources/nat64/static-mapping.json @@ -4,11 +4,11 @@ "index": 58, "type": "static", "transport-protocol": 58, - "internal-src-address": "2001:db8:85a3::8a2e:370:7333", + "internal-src-address": "2001:db8:85a3::8a2e:370:7333/128", "internal-src-port": { "start-port-number": 123 }, - "external-src-address": "10.1.1.3", + "external-src-address": "10.1.1.3/32", "external-src-port": { "start-port-number": 456 } -- cgit 1.2.3-korg