<interface>
<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">
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:loopback</type>
+ <loopback xmlns="http://fd.io/hc2vpp/yang/v3po">
<mac>00:ff:ff:ff:ff:ff</mac>
</loopback>
- <acl xmlns="urn:opendaylight:params:xml:ns:yang:interface:acl">
- <ingress>
- <vpp-acls>
- <type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</type>
- <name>tcp-acl</name>
- </vpp-acls>
- <vpp-acls>
- <type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</type>
- <name>udp-acl</name>
- </vpp-acls>
- <vpp-macip-acl>
- <type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-macip-acl</type>
- <name>macip-acl</name>
- </vpp-macip-acl>
- </ingress>
- </acl>
</interface>
</interfaces>
- <access-lists xmlns="urn:ietf:params:xml:ns:yang:ietf-access-control-list">
+ <acls xmlns="urn:ietf:params:xml:ns:yang:ietf-access-control-list">
<acl>
- <acl-name>macip-acl</acl-name>
- <acl-type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-macip-acl</acl-type>
- <access-list-entries>
+ <name>tcp-acl</name>
+ <aces>
<ace>
- <rule-name>macip-rule</rule-name>
+ <name>tcp-rule</name>
<matches>
- <vpp-macip-ace-nodes xmlns="urn:opendaylight:params:xml:ns:yang:vpp:acl">
+ <tcp>
+ <vpp-tcp-ace xmlns="http://fd.io/hc2vpp/yang/vpp/acl">
+ <flags-mask>cwr</flags-mask>
+ </vpp-tcp-ace>
+ <source-port>
+ <lower-port>1</lower-port>
+ <upper-port>5487</upper-port>
+ </source-port>
+ <destination-port>
+ <lower-port>87</lower-port>
+ <upper-port>6745</upper-port>
+ </destination-port>
+ <flags>cwr ece urg</flags>
+ </tcp>
+ <ipv4>
+ <destination-ipv4-network>192.168.2.1/24</destination-ipv4-network>
<source-ipv4-network>192.168.2.2/32</source-ipv4-network>
- <source-mac-address>aa:aa:aa:aa:aa:aa</source-mac-address>
- <source-mac-address-mask>ff:00:00:00:00:00</source-mac-address-mask>
- </vpp-macip-ace-nodes>
+ </ipv4>
</matches>
<actions>
- <permit/>
+ <forwarding>accept</forwarding>
</actions>
</ace>
- </access-list-entries>
+ </aces>
+ <type xmlns:x="http://fd.io/hc2vpp/yang/vpp/acl">x:vpp-acl</type>
</acl>
<acl>
- <acl-name>icmp-v6-acl</acl-name>
- <acl-type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</acl-type>
- <access-list-entries>
+ <name>icmp-v6-acl</name>
+ <aces>
<ace>
- <rule-name>imcp-v6-rule</rule-name>
+ <name>imcp-v6-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>
- <source-ipv6-network>2001:0db8:0a0b:12f0:0000:0000:0000:0002/48</source-ipv6-network>
- <icmp-v6-nodes>
+ <icmp>
+ <vpp-icmp-ace xmlns="http://fd.io/hc2vpp/yang/vpp/acl">
<icmp-type-range>
<last>8</last>
<first>5</first>
<last>3</last>
<first>1</first>
</icmp-code-range>
- </icmp-v6-nodes>
- </vpp-ace-nodes>
+ </vpp-icmp-ace>
+ </icmp>
+ <ipv6>
+ <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>
+ </ipv6>
</matches>
<actions>
- <permit/>
+ <forwarding>accept</forwarding>
</actions>
</ace>
- </access-list-entries>
+ </aces>
+ <type xmlns:x="http://fd.io/hc2vpp/yang/vpp/acl">x:vpp-acl</type>
</acl>
<acl>
- <acl-name>udp-acl</acl-name>
- <acl-type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</acl-type>
- <access-list-entries>
+ <name>macip-acl</name>
+ <aces>
<ace>
- <rule-name>udp-rule</rule-name>
+ <name>macip-rule</name>
<matches>
- <vpp-ace-nodes xmlns="urn:opendaylight:params:xml:ns:yang:vpp:acl">
- <destination-ipv4-network>192.168.2.1/24</destination-ipv4-network>
+ <eth>
+ <source-mac-address-mask>ff:00:00:00:00:00</source-mac-address-mask>
+ <source-mac-address>aa:aa:aa:aa:aa:aa</source-mac-address>
+ </eth>
+ <ipv4>
<source-ipv4-network>192.168.2.2/32</source-ipv4-network>
- <udp-nodes>
- <source-port-range>
- <upper-port>5487</upper-port>
- <lower-port>1</lower-port>
- </source-port-range>
- <destination-port-range>
- <upper-port>6745</upper-port>
- <lower-port>87</lower-port>
- </destination-port-range>
- </udp-nodes>
- </vpp-ace-nodes>
+ </ipv4>
</matches>
<actions>
- <permit/>
+ <forwarding>accept</forwarding>
</actions>
</ace>
- </access-list-entries>
+ </aces>
+ <type xmlns:x="http://fd.io/hc2vpp/yang/vpp/acl">x:vpp-macip-acl</type>
</acl>
<acl>
- <acl-name>tcp-acl</acl-name>
- <acl-type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</acl-type>
- <access-list-entries>
+ <name>udp-acl</name>
+ <aces>
<ace>
- <rule-name>tcp-rule</rule-name>
+ <name>udp-rule</name>
<matches>
- <vpp-ace-nodes xmlns="urn:opendaylight:params:xml:ns:yang:vpp:acl">
+ <udp>
+ <source-port>
+ <lower-port>1</lower-port>
+ <upper-port>5487</upper-port>
+ </source-port>
+ <destination-port>
+ <lower-port>87</lower-port>
+ <upper-port>6745</upper-port>
+ </destination-port>
+ </udp>
+ <ipv4>
<destination-ipv4-network>192.168.2.1/24</destination-ipv4-network>
<source-ipv4-network>192.168.2.2/32</source-ipv4-network>
- <tcp-nodes>
- <source-port-range>
- <upper-port>5487</upper-port>
- <lower-port>1</lower-port>
- </source-port-range>
- <destination-port-range>
- <upper-port>6745</upper-port>
- <lower-port>87</lower-port>
- </destination-port-range>
- <tcp-flags-mask>1</tcp-flags-mask>
- <tcp-flags-value>7</tcp-flags-value>
- </tcp-nodes>
- </vpp-ace-nodes>
+ </ipv4>
</matches>
<actions>
- <permit/>
+ <forwarding>accept</forwarding>
</actions>
</ace>
- </access-list-entries>
+ </aces>
+ <type xmlns:x="http://fd.io/hc2vpp/yang/vpp/acl">x:vpp-acl</type>
</acl>
<acl>
- <acl-name>icmp-acl</acl-name>
- <acl-type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</acl-type>
- <access-list-entries>
+ <name>icmp-acl</name>
+ <aces>
<ace>
- <rule-name>imcp-rule</rule-name>
+ <name>imcp-rule</name>
<matches>
- <vpp-ace-nodes xmlns="urn:opendaylight:params:xml:ns:yang:vpp:acl">
- <destination-ipv4-network>192.168.2.1/24</destination-ipv4-network>
- <source-ipv4-network>192.168.2.2/32</source-ipv4-network>
- <icmp-nodes>
+ <icmp>
+ <vpp-icmp-ace xmlns="http://fd.io/hc2vpp/yang/vpp/acl">
<icmp-type-range>
<last>8</last>
<first>5</first>
<last>3</last>
<first>1</first>
</icmp-code-range>
- </icmp-nodes>
- </vpp-ace-nodes>
+ </vpp-icmp-ace>
+ </icmp>
+ <ipv4>
+ <destination-ipv4-network>192.168.2.1/24</destination-ipv4-network>
+ <source-ipv4-network>192.168.2.2/32</source-ipv4-network>
+ </ipv4>
</matches>
<actions>
- <permit/>
+ <forwarding>accept</forwarding>
</actions>
</ace>
- </access-list-entries>
+ </aces>
+ <type xmlns:x="http://fd.io/hc2vpp/yang/vpp/acl">x:vpp-acl</type>
</acl>
- </access-lists>
+ <attachment-points>
+ <interface>
+ <interface-id>local0</interface-id>
+ <ingress>
+ <acl-sets>
+ <acl-set>
+ <name>tcp-acl</name>
+ </acl-set>
+ <acl-set>
+ <name>udp-acl</name>
+ </acl-set>
+ <acl-set>
+ <name>macip-acl</name>
+ </acl-set>
+ </acl-sets>
+ </ingress>
+ </interface>
+ </attachment-points>
+ </acls>
</config>
<interface>
<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">
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:loopback</type>
+ <loopback xmlns="http://fd.io/hc2vpp/yang/v3po">
<mac>00:ff:ff:ff:ff:ff</mac>
</loopback>
- <acl xmlns="urn:opendaylight:params:xml:ns:yang:interface:acl">
- <ingress>
- <vpp-macip-acl>
- <type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-macip-acl</type>
- <name>macip-acl</name>
- </vpp-macip-acl>
- </ingress>
- </acl>
</interface>
<interface>
<name>loop2</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">
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:loopback</type>
+ <loopback xmlns="http://fd.io/hc2vpp/yang/v3po">
<mac>aa:ff:ff:ff:ff:ff</mac>
</loopback>
- <acl xmlns="urn:opendaylight:params:xml:ns:yang:interface:acl">
- <ingress>
- <vpp-acls>
- <type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</type>
- <name>tcp-acl2</name>
- </vpp-acls>
- <vpp-acls>
- <type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</type>
- <name>udp-acl</name>
- </vpp-acls>
- </ingress>
- </acl>
</interface>
</interfaces>
- <access-lists xmlns="urn:ietf:params:xml:ns:yang:ietf-access-control-list">
- <acl>
- <acl-name>macip-acl</acl-name>
- <acl-type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-macip-acl</acl-type>
- <access-list-entries>
- <ace>
- <rule-name>macip-rule</rule-name>
- <matches>
- <vpp-macip-ace-nodes xmlns="urn:opendaylight:params:xml:ns:yang:vpp:acl">
- <source-ipv4-network>192.168.2.2/32</source-ipv4-network>
- <source-mac-address>aa:aa:aa:aa:aa:aa</source-mac-address>
- <source-mac-address-mask>ff:00:00:00:00:00</source-mac-address-mask>
- </vpp-macip-ace-nodes>
- </matches>
- <actions>
- <permit/>
- </actions>
- </ace>
- </access-list-entries>
- </acl>
+ <acls xmlns="urn:ietf:params:xml:ns:yang:ietf-access-control-list">
<acl>
- <acl-name>icmp-v6-acl</acl-name>
- <acl-type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</acl-type>
- <access-list-entries>
+ <name>tcp-acl</name>
+ <aces>
<ace>
- <rule-name>imcp-v6-rule</rule-name>
+ <name>tcp-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>
- <source-ipv6-network>2001:0db8:0a0b:12f0:0000:0000:0000:0002/48</source-ipv6-network>
- <icmp-v6-nodes>
- <icmp-type-range>
- <last>8</last>
- <first>5</first>
- </icmp-type-range>
- <icmp-code-range>
- <last>3</last>
- <first>1</first>
- </icmp-code-range>
- </icmp-v6-nodes>
- </vpp-ace-nodes>
- </matches>
- <actions>
- <permit/>
- </actions>
- </ace>
- </access-list-entries>
- </acl>
- <acl>
- <acl-name>udp-acl</acl-name>
- <acl-type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</acl-type>
- <access-list-entries>
- <ace>
- <rule-name>udp-rule</rule-name>
- <matches>
- <vpp-ace-nodes xmlns="urn:opendaylight:params:xml:ns:yang:vpp:acl">
+ <tcp>
+ <vpp-tcp-ace xmlns="http://fd.io/hc2vpp/yang/vpp/acl">
+ <flags-mask>cwr</flags-mask>
+ </vpp-tcp-ace>
+ <source-port>
+ <lower-port>1</lower-port>
+ <upper-port>5487</upper-port>
+ </source-port>
+ <destination-port>
+ <lower-port>87</lower-port>
+ <upper-port>6745</upper-port>
+ </destination-port>
+ <flags>cwr ece urg</flags>
+ </tcp>
+ <ipv4>
<destination-ipv4-network>192.168.2.1/24</destination-ipv4-network>
<source-ipv4-network>192.168.2.2/32</source-ipv4-network>
- <udp-nodes>
- <source-port-range>
- <upper-port>5486</upper-port>
- <lower-port>11</lower-port>
- </source-port-range>
- </udp-nodes>
- </vpp-ace-nodes>
+ </ipv4>
</matches>
<actions>
- <permit/>
+ <forwarding>accept</forwarding>
</actions>
</ace>
- </access-list-entries>
+ </aces>
+ <type xmlns:x="http://fd.io/hc2vpp/yang/vpp/acl">x:vpp-acl</type>
</acl>
- <acl>
- <acl-name>tcp-acl2</acl-name>
- <acl-type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</acl-type>
- <access-list-entries>
- <ace>
- <rule-name>tcp-rule</rule-name>
- <matches>
- <vpp-ace-nodes xmlns="urn:opendaylight:params:xml:ns:yang:vpp:acl">
- <destination-ipv4-network>192.168.2.1/24</destination-ipv4-network>
- <source-ipv4-network>192.168.2.2/32</source-ipv4-network>
- <tcp-nodes>
- <source-port-range>
- <upper-port>5487</upper-port>
- <lower-port>1</lower-port>
- </source-port-range>
- <destination-port-range>
- <upper-port>6745</upper-port>
- <lower-port>87</lower-port>
- </destination-port-range>
- <tcp-flags-mask>1</tcp-flags-mask>
- <tcp-flags-value>7</tcp-flags-value>
- </tcp-nodes>
- </vpp-ace-nodes>
- </matches>
- <actions>
- <permit/>
- </actions>
- </ace>
- </access-list-entries>
- </acl>
- <acl>
- <acl-name>icmp-acl</acl-name>
- <acl-type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</acl-type>
- <access-list-entries>
- <ace>
- <rule-name>renamed-imcp-rule</rule-name>
- <matches>
- <vpp-ace-nodes xmlns="urn:opendaylight:params:xml:ns:yang:vpp:acl">
- <destination-ipv4-network>192.168.2.1/24</destination-ipv4-network>
- <source-ipv4-network>192.168.2.2/32</source-ipv4-network>
- <icmp-nodes>
- <icmp-type-range>
- <last>8</last>
- <first>5</first>
- </icmp-type-range>
- <icmp-code-range>
- <last>3</last>
- <first>1</first>
- </icmp-code-range>
- </icmp-nodes>
- </vpp-ace-nodes>
- </matches>
- <actions>
- <permit/>
- </actions>
- </ace>
- <ace>
- <rule-name>new-icmp-rule</rule-name>
- <matches>
- <vpp-ace-nodes xmlns="urn:opendaylight:params:xml:ns:yang:vpp:acl">
- <destination-ipv4-network>10.1.1.1/24</destination-ipv4-network>
- <source-ipv4-network>10.2.2.2/32</source-ipv4-network>
- <icmp-nodes>
- <icmp-type-range>
- <first>4</first>
- <last>9</last>
- </icmp-type-range>
- </icmp-nodes>
- </vpp-ace-nodes>
- </matches>
- <actions>
- <permit/>
- </actions>
- </ace>
- </access-list-entries>
- </acl>
- </access-lists>
+ <attachment-points>
+ <interface>
+ <interface-id>loop2</interface-id>
+ <ingress>
+ <acl-sets>
+ <acl-set>
+ <name>tcp-acl</name>
+ </acl-set>
+ </acl-sets>
+ </ingress>
+ </interface>
+ </attachment-points>
+ </acls>
</config>
<config xmlns:xc="urn:ietf:params:xml:ns:netconf:base:1.0">
- <access-lists xmlns="urn:ietf:params:xml:ns:yang:ietf-access-control-list" xc:operation="create">
+ <acls xmlns="urn:ietf:params:xml:ns:yang:ietf-access-control-list" xc:operation="create">
<acl>
<acl-name>acl0</acl-name>
- <acl-type>ipv4-acl</acl-type>
+ <type xmlns:x="http://fd.io/hc2vpp/yang/vpp/acl">x:ipv4-acl</type>
</acl>
- </access-lists>
+ </acls>
</config>
<interface>
<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">
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:loopback</type>
+ <loopback xmlns="http://fd.io/hc2vpp/yang/v3po">
<mac>00:ff:ff:ff:ff:ff</mac>
</loopback>
- <acl xmlns="urn:opendaylight:params:xml:ns:yang:interface:acl">
- <ingress>
- <vpp-acls>
- <type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</type>
- <name>tcp-acl</name>
- </vpp-acls>
- <vpp-acls>
- <type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</type>
- <name>udp-acl</name>
- </vpp-acls>
- <vpp-macip-acl>
- <type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-macip-acl</type>
- <name>macip-acl</name>
- </vpp-macip-acl>
- </ingress>
- </acl>
</interface>
</interfaces>
- <access-lists xmlns="urn:ietf:params:xml:ns:yang:ietf-access-control-list">
+ <acls xmlns="urn:ietf:params:xml:ns:yang:ietf-access-control-list">
<acl>
- <acl-name>macip-acl</acl-name>
- <acl-type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-macip-acl</acl-type>
- <access-list-entries>
+ <name>tcp-acl</name>
+ <aces>
<ace>
- <rule-name>macip-rule</rule-name>
+ <name>tcp-rule</name>
<matches>
- <vpp-macip-ace-nodes xmlns="urn:opendaylight:params:xml:ns:yang:vpp:acl">
+ <tcp>
+ <vpp-tcp-ace xmlns="http://fd.io/hc2vpp/yang/vpp/acl">
+ <flags-mask>cwr</flags-mask>
+ </vpp-tcp-ace>
+ <source-port>
+ <lower-port>1</lower-port>
+ <upper-port>5487</upper-port>
+ </source-port>
+ <destination-port>
+ <lower-port>87</lower-port>
+ <upper-port>6745</upper-port>
+ </destination-port>
+ <flags>cwr ece urg</flags>
+ </tcp>
+ <ipv4>
+ <destination-ipv4-network>192.168.2.1/24</destination-ipv4-network>
<source-ipv4-network>192.168.2.2/32</source-ipv4-network>
- <source-mac-address>aa:aa:aa:aa:aa:aa</source-mac-address>
- <source-mac-address-mask>ff:00:00:00:00:00</source-mac-address-mask>
- </vpp-macip-ace-nodes>
+ </ipv4>
</matches>
<actions>
- <permit/>
+ <forwarding>accept</forwarding>
</actions>
</ace>
- </access-list-entries>
+ </aces>
+ <type xmlns:x="http://fd.io/hc2vpp/yang/vpp/acl">x:vpp-acl</type>
</acl>
<acl>
- <acl-name>icmp-v6-acl</acl-name>
- <acl-type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</acl-type>
- <access-list-entries>
+ <name>icmp-v6-acl</name>
+ <aces>
<ace>
- <rule-name>imcp-v6-rule</rule-name>
+ <name>imcp-v6-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>
- <source-ipv6-network>2001:0db8:0a0b:12f0:0000:0000:0000:0002/48</source-ipv6-network>
- <icmp-v6-nodes>
+ <icmp>
+ <vpp-icmp-ace xmlns="http://fd.io/hc2vpp/yang/vpp/acl">
<icmp-type-range>
<last>8</last>
<first>5</first>
<last>3</last>
<first>1</first>
</icmp-code-range>
- </icmp-v6-nodes>
- </vpp-ace-nodes>
+ </vpp-icmp-ace>
+ </icmp>
+ <ipv6>
+ <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>
+ </ipv6>
</matches>
<actions>
- <permit/>
+ <forwarding>accept</forwarding>
</actions>
</ace>
- </access-list-entries>
+ </aces>
+ <type xmlns:x="http://fd.io/hc2vpp/yang/vpp/acl">x:vpp-acl</type>
</acl>
<acl>
- <acl-name>udp-acl</acl-name>
- <acl-type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</acl-type>
- <access-list-entries>
+ <name>macip-acl</name>
+ <aces>
<ace>
- <rule-name>udp-rule</rule-name>
+ <name>macip-rule</name>
<matches>
- <vpp-ace-nodes xmlns="urn:opendaylight:params:xml:ns:yang:vpp:acl">
- <destination-ipv4-network>192.168.2.1/24</destination-ipv4-network>
+ <eth>
+ <source-mac-address-mask>ff:00:00:00:00:00</source-mac-address-mask>
+ <source-mac-address>aa:aa:aa:aa:aa:aa</source-mac-address>
+ </eth>
+ <ipv4>
<source-ipv4-network>192.168.2.2/32</source-ipv4-network>
- <udp-nodes>
- <source-port-range>
- <upper-port>5487</upper-port>
- <lower-port>1</lower-port>
- </source-port-range>
- <destination-port-range>
- <upper-port>6745</upper-port>
- <lower-port>87</lower-port>
- </destination-port-range>
- </udp-nodes>
- </vpp-ace-nodes>
+ </ipv4>
</matches>
<actions>
- <permit/>
+ <forwarding>accept</forwarding>
</actions>
</ace>
- </access-list-entries>
+ </aces>
+ <type xmlns:x="http://fd.io/hc2vpp/yang/vpp/acl">x:vpp-macip-acl</type>
</acl>
<acl>
- <acl-name>tcp-acl</acl-name>
- <acl-type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</acl-type>
- <access-list-entries>
+ <name>udp-acl</name>
+ <aces>
<ace>
- <rule-name>tcp-rule</rule-name>
+ <name>udp-rule</name>
<matches>
- <vpp-ace-nodes xmlns="urn:opendaylight:params:xml:ns:yang:vpp:acl">
+ <udp>
+ <source-port>
+ <lower-port>1</lower-port>
+ <upper-port>5487</upper-port>
+ </source-port>
+ <destination-port>
+ <lower-port>87</lower-port>
+ <upper-port>6745</upper-port>
+ </destination-port>
+ </udp>
+ <ipv4>
<destination-ipv4-network>192.168.2.1/24</destination-ipv4-network>
<source-ipv4-network>192.168.2.2/32</source-ipv4-network>
- <tcp-nodes>
- <source-port-range>
- <upper-port>5487</upper-port>
- <lower-port>1</lower-port>
- </source-port-range>
- <destination-port-range>
- <upper-port>6745</upper-port>
- <lower-port>87</lower-port>
- </destination-port-range>
- <tcp-flags-mask>1</tcp-flags-mask>
- <tcp-flags-value>7</tcp-flags-value>
- </tcp-nodes>
- </vpp-ace-nodes>
+ </ipv4>
</matches>
<actions>
- <permit/>
+ <forwarding>accept</forwarding>
</actions>
</ace>
- </access-list-entries>
+ </aces>
+ <type xmlns:x="http://fd.io/hc2vpp/yang/vpp/acl">x:vpp-acl</type>
</acl>
<acl>
- <acl-name>icmp-acl</acl-name>
- <acl-type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</acl-type>
- <access-list-entries>
+ <name>icmp-acl</name>
+ <aces>
<ace>
- <rule-name>imcp-rule</rule-name>
+ <name>imcp-rule</name>
<matches>
- <vpp-ace-nodes xmlns="urn:opendaylight:params:xml:ns:yang:vpp:acl">
- <destination-ipv4-network>192.168.2.1/24</destination-ipv4-network>
- <source-ipv4-network>192.168.2.2/32</source-ipv4-network>
- <icmp-nodes>
+ <icmp>
+ <vpp-icmp-ace xmlns="http://fd.io/hc2vpp/yang/vpp/acl">
<icmp-type-range>
<last>8</last>
<first>5</first>
<last>3</last>
<first>1</first>
</icmp-code-range>
- </icmp-nodes>
- </vpp-ace-nodes>
+ </vpp-icmp-ace>
+ </icmp>
+ <ipv4>
+ <destination-ipv4-network>192.168.2.1/24</destination-ipv4-network>
+ <source-ipv4-network>192.168.2.2/32</source-ipv4-network>
+ </ipv4>
</matches>
<actions>
- <permit/>
+ <forwarding>accept</forwarding>
</actions>
</ace>
- </access-list-entries>
+ </aces>
+ <type xmlns:x="http://fd.io/hc2vpp/yang/vpp/acl">x:vpp-acl</type>
</acl>
- </access-lists>
+ <attachment-points>
+ <interface>
+ <interface-id>local0</interface-id>
+ <ingress>
+ <acl-sets>
+ <acl-set>
+ <name>tcp-acl</name>
+ </acl-set>
+ <acl-set>
+ <name>udp-acl</name>
+ </acl-set>
+ <acl-set>
+ <name>macip-acl</name>
+ </acl-set>
+ </acl-sets>
+ </ingress>
+ </interface>
+ </attachment-points>
+ </acls>
</data>
<interface>
<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">
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:loopback</type>
+ <loopback xmlns="http://fd.io/hc2vpp/yang/v3po">
<mac>00:ff:ff:ff:ff:ff</mac>
</loopback>
- <acl xmlns="urn:opendaylight:params:xml:ns:yang:interface:acl">
- <ingress>
- <vpp-macip-acl>
- <type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-macip-acl</type>
- <name>macip-acl</name>
- </vpp-macip-acl>
- </ingress>
- </acl>
</interface>
<interface>
<name>loop2</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">
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:loopback</type>
+ <loopback xmlns="http://fd.io/hc2vpp/yang/v3po">
<mac>aa:ff:ff:ff:ff:ff</mac>
</loopback>
- <acl xmlns="urn:opendaylight:params:xml:ns:yang:interface:acl">
- <ingress>
- <vpp-acls>
- <type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</type>
- <name>tcp-acl2</name>
- </vpp-acls>
- <vpp-acls>
- <type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</type>
- <name>udp-acl</name>
- </vpp-acls>
- </ingress>
- </acl>
</interface>
</interfaces>
- <access-lists xmlns="urn:ietf:params:xml:ns:yang:ietf-access-control-list">
- <acl>
- <acl-name>macip-acl</acl-name>
- <acl-type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-macip-acl</acl-type>
- <access-list-entries>
- <ace>
- <rule-name>macip-rule</rule-name>
- <matches>
- <vpp-macip-ace-nodes xmlns="urn:opendaylight:params:xml:ns:yang:vpp:acl">
- <source-ipv4-network>192.168.2.2/32</source-ipv4-network>
- <source-mac-address>aa:aa:aa:aa:aa:aa</source-mac-address>
- <source-mac-address-mask>ff:00:00:00:00:00</source-mac-address-mask>
- </vpp-macip-ace-nodes>
- </matches>
- <actions>
- <permit/>
- </actions>
- </ace>
- </access-list-entries>
- </acl>
+ <acls xmlns="urn:ietf:params:xml:ns:yang:ietf-access-control-list">
<acl>
- <acl-name>icmp-v6-acl</acl-name>
- <acl-type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</acl-type>
- <access-list-entries>
+ <name>tcp-acl</name>
+ <aces>
<ace>
- <rule-name>imcp-v6-rule</rule-name>
+ <name>tcp-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>
- <source-ipv6-network>2001:0db8:0a0b:12f0:0000:0000:0000:0002/48</source-ipv6-network>
- <icmp-v6-nodes>
- <icmp-type-range>
- <last>8</last>
- <first>5</first>
- </icmp-type-range>
- <icmp-code-range>
- <last>3</last>
- <first>1</first>
- </icmp-code-range>
- </icmp-v6-nodes>
- </vpp-ace-nodes>
- </matches>
- <actions>
- <permit/>
- </actions>
- </ace>
- </access-list-entries>
- </acl>
- <acl>
- <acl-name>udp-acl</acl-name>
- <acl-type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</acl-type>
- <access-list-entries>
- <ace>
- <rule-name>udp-rule</rule-name>
- <matches>
- <vpp-ace-nodes xmlns="urn:opendaylight:params:xml:ns:yang:vpp:acl">
+ <tcp>
+ <vpp-tcp-ace xmlns="http://fd.io/hc2vpp/yang/vpp/acl">
+ <flags-mask>cwr</flags-mask>
+ </vpp-tcp-ace>
+ <source-port>
+ <lower-port>1</lower-port>
+ <upper-port>5487</upper-port>
+ </source-port>
+ <destination-port>
+ <lower-port>87</lower-port>
+ <upper-port>6745</upper-port>
+ </destination-port>
+ <flags>cwr ece urg</flags>
+ </tcp>
+ <ipv4>
<destination-ipv4-network>192.168.2.1/24</destination-ipv4-network>
<source-ipv4-network>192.168.2.2/32</source-ipv4-network>
- <udp-nodes>
- <source-port-range>
- <upper-port>5486</upper-port>
- <lower-port>11</lower-port>
- </source-port-range>
- </udp-nodes>
- </vpp-ace-nodes>
+ </ipv4>
</matches>
<actions>
- <permit/>
+ <forwarding>accept</forwarding>
</actions>
</ace>
- </access-list-entries>
+ </aces>
+ <type xmlns:x="http://fd.io/hc2vpp/yang/vpp/acl">x:vpp-acl</type>
</acl>
- <acl>
- <acl-name>tcp-acl2</acl-name>
- <acl-type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</acl-type>
- <access-list-entries>
- <ace>
- <rule-name>tcp-rule</rule-name>
- <matches>
- <vpp-ace-nodes xmlns="urn:opendaylight:params:xml:ns:yang:vpp:acl">
- <destination-ipv4-network>192.168.2.1/24</destination-ipv4-network>
- <source-ipv4-network>192.168.2.2/32</source-ipv4-network>
- <tcp-nodes>
- <source-port-range>
- <upper-port>5487</upper-port>
- <lower-port>1</lower-port>
- </source-port-range>
- <destination-port-range>
- <upper-port>6745</upper-port>
- <lower-port>87</lower-port>
- </destination-port-range>
- <tcp-flags-mask>1</tcp-flags-mask>
- <tcp-flags-value>7</tcp-flags-value>
- </tcp-nodes>
- </vpp-ace-nodes>
- </matches>
- <actions>
- <permit/>
- </actions>
- </ace>
- </access-list-entries>
- </acl>
- <acl>
- <acl-name>icmp-acl</acl-name>
- <acl-type xmlns:x="urn:opendaylight:params:xml:ns:yang:vpp:acl">x:vpp-acl</acl-type>
- <access-list-entries>
- <ace>
- <rule-name>renamed-imcp-rule</rule-name>
- <matches>
- <vpp-ace-nodes xmlns="urn:opendaylight:params:xml:ns:yang:vpp:acl">
- <destination-ipv4-network>192.168.2.1/24</destination-ipv4-network>
- <source-ipv4-network>192.168.2.2/32</source-ipv4-network>
- <icmp-nodes>
- <icmp-type-range>
- <last>8</last>
- <first>5</first>
- </icmp-type-range>
- <icmp-code-range>
- <last>3</last>
- <first>1</first>
- </icmp-code-range>
- </icmp-nodes>
- </vpp-ace-nodes>
- </matches>
- <actions>
- <permit/>
- </actions>
- </ace>
- <ace>
- <rule-name>new-icmp-rule</rule-name>
- <matches>
- <vpp-ace-nodes xmlns="urn:opendaylight:params:xml:ns:yang:vpp:acl">
- <destination-ipv4-network>10.1.1.1/24</destination-ipv4-network>
- <source-ipv4-network>10.2.2.2/32</source-ipv4-network>
- <icmp-nodes>
- <icmp-type-range>
- <first>4</first>
- <last>9</last>
- </icmp-type-range>
- </icmp-nodes>
- </vpp-ace-nodes>
- </matches>
- <actions>
- <permit/>
- </actions>
- </ace>
- </access-list-entries>
- </acl>
- </access-lists>
+ <attachment-points>
+ <interface>
+ <interface-id>loop2</interface-id>
+ <ingress>
+ <acl-sets>
+ <acl-set>
+ <name>tcp-acl</name>
+ </acl-set>
+ </acl-sets>
+ </ingress>
+ </interface>
+ </attachment-points>
+ </acls>
</data>
DIR_NAME=$(dirname $0)
-${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/config_acl.xml ${DIR_NAME}/expected_config_acl.xml
+${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/config_acl.xml ${DIR_NAME}/expected_config_acl.xml *
DIR_NAME=$(dirname $0)
-${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/config_acl.xml ${DIR_NAME}/expected_config_acl.xml
+${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/config_acl.xml ${DIR_NAME}/expected_config_acl.xml *
-${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/config_acl_update.xml ${DIR_NAME}/expected_config_acl_update.xml
+${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/config_acl_update.xml ${DIR_NAME}/expected_config_acl_update.xml *
</interface>
<interface>
<name>loop1</name>
- <type xmlns:x="urn:opendaylight:params:xml:ns:yang:v3po">x:loopback</type>
- <loopback xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:loopback</type>
+ <loopback xmlns="http://fd.io/hc2vpp/yang/v3po">
<mac>00:ff:ff:ff:ff:ff</mac>
</loopback>
- <l2 xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
+ <l2 xmlns="http://fd.io/hc2vpp/yang/v3po">
<bridge-domain>test_bd</bridge-domain>
</l2>
</interface>
</interfaces>
- <bridge-domains xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
+ <bridge-domains xmlns="http://fd.io/hc2vpp/yang/v3po">
<bridge-domain>
<name>test_bd</name>
</bridge-domain>
</interface>
<interface>
<name>loop1</name>
- <type xmlns:x="urn:opendaylight:params:xml:ns:yang:v3po">x:loopback</type>
- <loopback xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:loopback</type>
+ <loopback xmlns="http://fd.io/hc2vpp/yang/v3po">
<mac>00:ff:ff:ff:ff:ff</mac>
</loopback>
- <l2 xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
+ <l2 xmlns="http://fd.io/hc2vpp/yang/v3po">
<bridge-domain>test_bd</bridge-domain>
</l2>
</interface>
</interfaces>
- <bridge-domains xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
+ <bridge-domains xmlns="http://fd.io/hc2vpp/yang/v3po">
<bridge-domain>
<name>test_bd</name>
</bridge-domain>
DIR_NAME=$(dirname $0)
-${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/config_bd.xml ${DIR_NAME}/expected_config_bd.xml
+${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/config_bd.xml ${DIR_NAME}/expected_config_bd.xml *
import argparse
import logging
+
from ncclient import manager
_SOURCE_TEMPLATE = """<source xmlns:xc="urn:ietf:params:xml:ns:netconf:base:1.0">%s</source>"""
argparser = argparse.ArgumentParser(description="Configures VPP using <copy-config> RPC")
argparser.add_argument('config_filename', help="name of XML file with <config> element")
argparser.add_argument('--verbose', help="increase output verbosity", action="store_true")
+ argparser.add_argument('--host', default="localhost", help="host/node for which to write <config> element")
args = argparser.parse_args()
logger = logging.getLogger("hc2vpp.examples.copy_config")
else:
logging.basicConfig(level=logging.INFO)
- _copy_config(args.config_filename)
+ _copy_config(args.config_filename, host=args.host)
--- /dev/null
+#!/usr/bin/env python
+#
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""
+Usage: {prog} [OPTION] FILE1 FILE2 xPath
+
+Compare two XML files, while sorting elements.
+
+xPath optional parameter
+example:
+ ./{{urn:ietf:params:xml:ns:yang:ietf-interfaces}}interfaces/
+ {{urn:ietf:params:xml:ns:yang:ietf-interfaces}}interface[
+ {{urn:ietf:params:xml:ns:yang:ietf-interfaces}}name='loop0']
+"""
+import os
+import re
+import subprocess
+import sys
+from tempfile import NamedTemporaryFile
+from xml.etree import ElementTree
+from xml.etree.ElementTree import Element
+
+TAG_PATTERN = re.compile(r"""({(?P<namespace>[a-zA-Z0-9.:@\-/]+)}(?P<tag>[0-9a-zA-Z\-]+))|(?P<name>[0-9a-zA-Z\-]+)""",
+ re.VERBOSE)
+PREFIX_PATTERN = re.compile(r"""(((urn)|(.+://))[a-zA-Z0-9.:@\-/]+[:/](?P<prefix>[0-9a-zA-Z\-]+))""", re.VERBOSE)
+
+if sys.version_info < (3, 0):
+ # Python 2
+ import codecs
+
+ def unicode_writer(fp):
+ return codecs.getwriter('utf-8')(fp)
+else:
+ # Python 3
+ def unicode_writer(fp):
+ return fp
+
+
+def print_usage(program):
+ print(__doc__.format(prog=program).strip())
+
+
+def parse_namespace(namespace):
+ """
+ Extracts module name fom namespace.
+ example:
+ urn:ietf:params:xml:ns:yang:ietf-nat -> ietf-nat
+ http://fd.io/hc2vpp/yang/vpp-fib-table-management -> vpp-fib-table-management
+ https://fd.io/hc2vpp/yang/vpp-fib-table-management -> vpp-fib-table-management
+ :param namespace: namespace in urn or http format
+ :return: module name from namespace
+ """
+ matcher = PREFIX_PATTERN.match(namespace)
+ if matcher.group("prefix"):
+ return matcher.group("prefix").lower()
+
+
+def sort(xml_element):
+ """
+ Sorts elements in xml in alphabetical order.
+ :param xml_element: root element of xml
+ """
+ if not isinstance(xml_element, Element):
+ exit(-1)
+ xml_element[:] = sorted(xml_element, key=lambda child: child.tag)
+
+ mo = TAG_PATTERN.match(xml_element.tag)
+ if mo.group("namespace") and mo.group("tag") and not mo.group("namespace").__contains__(
+ "urn:ietf:params:xml:ns:netconf:base:1.0"):
+ ElementTree.register_namespace(parse_namespace(mo.group("namespace")), mo.group("namespace"))
+
+ for element in xml_element:
+ sort(element)
+
+
+def diff_xml(xml1, xml2, xpath):
+ """
+ Resolves differences between two xml files.
+ :param xml1: input file left side (original)
+ :param xml2: input file right side (to compare with)
+ :param xpath: xpath of element to read. example:
+ ./{urn:ietf:params:xml:ns:yang:ietf-interfaces}interfaces/{ \
+ urn:ietf:params:xml:ns:yang:ietf-interfaces}interface[{ \
+ urn:ietf:params:xml:ns:yang:ietf-interfaces}name='loop0']
+ :return: diff of input files
+ """
+ ElementTree.register_namespace("nc", "urn:ietf:params:xml:ns:netconf:base:1.0")
+ tmp1 = unicode_writer(NamedTemporaryFile('w'))
+ normalize_xml(tmp1, ElementTree.parse(xml1), xpath)
+
+ tmp2 = unicode_writer(NamedTemporaryFile('w'))
+ normalize_xml(tmp2, ElementTree.parse(xml2), xpath)
+
+ return subprocess.call(["diff", "-u", "-s", "-d", "--label", xml1, "--label", xml2, tmp1.name, tmp2.name])
+
+
+def normalize_xml(tmp, tree, xpath):
+ root = tree.getroot() if (xpath == "*") else tree.getroot().find(xPath)
+ sort(root)
+ xml_str = ElementTree.tostring(root, encoding="utf-8", method="xml")
+ tmp.write(xml_str.decode("utf-8"))
+ tmp.flush()
+ # format and normalize output using xmllint
+ # cmd: xmllint --exc-c14n [file_name] -o [file_name]
+ subprocess.call(["xmllint", "--format", tmp.name, "-o", tmp.name])
+
+
+if __name__ == '__main__':
+ args = sys.argv
+ prog = os.path.basename(args.pop(0))
+
+ if '-h' in args or '--help' in args:
+ print_usage(prog)
+ exit(0)
+
+ if len(args) < 2:
+ print_usage(prog)
+ exit(1)
+ args.reverse()
+ file1 = args.pop(-1)
+ file2 = args.pop(-1)
+ if len(args) > 2:
+ xPath = args.pop(-1)
+ else:
+ xPath = "*"
+
+ exit(diff_xml(file1, file2, xPath))
argparser.add_argument('-c', '--commit', help="commits candidate configuration",
action="store_true")
argparser.add_argument('--verbose', help="increase output verbosity", action="store_true")
+ argparser.add_argument('--host', default="localhost", help="host/node for which to write <config> element")
args = argparser.parse_args()
logger = logging.getLogger("hc2vpp.examples.edit_config")
else:
logging.basicConfig(level=logging.INFO)
- _edit_config(args.config_filename, validate=args.validate, commit=args.commit)
+ _edit_config(args.config_filename, validate=args.validate, commit=args.commit, host=args.host)
argparser = argparse.ArgumentParser(description="Obtains VPP configuration using <get-config> RPC")
argparser.add_argument('--reply_filename', help="name of XML file to store received configuration")
argparser.add_argument('--verbose', help="increase output verbosity", action="store_true")
+ argparser.add_argument('--host', default="localhost", help="host/node for which to write <config> element")
+ argparser.add_argument('--simple', help="decrease output verbosity", action="store_true")
args = argparser.parse_args()
logger = logging.getLogger("hc2vpp.examples.get_config")
- if args.verbose:
- logging.basicConfig(level=logging.DEBUG)
+
+ if args.simple:
+ logging.basicConfig(level=logging.ERROR)
else:
- logging.basicConfig(level=logging.INFO)
+ if args.verbose:
+ logging.basicConfig(level=logging.DEBUG)
+ else:
+ logging.basicConfig(level=logging.INFO)
+
+
- _get_config(args.reply_filename)
+ _get_config(args.reply_filename, host=args.host)
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright (c) 2019 Cisco and/or its affiliates.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at:
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0">
+ <nat xmlns="urn:ietf:params:xml:ns:yang:ietf-nat">
+ <instances>
+ <instance>
+ <id>0</id>
+ <policy>
+ <id>0</id>
+ </policy>
+ </instance>
+ </instances>
+ </nat>
+ <fib-table-management xmlns="http://fd.io/hc2vpp/yang/vpp-fib-table-management">
+ <fib-tables>
+ <table>
+ <table-id>0</table-id>
+ <address-family>ipv4</address-family>
+ <name>ipv4-VRF:0</name>
+ </table>
+ <table>
+ <table-id>0</table-id>
+ <address-family>ipv6</address-family>
+ <name>ipv6-VRF:0</name>
+ </table>
+ </fib-tables>
+ </fib-table-management>
+ <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
+ <interface>
+ <name>local0</name>
+ <type xmlns:x="urn:ietf:params:xml:ns:yang:iana-if-type">x:ethernetCsmacd</type>
+ <enabled>false</enabled>
+ </interface>
+ <interface>
+ <name>GigabitEthernet0/9/0</name>
+ <type xmlns:x="urn:ietf:params:xml:ns:yang:iana-if-type">x:ethernetCsmacd</type>
+ <enabled>false</enabled>
+ <ethernet xmlns="http://fd.io/hc2vpp/yang/v3po">
+ <mtu>9206</mtu>
+ </ethernet>
+ </interface>
+ <interface>
+ <name>host-vethAF</name>
+ <description>VethAF host interface</description>
+ <af-packet xmlns="http://fd.io/hc2vpp/yang/v3po">
+ <host-interface-name>vethAF</host-interface-name>
+ </af-packet>
+ <ipv4 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
+ <address>
+ <ip>10.2.0.2</ip>
+ <prefix-length>24</prefix-length>
+ </address>
+ </ipv4>
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:af-packet</type>
+ </interface>
+ </interfaces>
+ <gpe xmlns="http://fd.io/hc2vpp/yang/gpe">
+ <gpe-feature-data>
+ <enable>false</enable>
+ </gpe-feature-data>
+ </gpe>
+ <native-forward-paths-tables xmlns="http://fd.io/hc2vpp/yang/gpe">
+ <native-forward-paths-table>
+ <table-id>0</table-id>
+ </native-forward-paths-table>
+ </native-forward-paths-tables>
+ <lisp xmlns="http://fd.io/hc2vpp/yang/lisp">
+ <enable>false</enable>
+ </lisp>
+</data>
+
--- /dev/null
+<!--
+ ~ Copyright (c) 2019 Cisco and/or its affiliates.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at:
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<config>
+ <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
+ <interface>
+ <name>host-vethAF</name>
+ <description>VethAF host interface</description>
+ <af-packet xmlns="http://fd.io/hc2vpp/yang/v3po">
+ <host-interface-name>vethAF</host-interface-name>
+ </af-packet>
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:af-packet</type>
+ <ipv4 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
+ <address>
+ <ip>10.2.0.2</ip>
+ <prefix-length>24</prefix-length>
+ </address>
+ </ipv4>
+ </interface>
+ </interfaces>
+</config>
--- /dev/null
+#!/bin/bash
+#
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+DIR_NAME=$(dirname $0)
+
+${DIR_NAME}/../../test_diff_config.sh ${DIR_NAME}/candidate_config_af_packet_interface.xml
--- /dev/null
+#!/bin/bash
+#
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+DIR_NAME=$(dirname $0)
+
+# create linux side of AF-packet interface
+sudo ip link add vethAF type veth peer name vethFA
+xPath="./{urn:ietf:params:xml:ns:yang:ietf-interfaces}interfaces/\
+{urn:ietf:params:xml:ns:yang:ietf-interfaces}interface[{urn:ietf:params:xml:ns:yang:ietf-interfaces}name='host-vethAF']"
+
+${DIR_NAME}/../../test_edit_config.sh ${DIR_NAME}/edit_config_af_packet_interface.xml ${DIR_NAME}/edit_config_af_packet_interface.xml ${xPath}
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0">
+ <fib-table-management xmlns="http://fd.io/hc2vpp/yang/vpp-fib-table-management">
+ <fib-tables>
+ <table>
+ <table-id>0</table-id>
+ <address-family>ipv4</address-family>
+ <name>ipv4-VRF:0</name>
+ </table>
+ <table>
+ <table-id>0</table-id>
+ <address-family>ipv6</address-family>
+ <name>ipv6-VRF:0</name>
+ </table>
+ </fib-tables>
+ </fib-table-management>
+ <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
+ <interface>
+ <name>local0</name>
+ <type xmlns:x="urn:ietf:params:xml:ns:yang:iana-if-type">x:ethernetCsmacd</type>
+ <enabled>false</enabled>
+ </interface>
+ <interface>
+ <name>loop0</name>
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:loopback</type>
+ <enabled>true</enabled>
+ <ipv4 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
+ <address>
+ <ip>10.0.0.1</ip>
+ <prefix-length>24</prefix-length>
+ </address>
+ </ipv4>
+ <loopback xmlns="http://fd.io/hc2vpp/yang/v3po">
+ </loopback>
+ </interface>
+ </interfaces>
+ <nat xmlns="urn:ietf:params:xml:ns:yang:ietf-nat">
+ <instances>
+ <instance>
+ <id>0</id>
+ <policy>
+ <id>0</id>
+ </policy>
+ </instance>
+ </instances>
+ </nat>
+ <gpe xmlns="http://fd.io/hc2vpp/yang/gpe">
+ <gpe-feature-data>
+ <enable>false</enable>
+ </gpe-feature-data>
+ </gpe>
+ <native-forward-paths-tables xmlns="http://fd.io/hc2vpp/yang/gpe">
+ <native-forward-paths-table>
+ <table-id>0</table-id>
+ </native-forward-paths-table>
+ </native-forward-paths-tables>
+ <lisp xmlns="http://fd.io/hc2vpp/yang/lisp">
+ <enable>false</enable>
+ </lisp>
+</data>
+
--- /dev/null
+<!--
+ ~ Copyright (c) 2019 Cisco and/or its affiliates.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at:
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<config>
+ <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
+ <interface>
+ <name>loop0</name>
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:loopback</type>
+ <enabled>true</enabled>
+ <ipv4 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
+ <address>
+ <ip>10.0.0.1</ip>
+ <prefix-length>24</prefix-length>
+ </address>
+ </ipv4>
+ <loopback xmlns="http://fd.io/hc2vpp/yang/v3po">
+ </loopback>
+ </interface>
+ </interfaces>
+</config>
--- /dev/null
+#!/bin/bash
+#
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+DIR_NAME=$(dirname $0)
+
+${DIR_NAME}/../../test_diff_config.sh ${DIR_NAME}/candidate_config_loop_interface.xml
--- /dev/null
+#!/bin/bash
+#
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+DIR_NAME=$(dirname $0)
+xPath="./{urn:ietf:params:xml:ns:yang:ietf-interfaces}interfaces/\
+{urn:ietf:params:xml:ns:yang:ietf-interfaces}interface[{urn:ietf:params:xml:ns:yang:ietf-interfaces}name='loop0']"
+
+${DIR_NAME}/../../test_edit_config.sh ${DIR_NAME}/edit_config_loop_interface.xml ${DIR_NAME}/edit_config_loop_interface.xml ${xPath}
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright (c) 2019 Cisco and/or its affiliates.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at:
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0">
+ <fib-table-management xmlns="http://fd.io/hc2vpp/yang/vpp-fib-table-management">
+ <fib-tables>
+ <table>
+ <table-id>0</table-id>
+ <address-family>ipv4</address-family>
+ <name>ipv4-VRF:0</name>
+ </table>
+ <table>
+ <table-id>0</table-id>
+ <address-family>ipv6</address-family>
+ <name>ipv6-VRF:0</name>
+ </table>
+ </fib-tables>
+ </fib-table-management>
+ <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
+ <interface>
+ <name>local0</name>
+ <type xmlns:x="urn:ietf:params:xml:ns:yang:iana-if-type">x:ethernetCsmacd</type>
+ <enabled>false</enabled>
+ </interface>
+ <interface>
+ <name>tap1</name>
+ <description>TAP 1 test interface</description>
+ <tap xmlns="http://fd.io/hc2vpp/yang/v3po">
+ <tap-name>tap1</tap-name>
+ </tap>
+ <ipv4 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
+ <address>
+ <ip>10.1.0.3</ip>
+ <prefix-length>24</prefix-length>
+ </address>
+ </ipv4>
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:tap</type>
+ </interface>
+ </interfaces>
+ <nat xmlns="urn:ietf:params:xml:ns:yang:ietf-nat">
+ <instances>
+ <instance>
+ <id>0</id>
+ <policy>
+ <id>0</id>
+ </policy>
+ </instance>
+ </instances>
+ </nat>
+ <gpe xmlns="http://fd.io/hc2vpp/yang/gpe">
+ <gpe-feature-data>
+ <enable>false</enable>
+ </gpe-feature-data>
+ </gpe>
+ <native-forward-paths-tables xmlns="http://fd.io/hc2vpp/yang/gpe">
+ <native-forward-paths-table>
+ <table-id>0</table-id>
+ </native-forward-paths-table>
+ </native-forward-paths-tables>
+ <lisp xmlns="http://fd.io/hc2vpp/yang/lisp">
+ <enable>false</enable>
+ </lisp>
+</data>
--- /dev/null
+<!--
+ ~ Copyright (c) 2019 Cisco and/or its affiliates.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at:
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<config>
+ <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
+ <interface>
+ <name>tap1</name>
+ <description>TAP 1 test interface</description>
+ <tap xmlns="http://fd.io/hc2vpp/yang/v3po">
+ <tap-name>tap1</tap-name>
+ </tap>
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:tap</type>
+ <ipv4 xmlns="urn:ietf:params:xml:ns:yang:ietf-ip">
+ <address>
+ <ip>10.1.0.3</ip>
+ <prefix-length>24</prefix-length>
+ </address>
+ </ipv4>
+ </interface>
+ </interfaces>
+</config>
--- /dev/null
+#!/bin/bash
+#
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+DIR_NAME=$(dirname $0)
+
+${DIR_NAME}/../../test_diff_config.sh ${DIR_NAME}/candidate_config_tap_interface.xml
--- /dev/null
+#!/bin/bash
+#
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+DIR_NAME=$(dirname $0)
+xPath="./{urn:ietf:params:xml:ns:yang:ietf-interfaces}interfaces/\
+{urn:ietf:params:xml:ns:yang:ietf-interfaces}interface[{urn:ietf:params:xml:ns:yang:ietf-interfaces}name='tap1']"
+
+${DIR_NAME}/../../test_edit_config.sh ${DIR_NAME}/edit_config_tap_interface.xml ${DIR_NAME}/edit_config_tap_interface.xml ${xPath}
<interface>
<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">
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:loopback</type>
+ <loopback xmlns="http://fd.io/hc2vpp/yang/v3po">
<mac>01:ff:ff:ff:ff:ff</mac>
</loopback>
- <nat xmlns="urn:opendaylight:params:xml:ns:yang:interface:nat">
+ <nat xmlns="http://fd.io/hc2vpp/yang/interface-nat">
<outbound>
<post-routing>true</post-routing>
</outbound>
<interface>
<name>loop0</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">
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:loopback</type>
+ <loopback xmlns="http://fd.io/hc2vpp/yang/v3po">
<mac>00:ff:ff:ff:ff:ff</mac>
</loopback>
- <nat xmlns="urn:opendaylight:params:xml:ns:yang:interface:nat">
+ <nat xmlns="http://fd.io/hc2vpp/yang/interface-nat">
<inbound>
<nat64-support>true</nat64-support>
<nat44-support>false</nat44-support>
<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>
+ <pool-type xmlns="http://fd.io/hc2vpp/yang/vpp-nat">nat64</pool-type>
</external-ip-address-pool>
<external-ip-address-pool>
<pool-id>2</pool-id>
<interface>
<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">
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:loopback</type>
+ <loopback xmlns="http://fd.io/hc2vpp/yang/v3po">
<mac>01:ff:ff:ff:ff:ff</mac>
</loopback>
</interface>
<interface>
<name>loop2</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">
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:loopback</type>
+ <loopback xmlns="http://fd.io/hc2vpp/yang/v3po">
<mac>02:ff:ff:ff:ff:ff</mac>
</loopback>
- <nat xmlns="urn:opendaylight:params:xml:ns:yang:interface:nat">
+ <nat xmlns="http://fd.io/hc2vpp/yang/interface-nat">
<inbound>
<nat64-support>true</nat64-support>
<nat44-support>false</nat44-support>
<interface>
<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">
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:loopback</type>
+ <loopback xmlns="http://fd.io/hc2vpp/yang/v3po">
<mac>03:ff:ff:ff:ff:ff</mac>
</loopback>
- <nat xmlns="urn:opendaylight:params:xml:ns:yang:interface:nat">
+ <nat xmlns="http://fd.io/hc2vpp/yang/interface-nat">
<outbound>
<post-routing>true</post-routing>
</outbound>
<interface>
<name>loop0</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">
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:loopback</type>
+ <loopback xmlns="http://fd.io/hc2vpp/yang/v3po">
<mac>00:ff:ff:ff:ff:ff</mac>
</loopback>
</interface>
<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>
+ <pool-type xmlns="http://fd.io/hc2vpp/yang/vpp-nat">nat64</pool-type>
</external-ip-address-pool>
<external-ip-address-pool>
<pool-id>5</pool-id>
<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>
+ <pool-type xmlns="http://fd.io/hc2vpp/yang/vpp-nat">nat64</pool-type>
</external-ip-address-pool>
<external-ip-address-pool>
<pool-id>2</pool-id>
<interface>
<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">
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:loopback</type>
+ <loopback xmlns="http://fd.io/hc2vpp/yang/v3po">
<mac>01:ff:ff:ff:ff:ff</mac>
</loopback>
- <nat xmlns="urn:opendaylight:params:xml:ns:yang:interface:nat">
+ <nat xmlns="http://fd.io/hc2vpp/yang/interface-nat">
<outbound>
<post-routing>true</post-routing>
</outbound>
<interface>
<name>loop0</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">
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:loopback</type>
+ <loopback xmlns="http://fd.io/hc2vpp/yang/v3po">
<mac>00:ff:ff:ff:ff:ff</mac>
</loopback>
- <nat xmlns="urn:opendaylight:params:xml:ns:yang:interface:nat">
+ <nat xmlns="http://fd.io/hc2vpp/yang/interface-nat">
<inbound>
<nat64-support>true</nat64-support>
<nat44-support>false</nat44-support>
<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>
+ <pool-type xmlns="http://fd.io/hc2vpp/yang/vpp-nat">nat64</pool-type>
</external-ip-address-pool>
<external-ip-address-pool>
<pool-id>2</pool-id>
<interface>
<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">
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:loopback</type>
+ <loopback xmlns="http://fd.io/hc2vpp/yang/v3po">
<mac>01:ff:ff:ff:ff:ff</mac>
</loopback>
</interface>
<interface>
<name>loop2</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">
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:loopback</type>
+ <loopback xmlns="http://fd.io/hc2vpp/yang/v3po">
<mac>02:ff:ff:ff:ff:ff</mac>
</loopback>
- <nat xmlns="urn:opendaylight:params:xml:ns:yang:interface:nat">
+ <nat xmlns="http://fd.io/hc2vpp/yang/interface-nat">
<inbound>
<nat64-support>true</nat64-support>
<nat44-support>false</nat44-support>
<interface>
<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">
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:loopback</type>
+ <loopback xmlns="http://fd.io/hc2vpp/yang/v3po">
<mac>03:ff:ff:ff:ff:ff</mac>
</loopback>
- <nat xmlns="urn:opendaylight:params:xml:ns:yang:interface:nat">
+ <nat xmlns="http://fd.io/hc2vpp/yang/interface-nat">
<outbound>
<post-routing>true</post-routing>
</outbound>
<interface>
<name>loop0</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">
+ <type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:loopback</type>
+ <loopback xmlns="http://fd.io/hc2vpp/yang/v3po">
<mac>00:ff:ff:ff:ff:ff</mac>
</loopback>
</interface>
<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>
+ <pool-type xmlns="http://fd.io/hc2vpp/yang/vpp-nat">nat64</pool-type>
</external-ip-address-pool>
<external-ip-address-pool>
<pool-id>5</pool-id>
<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>
+ <pool-type xmlns="http://fd.io/hc2vpp/yang/vpp-nat">nat64</pool-type>
</external-ip-address-pool>
<external-ip-address-pool>
<pool-id>2</pool-id>
DIR_NAME=$(dirname $0)
-${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/config_nat.xml ${DIR_NAME}/expected_config_nat.xml
+${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/config_nat.xml ${DIR_NAME}/expected_config_nat.xml *
DIR_NAME=$(dirname $0)
-${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/config_nat.xml ${DIR_NAME}/expected_config_nat.xml
+${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/config_nat.xml ${DIR_NAME}/expected_config_nat.xml *
-${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/config_nat_update.xml ${DIR_NAME}/expected_config_nat_update.xml
+${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/config_nat_update.xml ${DIR_NAME}/expected_config_nat_update.xml *
#
# $1 config element for <copy-config> RPC
# $2 expected running config
+# $3 xPath to verify config against
DIR_NAME=$(dirname $0)
# fixme: find better xml comparison tool
# xmldiffs does not work well when difference occurs on deep level
-${DIR_NAME}/xmldiffs.py $2 _actual_config.xml
+${DIR_NAME}/xmldiffs.py $2 _actual_config.xml $3
ret_code=$?
-if [ $ret_code == 0 ]; then
+if [[ ${ret_code} == 0 ]]; then
echo "<copy-config> successful"
rm _actual_config.xml
exit 0
--- /dev/null
+#!/bin/bash
+#
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# $1 candidate config element to diff against actual config
+# $2 xPath to verify config against
+
+DIR_NAME=$(dirname $0)
+
+${DIR_NAME}/get_config.py --reply_filename _actual_config.xml --simple
+
+echo "Differences in running and candidate config:"
+
+${DIR_NAME}/diff_xml.py $1 _actual_config.xml $2
+ret_code=$?
+
+if [[ ${ret_code} == 0 ]]; then
+ exit 0
+fi
+rm _actual_config.xml
+echo "finished."
+exit 0
--- /dev/null
+#!/bin/bash
+#
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# $1 config element for <copy-config> RPC
+# $2 expected running config
+# $3 xPath to verify config against
+
+DIR_NAME=$(dirname $0)
+
+${DIR_NAME}/edit_config.py $1 -c
+${DIR_NAME}/get_config.py --reply_filename _actual_config.xml
+
+# fixme: find better xml comparison tool
+# xmldiffs does not work well when difference occurs on deep level
+${DIR_NAME}/xmldiffs.py $2 _actual_config.xml $3
+ret_code=$?
+
+if [[ ${ret_code} == 0 ]]; then
+ echo "<edit-config> successful"
+ rm _actual_config.xml
+ exit 0
+fi
+
+echo "<edit-config> failed"
+exit 1
#!/usr/bin/env python
"""
-Usage: {prog} [OPTION] FILE1 FILE2
+Usage: {prog} [OPTION] FILE1 FILE2 xPath
Compare two XML files, ignoring element and attribute order.
+xPath a valid path should be defined or wildcard "*" should be used.
+example:
+ ./{{urn:ietf:params:xml:ns:yang:ietf-interfaces}}interfaces/
+ {{urn:ietf:params:xml:ns:yang:ietf-interfaces}}interface[
+ {{urn:ietf:params:xml:ns:yang:ietf-interfaces}}name='loop0']
+
Any extra options are passed to the `diff' command.
Copyright (c) 2017, Johannes H. Jensen.
License: BSD, see LICENSE for more details.
"""
from __future__ import print_function, unicode_literals
-import sys
+
import os
-import io
+import subprocess
+import sys
import xml.etree.ElementTree as ET
from tempfile import NamedTemporaryFile
-import subprocess
+
def attr_str(k, v):
- return "{}=\"{}\"".format(k,v)
+ return "{}=\"{}\"".format(k, v)
+
def node_str(n):
attrs = sorted(n.attrib.items())
- astr = " ".join(attr_str(k,v) for k,v in attrs)
+ astr = " ".join(attr_str(k, v) for k, v in attrs)
s = n.tag
if astr:
s += " " + astr
return s
+
def node_key(n):
return node_str(n)
+
def indent(s, level):
return " " * level + s
+
def write_sorted(stream, node, level=0):
+ if node is None:
+ return
children = node.getchildren()
text = (node.text or "").strip()
tail = (node.tail or "").strip()
if tail:
stream.write(indent(tail + "\n", level))
+
if sys.version_info < (3, 0):
# Python 2
import codecs
+
def unicode_writer(fp):
return codecs.getwriter('utf-8')(fp)
else:
def unicode_writer(fp):
return fp
-def xmldiffs(file1, file2, diffargs=["-u"]):
+
+def xmldiffs(file1, file2, xpath="*", diffargs=["-u"]):
tree = ET.parse(file1)
tmp1 = unicode_writer(NamedTemporaryFile('w'))
- write_sorted(tmp1, tree.getroot())
+ if xpath == "*":
+ write_sorted(tmp1, tree.getroot())
+ else:
+ write_sorted(tmp1, tree.getroot().find(xpath))
+
tmp1.flush()
tree = ET.parse(file2)
tmp2 = unicode_writer(NamedTemporaryFile('w'))
- write_sorted(tmp2, tree.getroot())
+ if xpath == "*":
+ write_sorted(tmp2, tree.getroot())
+ else:
+ write_sorted(tmp2, tree.getroot().find(xpath))
tmp2.flush()
- args = [ "diff" ]
+ args = ["diff"]
args += diffargs
- args += [ "--label", file1, "--label", file2 ]
- args += [ tmp1.name, tmp2.name ]
+ args += ["--label", file1, "--label", file2]
+ args += [tmp1.name, tmp2.name]
return subprocess.call(args)
+
def print_usage(prog):
print(__doc__.format(prog=prog).strip())
+
if __name__ == '__main__':
args = sys.argv
prog = os.path.basename(args.pop(0))
print_usage(prog)
exit(0)
- if len(args) < 2:
+ if len(args) < 3:
print_usage(prog)
exit(1)
+ xPath = args.pop(-1)
file2 = args.pop(-1)
file1 = args.pop(-1)
- diffargs = args if args else ["-u"]
- exit(xmldiffs(file1, file2, diffargs))
+ xPath = xPath if xPath else "*"
+
+ diffargs = args if args else ["-u", "-s"]
+
+ exit(xmldiffs(file1, file2, xPath, diffargs))
Code Review / hc2vpp.git / commitdiff