From c7425cb71413ed8f60493e2603ec9376137eadc2 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Tue, 21 Aug 2018 09:40:37 +0200 Subject: Adapt ncclient examples to 18.07 ietf-nat model changes The ietf-nat model was updated by HC2VPP-226 and HC2VPP-367. Change-Id: I1bf8bfdbc0a106c933a565b5f11032e802598fbb Signed-off-by: Marek Gradzki --- examples/ncclient/acl/copy_config_acl.xml | 15 +-- examples/ncclient/acl/copy_config_acl_update.xml | 15 +-- examples/ncclient/acl/expected_config_acl.xml | 18 ++-- .../ncclient/acl/expected_config_acl_update.xml | 15 +-- examples/ncclient/nat/copy_config_nat.xml | 80 +++++++-------- examples/ncclient/nat/copy_config_nat_update.xml | 108 +++++++++++---------- examples/ncclient/nat/expected_config_nat.xml | 80 +++++++-------- .../ncclient/nat/expected_config_nat_update.xml | 90 ++++++++--------- 8 files changed, 220 insertions(+), 201 deletions(-) diff --git a/examples/ncclient/acl/copy_config_acl.xml b/examples/ncclient/acl/copy_config_acl.xml index d2177d643..164fd5aaa 100644 --- a/examples/ncclient/acl/copy_config_acl.xml +++ b/examples/ncclient/acl/copy_config_acl.xml @@ -6,13 +6,16 @@ ~ and is available at http://www.eclipse.org/legal/epl-v10.html --> - - - + + + 0 - - - + + 0 + + + + local0 diff --git a/examples/ncclient/acl/copy_config_acl_update.xml b/examples/ncclient/acl/copy_config_acl_update.xml index 1a30ece94..5b99994c3 100644 --- a/examples/ncclient/acl/copy_config_acl_update.xml +++ b/examples/ncclient/acl/copy_config_acl_update.xml @@ -6,13 +6,16 @@ ~ and is available at http://www.eclipse.org/legal/epl-v10.html --> - - - + + + 0 - - - + + 0 + + + + local0 diff --git a/examples/ncclient/acl/expected_config_acl.xml b/examples/ncclient/acl/expected_config_acl.xml index 735e0f43d..024c1b30a 100644 --- a/examples/ncclient/acl/expected_config_acl.xml +++ b/examples/ncclient/acl/expected_config_acl.xml @@ -6,13 +6,16 @@ ~ and is available at http://www.eclipse.org/legal/epl-v10.html --> - - - + + + 0 - - - + + 0 + + + + local0 @@ -72,8 +75,7 @@ imcp-v6-rule - 2001:0db8:0a0b:12f0:0000:0000:0000:0001/64 - + 2001:0db8:0a0b:12f0:0000:0000:0000:0001/64 2001:0db8:0a0b:12f0:0000:0000:0000:0002/48 diff --git a/examples/ncclient/acl/expected_config_acl_update.xml b/examples/ncclient/acl/expected_config_acl_update.xml index 17f76ff69..cc88ffcf3 100644 --- a/examples/ncclient/acl/expected_config_acl_update.xml +++ b/examples/ncclient/acl/expected_config_acl_update.xml @@ -6,13 +6,16 @@ ~ and is available at http://www.eclipse.org/legal/epl-v10.html --> - - - + + + 0 - - - + + 0 + + + + local0 diff --git a/examples/ncclient/nat/copy_config_nat.xml b/examples/ncclient/nat/copy_config_nat.xml index d1441b07f..eb261f1d2 100644 --- a/examples/ncclient/nat/copy_config_nat.xml +++ b/examples/ncclient/nat/copy_config_nat.xml @@ -6,45 +6,6 @@ ~ and is available at http://www.eclipse.org/legal/epl-v10.html --> - - - - 0 - - 2 - 172.16.2.123/32 - - - 3 - 10.10.10.1/30 - nat64 - - - 1 - 172.16.2.0/30 - - - - 1 - 10.1.1.3 - static - 6 - - 5678 - - - 1234 - - 2001:db8:85a3::8a2e:370:7334 - - - - 0 - 2001:db8:122:300::/56 - - - - local0 @@ -79,4 +40,45 @@ + + + + 0 + + 0 + + 2001:db8:122:300::/56 + + + 3 + 10.10.10.1/30 + nat64 + + + 2 + 172.16.2.123/32 + + + 1 + 172.16.2.0/30 + + + + + 1 + static + 6 + 10.1.1.3/32 + + 5678 + + 2001:db8:85a3::8a2e:370:7334/128 + + 1234 + + + + + + diff --git a/examples/ncclient/nat/copy_config_nat_update.xml b/examples/ncclient/nat/copy_config_nat_update.xml index 6b346cf80..7c8bd9b9b 100644 --- a/examples/ncclient/nat/copy_config_nat_update.xml +++ b/examples/ncclient/nat/copy_config_nat_update.xml @@ -6,50 +6,6 @@ ~ and is available at http://www.eclipse.org/legal/epl-v10.html --> - - - - 0 - - 2 - 172.15.2.123/32 - - - 3 - 10.10.10.1/30 - nat64 - - - 5 - 172.16.2.0/30 - - - 6 - 1.2.3.4/32 - nat64 - - - - 1 - 10.1.1.3 - static - 6 - - 5678 - - - 1234 - - 2001:db8:85a3::8a2e:370:7334 - - - - 0 - 2001:db8:122:300::/56 - - - - local0 @@ -57,17 +13,12 @@ false - loop3 + loop1 for testing purposes x:loopback - 03:ff:ff:ff:ff:ff + 01:ff:ff:ff:ff:ff - - - true - - loop2 @@ -84,12 +35,17 @@ - loop1 + loop3 for testing purposes x:loopback - 01:ff:ff:ff:ff:ff + 03:ff:ff:ff:ff:ff + + + true + + loop0 @@ -100,4 +56,50 @@ + + + + 0 + + 0 + + 2001:db8:122:300::/56 + + + 6 + 1.2.3.4/32 + nat64 + + + 5 + 172.16.2.0/30 + + + 3 + 10.10.10.1/30 + nat64 + + + 2 + 172.15.2.123/32 + + + + + 1 + static + 6 + 10.1.1.3/32 + + 5678 + + 2001:db8:85a3::8a2e:370:7334/128 + + 1234 + + + + + + diff --git a/examples/ncclient/nat/expected_config_nat.xml b/examples/ncclient/nat/expected_config_nat.xml index 35a51bc1e..eaf08029c 100644 --- a/examples/ncclient/nat/expected_config_nat.xml +++ b/examples/ncclient/nat/expected_config_nat.xml @@ -6,45 +6,6 @@ ~ and is available at http://www.eclipse.org/legal/epl-v10.html --> - - - - 0 - - 2 - 172.16.2.123/32 - - - 3 - 10.10.10.1/30 - nat64 - - - 1 - 172.16.2.0/30 - - - - 1 - 10.1.1.3 - static - 6 - - 5678 - - - 1234 - - 2001:db8:85a3::8a2e:370:7334 - - - - 0 - 2001:db8:122:300::/56 - - - - local0 @@ -79,4 +40,45 @@ + + + + 0 + + 0 + + 2001:db8:122:300::/56 + + + 3 + 10.10.10.1/30 + nat64 + + + 2 + 172.16.2.123/32 + + + 1 + 172.16.2.0/30 + + + + + 1 + static + 6 + 10.1.1.3/32 + + 5678 + + 2001:db8:85a3::8a2e:370:7334/128 + + 1234 + + + + + + diff --git a/examples/ncclient/nat/expected_config_nat_update.xml b/examples/ncclient/nat/expected_config_nat_update.xml index 41891e088..8aa9e64d4 100644 --- a/examples/ncclient/nat/expected_config_nat_update.xml +++ b/examples/ncclient/nat/expected_config_nat_update.xml @@ -6,50 +6,6 @@ ~ and is available at http://www.eclipse.org/legal/epl-v10.html --> - - - - 0 - - 6 - 1.2.3.4/32 - nat64 - - - 5 - 172.16.2.0/30 - - - 2 - 172.15.2.123/32 - - - 3 - 10.10.10.1/30 - nat64 - - - - 1 - 10.1.1.3 - static - 6 - - 5678 - - - 1234 - - 2001:db8:85a3::8a2e:370:7334 - - - - 0 - 2001:db8:122:300::/56 - - - - local0 @@ -100,4 +56,50 @@ + + + + 0 + + 0 + + 2001:db8:122:300::/56 + + + 6 + 1.2.3.4/32 + nat64 + + + 5 + 172.16.2.0/30 + + + 3 + 10.10.10.1/30 + nat64 + + + 2 + 172.15.2.123/32 + + + + + 1 + static + 6 + 10.1.1.3/32 + + 5678 + + 2001:db8:85a3::8a2e:370:7334/128 + + 1234 + + + + + + -- cgit 1.2.3-korg