Commit c9540b7b authored by Jean Rebiffe's avatar Jean Rebiffe
Browse files

Merge branch 'xml' into 'main'

Update scripts/PROV_C_01/cvlan.xml, scripts/PROV_SC_01/add_mw_if.xml,...

See merge request sdn/mwt/mwt-sdn-plugtests-4-materials!5
parents 1031d29b c68209fa
Loading
Loading
Loading
Loading
+43 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>
<bridges xmlns="urn:ieee:std:802.1Q:yang:ieee802-dot1q-bridge">
    <bridge>
        <name>ExampleBridge</name>
        <bridge-type>customer-vlan-bridge</bridge-type>
        <component>
            <name>ExampleComponent</name>
            <type>c-vlan-component</type>
            <filtering-database>
                <vlan-registration-entry>
                    <vids>101<vids>
                    <port-map>
                        <port-ref>{port1_ref}</port-ref>
                        <static-vlan-registration-entries>
                            <registrar-admin-control>fixed-new-ignored</registrar-admin-control>
                            <vlan-transmitted>tagged</vlan-transmitted>
                        </static-vlan-registration-entries>
                    </port-map>
                </vlan-registration-entry>
                <vlan-registration-entry>
                    <vids>102<vids>
                    <port-map>
                        <port-ref>{port2_ref}</port-ref>
                        <static-vlan-registration-entries>
                            <registrar-admin-control>fixed-new-ignored</registrar-admin-control>
                            <vlan-transmitted>tagged</vlan-transmitted>
                        </static-vlan-registration-entries>
                    </port-map>
                </vlan-registration-entry>
            </filtering-database>
            <bridge-vlan>
                <vlan>
                    <vid>101</vid>
                    <name>Service-101</name>
                </vlan>
                <vlan>
                    <vid>102</vid>
                    <name>Service-102</name>
                </vlan>
            </bridge-vlan>
        </component>
    </bridge>
</bridges>
+52 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>
<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
    <interface>
        <name>eth0</name>
        <bridge-port xmlns="urn:ieee:std:802.1Q:yang:ieee802-dot1q-bridge">
            <port-type>customer-edge-port</port-type>
            <component-name>CvlanExampleComponent101</component-name>
            <cvid-registration xmlns="urn:ieee:std:802.1Q:yang:ieee802-dot1q-pb">
                <svid>42</svid>
                <cvid>101</cvid>
            </cvid-registration>
            <cvid-registration xmlns="urn:ieee:std:802.1Q:yang:ieee802-dot1q-pb">
                <svid>42</svid>
                <cvid>102</cvid>
            </cvid-registration>
        </bridge-port>
    </interface>
</interfaces>

<!-- Does <cvid-registration> elements makes useless to add a <port-map> to /bridges/bridge/name/component/filtering-database ? -->
<!--
<bridges xmlns="urn:ieee:std:802.1Q:yang:ieee802-dot1q-bridge">
    <bridge>
        <name>ExampleBridge</name>
        <component>
            <name>CvlanExampleComponent</name>
            <filtering-database>
                <vlan-registration-entry>
                    <vids>101<vids>
                    <port-map>
                        <port-ref>42002</port-ref>
                        <static-vlan-registration-entries>
                            <registrar-admin-control>fixed-new-ignored</registrar-admin-control>
                            <vlan-transmitted>tagged</vlan-transmitted>
                        </static-vlan-registration-entries>
                    </port-map>
                </vlan-registration-entry>
                <vlan-registration-entry>
                    <vids>102<vids>
                    <port-map>
                        <port-ref>42002</port-ref>
                        <static-vlan-registration-entries>
                            <registrar-admin-control>fixed-new-ignored</registrar-admin-control>
                            <vlan-transmitted>tagged</vlan-transmitted>
                        </static-vlan-registration-entries>
                    </port-map>
                </vlan-registration-entry>
            </filtering-database>
        </component>
    </bridge>
</bridges>
-->
+36 −0
Original line number Diff line number Diff line
# XML elaboration on going
<?xml version="1.0" encoding="UTF-8"?>
<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
    <interface>
        <name>eth1-mw</name>
        <bridge-port xmlns="urn:ieee:std:802.1Q:yang:ieee802-dot1q-bridge">
            <port-type>provider-network-port</port-type>
            <component-name>SvlanExampleComponent</component-name>
            <!-- Is <cvid-registration> usable on PEP? -->
        </bridge-port>
    </interface>
</interfaces>

<!-- Does <cvid-registration> elements makes useless to add a <port-map> to /bridges/bridge/name/component/filtering-database ? -->
<bridges xmlns="urn:ieee:std:802.1Q:yang:ieee802-dot1q-bridge">
    <bridge>
        <name>ExampleBridge</name>
        <component>
            <name>SvlanExampleComponent</name>
            <filtering-database>
                <vlan-registration-entry>
                    <database-id>1</database-id>
                    <vids>42</vids>
                    <entry-type>static</entry-type>
                    <port-map>
                        <port-ref>42001</port-ref>
                        <static-vlan-registration-entries>
                            <registrar-admin-control>fixed-new-ignored</registrar-admin-control>
                            <vlan-transmitted>tagged</vlan-transmitted>
                        </static-vlan-registration-entries>
                    </port-map>
                </vlan-registration-entry>
            </filtering-database>
        </component>
    </bridge>
</bridges>
+32 −0
Original line number Diff line number Diff line
# XML elaboration on going
<?xml version="1.0" encoding="UTF-8"?>
<bridges xmlns="urn:ieee:std:802.1Q:yang:ieee802-dot1q-bridge">
    <bridge>
        <name>ExampleBridge</name>
        <bridge-type>provider-edge-bridge</bridge-type>
        <component>
            <name>SvlanExampleComponent</name>
            <type>s-vlan-component</type>
            <bridge-vlan>
                <vlan>
                    <vid>42</vid>
                    <name>Customer-A</name>
                </vlan>
            </bridge-vlan>
        </component>
        <component>
            <name>CvlanExampleComponent</name>
            <type>c-vlan-component</type>
            <bridge-vlan>
                <vlan>
                    <vid>101</vid>
                    <name>VLAN101</name>
                </vlan>
                <vlan>
                    <vid>102</vid>
                    <name>VLAN102</name>
                </vlan>
            </bridge-vlan>
        </component>
    </bridge>
</bridges>