Skip to content

Commit f078216

Browse files
kreynoldsf5kreynoldsf5
committed
content, content, content
1 parent d77e536 commit f078216

File tree

9 files changed

+106
-55
lines changed

9 files changed

+106
-55
lines changed

‎labapp/app/app.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,23 @@ def return_err(err):
8181
@app.route('/')
8282
def index():
8383
"""index page"""
84-
html = render_md("markdown/overview.md")
84+
html = render_md("markdown/welcome.md")
8585
return render_template('standard.html',
8686
title="MCN Practical: Overview",
8787
content=html,
8888
udf=app.config['UDF']
8989
)
9090

91+
@app.route('/overview')
92+
def arch():
93+
"""arch page"""
94+
html = render_md("markdown/overview.md")
95+
return render_template('standard.html',
96+
title="MCN Practical: Architecture",
97+
content=html,
98+
udf=app.config['UDF']
99+
)
100+
91101
@app.route('/setup', methods=['GET', 'POST'])
92102
def setup():
93103
"""setup page"""
@@ -114,16 +124,6 @@ def setup():
114124
udf=app.config['UDF']
115125
)
116126

117-
@app.route('/arch')
118-
def arch():
119-
"""arch page"""
120-
html = render_md("markdown/arch.md")
121-
return render_template('standard.html',
122-
title="MCN Practical: Architecture",
123-
content=html,
124-
udf=app.config['UDF']
125-
)
126-
127127
@app.route('/_ce_status')
128128
@cache.cached(timeout=30)
129129
def ce_state():

‎labapp/app/markdown/arch.md

-14
This file was deleted.

‎labapp/app/markdown/overview.md

+40-28
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,63 @@
1-
<div style="height:25px"></div>
21
<div href="/" class="d-flex align-items-center pb-3 mb-3 link-dark text-decoration-none">
3-
<img src="/static/practical.png" width="700px" height="auto" alt="intro">
2+
<img src="/static/arch.png" width="300px" height="auto" alt="arch">
43
</div>
54

6-
This lab is a "practical" training activity.
7-
Each exercise will ask you to **configure** F5 Distributed Cloud ("XC") objects to reinforce core XC Multi-Cloud Networking ("MCN") concepts.
8-
Once configured, you'll be asked to **test** your configuration using this web application.
5+
# **Overview**
96

107
<div href="/" class="d-flex align-items-center pb-3 mb-3 link-dark text-decoration-none border-bottom"></div>
8+
9+
The lab environment, it's apps, and method of interaction are intentionally simple in an attempt to streamline...
10+
1111
<div style="height:25px"></div>
1212

13-
# **Getting Started**
13+
## **Architecture**
1414

