Merge pull request #1512 from ubaumann/main

Update lab-example clos02
srl-labs · Aug 10, 2023 · 46f8c52 · 46f8c52
2 parents 01ca47f + 6a40b2a
commit 46f8c52
Show file tree

Hide file tree

Showing 13 changed files with 112 additions and 2 deletions.
diff --git a/lab-examples/clos02/README.md b/lab-examples/clos02/README.md
@@ -11,6 +11,9 @@ $ chmod +x setup.sh
 $ ./setup.sh 
 ```
 
+!!!note
+    The setup script needs [gnmic](https://gnmic.openconfig.net/)
+
 ### Setup Configures
 1. NEs with Management, System and Ethernet IP Addresses. 
 2. Clients with eth0 (Management) and eth1 interface.

diff --git a/lab-examples/clos02/configs/leaf1.yaml b/lab-examples/clos02/configs/leaf1.yaml
@@ -4,29 +4,35 @@ srl_nokia-interfaces:interface:
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.0/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: '1000:10::/127'
   - name: ethernet-1/2
     admin-state: enable
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.2/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: '1000:10::2/127'
   - name: ethernet-1/3
     admin-state: enable
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.24/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: '1000:10::24/127'
   - name: system0
@@ -52,6 +58,11 @@ srl_nokia-network-instance:network-instance:
       srl_nokia-bgp:bgp:
         autonomous-system: 65001
         router-id: 30.0.0.1
+        afi-safi:
+          - afi-safi-name: ipv4-unicast
+            admin-state: enable
+          - afi-safi-name: ipv6-unicast
+            admin-state: enable
         group:
           - group-name: clos02
             admin-state: enable

diff --git a/lab-examples/clos02/configs/leaf2.yaml b/lab-examples/clos02/configs/leaf2.yaml
@@ -4,29 +4,35 @@ srl_nokia-interfaces:interface:
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.4/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: 1000:10::4/127
   - name: ethernet-1/2
     admin-state: enable
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.6/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: 1000:10::6/127
   - name: ethernet-1/3
     admin-state: enable
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.26/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: 1000:10::26/127
   - name: system0
@@ -52,6 +58,11 @@ srl_nokia-network-instance:network-instance:
       srl_nokia-bgp:bgp:
         autonomous-system: 65002
         router-id: 30.0.0.2
+        afi-safi:
+          - afi-safi-name: ipv4-unicast
+            admin-state: enable
+          - afi-safi-name: ipv6-unicast
+            admin-state: enable
         group:
           - group-name: clos02
             admin-state: enable

diff --git a/lab-examples/clos02/configs/leaf3.yaml b/lab-examples/clos02/configs/leaf3.yaml
@@ -4,29 +4,35 @@ srl_nokia-interfaces:interface:
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.12/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: 1000:10::12/127
   - name: ethernet-1/2
     admin-state: enable
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.14/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: 1000:10::14/127
   - name: ethernet-1/3
     admin-state: enable
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.28/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: 1000:10::28/127
   - name: system0
@@ -52,6 +58,11 @@ srl_nokia-network-instance:network-instance:
       srl_nokia-bgp:bgp:
         autonomous-system: 65003
         router-id: 30.0.0.3
+        afi-safi:
+          - afi-safi-name: ipv4-unicast
+            admin-state: enable
+          - afi-safi-name: ipv6-unicast
+            admin-state: enable
         group:
           - group-name: clos02
             admin-state: enable

diff --git a/lab-examples/clos02/configs/leaf4.yaml b/lab-examples/clos02/configs/leaf4.yaml
@@ -4,29 +4,35 @@ srl_nokia-interfaces:interface:
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.16/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: 1000:10::16/127
   - name: ethernet-1/2
     admin-state: enable
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.18/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: 1000:10::18/127
   - name: ethernet-1/3
     admin-state: enable
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.30/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: 1000:10::30/127
   - name: system0
@@ -52,6 +58,11 @@ srl_nokia-network-instance:network-instance:
       srl_nokia-bgp:bgp:
         autonomous-system: 65004
         router-id: 30.0.0.4
+        afi-safi:
+          - afi-safi-name: ipv4-unicast
+            admin-state: enable
+          - afi-safi-name: ipv6-unicast
+            admin-state: enable
         group:
           - group-name: clos02
             admin-state: enable

diff --git a/lab-examples/clos02/configs/spine1.yaml b/lab-examples/clos02/configs/spine1.yaml
@@ -4,29 +4,35 @@ srl_nokia-interfaces:interface:
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.1/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: 1000:10::1/127
   - name: ethernet-1/2
     admin-state: enable
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.5/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: 1000:10::5/127
   - name: ethernet-1/3
     admin-state: enable
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.8/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: 1000:10::8/127
   - name: system0
@@ -52,6 +58,11 @@ srl_nokia-network-instance:network-instance:
       srl_nokia-bgp:bgp:
         autonomous-system: 65056
         router-id: 30.0.0.5
+        afi-safi:
+          - afi-safi-name: ipv4-unicast
+            admin-state: enable
+          - afi-safi-name: ipv6-unicast
+            admin-state: enable
         group:
           - group-name: clos02
             admin-state: enable

diff --git a/lab-examples/clos02/configs/spine2.yaml b/lab-examples/clos02/configs/spine2.yaml
@@ -4,29 +4,35 @@ srl_nokia-interfaces:interface:
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.3/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: 1000:10::3/127
   - name: ethernet-1/2
     admin-state: enable
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.7/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: 1000:10::7/127
   - name: ethernet-1/3
     admin-state: enable
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.10/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: 1000:10::10/127
   - name: system0
@@ -52,6 +58,11 @@ srl_nokia-network-instance:network-instance:
       srl_nokia-bgp:bgp:
         autonomous-system: 65056
         router-id: 30.0.0.6
+        afi-safi:
+          - afi-safi-name: ipv4-unicast
+            admin-state: enable
+          - afi-safi-name: ipv6-unicast
+            admin-state: enable
         group:
           - group-name: clos02
             admin-state: enable

diff --git a/lab-examples/clos02/configs/spine3.yaml b/lab-examples/clos02/configs/spine3.yaml
@@ -4,29 +4,35 @@ srl_nokia-interfaces:interface:
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.13/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: 1000:10::13/127
   - name: ethernet-1/2
     admin-state: enable
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.17/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: 1000:10::17/127
   - name: ethernet-1/3
     admin-state: enable
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.20/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: 1000:10::20/127
   - name: system0
@@ -52,6 +58,11 @@ srl_nokia-network-instance:network-instance:
       srl_nokia-bgp:bgp:
         autonomous-system: 65078
         router-id: 30.0.0.7
+        afi-safi:
+          - afi-safi-name: ipv4-unicast
+            admin-state: enable
+          - afi-safi-name: ipv6-unicast
+            admin-state: enable
         group:
           - group-name: clos02
             admin-state: enable

diff --git a/lab-examples/clos02/configs/spine4.yaml b/lab-examples/clos02/configs/spine4.yaml
@@ -4,29 +4,35 @@ srl_nokia-interfaces:interface:
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.15/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: 1000:10::15/127
   - name: ethernet-1/2
     admin-state: enable
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.19/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: 1000:10::19/127
   - name: ethernet-1/3
     admin-state: enable
     subinterface:
       - index: 0
         ipv4:
+          admin-state: enable
           address:
             - ip-prefix: 10.0.0.22/31
         ipv6:
+          admin-state: enable
           address:
             - ip-prefix: 1000:10::22/127
   - name: system0
@@ -52,6 +58,11 @@ srl_nokia-network-instance:network-instance:
       srl_nokia-bgp:bgp:
         autonomous-system: 65078
         router-id: 30.0.0.8
+        afi-safi:
+          - afi-safi-name: ipv4-unicast
+            admin-state: enable
+          - afi-safi-name: ipv6-unicast
+            admin-state: enable
         group:
           - group-name: clos02
             admin-state: enable