Skip to content

Commit 20071ee

Browse files
authored
Merge pull request #808 from coreemu/develop
fix issues with updated documentation
2 parents c37fa33 + 62a09c7 commit 20071ee

File tree

8 files changed

+49
-46
lines changed

8 files changed

+49
-46
lines changed

docs/tutorials/common/grpc.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ the remaining steps of a given section.
1818
```
1919
4. You will be presented with sessions to join, select the one created by the script
2020
<p align="center">
21-
<img src="/static/tutorial-common/running-join.png" width="75%">
21+
<img src="/core/static/tutorial-common/running-join.png" width="75%">
2222
</p>

docs/tutorials/tutorial1.md

+13-13
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This tutorial will cover some use cases when using a wired 2 node
66
scenario in CORE.
77

88
<p align="center">
9-
<img src="/static/tutorial1/scenario.png" width="75%">
9+
<img src="/core/static/tutorial1/scenario.png" width="75%">
1010
</p>
1111

1212
## Files
@@ -46,11 +46,11 @@ between nodes in CORE.
4646
```
4747
* In the GUI menu bar select **File->Open...**, then navigate to and select **scenario.xml**
4848
<p align="center">
49-
<img src="/static/tutorial-common/running-open.png" width="75%">
49+
<img src="/core/static/tutorial-common/running-open.png" width="75%">
5050
</p>
5151
* You can now click on the **Start Session** button to run the scenario
5252
<p align="center">
53-
<img src="/static/tutorial1/scenario.png" width="75%">
53+
<img src="/core/static/tutorial1/scenario.png" width="75%">
5454
</p>
5555
* Open a terminal on **n1** by double clicking it in the GUI
5656
* Run the following in **n1** terminal
@@ -84,11 +84,11 @@ traffic being sent/received among many other uses.
8484
```
8585
* In the GUI menu bar select **File->Open...**, then navigate to and select **scenario.xml**
8686
<p align="center">
87-
<img src="/static/tutorial-common/running-open.png" width="75%">
87+
<img src="/core/static/tutorial-common/running-open.png" width="75%">
8888
</p>
8989
* You can now click on the **Start Session** button to run the scenario
9090
<p align="center">
91-
<img src="/static/tutorial1/scenario.png" width="75%">
91+
<img src="/core/static/tutorial1/scenario.png" width="75%">
9292
</p>
9393
* Open a terminal on **n1** by double clicking it in the GUI
9494
* Open a terminal on **n2** by double clicking it in the GUI
@@ -123,20 +123,20 @@ beneficial for understanding how software will behave in adverse conditions.
123123
```
124124
* In the GUI menu bar select **File->Open...**, then navigate to and select **scenario.xml**
125125
<p align="center">
126-
<img src="/static/tutorial-common/running-open.png" width="75%">
126+
<img src="/core/static/tutorial-common/running-open.png" width="75%">
127127
</p>
128128
* You can now click on the **Start Session** button to run the scenario
129129
<p align="center">
130-
<img src="/static/tutorial1/scenario.png" width="75%">
130+
<img src="/core/static/tutorial1/scenario.png" width="75%">
131131
</p>
132132
* Right click the link between **n1** and **n2**
133133
* Select **Configure**
134134
<p align="center">
135-
<img src="/static/tutorial1/link-config.png" width="75%">
135+
<img src="/core/static/tutorial1/link-config.png" width="75%">
136136
</p>
137137
* Update the loss to **25**
138138
<p align="center">
139-
<img src="/static/tutorial1/link-config-dialog.png" width="50%">
139+
<img src="/core/static/tutorial1/link-config-dialog.png" width="50%">
140140
</p>
141141
* Open a terminal on **n1** by double clicking it in the GUI
142142
* Run the following in **n1** terminal
@@ -166,11 +166,11 @@ within the nodes of our scenario.
166166
```
167167
* In the GUI menu bar select **File->Open...**, then navigate to and select **scenario.xml**
168168
<p align="center">
169-
<img src="/static/tutorial-common/running-open.png" width="75%">
169+
<img src="/core/static/tutorial-common/running-open.png" width="75%">
170170
</p>
171171
* You can now click on the **Start Session** button to run the scenario
172172
<p align="center">
173-
<img src="/static/tutorial1/scenario.png" width="75%">
173+
<img src="/core/static/tutorial1/scenario.png" width="75%">
174174
</p>
175175
* Open a terminal on **n1** by double clicking it in the GUI
176176
* Run the following in **n1** terminal
@@ -216,11 +216,11 @@ using `tail -f` to observe the output of running software.
216216
```
217217
* In the GUI menu bar select **File->Open...**, then navigate to and select **scenario_service.xml**
218218
<p align="center">
219-
<img src="/static/tutorial-common/running-open.png" width="75%">
219+
<img src="/core/static/tutorial-common/running-open.png" width="75%">
220220
</p>
221221
* You can now click on the **Start Session** button to run the scenario
222222
<p align="center">
223-
<img src="/static/tutorial1/scenario.png" width="75%">
223+
<img src="/core/static/tutorial1/scenario.png" width="75%">
224224
</p>
225225
* Open a terminal on **n1** by double clicking it in the GUI
226226
* Run the following in **n1** terminal

docs/tutorials/tutorial2.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ XML scenario file, leveraging an NS2 mobility file.
3030
* Navigate to and select this tutorials **scenario.xml** file
3131
* You can now click play to start the session
3232
<p align="center">
33-
<img src="/static/tutorial2/wireless.png" width="75%">
33+
<img src="/core/static/tutorial2/wireless.png" width="75%">
3434
</p>
3535
* Note that OSPF routing protocol is included in the scenario to provide routes to other nodes, as they are discovered
3636
* Double click node **n4** to open a terminal and ping node **n2**
@@ -49,7 +49,7 @@ XML scenario file, leveraging an NS2 mobility file.
4949

5050
* Right click on the **wlan1** node and select **WLAN Config**, then set delay to 500000
5151
<p align="center">
52-
<img src="/static/tutorial2/wireless-config-delay.png" width="90%">
52+
<img src="/core/static/tutorial2/wireless-config-delay.png" width="90%">
5353
</p>
5454
* Using the open terminal for node **n4**, ping **n2** again, expect about 2 seconds delay
5555
```shell
@@ -69,7 +69,7 @@ XML scenario file, leveraging an NS2 mobility file.
6969

7070
* Right click on the **wlan1** node and select **WLAN Config**, set delay back to 5000 and loss to 10
7171
<p align="center">
72-
<img src="/static/tutorial2/wireless-configuration.png" width="90%">
72+
<img src="/core/static/tutorial2/wireless-configuration.png" width="90%">
7373
</p>
7474
* Using the open terminal for node **n4**, ping **n2** again, expect to notice considerable loss
7575
```shell
@@ -111,7 +111,7 @@ gRPC python script and providing mobility over the gRPC interface.
111111
* You will now have joined the already running scenario
112112

113113
<p align="center">
114-
<img src="/static/tutorial2/wireless.png" width="90%">
114+
<img src="/core/static/tutorial2/wireless.png" width="90%">
115115
</p>
116116

117117
## Running Software

docs/tutorials/tutorial3.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ file, leveraging an NS2 file for mobility.
7171
known and when the routes are discovered, ping will work
7272

7373
<p align="center">
74-
<img src="/static/tutorial3/motion_from_ns2_file.png" width="80%" >
74+
<img src="/core/static/tutorial3/motion_from_ns2_file.png" width="80%" >
7575
</p>
7676

7777
## Running with the gRPC Script
@@ -94,11 +94,11 @@ This section covers using a gRPC script to create and provide scenario movement.
9494
* You will now have joined the already running scenario
9595
* In the terminal running the **scenario.py**, hit a key to start motion
9696
<p align="center">
97-
<img src="/static/tutorial3/mobility-script.png" width="80%" >
97+
<img src="/core/static/tutorial3/mobility-script.png" width="80%" >
9898
</p>
9999
* Observe the link between **n3** and **n4** is shown and then as motion continues the link breaks
100100
<p align="center">
101-
<img src="/static/tutorial3/motion_continued_breaks_link.png" width="80%" >
101+
<img src="/core/static/tutorial3/motion_continued_breaks_link.png" width="80%" >
102102
</p>
103103

104104
## Running the Chat App Software
@@ -151,5 +151,5 @@ API.
151151
* Observe that node 2 moves and continues to move
152152

153153
<p align="center">
154-
<img src="/static/tutorial3/move-n2.png" width="80%" >
154+
<img src="/core/static/tutorial3/move-n2.png" width="80%" >
155155
</p>

docs/tutorials/tutorial5.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This section covers using the saved **scenario.xml** file to get and up and runn
1818

1919
* Configure the Windows host VM to have a bridged network adapter
2020
<p align="center">
21-
<img src="/static/tutorial5/VM-network-settings.png" width="80%">
21+
<img src="/core/static/tutorial5/VM-network-settings.png" width="80%">
2222
</p>
2323
* Make sure the **core-daemon** is running in a terminal
2424
```shell
@@ -30,15 +30,15 @@ This section covers using the saved **scenario.xml** file to get and up and runn
3030
```
3131
* Open the **scenario.xml** with the unassigned RJ45 node
3232
<p align="center">
33-
<img src="/static/tutorial5/rj45-unassigned.png" width="80%">
33+
<img src="/core/static/tutorial5/rj45-unassigned.png" width="80%">
3434
</p>
3535
* Configure the RJ45 node name to use the bridged interface
3636
<p align="center">
37-
<img src="/static/tutorial5/configure-the-rj45.png" width="80%">
37+
<img src="/core/static/tutorial5/configure-the-rj45.png" width="80%">
3838
</p>
3939
* After configuring the RJ45, run the scenario:
4040
<p align="center">
41-
<img src="/static/tutorial5/rj45-connector.png" width="80%">
41+
<img src="/core/static/tutorial5/rj45-connector.png" width="80%">
4242
</p>
4343
* Double click node **n1** to open a terminal and add a route to the Windows host
4444
```shell
@@ -97,7 +97,7 @@ This section covers leveraging the gRPC script to get up and running.
9797

9898
* Configure the Windows host VM to have a bridged network adapter
9999
<p align="center">
100-
<img src="/static/tutorial5/VM-network-settings.png" width="80%">
100+
<img src="/core/static/tutorial5/VM-network-settings.png" width="80%">
101101
</p>
102102
* Make sure the **core-daemon** is running in a terminal
103103
```shell
@@ -114,7 +114,7 @@ This section covers leveraging the gRPC script to get up and running.
114114
```
115115
* In the **core-gui** connect to the running session that was created
116116
<p align="center">
117-
<img src="/static/tutorial5/rj45-connector.png" width="80%">
117+
<img src="/core/static/tutorial5/rj45-connector.png" width="80%">
118118
</p>
119119
* Double click node **n1** to open a terminal and add a route to the Windows host
120120
```shell

docs/tutorials/tutorial6.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ This section will cover running this sample tutorial that develops a scenario fi
3131

3232
* Create three MDR nodes
3333
<p align="center">
34-
<img src="/static/tutorial6/create-nodes.png" width="80%">
34+
<img src="/core/static/tutorial6/create-nodes.png" width="80%">
3535
</p>
3636
* Double click on each node for configuration, click the icon and set it to use the **drone.png** image
3737
<p align="center">
38-
<img src="/static/tutorial6/configure-icon.png" width="50%">
38+
<img src="/core/static/tutorial6/configure-icon.png" width="50%">
3939
</p>
4040
* Use **Session -> Options** and set **Control Network 0** to **172.16.0.0./24**
4141

@@ -44,30 +44,30 @@ This section will cover running this sample tutorial that develops a scenario fi
4444
* Add a WLAN Node
4545
* Link the three prior MDR nodes to the WLAN node
4646
<p align="center">
47-
<img src="/static/tutorial6/linked-nodes.png" width="50%">
47+
<img src="/core/static/tutorial6/linked-nodes.png" width="50%">
4848
</p>
4949
* Click play to start the scenario
5050
* Observe wireless links being created
5151
<p align="center">
52-
<img src="/static/tutorial6/wlan-links.png" width="50%">
52+
<img src="/core/static/tutorial6/wlan-links.png" width="50%">
5353
</p>
5454
* Click stop to end the scenario
5555
* Right click the WLAN node and select **Edit -> Hide**
5656
* Now you can view the nodes in isolation
5757
<p align="center">
58-
<img src="/static/tutorial6/hidden-nodes.png" width="50%">
58+
<img src="/core/static/tutorial6/hidden-nodes.png" width="50%">
5959
</p>
6060

6161
### Changing Canvas Background
6262

6363
* Click **Canvas -> Wallpaper** to set the background to terrain.png
6464
<p align="center">
65-
<img src="/static/tutorial6/select-wallpaper.png" width="50%">
65+
<img src="/core/static/tutorial6/select-wallpaper.png" width="50%">
6666
</p>
6767
* Click play to start the scenario again
6868
* You now have a scenario with drone icons, terrain background, links displayed and hidden WLAN node
6969
<p align="center">
70-
<img src="/static/tutorial6/scenario-with-terrain.png" width="80%">
70+
<img src="/core/static/tutorial6/scenario-with-terrain.png" width="80%">
7171
</p>
7272

7373
## Adding Mobility
@@ -80,7 +80,7 @@ This section will cover running this sample tutorial that develops a scenario fi
8080
```
8181
* Let it run to see the link break as the node 1 drone approches the right side
8282
<p align="center">
83-
<img src="/static/tutorial6/only-node1-moving.png" width="80%">
83+
<img src="/core/static/tutorial6/only-node1-moving.png" width="80%">
8484
</p>
8585
* Repeat for other nodes, double click on **n2** and **n3** and run the demo.py script
8686
```shell
@@ -93,5 +93,5 @@ This section will cover running this sample tutorial that develops a scenario fi
9393
* Observe nodes moving in parallel tracks, when the far right is reached, the node will move down
9494
and then move to the left. When the far left is reached, the drone will move down and then move to the right.
9595
<p align="center">
96-
<img src="/static/tutorial6/scenario-with-motion.png" width="80%">
96+
<img src="/core/static/tutorial6/scenario-with-motion.png" width="80%">
9797
</p>

docs/tutorials/tutorial7.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This tutorial will cover basic usage and some concepts one may want to
66
use or leverage when working with and creating EMANE based networks.
77

88
<p align="center">
9-
<img src="/static/tutorial7/scenario.png" width="75%">
9+
<img src="/core/static/tutorial7/scenario.png" width="75%">
1010
</p>
1111

1212
For more detailed information on EMANE see the following:
@@ -52,11 +52,11 @@ between nodes in CORE.
5252
```
5353
* In the GUI menu bar select **File->Open...**, then navigate to and select **scenario.xml**
5454
<p align="center">
55-
<img src="/static/tutorial-common/running-open.png" width="75%">
55+
<img src="/core/static/tutorial-common/running-open.png" width="75%">
5656
</p>
5757
* You can now click on the **Start Session** button to run the scenario
5858
<p align="center">
59-
<img src="/static/tutorial7/scenario.png" width="75%">
59+
<img src="/core/static/tutorial7/scenario.png" width="75%">
6060
</p>
6161
* Open a terminal on **n2** by double clicking it in the GUI
6262
* Run the following in **n2** terminal
@@ -90,11 +90,11 @@ traffic being sent/received among many other uses.
9090
```
9191
* In the GUI menu bar select **File->Open...**, then navigate to and select **scenario.xml**
9292
<p align="center">
93-
<img src="/static/tutorial-common/running-open.png" width="75%">
93+
<img src="/core/static/tutorial-common/running-open.png" width="75%">
9494
</p>
9595
* You can now click on the **Start Session** button to run the scenario
9696
<p align="center">
97-
<img src="/static/tutorial7/scenario.png" width="75%">
97+
<img src="/core/static/tutorial7/scenario.png" width="75%">
9898
</p>
9999
* Open a terminal on **n2** by double clicking it in the GUI
100100
* Open a terminal on **n3** by double clicking it in the GUI
@@ -129,11 +129,11 @@ within the nodes of our scenario.
129129
```
130130
* In the GUI menu bar select **File->Open...**, then navigate to and select **scenario.xml**
131131
<p align="center">
132-
<img src="/static/tutorial-common/running-open.png" width="75%">
132+
<img src="/core/static/tutorial-common/running-open.png" width="75%">
133133
</p>
134134
* You can now click on the **Start Session** button to run the scenario
135135
<p align="center">
136-
<img src="/static/tutorial7/scenario.png" width="75%">
136+
<img src="/core/static/tutorial7/scenario.png" width="75%">
137137
</p>
138138
* Open a terminal on **n2** by double clicking it in the GUI
139139
* Run the following in **n2** terminal
@@ -179,11 +179,11 @@ using `tail -f` to observe the output of running software.
179179
```
180180
* In the GUI menu bar select **File->Open...**, then navigate to and select **scenario_service.xml**
181181
<p align="center">
182-
<img src="/static/tutorial-common/running-open.png" width="75%">
182+
<img src="/core/static/tutorial-common/running-open.png" width="75%">
183183
</p>
184184
* You can now click on the **Start Session** button to run the scenario
185185
<p align="center">
186-
<img src="/static/tutorial7/scenario.png" width="75%">
186+
<img src="/core/static/tutorial7/scenario.png" width="75%">
187187
</p>
188188
* Open a terminal on **n2** by double clicking it in the GUI
189189
* Run the following in **n2** terminal

mkdocs.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
site_name: CORE Documentation
2+
site_url: https://coreemu.github.io/core
3+
repo_name: coreemu/core
4+
repo_url: https://github.com/coreemu/core
25
use_directory_urls: false
36
theme:
47
name: material

0 commit comments

Comments
 (0)