15-
When your UDF deployment launched, two automated processes started - Customer Edge ("CE") registration and account provisioning in the [lab tenant](https://f5-xc-lab-mcn.console.ves.volterra.io/).
15+
The lab environment contains three distributed sites meshed using the F5 Distributed Cloud Global Network.
1616

1717
<div style="height:25px"></div>
1818

19-
## **Customer Edge**
19+
<ul class="list-group">
20+
<li class="list-group-item">
21+
<img src="/static/mcnp-aws.png" width="auto" height="30px"> &nbsp; &nbsp;
22+
<strong>student-awsnet</strong> in Amazon Web Services
23+
</li>
24+
<li class="list-group-item">
25+
<img src="/static/mcnp-azure.png" width="auto" height="30px"> &nbsp; &nbsp;
26+
<strong>student-azurenet</strong> in Microsoft Azure
27+
</li>
28+
<li class="list-group-item">
29+
<img src="/static/mcnp-udf.png" width="auto" height="30px"> &nbsp; &nbsp;&nbsp;
30+
<strong>Lab CE</strong> in UDF
31+
</li>
32+
</ul>
2033

21-
The CE in your UDF deployment is being registered with the [lab tenant](https://f5-xc-lab-mcn.console.ves.volterra.io/).
22-
CEs on first launch update software and, often, their OS. This can be very time consuming.
23-
This process will take 15-20 min from when the CE is booted.
24-
You can still get started on some preliminary tasks while waiting.
34+
<div style="height:25px"></div>
2535

26-
<img src="/static/ce.png" height="200px" width="auth"/>
36+
<img src="/static/mcn-prac-arch-base.png" width="auto" height="600px" alt="Arch diagram">
2737

28-
**Note on status in nav and status page.**
38+
## **Cloud App**
2939

30-
<div style="height:25px"></div>
40+
An instance of the [cloud app](https://github.com/f5devcentral/f5xc-lab-mcn-practical/tree/main/cloudapp) is hosted in each cloud site.
41+
The [cloud app](https://github.com/f5devcentral/f5xc-lab-mcn-practical/tree/main/cloudapp) is a simple application that echoes back an HTTP request.
42+
Remember while working through the lab, unless otherwise noted, the tests are displaying the headers and info **from the request received by the app**.
3143

32-
## **Account Provisioning**
3344

34-
Check the email used to launch your UDF deployment for a "welcome" or password reset email to the [lab tenant](https://f5-xc-lab-mcn.console.ves.volterra.io/).
35-
Update your password and log into the tenant.
45+
## **Lab Exercises**
3646

37-
<p float="left">
38-
<a href="https://f5-xc-lab-mcn.console.ves.volterra.io/" target="_blank">
39-
<img src="/static/email.png" height="300px" width="auth"/>
40-
<img src="/static/password.png" height="300px" width="auth"/>
41-
</a>
42-
</p>
47+
To complete the lab exercises, you will interact with a load balancer advertised from the Customer Edge in your UDF site in this [lab app](https://github.com/f5devcentral/f5xc-lab-mcn-practical/tree/main/labapp).
4348

44-
<div class="alert alert-danger" role="alert">
45-
After you've logged in to the tenant you <strong>must</strong> visit the <a href="/setup" class="alert-link">setup page</a> before starting the exercises.
46-
</div>
49+
Curl on the UDF Runner
50+
51+
criteria with symbols
52+
53+
code block
54+
55+
test
56+
57+
<div href="/" class="d-flex align-items-center pb-3 mb-3 link-dark text-decoration-none border-bottom"></div>
58+
59+
Next, visit the <strong><a href="/setup" >setup page</a></strong> before starting the exercises.
4760

48-
<div style="height:25px"></div>
4961

5062

5163

‎labapp/app/markdown/welcome.md

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<div style="height:25px"></div>
2+
<div href="/" class="d-flex align-items-center pb-3 mb-3 link-dark text-decoration-none">
3+
<img src="/static/practical.png" width="700px" height="auto" alt="intro">
4+
</div>
5+
6+
# **Welcome**
7+
8+
<div href="/" class="d-flex align-items-center pb-3 mb-3 link-dark text-decoration-none border-bottom"></div>
9+
10+
This lab is a "practical" training activity.
11+
Each exercise will ask you to **configure** F5 Distributed Cloud ("XC") objects to reinforce core XC Multi-Cloud Networking ("MCN") concepts.
12+
Once configured, you'll be asked to **test** your configuration using this web application.
13+
14+
<div style="height:25px"></div>
15+
16+
## **Getting Started**
17+
18+
When your UDF deployment launched, two automated processes started - Customer Edge ("CE") registration and account provisioning in the [lab tenant](https://f5-xc-lab-mcn.console.ves.volterra.io/).
19+
20+
<div style="height:25px"></div>
21+
22+
### **Customer Edge**
23+
24+
The CE in the UDF deployment will registered with the [lab tenant](https://f5-xc-lab-mcn.console.ves.volterra.io/).
25+
CEs on first launch update software and, often, their OS. This can be very time consuming ~20 min from when the CE is booted.
26+
You can still get started on some preliminary tasks while waiting.
27+
28+
This lab app includes an indicator of the CE's status along with the site name in the navigation pane.
29+
The **site name** is needed when configuring the load balancer advertise policy.
30+
31+
<div style="height:25px"></div>
32+
33+
### **Account Provisioning**
34+
35+
Check the email used to launch your UDF deployment for a "welcome" or password reset email to the [lab tenant](https://f5-xc-lab-mcn.console.ves.volterra.io/).
36+
Update your password and log into the tenant.
37+
38+
<p float="left">
39+
<a href="https://f5-xc-lab-mcn.console.ves.volterra.io/" target="_blank">
40+
<img src="/static/email.png" height="300px" width="auth"/>
41+
<img src="/static/password.png" height="300px" width="auth"/>
42+
</a>
43+
</p>
44+
45+
<div class="alert alert-danger" role="alert">
46+
After logging in to the tenant you <strong>must</strong> visit the <strong><a href="/setup" class="alert-link">setup page</a></strong> before starting the exercises.
47+
</div>
48+
49+
<div style="height:25px" class="d-flex align-items-center pb-3 mb-3 link-dark text-decoration-none border-bottom"></div>
50+
51+
Welcome to the lab! Next, read an <strong><a href="/overview" class="alert-link">overview</a></strong> that explains the lab environment, tools, and exercises.
52+
53+

‎labapp/app/static/mcn-prac-arch-base.png

208 KB
Loading

‎labapp/app/static/mcnp-aws.png

17 KB
Loading

‎labapp/app/static/mcnp-azure.png

16.9 KB
Loading

‎labapp/app/static/mcnp-udf.png

13.2 KB
Loading

‎labapp/app/templates/base.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@
113113
</button>
114114
<div class="collapse show" id="home-collapse">
115115
<ul class="btn-toggle-nav list-unstyled fw-normal pb-1 small">
116-
<li><a href="/" class="link-dark rounded">Overview</a></li>
116+
<li><a href="/" class="link-dark rounded">Welcome</a></li>
117+
<li><a href="/overview" class="link-dark rounded">Overview</a></li>
117118
<li><a href="/setup" class="link-dark rounded">Setup</a></li>
118-
<li><a href="/arch" class="link-dark rounded">Architecture</a></li>
119119
</ul>
120120
</div>
121121
</li>

0 commit comments

Comments
 (0)