From c7d8de123dc620fd1a972b0cb8390476d7485f0c Mon Sep 17 00:00:00 2001
From: rebiffe <jean.rebiffe@orange.com>
Date: Mon, 7 Nov 2022 18:02:01 +0000
Subject: [PATCH 1/4] Adds 4 XML files for E-Line service provisioning

---
 scripts/PROV_C_01/cvlan.xml            | 41 ++++++++++++++++++++++++++
 scripts/PROV_SC_01/add_eth_if.xml      | 19 ++++++++++++
 scripts/PROV_SC_01/add_mw_if.xml       | 31 +++++++++++++++++++
 scripts/PROV_SC_01/bridge_creation.xml | 32 ++++++++++++++++++++
 4 files changed, 123 insertions(+)
 create mode 100644 scripts/PROV_C_01/cvlan.xml
 create mode 100644 scripts/PROV_SC_01/add_eth_if.xml
 create mode 100644 scripts/PROV_SC_01/add_mw_if.xml
 create mode 100644 scripts/PROV_SC_01/bridge_creation.xml

diff --git a/scripts/PROV_C_01/cvlan.xml b/scripts/PROV_C_01/cvlan.xml
new file mode 100644
index 0000000..7aad21a
--- /dev/null
+++ b/scripts/PROV_C_01/cvlan.xml
@@ -0,0 +1,41 @@
+<?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>
+                    <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>
+                    <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>
+            </bridge-vlan>
+            <bridge-vlan>
+                <vlan>
+                    <vid>102</vid>
+                    <name>Service-102</name>
+                </vlan>
+            </bridge-vlan>
+        </component>
+    </bridge>
+</bridges>
diff --git a/scripts/PROV_SC_01/add_eth_if.xml b/scripts/PROV_SC_01/add_eth_if.xml
new file mode 100644
index 0000000..05fb26b
--- /dev/null
+++ b/scripts/PROV_SC_01/add_eth_if.xml
@@ -0,0 +1,19 @@
+# XML elaboration on going
+<?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>
+                <svid>42</svid>
+                <cvid>101</cvid>
+            </cvid-registration>
+            <cvid-registration>
+                <svid>42</svid>
+                <cvid>102</cvid>
+            </cvid-registration>
+        </bridge-port>
+    </interface>
+</interfaces>
diff --git a/scripts/PROV_SC_01/add_mw_if.xml b/scripts/PROV_SC_01/add_mw_if.xml
new file mode 100644
index 0000000..e3072f1
--- /dev/null
+++ b/scripts/PROV_SC_01/add_mw_if.xml
@@ -0,0 +1,31 @@
+# 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>
+        </bridge-port>
+    </interface>
+</interfaces>
+
+<bridges xmlns="urn:ieee:std:802.1Q:yang:ieee802-dot1q-bridge">
+    <bridge>
+        <name>ExampleBridge</name>
+        <component>
+            <name>SvlanExampleComponent</name>
+            <filtering-database>
+                <vlan-registration-entry>
+                    <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>
diff --git a/scripts/PROV_SC_01/bridge_creation.xml b/scripts/PROV_SC_01/bridge_creation.xml
new file mode 100644
index 0000000..21a863b
--- /dev/null
+++ b/scripts/PROV_SC_01/bridge_creation.xml
@@ -0,0 +1,32 @@
+# 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>CvlanExampleComponent101</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>
-- 
GitLab


From 394475abc43a81550536258312c0f5a04c20b6a3 Mon Sep 17 00:00:00 2001
From: rebiffe <jean.rebiffe@orange.com>
Date: Mon, 7 Nov 2022 18:07:54 +0000
Subject: [PATCH 2/4] Correction: <bridge-vlan> element is a container, not a
 list

---
 scripts/PROV_C_01/cvlan.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/PROV_C_01/cvlan.xml b/scripts/PROV_C_01/cvlan.xml
index 7aad21a..223ad2a 100644
--- a/scripts/PROV_C_01/cvlan.xml
+++ b/scripts/PROV_C_01/cvlan.xml
@@ -29,8 +29,6 @@
                     <vid>101</vid>
                     <name>Service-101</name>
                 </vlan>
-            </bridge-vlan>
-            <bridge-vlan>
                 <vlan>
                     <vid>102</vid>
                     <name>Service-102</name>
-- 
GitLab


