Merge branch 'nested-release' into nested/2020.1

aristanetworks · Oct 29, 2020 · af201b6 · af201b6
2 parents 31c4f22 + 9531768
commit af201b6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/nested-labvm/atd-docker/uilanding/src/html/index.html b/nested-labvm/atd-docker/uilanding/src/html/index.html
@@ -14,10 +14,11 @@
 
     <!-- Custom styles for this template -->
     <link href="css/simple-sidebar.css" rel="stylesheet">
+    <script src="js/atd.js"></script>
 
 </head>
 
-<body>
+<body onload="updateCVP();">
     <div id="wrapper" class="toggled">
 
         <!-- Sidebar -->
@@ -33,7 +34,7 @@
                     <a href="/guacamole" target="_blank">Lab Frontend</a>
                 </li>
                 <li>
-                    <a href="https://{{ PUBLIC_IP }}" target="_blank">CVP</a>
+                    <div id="cvp_link"></div>
                 </li>
                 <li>
                     <a href="/jenkins" target="_blank">Jenkins</a>

diff --git a/nested-labvm/atd-docker/uilanding/src/html/js/atd.js b/nested-labvm/atd-docker/uilanding/src/html/js/atd.js
@@ -0,0 +1,5 @@
+var atdHostname = window.location.hostname;
+
+function updateCVP() {
+    document.getElementById("cvp_link").innerHTML = '<a href="https://' + atdHostname + '" target="_blank">CVP</a>';
+}
diff --git a/nested-labvm/atd-docker/uilanding/src/uilanding.py b/nested-labvm/atd-docker/uilanding/src/uilanding.py
@@ -82,11 +82,9 @@ def get(self):
                 self.redirect('/login')
             return()
         else:
-            node_ip = getPublicIP()
             self.render(
                 BASE_PATH + 'index.html',
-                ARISTA_PWD=host_yaml['login_info']['jump_host']['pw'],
-                PUBLIC_IP=node_ip
+                ARISTA_PWD=host_yaml['login_info']['jump_host']['pw']
             )
 
 # ===============================

diff --git a/topologies/base_topo.yml b/topologies/base_topo.yml
@@ -38,8 +38,8 @@ topologies:
         ram: 60
         cvp:
           2020.1:
-            branch: v2020.1.20201016a
-            image: base-atd-datacenter-e4-24-1f-c2020-1-1-20200909-u
+            branch: v2020.1-20201029a
+            image: base-atd-datacenter-e4-24-1f-c2020-1-1-20201029-u
             eos:
               - 4.24.1F
     desc: 'Two Spines, Four Leafs. Focused on EOS fundamentals within the Data Center.'
@@ -58,7 +58,7 @@ topologies:
               - 4.24.1F
           2020.2:
             branch: nested-release
-            image: base-atd-routing-e4-24-2-1f-c2020-2-1-20200911
+            image: base-atd-routing-e4-24-2-1f-c2020-2-1-20201029-u
             eos:
               - 4.24.2.1F
       ceos:
@@ -77,8 +77,8 @@ topologies:
         ram: 90
         cvp:
           2020.1:
-            branch: v2020.1.20201016a
-            image: base-atd-routing-e4-24-1f-c2020-1-1-20200701-u
+            branch: v2020.1-20201029a
+            image: base-atd-routing-e4-24-1f-c2020-1-1-20201029-u
             eos:
               - 4.24.1F
     desc: 'Twenty nodes. Focused on advanced routing, L2VPN and L3VPN topics'
@@ -101,8 +101,8 @@ topologies:
         ram: 72
         cvp:
           2020.1:
-            branch: v2020.1.20201016a
-            image: base-training-e4-24-1f-c2020-1-1-20200916-u
+            branch: v2020.1-20201029a
+            image: base-training-e4-24-1f-c2020-1-1-20201029-u
             eos:
               - 4.24.1F
     desc: 'Four Spines, Four Leafs. For use by the Arista Training Team.'