summaryrefslogtreecommitdiffstats
path: root/examples/ncclient/acl
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2018-08-21 09:40:37 +0200
committerMarek Gradzki <mgradzki@cisco.com>2018-08-21 10:11:04 +0200
commitc7425cb71413ed8f60493e2603ec9376137eadc2 (patch)
tree4cdf51254b71e72ba5be429a0e6ff509a6b6e85a /examples/ncclient/acl
parent16d190d24cfb3286ffd941d690c656d7e5d73928 (diff)
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>
Diffstat (limited to 'examples/ncclient/acl')
-rw-r--r--examples/ncclient/acl/copy_config_acl.xml15
-rw-r--r--examples/ncclient/acl/copy_config_acl_update.xml15
-rw-r--r--examples/ncclient/acl/expected_config_acl.xml18
-rw-r--r--examples/ncclient/acl/expected_config_acl_update.xml15
4 files changed, 37 insertions, 26 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
-->
<config>
- <nat-config xmlns="urn:ietf:params:xml:ns:yang:ietf-nat">
- <nat-instances>
- <nat-instance>
+ <nat xmlns="urn:ietf:params:xml:ns:yang:ietf-nat">
+ <instances>
+ <instance>
<id>0</id>
- </nat-instance>
- </nat-instances>
- </nat-config>
+ <policy>
+ <id>0</id>
+ </policy>
+ </instance>
+ </instances>
+ </nat>
<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
<interface>
<name>local0</name>
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
-->
<config>
- <nat-config xmlns="urn:ietf:params:xml:ns:yang:ietf-nat">
- <nat-instances>
- <nat-instance>
+ <nat xmlns="urn:ietf:params:xml:ns:yang:ietf-nat">
+ <instances>
+ <instance>
<id>0</id>
- </nat-instance>
- </nat-instances>
- </nat-config>
+ <policy>
+ <id>0</id>
+ </policy>
+ </instance>
+ </instances>
+ </nat>
<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
<interface>
<name>local0</name>
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
-->
<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>
+ <nat xmlns="urn:ietf:params:xml:ns:yang:ietf-nat">
+ <instances>
+ <instance>
<id>0</id>
- </nat-instance>
- </nat-instances>
- </nat-config>
+ <policy>
+ <id>0</id>
+ </policy>
+ </instance>
+ </instances>
+ </nat>
<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
<interface>
<name>local0</name>
@@ -72,8 +75,7 @@
<rule-name>imcp-v6-rule</rule-name>
<matches>
<vpp-ace-nodes xmlns="urn:opendaylight:params:xml:ns:yang:vpp:acl">
- <destination-ipv6-network>2001:0db8:0a0b:12f0:0000:0000:0000:0001/64
- </destination-ipv6-network>
+ <destination-ipv6-network>2001:0db8:0a0b:12f0:0000:0000:0000:0001/64</destination-ipv6-network>
<source-ipv6-network>2001:0db8:0a0b:12f0:0000:0000:0000:0002/48</source-ipv6-network>
<icmp-v6-nodes>
<icmp-type-range>
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
-->
<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>
+ <nat xmlns="urn:ietf:params:xml:ns:yang:ietf-nat">
+ <instances>
+ <instance>
<id>0</id>
- </nat-instance>
- </nat-instances>
- </nat-config>
+ <policy>
+ <id>0</id>
+ </policy>
+ </instance>
+ </instances>
+ </nat>
<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
<interface>
<name>local0</name>