Skip to content

Commit

Permalink
UI labguides (#877)
Browse files Browse the repository at this point in the history 
* Updated Uilanding with url checks

* updated campus labguide url"
  • Loading branch information
@networkRob @networkRob-Arista
networkRob authored and networkRob-Arista committed Sep 26, 2024
1 parent c3e18ae commit 2c3af87
Show file tree
Hide file tree
Showing 4 changed files with 145 additions and 111 deletions.
2 changes: 1 addition & 1 deletion nested-labvm/atd-docker/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ services:
# - /opt/ceos:/opt/ceos:rw
uilanding:
container_name: atd-uilanding
image: us.gcr.io/beta-atds/atddocker_uilanding:2.3.0
image: us.gcr.io/beta-atds/atddocker_uilanding:2.3.1
restart: always
environment:
- PYTHONUNBUFFERED=1
Expand Down
236 changes: 129 additions & 107 deletions nested-labvm/atd-docker/uilanding/src/html/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,125 +3,147 @@

<head>

<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="Arista ATD Lab">
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="Arista ATD Lab">

<title>Arista {{ topo_title }}</title>
<title>Arista {{ topo_title }}</title>

<!-- Bootstrap core CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet">
<script src="js/atd-ws.js"></script>
<!-- Bootstrap core CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet">
<script src="js/atd-ws.js"></script>

<!-- Custom styles for this template -->
<link href="css/simple-sidebar.css" rel="stylesheet">
<!-- Custom styles for this template -->
<link href="css/simple-sidebar.css" rel="stylesheet">
</head>

<body>
<div id="wrapper" class="toggled">
<div id="wrapper" class="toggled">

<!-- Sidebar -->
<div id="sidebar-wrapper">
<ul class="sidebar-nav">
<br>
<img src="images/logotransparent.png" class="arista-logo">
<hr class="hr">
{% if "labguides" not in disable_links %}
<li>
<a href="{{ labguides }}" target="_blank">Lab Guides</a> <a href="/labguides/ATD.pdf" target="_blank">(PDF)</a>
</li>
{% end %}
{% if "console" not in disable_links %}
<li>
<a href="/ssh/host/192.168.0.1" target="_blank">Console Access</a>
</li>
{% end %}
{% if "ide" not in disable_links %}
<li>
<a href="/coder" target="_blank">Programmability IDE</a>
</li>
{% end %}
{% if "webui" not in disable_links %}
<li>
<a href="/firefox" target="_blank">WebUI</a>
</li>
{% end %}
{% if "cvp" not in disable_links %}
<li>
<a href="/cv" target="_blank">CVP</a>
</li>
{% end %}
{% if "alertapi" not in disable_links %}
<li>
<a href="/alert" target="_blank">Event Alert API</a>
</li>
{% end %}
{% if "jenkins" not in disable_links %}
<li>
<a href="/jenkins" target="_blank">Jenkins</a>
</li>
{% end %}
{% if "ipam" not in disable_links %}
<li>
<a href="/ipam" target="_blank">IPAM</a>
</li>
{% end %}
</ul>
</div>
<!-- /#sidebar-wrapper -->

<!-- Page Content -->
<div id="page-content-wrapper">
<div class="container-fluid">
<h1>Arista {{ topo_title }}</h1>
Welcome to the Arista {{ topo_title }}! Please use the links on the left to navigate through the lab.
<br><br>
<h4>Time Remaining: <span id="countdown_timer">00:00:00</span></h4>
<br />
<h2>Topology</h2>
Click on a device to access CLI.
<br />
<img src="topo/atd-topo.png" usemap="#image_map">
<map name="image_map">
{% for node in NODES %}
{% if node == "CVP" %}
<area alt="{{ escape(node) }}" title="{{ escape(node) }}" href="/cv" target="_blank" coords="{{ escape(NODES[node]['coords']) }}" shape="rect">
{% else %}
<area alt="{{ escape(node) }}" title="{{ escape(node) }}" href="/ssh/host/{{ escape(NODES[node]['ip']) }}" target="_blank" coords="{{ escape(NODES[node]['coords']) }}" shape="rect">
{% end %}
{% end %}
</map>
<br /><br />
{% if topo_cvp %}
<span id="cvp_info"></span>
<br /><br />
{% end %}
<h2>Usernames and Passwords</h2>
Use the following usernames and passwords to access the ATD:
<br>
<br>
<table class="table table-striped">
<thead> <tr> <th>Device</th> <th>Username</th> <th>Password</th> </tr> </thead>
<tbody>
<tr><td>Lab Credentials</td> <td>arista</td> <td>{{ ARISTA_PWD }}</td> </tr>
<tr><td>Programmability IDE</td> <td></td><td>{{ ARISTA_PWD }}</td></tr>
<tr><td>WebUI</td> <td></td><td>@rista1</td></tr>
</tbody> </table>
<!-- Sidebar -->
<div id="sidebar-wrapper">
<ul class="sidebar-nav">
<br>
<img src="images/logotransparent.png" class="arista-logo">
<hr class="hr">
{% if "labguides" not in disable_links %}
<li>
<a href="{{ labguides }}" target="_blank">Lab Guides</a>{% if "pdf" not in disable_links %} <a
href="/labguides/ATD.pdf" target="_blank">(PDF)</a>{% end %}
</li>
{% end %}
{% if "console" not in disable_links %}
<li>
<a href="/ssh/host/192.168.0.1" target="_blank">Console Access</a>
</li>
{% end %}
{% if "ide" not in disable_links %}
<li>
<a href="/coder" target="_blank">Programmability IDE</a>
</li>
{% end %}
{% if "webui" not in disable_links %}
<li>
<a href="/firefox" target="_blank">WebUI</a>
</li>
{% end %}
{% if "cvp" not in disable_links %}
<li>
<a href="/cv" target="_blank">CVP</a>
</li>
{% end %}
{% if "alertapi" not in disable_links %}
<li>
<a href="/alert" target="_blank">Event Alert API</a>
</li>
{% end %}
{% if "jenkins" not in disable_links %}
<li>
<a href="/jenkins" target="_blank">Jenkins</a>
</li>
{% end %}
{% if "ipam" not in disable_links %}
<li>
<a href="/ipam" target="_blank">IPAM</a>
</li>
{% end %}
</ul>
</div>
<!-- /#sidebar-wrapper -->

<br>
</div>
</div>
<!-- /#page-content-wrapper -->
<!-- Page Content -->
<div id="page-content-wrapper">
<div class="container-fluid">
<h1>Arista {{ topo_title }}</h1>
Welcome to the Arista {{ topo_title }}! Please use the links on the left to navigate through the lab.
<br><br>
<h4>Time Remaining: <span id="countdown_timer">00:00:00</span></h4>
<br />
<h2>Topology</h2>
Click on a device to access CLI.
<br />
<img src="topo/atd-topo.png" usemap="#image_map">
<map name="image_map">
{% for node in NODES %}
{% if node == "CVP" %}
<area alt="{{ escape(node) }}" title="{{ escape(node) }}" href="/cv" target="_blank"
coords="{{ escape(NODES[node]['coords']) }}" shape="rect">
{% else %}
<area alt="{{ escape(node) }}" title="{{ escape(node) }}" href="/ssh/host/{{ escape(NODES[node]['ip']) }}"
target="_blank" coords="{{ escape(NODES[node]['coords']) }}" shape="rect">
{% end %}
{% end %}
</map>
<br /><br />
{% if topo_cvp %}
<span id="cvp_info"></span>
<br /><br />
{% end %}
<h2>Usernames and Passwords</h2>
Use the following usernames and passwords to access the ATD:
<br>
<br>
<table class="table table-striped">
<thead>
<tr>
<th>Device</th>
<th>Username</th>
<th>Password</th>
</tr>
</thead>
<tbody>
<tr>
<td>Lab Credentials</td>
<td>arista</td>
<td>{{ ARISTA_PWD }}</td>
</tr>
<tr>
<td>Programmability IDE</td>
<td></td>
<td>{{ ARISTA_PWD }}</td>
</tr>
<tr>
<td>WebUI</td>
<td></td>
<td>@rista1</td>
</tr>
</tbody>
</table>

<br>
</div>
</div>
<!-- /#wrapper -->
<!-- /#page-content-wrapper -->

</div>
<!-- /#wrapper -->

<!-- Bootstrap core JavaScript -->
<script src="js/jquery.min.js"></script>
<script src="js/popper.min.js"></script>
<script src="js/bootstrap.min.js"></script>
<!-- Bootstrap core JavaScript -->
<script src="js/jquery.min.js"></script>
<script src="js/popper.min.js"></script>
<script src="js/bootstrap.min.js"></script>


</body>

</html>
</html>
14 changes: 13 additions & 1 deletion nested-labvm/atd-docker/uilanding/src/uilanding.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@
else:
TITLE = 'Test Drive Lab'

# Set Project Enviroment
if "alpha" in PROJECT or "beta" in PROJECT:
ATD_ENV = "dev"
else:
ATD_ENV = "prod"

# Check and try to grab CVP Version for Info File
try:
CVP_VER = host_yaml['cvp']
Expand Down Expand Up @@ -128,7 +134,13 @@ def get(self):
if host_yaml['labguides'] == 'self':
labguides = '/labguides/index.html'
elif "testdrive" in host_yaml['labguides']:
labguides = f"{host_yaml['labguides']}/{CVP_VER}/"
if ATD_ENV == "dev":
_lab_url = host_yaml['labguides'].split('.')
_lab_url[0] += "-dev"
_labguides = ".".join(_lab_url)
else:
_labguides = host_yaml['labguides']
labguides = f"{_labguides}/{CVP_VER}/"
else:
labguides = host_yaml['labguides']
else:
Expand Down
4 changes: 2 additions & 2 deletions topologies/base_topo.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -513,8 +513,8 @@ topologies:
title: 'Campus Lab'
disk_size: 300
access: admin
disable_links: []
labguides: self
disable_links: ["pdf"]
labguides: https://labguides.testdrive.arista.com
wan:
dev:
veos:
Expand Down

0 comments on commit 2c3af87

Please sign in to comment.