From 63b83e84a28207dfe08f57f4777f444f46e96135 Mon Sep 17 00:00:00 2001
From: sbyrnes1 <sbyrnes@internet2.edu>
Date: Thu, 14 Mar 2024 18:24:02 +0000
Subject: [PATCH] enabler: Mild restructure and removal of Juniper device

---
 .gitignore                                    |  2 +
 .../images}/README.md                         |  0
 .../startup-config/juniper1.conf              | 83 -------------------
 .../workshop.clab.yml.j2                      | 17 ++--
 4 files changed, 8 insertions(+), 94 deletions(-)
 rename {images => internal-lab-setup-assets/images}/README.md (100%)
 delete mode 100644 internal-lab-setup-assets/startup-config/juniper1.conf

diff --git a/.gitignore b/.gitignore
index e43b0f9..360fcc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 .DS_Store
+internal-lab-setup-assets/images/*
+!internal-lab-setup-assets/images/README.md
diff --git a/images/README.md b/internal-lab-setup-assets/images/README.md
similarity index 100%
rename from images/README.md
rename to internal-lab-setup-assets/images/README.md
diff --git a/internal-lab-setup-assets/startup-config/juniper1.conf b/internal-lab-setup-assets/startup-config/juniper1.conf
deleted file mode 100644
index 807f2ba..0000000
--- a/internal-lab-setup-assets/startup-config/juniper1.conf
+++ /dev/null
@@ -1,83 +0,0 @@
-system {
-    root-authentication {
-        encrypted-password "$6$lB5c6$Zeud8c6IhCTE6hnZxXBl3ZMZTC2hOx9pxxYUWTHKW1oC32SATWLMH2EXarxWS5k685qMggUfFur1lq.o4p4cg1"; ## SECRET-DATA
-    }
-    login {
-        user clab {
-            uid 2000;
-            class super-user;
-            authentication {
-                encrypted-password "$6$lCT4O$miC8pBTrsdg5AI8wzsIb.oQPYosEaP2b1waGyrMV7QgBBjmrhjG37doJ094t6.m/Xv.p3EUAuZT0Fh7dkqt7b/"; ## SECRET-DATA
-            }
-        }
-    }
-    services {
-        ssh {
-            root-login allow;
-        }
-        netconf {
-            ssh;
-        }
-    }
-}
-interfaces {
-    eth1 {
-        description foobar;
-        unit 0 {
-            family inet {
-                address 172.17.1.17/31;
-            }
-        }
-        unit 100 {
-            description foo;
-            vlan-id 100;
-            family inet {
-                address 198.51.100.2/24;
-            }
-        }
-        unit 200 {
-            description foo;
-            vlan-id 200;
-            family inet {
-                address 192.0.2.2/24;
-            }
-        }
-    }
-    eth2 {
-        unit 0 {
-            description EXAMPLE_NETWORK;
-            family inet {
-                address 10.0.2.1/24;
-            }
-        }
-    }
-}
-policy-options {
-    policy-statement PERMIT_ALL {
-        term pass {
-            then accept;
-        }
-    }
-}
-routing-options {
-    router-id 198.51.100.2;
-    autonomous-system 64501;
-    static {
-        route 0.0.0.0/0 next-hop {{ .MgmtIPv4Gateway }};
-    }
-}
-protocols {
-    bgp {
-        group PEER_A {
-            type external;
-            multihop;
-            import PERMIT_ALL;
-            authentication-key "$9$RXPcyKY2aHqfLxNbY2UD"; ## SECRET-DATA
-            export PERMIT_ALL;
-            neighbor 198.51.100.1 {
-                export PERMIT_ALL;
-                peer-as 64500;
-            }
-        }
-    }
-}
diff --git a/internal-lab-setup-assets/workshop.clab.yml.j2 b/internal-lab-setup-assets/workshop.clab.yml.j2
index 918c1ef..ff8ccce 100644
--- a/internal-lab-setup-assets/workshop.clab.yml.j2
+++ b/internal-lab-setup-assets/workshop.clab.yml.j2
@@ -15,13 +15,7 @@ mgmt:
 topology:
   kinds:
     cisco_xrd:
-      image: ios-xr/xrd-control-plane:7.9.1
-    juniper_crpd:
-      image: crpd:23.1R1.8
-      license: license.txt
-      startup-config: startup-config/juniper1.conf
-      exec:
-        - cli request system license add tmp/junos_sfnt_tmp.lic
+      image: ios-xr/xrd-control-plane:7.11.1
 
   nodes:
     {%- set x = 2 %}
@@ -35,8 +29,9 @@ topology:
       startup-config: startup-config/cisco2.conf
       {{- shared_node_settings(x) }}
     {%- set x = x+1 %}
-    juniper1:
-      kind: juniper_crpd
+    cisco3:
+      kind: cisco_xrd
+      startup-config: startup-config/cisco3.conf
       {{- shared_node_settings(x) }}
     {%- set x = x+1 %}
     ubuntu:
@@ -48,7 +43,7 @@ topology:
 
   links:
     - endpoints: ["cisco1:Gi0-0-0-0", "cisco2:Gi0-0-0-0"]
-    - endpoints: ["cisco1:Gi0-0-0-1", "juniper1:eth1"]
-    - endpoints: ["cisco2:Gi0-0-0-1", "juniper1:eth2"]
+    - endpoints: ["cisco1:Gi0-0-0-1", "cisco3:Gi0-0-0-0"]
+    - endpoints: ["cisco2:Gi0-0-0-1", "cisco3:Gi0-0-0-1"]
     - endpoints: ["ubuntu:eth1", "cisco1:Gi0-0-0-2"]
     - endpoints: ["ubuntu:eth2", "cisco2:Gi0-0-0-2"]