From 3f089ede3b0e8ba076b95e8963a02929ffdd1ef9 Mon Sep 17 00:00:00 2001
From: rebiffe <jean.rebiffe@orange.com>
Date: Tue, 8 Nov 2022 08:29:05 +0000
Subject: [PATCH 3/4] Update scripts/PROV_SC_01/add_eth_if.xml,
 scripts/PROV_SC_01/add_mw_if.xml files

---
 scripts/PROV_SC_01/add_eth_if.xml | 28 +++++++++++++++++++++++++---
 scripts/PROV_SC_01/add_mw_if.xml  |  2 ++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/scripts/PROV_SC_01/add_eth_if.xml b/scripts/PROV_SC_01/add_eth_if.xml
index 05fb26b..9aeb125 100644
--- a/scripts/PROV_SC_01/add_eth_if.xml
+++ b/scripts/PROV_SC_01/add_eth_if.xml
@@ -1,4 +1,3 @@
-# XML elaboration on going
 <?xml version="1.0" encoding="UTF-8"?>
 <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
     <interface>
@@ -6,14 +5,37 @@
         <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>
+            <cvid-registration xmlns="urn:ieee:std:802.1Q:yang:ieee802-dot1q-pb">
                 <svid>42</svid>
                 <cvid>101</cvid>
             </cvid-registration>
-            <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>SvlanExampleComponent</name>
+            <filtering-database>
+                <vlan-registration-entry>
+                    <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>
+-->
diff --git a/scripts/PROV_SC_01/add_mw_if.xml b/scripts/PROV_SC_01/add_mw_if.xml
index e3072f1..f1627cf 100644
--- a/scripts/PROV_SC_01/add_mw_if.xml
+++ b/scripts/PROV_SC_01/add_mw_if.xml
@@ -6,10 +6,12 @@
         <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>
-- 
GitLab


From c68209fad9c9ee44b9d181ed76387dce8255b607 Mon Sep 17 00:00:00 2001
From: rebiffe <jean.rebiffe@orange.com>
Date: Tue, 8 Nov 2022 08:49:42 +0000
Subject: [PATCH 4/4] Update scripts/PROV_C_01/cvlan.xml,
 scripts/PROV_SC_01/add_mw_if.xml, scripts/PROV_SC_01/add_eth_if.xml,
 scripts/PROV_SC_01/bridge_creation.xml files

---
 scripts/PROV_C_01/cvlan.xml            |  4 ++++
 scripts/PROV_SC_01/add_eth_if.xml      | 13 ++++++++++++-
 scripts/PROV_SC_01/add_mw_if.xml       |  3 +++
 scripts/PROV_SC_01/bridge_creation.xml |  2 +-
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/scripts/PROV_C_01/cvlan.xml b/scripts/PROV_C_01/cvlan.xml
index 223ad2a..6109c1a 100644
--- a/scripts/PROV_C_01/cvlan.xml
+++ b/scripts/PROV_C_01/cvlan.xml
@@ -8,6 +8,7 @@
             <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>
@@ -15,6 +16,9 @@
                             <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>
diff --git a/scripts/PROV_SC_01/add_eth_if.xml b/scripts/PROV_SC_01/add_eth_if.xml
index 9aeb125..48c457d 100644
--- a/scripts/PROV_SC_01/add_eth_if.xml
+++ b/scripts/PROV_SC_01/add_eth_if.xml
@@ -23,9 +23,20 @@
     <bridge>
         <name>ExampleBridge</name>
         <component>
-            <name>SvlanExampleComponent</name>
+            <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>
diff --git a/scripts/PROV_SC_01/add_mw_if.xml b/scripts/PROV_SC_01/add_mw_if.xml
index f1627cf..e649d25 100644
--- a/scripts/PROV_SC_01/add_mw_if.xml
+++ b/scripts/PROV_SC_01/add_mw_if.xml
@@ -19,6 +19,9 @@
             <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>
diff --git a/scripts/PROV_SC_01/bridge_creation.xml b/scripts/PROV_SC_01/bridge_creation.xml
index 21a863b..4d3889e 100644
--- a/scripts/PROV_SC_01/bridge_creation.xml
+++ b/scripts/PROV_SC_01/bridge_creation.xml
@@ -15,7 +15,7 @@
             </bridge-vlan>
         </component>
         <component>
-            <name>CvlanExampleComponent101</name>
+            <name>CvlanExampleComponent</name>
             <type>c-vlan-component</type>
             <bridge-vlan>
                 <vlan>
-- 
GitLab