diff options
| -rw-r--r-- | examples/ncclient/acl/copy_config_acl.xml | 15 | ||||
| -rw-r--r-- | examples/ncclient/acl/copy_config_acl_update.xml | 15 | ||||
| -rw-r--r-- | examples/ncclient/acl/expected_config_acl.xml | 18 | ||||
| -rw-r--r-- | examples/ncclient/acl/expected_config_acl_update.xml | 15 | ||||
| -rw-r--r-- | examples/ncclient/nat/copy_config_nat.xml | 80 | ||||
| -rw-r--r-- | examples/ncclient/nat/copy_config_nat_update.xml | 108 | ||||
| -rw-r--r-- | examples/ncclient/nat/expected_config_nat.xml | 80 | ||||
| -rw-r--r-- | examples/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 --> <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> 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 --> <config> - <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> </config> 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 --> <config> - <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.15.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>5</pool-id> - <external-ip-pool>172.16.2.0/30</external-ip-pool> - </external-ip-address-pool> - <external-ip-address-pool> - <pool-id>6</pool-id> - <external-ip-pool>1.2.3.4/32</external-ip-pool> - <pool-type xmlns="urn:opendaylight:params:xml:ns:yang:vpp:nat">nat64</pool-type> - </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> @@ -57,17 +13,12 @@ <enabled>false</enabled> </interface> <interface> - <name>loop3</name> + <name>loop1</name> <description>for testing purposes</description> <type xmlns:x="urn:opendaylight:params:xml:ns:yang:v3po">x:loopback</type> <loopback xmlns="urn:opendaylight:params:xml:ns:yang:v3po"> - <mac>03:ff:ff:ff:ff:ff</mac> + <mac>01:ff:ff:ff:ff:ff</mac> </loopback> - <nat xmlns="urn:opendaylight:params:xml:ns:yang:interface:nat"> - <outbound> - <post-routing>true</post-routing> - </outbound> - </nat> </interface> <interface> <name>loop2</name> @@ -84,12 +35,17 @@ </nat> </interface> <interface> - <name>loop1</name> + <name>loop3</name> <description>for testing purposes</description> <type xmlns:x="urn:opendaylight:params:xml:ns:yang:v3po">x:loopback</type> <loopback xmlns="urn:opendaylight:params:xml:ns:yang:v3po"> - <mac>01:ff:ff:ff:ff:ff</mac> + <mac>03:ff:ff:ff:ff:ff</mac> </loopback> + <nat xmlns="urn:opendaylight:params:xml:ns:yang:interface:nat"> + <outbound> + <post-routing>true</post-routing> + </outbound> + </nat> </interface> <interface> <name>loop0</name> @@ -100,4 +56,50 @@ </loopback> </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>6</pool-id> + <external-ip-pool>1.2.3.4/32</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>5</pool-id> + <external-ip-pool>172.16.2.0/30</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>2</pool-id> + <external-ip-pool>172.15.2.123/32</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> </config> 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> 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 --> <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>6</pool-id> - <external-ip-pool>1.2.3.4/32</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>5</pool-id> - <external-ip-pool>172.16.2.0/30</external-ip-pool> - </external-ip-address-pool> - <external-ip-address-pool> - <pool-id>2</pool-id> - <external-ip-pool>172.15.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> - <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> @@ -100,4 +56,50 @@ </loopback> </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>6</pool-id> + <external-ip-pool>1.2.3.4/32</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>5</pool-id> + <external-ip-pool>172.16.2.0/30</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>2</pool-id> + <external-ip-pool>172.15.2.123/32</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> |