From de8620bd9200cd063facabec86b51302ce2547d7 Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
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 <mgradzki@cisco.com>
---
 examples/ncclient/nat/expected_config_nat.xml | 80 ++++++++++++++-------------
 1 file changed, 41 insertions(+), 39 deletions(-)

(limited to 'examples/ncclient/nat/expected_config_nat.xml')

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
   -->
 <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-    <nat-config xmlns="urn:ietf:params:xml:ns:yang:ietf-nat">
-        <nat-instances>
-            <nat-instance>
-                <id>0</id>
-                <external-ip-address-pool>
-                    <pool-id>2</pool-id>
-                    <external-ip-pool>172.16.2.123/32</external-ip-pool>
-                </external-ip-address-pool>
-                <external-ip-address-pool>
-                    <pool-id>3</pool-id>
-                    <external-ip-pool>10.10.10.1/30</external-ip-pool>
-                    <pool-type xmlns="urn:opendaylight:params:xml:ns:yang:vpp:nat">nat64</pool-type>
-                </external-ip-address-pool>
-                <external-ip-address-pool>
-                    <pool-id>1</pool-id>
-                    <external-ip-pool>172.16.2.0/30</external-ip-pool>
-                </external-ip-address-pool>
-                <mapping-table>
-                    <mapping-entry>
-                        <index>1</index>
-                        <external-src-address>10.1.1.3</external-src-address>
-                        <type>static</type>
-                        <transport-protocol>6</transport-protocol>
-                        <external-src-port>
-                            <single-port-number>5678</single-port-number>
-                        </external-src-port>
-                        <internal-src-port>
-                            <single-port-number>1234</single-port-number>
-                        </internal-src-port>
-                        <internal-src-address>2001:db8:85a3::8a2e:370:7334</internal-src-address>
-                    </mapping-entry>
-                </mapping-table>
-                <nat64-prefixes>
-                    <nat64-prefix-id>0</nat64-prefix-id>
-                    <nat64-prefix>2001:db8:122:300::/56</nat64-prefix>
-                </nat64-prefixes>
-            </nat-instance>
-        </nat-instances>
-    </nat-config>
     <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
         <interface>
             <name>local0</name>
@@ -79,4 +40,45 @@
             </nat>
         </interface>
     </interfaces>
+    <nat xmlns="urn:ietf:params:xml:ns:yang:ietf-nat">
+        <instances>
+            <instance>
+                <id>0</id>
+                <policy>
+                    <id>0</id>
+                    <nat64-prefixes>
+                        <nat64-prefix>2001:db8:122:300::/56</nat64-prefix>
+                    </nat64-prefixes>
+                    <external-ip-address-pool>
+                        <pool-id>3</pool-id>
+                        <external-ip-pool>10.10.10.1/30</external-ip-pool>
+                        <pool-type xmlns="urn:opendaylight:params:xml:ns:yang:vpp:nat">nat64</pool-type>
+                    </external-ip-address-pool>
+                    <external-ip-address-pool>
+                        <pool-id>2</pool-id>
+                        <external-ip-pool>172.16.2.123/32</external-ip-pool>
+                    </external-ip-address-pool>
+                    <external-ip-address-pool>
+                        <pool-id>1</pool-id>
+                        <external-ip-pool>172.16.2.0/30</external-ip-pool>
+                    </external-ip-address-pool>
+                </policy>
+                <mapping-table>
+                    <mapping-entry>
+                        <index>1</index>
+                        <type>static</type>
+                        <transport-protocol>6</transport-protocol>
+                        <external-src-address>10.1.1.3/32</external-src-address>
+                        <external-src-port>
+                            <start-port-number>5678</start-port-number>
+                        </external-src-port>
+                        <internal-src-address>2001:db8:85a3::8a2e:370:7334/128</internal-src-address>
+                        <internal-src-port>
+                            <start-port-number>1234</start-port-number>
+                        </internal-src-port>
+                    </mapping-entry>
+                </mapping-table>
+            </instance>
+        </instances>
+    </nat>
 </data>
-- 
cgit 1.2.3-korg