diff --git a/gec21_oedl_tutorial/tutorial_2.fig1.graffle b/gec21_oedl_tutorial/tut_event_measure.fig1.graffle similarity index 100% rename from gec21_oedl_tutorial/tutorial_2.fig1.graffle rename to gec21_oedl_tutorial/tut_event_measure.fig1.graffle diff --git a/gec21_oedl_tutorial/tutorial_2.fig1.png b/gec21_oedl_tutorial/tut_event_measure.fig1.png similarity index 100% rename from gec21_oedl_tutorial/tutorial_2.fig1.png rename to gec21_oedl_tutorial/tut_event_measure.fig1.png diff --git a/gec21_oedl_tutorial/tutorial_2.fig2.png b/gec21_oedl_tutorial/tut_event_measure.fig2.png similarity index 100% rename from gec21_oedl_tutorial/tutorial_2.fig2.png rename to gec21_oedl_tutorial/tut_event_measure.fig2.png diff --git a/gec21_oedl_tutorial/tutorial_2.fig3.png b/gec21_oedl_tutorial/tut_event_measure.fig3.png similarity index 100% rename from gec21_oedl_tutorial/tutorial_2.fig3.png rename to gec21_oedl_tutorial/tut_event_measure.fig3.png diff --git a/gec21_oedl_tutorial/tutorial_2.fig4.png b/gec21_oedl_tutorial/tut_event_measure.fig4.png similarity index 100% rename from gec21_oedl_tutorial/tutorial_2.fig4.png rename to gec21_oedl_tutorial/tut_event_measure.fig4.png diff --git a/gec21_oedl_tutorial/tutorial_2.fig5.png b/gec21_oedl_tutorial/tut_event_measure.fig5.png similarity index 100% rename from gec21_oedl_tutorial/tutorial_2.fig5.png rename to gec21_oedl_tutorial/tut_event_measure.fig5.png diff --git a/gec21_oedl_tutorial/tutorial_2.md b/gec21_oedl_tutorial/tut_event_measure.md similarity index 95% rename from gec21_oedl_tutorial/tutorial_2.md rename to gec21_oedl_tutorial/tut_event_measure.md index b6a564c..35ac792 100644 --- a/gec21_oedl_tutorial/tutorial_2.md +++ b/gec21_oedl_tutorial/tut_event_measure.md @@ -17,7 +17,7 @@ In this experiment: - we finally display both measurements from the sine generator and the ICMP ping packets, as a graph showing the sine values and a table showing ping's timestamp and RTT, respectively. Thus the table's number of rows should be equal to the graph's number of positive and negative peaks. -![Experiment 2 Overview](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tutorial_2.fig1.png) +![Experiment 2 Overview](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tut_event_measure.fig1.png) # Step 1 - Design/Setup @@ -26,10 +26,10 @@ For specific help on using LabWiki, please refer to the [LabWiki introduction pa **The OEDL experiment description** - First, if you have not done it yet, login into LabWiki -- Load the 'gec21_exp2' experiment file in the 'Prepare' Panel of LabWiki. This file contains the OEDL script for this 1st experiment +- Load the 'tut_event_measure' experiment file in the 'Prepare' Panel of LabWiki. This file contains the OEDL script for this 1st experiment - If you are not reading this using LabWiki, you can view this OEDL file online at: [http://git.io/UVUNag](http://git.io/UVUNag) -![Experiment 2 OEDL Extract](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tutorial_2.fig2.png) +![Experiment 2 OEDL Extract](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tut_event_measure.fig2.png) **Walk-through the OEDL experiment description** @@ -62,18 +62,18 @@ For specific help on using LabWiki, please refer to the [LabWiki introduction pa (You can optionally decide to give a name to your experiment, if not LabWiki will assign a default unique name to it.) - Click on the "Start Experiment" button. You will soon see output messages under the "Logging" section. Some of these messages are from the OMF Experiment Controller, which interprets your OEDL experiment description and sends corresponding commands to the resources. Other messages are from the resources themselves (either the VM nodes or the applications), reporting on configuration and command results. -![Experiment 2 Execute Screenshot](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tutorial_2.fig3.png) +![Experiment 2 Execute Screenshot](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tut_event_measure.fig3.png) - Above that "Logging" section, you should soon see the graph, which we defined in the OEDL experiment description. It is drawn dynamically as measurements are collected from the resources. -![Experiment 2 Running Screenshot](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tutorial_2.fig4.png) +![Experiment 2 Running Screenshot](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tut_event_measure.fig4.png) # Step 3 - Finish - A message in the "Execute" panel will appear to inform you that the experiment execution has finished. At this stage, you should have the complete graph and table for this experiment in that panel, which should look as follows. -![Experiment 2 Result Screenshot](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tutorial_2.fig5.png) +![Experiment 2 Result Screenshot](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tut_event_measure.fig5.png) - You may interact to with the graph, e.g. hover the pointer above a graph point to display the underlying data point, drag-and-drop the graph via its icon to the "Plan" panel as described in the [LabWiki introduction page](http://groups.geni.net/geni/wiki/GEC21Agenda/OEDL/Introduction#Execute) diff --git a/gec21_oedl_tutorial/tutorial_2.rb b/gec21_oedl_tutorial/tut_event_measure.oedl similarity index 100% rename from gec21_oedl_tutorial/tutorial_2.rb rename to gec21_oedl_tutorial/tut_event_measure.oedl diff --git a/gec21_oedl_tutorial/tutorial_1.fig1.graffle b/gec21_oedl_tutorial/tut_event_state.fig1.graffle similarity index 100% rename from gec21_oedl_tutorial/tutorial_1.fig1.graffle rename to gec21_oedl_tutorial/tut_event_state.fig1.graffle diff --git a/gec21_oedl_tutorial/tutorial_1.fig1.png b/gec21_oedl_tutorial/tut_event_state.fig1.png similarity index 100% rename from gec21_oedl_tutorial/tutorial_1.fig1.png rename to gec21_oedl_tutorial/tut_event_state.fig1.png diff --git a/gec21_oedl_tutorial/tutorial_1.fig2.png b/gec21_oedl_tutorial/tut_event_state.fig2.png similarity index 100% rename from gec21_oedl_tutorial/tutorial_1.fig2.png rename to gec21_oedl_tutorial/tut_event_state.fig2.png diff --git a/gec21_oedl_tutorial/tutorial_1.fig3.png b/gec21_oedl_tutorial/tut_event_state.fig3.png similarity index 100% rename from gec21_oedl_tutorial/tutorial_1.fig3.png rename to gec21_oedl_tutorial/tut_event_state.fig3.png diff --git a/gec21_oedl_tutorial/tutorial_1.fig4.png b/gec21_oedl_tutorial/tut_event_state.fig4.png similarity index 100% rename from gec21_oedl_tutorial/tutorial_1.fig4.png rename to gec21_oedl_tutorial/tut_event_state.fig4.png diff --git a/gec21_oedl_tutorial/tutorial_1.fig5.png b/gec21_oedl_tutorial/tut_event_state.fig5.png similarity index 100% rename from gec21_oedl_tutorial/tutorial_1.fig5.png rename to gec21_oedl_tutorial/tut_event_state.fig5.png diff --git a/gec21_oedl_tutorial/tutorial_1.fig6.png b/gec21_oedl_tutorial/tut_event_state.fig6.png similarity index 100% rename from gec21_oedl_tutorial/tutorial_1.fig6.png rename to gec21_oedl_tutorial/tut_event_state.fig6.png diff --git a/gec21_oedl_tutorial/tutorial_1.md b/gec21_oedl_tutorial/tut_event_state.md similarity index 94% rename from gec21_oedl_tutorial/tutorial_1.md rename to gec21_oedl_tutorial/tut_event_state.md index 51d7fd1..9b65737 100644 --- a/gec21_oedl_tutorial/tutorial_1.md +++ b/gec21_oedl_tutorial/tut_event_state.md @@ -19,7 +19,7 @@ In this experiment: - we display a graph of the ping's RTT for each of the 4 resources and observe that a new ping instance starts when a previously running one is stopped -![Experiment 1 Overview](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tutorial_1.fig1.png) +![Experiment 1 Overview](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tut_event_state.fig1.png) # Step 1 - Design/Setup @@ -28,10 +28,10 @@ For specific help on using LabWiki, please refer to the [LabWiki introduction pa **The OEDL experiment description** - First, if you have not done it yet, login into LabWiki -- Load the 'gec21_exp1' experiment file in the 'Prepare' Panel of LabWiki. This file contains the OEDL script for this 1st experiment +- Load the 'tut_event_state' experiment file in the 'Prepare' Panel of LabWiki. This file contains the OEDL script for this 1st experiment - If you are not reading this using LabWiki, you can view this OEDL file online at: [http://git.io/AcVU1g](http://git.io/AcVU1g) -![Experiment 1 OEDL Extract](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tutorial_1.fig2.png) +![Experiment 1 OEDL Extract](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tut_event_state.fig2.png) **Walk-through the OEDL experiment description** @@ -61,24 +61,24 @@ For specific help on using LabWiki, please refer to the [LabWiki introduction pa (You can optionally decide to give a name to your experiment, if not LabWiki will assign a default unique name to it.) - Click on the "Start Experiment" button. You will soon see output messages under the "Logging" section. Some of these messages are from the OMF Experiment Controller, which interprets your OEDL experiment description and sends corresponding commands to the resources. Other messages are from the resources themselves (either the VM nodes or the applications), reporting on configuration and command results. -![Experiment 1 Execute Screenshot](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tutorial_1.fig3.png) +![Experiment 1 Execute Screenshot](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tut_event_state.fig3.png) - Above that "Logging" section, you should soon see the graph, which we defined in the OEDL experiment description. It is drawn dynamically as measurements are collected from the resources. -![Experiment 1 Running Screenshot](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tutorial_1.fig4.png) +![Experiment 1 Running Screenshot](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tut_event_state.fig4.png) # Step 3 - Finish - A message in the "Execute" panel will appear to inform you that the experiment execution has finished. At this stage, you should have the complete graphs for this experiment in that panel, which should look as follows. -![Experiment 1 Result Screenshot](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tutorial_1.fig5.png) +![Experiment 1 Result Screenshot](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tut_event_state.fig5.png) - You may interact to with these graphs, e.g. tick or un-tick the legend's keys to display only results from the first or/and second resource, hover the pointer above a graph point to display the underlying data point, drag-and-drop the graph via its icon to the "Plan" panel as described in the [LabWiki introduction page](http://groups.geni.net/geni/wiki/GEC21Agenda/OEDL/Introduction#Execute) - The complete data set holding the measurements collected from this experiment is stored in an SQL database. You can retrieve a copy of that database by clicking on the 'Database Dump' buttom in the 'Execute' panel. The format of that copy is depends on your LabWiki's deployment configuration. It could be an iRODS dump, a Zipped archive of CSV files, a SQLite3 dump or a PostgreSQL dump. By default, it is a PostgreSQL dump. -![Database Dump](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tutorial_1.fig6.png) +![Database Dump](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tut_event_state.fig6.png) # Help & Additional Resources diff --git a/gec21_oedl_tutorial/tutorial_1.rb b/gec21_oedl_tutorial/tut_event_state.oedl similarity index 100% rename from gec21_oedl_tutorial/tutorial_1.rb rename to gec21_oedl_tutorial/tut_event_state.oedl diff --git a/gec21_oedl_tutorial/tutorial_3.fig1.png b/gec21_oedl_tutorial/tut_get_resource.fig1.png similarity index 100% rename from gec21_oedl_tutorial/tutorial_3.fig1.png rename to gec21_oedl_tutorial/tut_get_resource.fig1.png diff --git a/gec21_oedl_tutorial/tutorial_3.fig2.png b/gec21_oedl_tutorial/tut_get_resource.fig2.png similarity index 100% rename from gec21_oedl_tutorial/tutorial_3.fig2.png rename to gec21_oedl_tutorial/tut_get_resource.fig2.png diff --git a/gec21_oedl_tutorial/tutorial_3.fig3.png b/gec21_oedl_tutorial/tut_get_resource.fig3.png similarity index 100% rename from gec21_oedl_tutorial/tutorial_3.fig3.png rename to gec21_oedl_tutorial/tut_get_resource.fig3.png diff --git a/gec21_oedl_tutorial/tutorial_3.fig4.png b/gec21_oedl_tutorial/tut_get_resource.fig4.png similarity index 100% rename from gec21_oedl_tutorial/tutorial_3.fig4.png rename to gec21_oedl_tutorial/tut_get_resource.fig4.png diff --git a/gec21_oedl_tutorial/tutorial_3.fig5.png b/gec21_oedl_tutorial/tut_get_resource.fig5.png similarity index 100% rename from gec21_oedl_tutorial/tutorial_3.fig5.png rename to gec21_oedl_tutorial/tut_get_resource.fig5.png diff --git a/gec21_oedl_tutorial/tutorial_3.md b/gec21_oedl_tutorial/tut_get_resource.md similarity index 95% rename from gec21_oedl_tutorial/tutorial_3.md rename to gec21_oedl_tutorial/tut_get_resource.md index 456ab25..acd79aa 100644 --- a/gec21_oedl_tutorial/tutorial_3.md +++ b/gec21_oedl_tutorial/tut_get_resource.md @@ -22,10 +22,10 @@ For specific help on using LabWiki, please refer to the [LabWiki introduction pa **The OEDL experiment description** - First, if you have not done it yet, login into LabWiki -- Load the 'gec21_exp3' experiment file in the 'Prepare' Panel of LabWiki. This file contains the OEDL script for this 1st experiment +- Load the 'tut_get_resource' experiment file in the 'Prepare' Panel of LabWiki. This file contains the OEDL script for this 1st experiment - If you are not reading this using LabWiki, you can view this OEDL file online at: [http://git.io/kZMN_A](http://git.io/kZMN_A) -![Experiment 3 OEDL Extract](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tutorial_3.fig1.png) +![Experiment 3 OEDL Extract](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tut_get_resource.fig1.png) **Walk-through the OEDL experiment description** @@ -53,22 +53,22 @@ For specific help on using LabWiki, please refer to the [LabWiki introduction pa (You can optionally decide to give a name to your experiment, if not LabWiki will assign a default unique name to it.) - Click on the "Start Experiment" button. You will soon see output messages under the "Logging" section. Some of these messages are from the OMF Experiment Controller, which interprets your OEDL experiment description and sends corresponding commands to the resources. Other messages are from the resources themselves (either the VM nodes or the applications), reporting on configuration and command results. -![Experiment 3 Execute Screenshot](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tutorial_3.fig2.png) +![Experiment 3 Execute Screenshot](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tut_get_resource.fig2.png) - If you scroll down to the start of the "Loggin" section, you should see the dynamic information about the resources in the slice and the one we randomly selected. These are the messages which corresponds to the lines 45-47 in the OEDL experiment script. -![Experiment 3 Information Screenshot](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tutorial_3.fig3.png) +![Experiment 3 Information Screenshot](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tut_get_resource.fig3.png) - Above that "Logging" section, you should soon see the graph, which we defined in the OEDL experiment description. It is drawn dynamically as measurements are collected from the resources. -![Experiment 3 Running Screenshot](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tutorial_3.fig4.png) +![Experiment 3 Running Screenshot](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tut_get_resource.fig4.png) # Step 3 - Finish - A message in the "Execute" panel will appear to inform you that the experiment execution has finished. At this stage, you should have the complete graph for this experiment in that panel, which should look as follows. -![Experiment 3 Result Screenshot](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tutorial_3.fig5.png) +![Experiment 3 Result Screenshot](https://raw.githubusercontent.com/mytestbed/gec_demos_tutorial/master/gec21_oedl_tutorial/tut_get_resource.fig5.png) - You may interact to with the graph, e.g. hover the pointer above a graph point to display the underlying data point, drag-and-drop the graph via its icon to the "Plan" panel as described in the [LabWiki introduction page](http://groups.geni.net/geni/wiki/GEC21Agenda/OEDL/Introduction#Execute) diff --git a/gec21_oedl_tutorial/tutorial_3.rb b/gec21_oedl_tutorial/tut_get_resource.oedl similarity index 100% rename from gec21_oedl_tutorial/tutorial_3.rb rename to gec21_oedl_tutorial/tut_get_resource.oedl