diff --git a/nested-labvm/atd-docker/docker-compose.yml b/nested-labvm/atd-docker/docker-compose.yml index 4b942664..c829a650 100644 --- a/nested-labvm/atd-docker/docker-compose.yml +++ b/nested-labvm/atd-docker/docker-compose.yml @@ -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 diff --git a/nested-labvm/atd-docker/uilanding/src/html/index.html b/nested-labvm/atd-docker/uilanding/src/html/index.html index f60bcbc6..c7253163 100755 --- a/nested-labvm/atd-docker/uilanding/src/html/index.html +++ b/nested-labvm/atd-docker/uilanding/src/html/index.html @@ -3,125 +3,147 @@ - - - + + + - Arista {{ topo_title }} + Arista {{ topo_title }} - - - + + + - - + + -
+
- - - - - -
-
-

Arista {{ topo_title }}

- Welcome to the Arista {{ topo_title }}! Please use the links on the left to navigate through the lab. -

-

Time Remaining: 00:00:00

-
-

Topology

- Click on a device to access CLI. -
- - - {% for node in NODES %} - {% if node == "CVP" %} - {{ escape(node) }} - {% else %} - {{ escape(node) }} - {% end %} - {% end %} - -

- {% if topo_cvp %} - -

- {% end %} -

Usernames and Passwords

- Use the following usernames and passwords to access the ATD: -
-
- - - - - - -
Device Username Password
Lab Credentials arista {{ ARISTA_PWD }}
Programmability IDE {{ ARISTA_PWD }}
WebUI @rista1
+ + + -
-
-
- + +
+
+

Arista {{ topo_title }}

+ Welcome to the Arista {{ topo_title }}! Please use the links on the left to navigate through the lab. +

+

Time Remaining: 00:00:00

+
+

Topology

+ Click on a device to access CLI. +
+ + + {% for node in NODES %} + {% if node == "CVP" %} + {{ escape(node) }} + {% else %} + {{ escape(node) }} + {% end %} + {% end %} + +

+ {% if topo_cvp %} + +

+ {% end %} +

Usernames and Passwords

+ Use the following usernames and passwords to access the ATD: +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
DeviceUsernamePassword
Lab Credentialsarista{{ ARISTA_PWD }}
Programmability IDE{{ ARISTA_PWD }}
WebUI@rista1
+
+
- + + +
+ - - - - + + + + - + \ No newline at end of file diff --git a/nested-labvm/atd-docker/uilanding/src/uilanding.py b/nested-labvm/atd-docker/uilanding/src/uilanding.py index 4b24bc03..1542c5e6 100755 --- a/nested-labvm/atd-docker/uilanding/src/uilanding.py +++ b/nested-labvm/atd-docker/uilanding/src/uilanding.py @@ -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'] @@ -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: diff --git a/topologies/base_topo.yml b/topologies/base_topo.yml index 70e7b04e..54e48c0d 100644 --- a/topologies/base_topo.yml +++ b/topologies/base_topo.yml @@ -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: