Skip to content

Commit

Permalink
Merge pull request #808 from coreemu/develop
Browse files Browse the repository at this point in the history
fix issues with updated documentation
  • Loading branch information
bharnden authored Aug 1, 2023
2 parents c37fa33 + 62a09c7 commit 20071ee
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 46 deletions.
2 changes: 1 addition & 1 deletion docs/tutorials/common/grpc.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ the remaining steps of a given section.
```
4. You will be presented with sessions to join, select the one created by the script
<p align="center">
<img src="/static/tutorial-common/running-join.png" width="75%">
<img src="/core/static/tutorial-common/running-join.png" width="75%">
</p>
26 changes: 13 additions & 13 deletions docs/tutorials/tutorial1.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This tutorial will cover some use cases when using a wired 2 node
scenario in CORE.

<p align="center">
<img src="/static/tutorial1/scenario.png" width="75%">
<img src="/core/static/tutorial1/scenario.png" width="75%">
</p>

## Files
Expand Down Expand Up @@ -46,11 +46,11 @@ between nodes in CORE.
```
* In the GUI menu bar select **File->Open...**, then navigate to and select **scenario.xml**
<p align="center">
<img src="/static/tutorial-common/running-open.png" width="75%">
<img src="/core/static/tutorial-common/running-open.png" width="75%">
</p>
* You can now click on the **Start Session** button to run the scenario
<p align="center">
<img src="/static/tutorial1/scenario.png" width="75%">
<img src="/core/static/tutorial1/scenario.png" width="75%">
</p>
* Open a terminal on **n1** by double clicking it in the GUI
* Run the following in **n1** terminal
Expand Down Expand Up @@ -84,11 +84,11 @@ traffic being sent/received among many other uses.
```
* In the GUI menu bar select **File->Open...**, then navigate to and select **scenario.xml**
<p align="center">
<img src="/static/tutorial-common/running-open.png" width="75%">
<img src="/core/static/tutorial-common/running-open.png" width="75%">
</p>
* You can now click on the **Start Session** button to run the scenario
<p align="center">
<img src="/static/tutorial1/scenario.png" width="75%">
<img src="/core/static/tutorial1/scenario.png" width="75%">
</p>
* Open a terminal on **n1** by double clicking it in the GUI
* Open a terminal on **n2** by double clicking it in the GUI
Expand Down Expand Up @@ -123,20 +123,20 @@ beneficial for understanding how software will behave in adverse conditions.
```
* In the GUI menu bar select **File->Open...**, then navigate to and select **scenario.xml**
<p align="center">
<img src="/static/tutorial-common/running-open.png" width="75%">
<img src="/core/static/tutorial-common/running-open.png" width="75%">
</p>
* You can now click on the **Start Session** button to run the scenario
<p align="center">
<img src="/static/tutorial1/scenario.png" width="75%">
<img src="/core/static/tutorial1/scenario.png" width="75%">
</p>
* Right click the link between **n1** and **n2**
* Select **Configure**
<p align="center">
<img src="/static/tutorial1/link-config.png" width="75%">
<img src="/core/static/tutorial1/link-config.png" width="75%">
</p>
* Update the loss to **25**
<p align="center">
<img src="/static/tutorial1/link-config-dialog.png" width="50%">
<img src="/core/static/tutorial1/link-config-dialog.png" width="50%">
</p>
* Open a terminal on **n1** by double clicking it in the GUI
* Run the following in **n1** terminal
Expand Down Expand Up @@ -166,11 +166,11 @@ within the nodes of our scenario.
```
* In the GUI menu bar select **File->Open...**, then navigate to and select **scenario.xml**
<p align="center">
<img src="/static/tutorial-common/running-open.png" width="75%">
<img src="/core/static/tutorial-common/running-open.png" width="75%">
</p>
* You can now click on the **Start Session** button to run the scenario
<p align="center">
<img src="/static/tutorial1/scenario.png" width="75%">
<img src="/core/static/tutorial1/scenario.png" width="75%">
</p>
* Open a terminal on **n1** by double clicking it in the GUI
* Run the following in **n1** terminal
Expand Down Expand Up @@ -216,11 +216,11 @@ using `tail -f` to observe the output of running software.
```
* In the GUI menu bar select **File->Open...**, then navigate to and select **scenario_service.xml**
<p align="center">
<img src="/static/tutorial-common/running-open.png" width="75%">
<img src="/core/static/tutorial-common/running-open.png" width="75%">
</p>
* You can now click on the **Start Session** button to run the scenario
<p align="center">
<img src="/static/tutorial1/scenario.png" width="75%">
<img src="/core/static/tutorial1/scenario.png" width="75%">
</p>
* Open a terminal on **n1** by double clicking it in the GUI
* Run the following in **n1** terminal
Expand Down
8 changes: 4 additions & 4 deletions docs/tutorials/tutorial2.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ XML scenario file, leveraging an NS2 mobility file.
* Navigate to and select this tutorials **scenario.xml** file
* You can now click play to start the session
<p align="center">
<img src="/static/tutorial2/wireless.png" width="75%">
<img src="/core/static/tutorial2/wireless.png" width="75%">
</p>
* Note that OSPF routing protocol is included in the scenario to provide routes to other nodes, as they are discovered
* Double click node **n4** to open a terminal and ping node **n2**
Expand All @@ -49,7 +49,7 @@ XML scenario file, leveraging an NS2 mobility file.

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

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

<p align="center">
<img src="/static/tutorial2/wireless.png" width="90%">
<img src="/core/static/tutorial2/wireless.png" width="90%">
</p>

## Running Software
Expand Down
8 changes: 4 additions & 4 deletions docs/tutorials/tutorial3.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ file, leveraging an NS2 file for mobility.
known and when the routes are discovered, ping will work

<p align="center">
<img src="/static/tutorial3/motion_from_ns2_file.png" width="80%" >
<img src="/core/static/tutorial3/motion_from_ns2_file.png" width="80%" >
</p>

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

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

<p align="center">
<img src="/static/tutorial3/move-n2.png" width="80%" >
<img src="/core/static/tutorial3/move-n2.png" width="80%" >
</p>
12 changes: 6 additions & 6 deletions docs/tutorials/tutorial5.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This section covers using the saved **scenario.xml** file to get and up and runn

* Configure the Windows host VM to have a bridged network adapter
<p align="center">
<img src="/static/tutorial5/VM-network-settings.png" width="80%">
<img src="/core/static/tutorial5/VM-network-settings.png" width="80%">
</p>
* Make sure the **core-daemon** is running in a terminal
```shell
Expand All @@ -30,15 +30,15 @@ This section covers using the saved **scenario.xml** file to get and up and runn
```
* Open the **scenario.xml** with the unassigned RJ45 node
<p align="center">
<img src="/static/tutorial5/rj45-unassigned.png" width="80%">
<img src="/core/static/tutorial5/rj45-unassigned.png" width="80%">
</p>
* Configure the RJ45 node name to use the bridged interface
<p align="center">
<img src="/static/tutorial5/configure-the-rj45.png" width="80%">
<img src="/core/static/tutorial5/configure-the-rj45.png" width="80%">
</p>
* After configuring the RJ45, run the scenario:
<p align="center">
<img src="/static/tutorial5/rj45-connector.png" width="80%">
<img src="/core/static/tutorial5/rj45-connector.png" width="80%">
</p>
* Double click node **n1** to open a terminal and add a route to the Windows host
```shell
Expand Down Expand Up @@ -97,7 +97,7 @@ This section covers leveraging the gRPC script to get up and running.

* Configure the Windows host VM to have a bridged network adapter
<p align="center">
<img src="/static/tutorial5/VM-network-settings.png" width="80%">
<img src="/core/static/tutorial5/VM-network-settings.png" width="80%">
</p>
* Make sure the **core-daemon** is running in a terminal
```shell
Expand All @@ -114,7 +114,7 @@ This section covers leveraging the gRPC script to get up and running.
```
* In the **core-gui** connect to the running session that was created
<p align="center">
<img src="/static/tutorial5/rj45-connector.png" width="80%">
<img src="/core/static/tutorial5/rj45-connector.png" width="80%">
</p>
* Double click node **n1** to open a terminal and add a route to the Windows host
```shell
Expand Down
18 changes: 9 additions & 9 deletions docs/tutorials/tutorial6.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ This section will cover running this sample tutorial that develops a scenario fi

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

Expand All @@ -44,30 +44,30 @@ This section will cover running this sample tutorial that develops a scenario fi
* Add a WLAN Node
* Link the three prior MDR nodes to the WLAN node
<p align="center">
<img src="/static/tutorial6/linked-nodes.png" width="50%">
<img src="/core/static/tutorial6/linked-nodes.png" width="50%">
</p>
* Click play to start the scenario
* Observe wireless links being created
<p align="center">
<img src="/static/tutorial6/wlan-links.png" width="50%">
<img src="/core/static/tutorial6/wlan-links.png" width="50%">
</p>
* Click stop to end the scenario
* Right click the WLAN node and select **Edit -> Hide**
* Now you can view the nodes in isolation
<p align="center">
<img src="/static/tutorial6/hidden-nodes.png" width="50%">
<img src="/core/static/tutorial6/hidden-nodes.png" width="50%">
</p>

### Changing Canvas Background

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

## Adding Mobility
Expand All @@ -80,7 +80,7 @@ This section will cover running this sample tutorial that develops a scenario fi
```
* Let it run to see the link break as the node 1 drone approches the right side
<p align="center">
<img src="/static/tutorial6/only-node1-moving.png" width="80%">
<img src="/core/static/tutorial6/only-node1-moving.png" width="80%">
</p>
* Repeat for other nodes, double click on **n2** and **n3** and run the demo.py script
```shell
Expand All @@ -93,5 +93,5 @@ This section will cover running this sample tutorial that develops a scenario fi
* Observe nodes moving in parallel tracks, when the far right is reached, the node will move down
and then move to the left. When the far left is reached, the drone will move down and then move to the right.
<p align="center">
<img src="/static/tutorial6/scenario-with-motion.png" width="80%">
<img src="/core/static/tutorial6/scenario-with-motion.png" width="80%">
</p>
18 changes: 9 additions & 9 deletions docs/tutorials/tutorial7.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This tutorial will cover basic usage and some concepts one may want to
use or leverage when working with and creating EMANE based networks.

<p align="center">
<img src="/static/tutorial7/scenario.png" width="75%">
<img src="/core/static/tutorial7/scenario.png" width="75%">
</p>

For more detailed information on EMANE see the following:
Expand Down Expand Up @@ -52,11 +52,11 @@ between nodes in CORE.
```
* In the GUI menu bar select **File->Open...**, then navigate to and select **scenario.xml**
<p align="center">
<img src="/static/tutorial-common/running-open.png" width="75%">
<img src="/core/static/tutorial-common/running-open.png" width="75%">
</p>
* You can now click on the **Start Session** button to run the scenario
<p align="center">
<img src="/static/tutorial7/scenario.png" width="75%">
<img src="/core/static/tutorial7/scenario.png" width="75%">
</p>
* Open a terminal on **n2** by double clicking it in the GUI
* Run the following in **n2** terminal
Expand Down Expand Up @@ -90,11 +90,11 @@ traffic being sent/received among many other uses.
```
* In the GUI menu bar select **File->Open...**, then navigate to and select **scenario.xml**
<p align="center">
<img src="/static/tutorial-common/running-open.png" width="75%">
<img src="/core/static/tutorial-common/running-open.png" width="75%">
</p>
* You can now click on the **Start Session** button to run the scenario
<p align="center">
<img src="/static/tutorial7/scenario.png" width="75%">
<img src="/core/static/tutorial7/scenario.png" width="75%">
</p>
* Open a terminal on **n2** by double clicking it in the GUI
* Open a terminal on **n3** by double clicking it in the GUI
Expand Down Expand Up @@ -129,11 +129,11 @@ within the nodes of our scenario.
```
* In the GUI menu bar select **File->Open...**, then navigate to and select **scenario.xml**
<p align="center">
<img src="/static/tutorial-common/running-open.png" width="75%">
<img src="/core/static/tutorial-common/running-open.png" width="75%">
</p>
* You can now click on the **Start Session** button to run the scenario
<p align="center">
<img src="/static/tutorial7/scenario.png" width="75%">
<img src="/core/static/tutorial7/scenario.png" width="75%">
</p>
* Open a terminal on **n2** by double clicking it in the GUI
* Run the following in **n2** terminal
Expand Down Expand Up @@ -179,11 +179,11 @@ using `tail -f` to observe the output of running software.
```
* In the GUI menu bar select **File->Open...**, then navigate to and select **scenario_service.xml**
<p align="center">
<img src="/static/tutorial-common/running-open.png" width="75%">
<img src="/core/static/tutorial-common/running-open.png" width="75%">
</p>
* You can now click on the **Start Session** button to run the scenario
<p align="center">
<img src="/static/tutorial7/scenario.png" width="75%">
<img src="/core/static/tutorial7/scenario.png" width="75%">
</p>
* Open a terminal on **n2** by double clicking it in the GUI
* Run the following in **n2** terminal
Expand Down
3 changes: 3 additions & 0 deletions mkdocs.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
site_name: CORE Documentation
site_url: https://coreemu.github.io/core
repo_name: coreemu/core
repo_url: https://github.com/coreemu/core
use_directory_urls: false
theme:
name: material
Expand Down

0 comments on commit 20071ee

Please sign in to comment.