diff --git a/fit_and_g5k/01_networking.ipynb b/fit_and_g5k/01_networking.ipynb index d93f040299baacb131c3510f4471096b68ea91c1..9f92fe9baafddc9aba30ddd72abd1e65d873e0e1 100644 --- a/fit_and_g5k/01_networking.ipynb +++ b/fit_and_g5k/01_networking.ipynb @@ -152,7 +152,7 @@ "metadata": {}, "outputs": [], "source": [ - "fit = en.Iotlab(fit_conf)" + "fit = en.Iotlab(fit_conf, name=\"Iotlab\")" ] }, { @@ -205,7 +205,7 @@ "metadata": {}, "outputs": [], "source": [ - "g5k = en.G5k(conf)" + "g5k = en.G5k(conf, name=\"G5k\")" ] }, { @@ -230,10 +230,31 @@ "metadata": {}, "outputs": [], "source": [ - "roles, networks = providers.init(time_window=86400)\n", + "roles, networks = providers.init()\n", "fit, g5k = providers.providers" ] }, + { + "cell_type": "code", + "execution_count": null, + "id": "13657ac1-6666-42d8-9fcc-27bb0e1391bd", + "metadata": {}, + "outputs": [], + "source": [ + "# Get all the nodes and networks reserved for this experiment\n", + "roles" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "8c41ddaa-0f50-42da-a9db-fabc993ea3f0", + "metadata": {}, + "outputs": [], + "source": [ + "networks" + ] + }, { "cell_type": "code", "execution_count": null, @@ -304,8 +325,8 @@ "outputs": [], "source": [ "# CHANGE ME!\n", - "tap = \"tap1\"\n", - "prefix = \"2001:660:5307:3110\"" + "tap = \"tap2\"\n", + "prefix = \"2001:660:5307:3101\"" ] }, { @@ -424,7 +445,7 @@ "outputs": [], "source": [ "# Change me! (manual change)\n", - "G5K_IPv6 = \"2001:660:4406:700:1::38\"" + "G5K_IPv6 = \"2001:660:4406:700:1::e\"" ] }, { @@ -487,7 +508,7 @@ "# Getting the IP automatically using the library\n", "# First, do a sync of the description\n", "# Second, filter the desired IP\n", - "roles = en.sync_info(roles,networks)\n", + "roles = en.sync_info(roles, networks)\n", "roles[\"server\"][0]" ] }, diff --git a/fit_and_g5k/02_monitoring_stack.ipynb b/fit_and_g5k/02_monitoring_stack.ipynb index 58d07583a214149e650d8b0184eb69d54785ca6c..432a8dbfaf261ab9b3e8fae2535626c5018bc8ed 100644 --- a/fit_and_g5k/02_monitoring_stack.ipynb +++ b/fit_and_g5k/02_monitoring_stack.ipynb @@ -312,12 +312,12 @@ "\n", "from enoslib.infra.providers import Providers\n", "\n", - "iotlab_provider = en.Iotlab(fit_conf)\n", - "g5k_provider = en.G5k(g5k_conf)\n", + "iotlab_provider = en.Iotlab(fit_conf, name=\"Iotlab\")\n", + "g5k_provider = en.G5k(g5k_conf, name=\"G5k\")\n", "\n", "providers = Providers([iotlab_provider,g5k_provider])\n", "\n", - "roles,networks = providers.init(86400)\n", + "roles, networks = providers.init(86400)\n", "iotlab_provider, g5k_provider = providers.providers" ] }, diff --git a/setup_for_use_in_labs.iot-lab.info.ipynb b/setup_for_use_in_labs.iot-lab.info.ipynb index 5c0afcb2d7b17a516f7b029b98a9e7ebd8964a97..52f35324be7f7580fc344c0d5b4f9037535c8f49 100644 --- a/setup_for_use_in_labs.iot-lab.info.ipynb +++ b/setup_for_use_in_labs.iot-lab.info.ipynb @@ -66,7 +66,7 @@ "# !pip install -U --user --pre enoslib[silecs]\n", "\n", "# master version (might be wild)\n", - "!pip install -U --user enoslib[silecs]@git+https://gitlab.inria.fr/discovery/enoslib" + "!pip install -U --user enoslib[silecs]@git+https://gitlab.inria.fr/discovery/enoslib@dev/hostsview" ] }, { @@ -319,14 +319,6 @@ "source": [ "en.check()" ] - }, - { - "cell_type": "code", - "execution_count": null, - "id": "3baa0a7b-6319-414d-8f5c-8c40922d6a41", - "metadata": {}, - "outputs": [], - "source": [] } ], "metadata": {