From 453eafb4cc6ae939a6d083c25c0f3651c9790003 Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <baptiste.jonglez@inria.fr>
Date: Wed, 18 Dec 2024 17:06:45 +0100
Subject: [PATCH] Replace paravance and grisou clusters because they were
retired
Also minor misc updates while at it.
---
fit_and_g5k/01_networking.ipynb | 6 +++---
fit_and_g5k/02_monitoring_stack.ipynb | 6 +++---
fit_and_g5k/03_coap.ipynb | 4 ++--
fit_and_g5k/03_mqttsn.ipynb | 4 ++--
...vironment_control_resource_selection.ipynb | 12 +++++------
g5k/04_network_emulation.ipynb | 14 ++++++-------
g5k/05_using_several_networks.ipynb | 6 +++---
...6_working_with_virtualized_resources.ipynb | 20 +++++++++++--------
g5k/07_orchestrators.ipynb | 12 +++++------
g5k/08_planning_service.ipynb | 6 +++---
setup_for_use_in_labs.iot-lab.info.ipynb | 4 ++--
11 files changed, 48 insertions(+), 46 deletions(-)
diff --git a/fit_and_g5k/01_networking.ipynb b/fit_and_g5k/01_networking.ipynb
index b36c20a..05201e9 100644
--- a/fit_and_g5k/01_networking.ipynb
+++ b/fit_and_g5k/01_networking.ipynb
@@ -163,7 +163,7 @@
"outputs": [],
"source": [
"G5K_SITE = \"rennes\"\n",
- "G5K_CLUSTER = \"paravance\""
+ "G5K_CLUSTER = \"paradoxe\""
]
},
{
@@ -469,7 +469,7 @@
"from enoslib.infra.enos_g5k.g5k_api_utils import get_api_client\n",
"\n",
"gk = get_api_client()\n",
- "# grisou-1.nancy.grid5000.fr -> grisou-1\n",
+ "# gros-1.nancy.grid5000.fr -> gros-1\n",
"node_uid = roles[\"server\"][0].alias.split(\".\")[0]\n",
"node = gk.sites[G5K_SITE].clusters[G5K_CLUSTER].nodes[node_uid]\n",
"print(node)"
@@ -616,7 +616,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.9.7"
+ "version": "3.11.2"
}
},
"nbformat": 4,
diff --git a/fit_and_g5k/02_monitoring_stack.ipynb b/fit_and_g5k/02_monitoring_stack.ipynb
index 0f085e3..e348ae4 100644
--- a/fit_and_g5k/02_monitoring_stack.ipynb
+++ b/fit_and_g5k/02_monitoring_stack.ipynb
@@ -275,10 +275,10 @@
" en.G5kConf.from_settings(job_type=[], job_name=\"fit_g5k_monitoring\")\n",
" .add_network_conf(network)\n",
" .add_machine(\n",
- " roles=[\"xp\", \"collector\"], cluster=\"paravance\", nodes=1, primary_network=network\n",
+ " roles=[\"xp\", \"collector\"], cluster=\"paradoxe\", nodes=1, primary_network=network\n",
" )\n",
" .add_machine(\n",
- " roles=[\"xp\", \"agent\"], cluster=\"paravance\", nodes=1, primary_network=network\n",
+ " roles=[\"xp\", \"agent\"], cluster=\"paradoxe\", nodes=1, primary_network=network\n",
" )\n",
" .finalize()\n",
")\n",
@@ -567,7 +567,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.9.7"
+ "version": "3.11.2"
}
},
"nbformat": 4,
diff --git a/fit_and_g5k/03_coap.ipynb b/fit_and_g5k/03_coap.ipynb
index cc97478..4f8b276 100644
--- a/fit_and_g5k/03_coap.ipynb
+++ b/fit_and_g5k/03_coap.ipynb
@@ -160,7 +160,7 @@
" en.G5kConf.from_settings(job_type=[], job_name=\"coap_client\")\n",
" .add_network_conf(network)\n",
" .add_machine(\n",
- " roles=[\"client\"], cluster=\"grisou\", nodes=1, primary_network=network\n",
+ " roles=[\"client\"], cluster=\"gros\", nodes=1, primary_network=network\n",
" )\n",
" .finalize()\n",
")\n",
@@ -544,7 +544,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.9.7"
+ "version": "3.11.2"
}
},
"nbformat": 4,
diff --git a/fit_and_g5k/03_mqttsn.ipynb b/fit_and_g5k/03_mqttsn.ipynb
index 407f3a5..1ab87ce 100644
--- a/fit_and_g5k/03_mqttsn.ipynb
+++ b/fit_and_g5k/03_mqttsn.ipynb
@@ -186,7 +186,7 @@
" en.G5kConf.from_settings(job_type=[], job_name=\"mqtt\")\n",
" .add_network_conf(network)\n",
" .add_machine(\n",
- " roles=[\"broker\"], cluster=\"grisou\", nodes=1, primary_network=network\n",
+ " roles=[\"broker\"], cluster=\"gros\", nodes=1, primary_network=network\n",
" )\n",
" .finalize()\n",
")\n",
@@ -523,7 +523,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.9.7"
+ "version": "3.11.2"
}
},
"nbformat": 4,
diff --git a/g5k/02_environment_control_resource_selection.ipynb b/g5k/02_environment_control_resource_selection.ipynb
index 8bb248c..413745c 100644
--- a/g5k/02_environment_control_resource_selection.ipynb
+++ b/g5k/02_environment_control_resource_selection.ipynb
@@ -92,8 +92,8 @@
"conf = (\n",
" en.G5kConf.from_settings(job_name=job_name, walltime=\"0:10:00\")\n",
" # For convenience, we use the site name as role but that's only informative\n",
- " # paravance cluster has many nodes (rennes site)\n",
- " .add_machine(roles=[\"rennes\", \"intel\"], cluster=\"paravance\", nodes=1)\n",
+ " # paradoxe cluster has relatively many nodes (rennes site)\n",
+ " .add_machine(roles=[\"rennes\", \"intel\"], cluster=\"paradoxe\", nodes=1)\n",
" # chiclet cluster has only 8 nodes (lille site)\n",
" .add_machine(roles=[\"lille\", \"amd\"], cluster=\"chiclet\", nodes=1)\n",
")\n",
@@ -160,7 +160,7 @@
" .from_settings(job_name=job_name, walltime=\"0:10:00\")\n",
" .add_machine(\n",
" roles=[\"compute\"],\n",
- " servers=[\"paravance-19.rennes.grid5000.fr\", \"paravance-20.rennes.grid5000.fr\"],\n",
+ " servers=[\"paradoxe-10.rennes.grid5000.fr\", \"paradoxe-11.rennes.grid5000.fr\"],\n",
" )\n",
")\n",
"\n",
@@ -383,9 +383,9 @@
],
"metadata": {
"kernelspec": {
- "display_name": "my_venv",
+ "display_name": "Python 3 (ipykernel)",
"language": "python",
- "name": "my_venv"
+ "name": "python3"
},
"language_info": {
"codemirror_mode": {
@@ -397,7 +397,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.9.2"
+ "version": "3.11.2"
}
},
"nbformat": 4,
diff --git a/g5k/04_network_emulation.ipynb b/g5k/04_network_emulation.ipynb
index cdcbe85..3962cea 100644
--- a/g5k/04_network_emulation.ipynb
+++ b/g5k/04_network_emulation.ipynb
@@ -74,17 +74,17 @@
" en.G5kConf.from_settings(job_type=[], walltime=\"01:00:00\", job_name=\"labs_netem\")\n",
" .add_machine(\n",
" roles=[\"city\", \"paris\"],\n",
- " cluster=\"paravance\",\n",
+ " cluster=\"parasilo\",\n",
" nodes=1,\n",
" )\n",
" .add_machine(\n",
" roles=[\"city\", \"berlin\"],\n",
- " cluster=\"paravance\",\n",
+ " cluster=\"parasilo\",\n",
" nodes=1,\n",
" )\n",
" .add_machine(\n",
" roles=[\"city\", \"londres\"],\n",
- " cluster=\"paravance\",\n",
+ " cluster=\"parasilo\",\n",
" nodes=1,\n",
" )\n",
" .finalize()\n",
@@ -451,19 +451,19 @@
" .from_settings(job_name=\"labs_netem\")\n",
" .add_machine(\n",
" roles=[\"city\", \"paris\"],\n",
- " cluster=\"paravance\",\n",
+ " cluster=\"parasilo\",\n",
" number=5,\n",
" flavour=\"tiny\"\n",
" )\n",
" .add_machine(\n",
" roles=[\"city\", \"londres\"],\n",
- " cluster=\"paravance\",\n",
+ " cluster=\"parasilo\",\n",
" number=5,\n",
" flavour=\"tiny\"\n",
" )\n",
" .add_machine(\n",
" roles=[\"city\", \"berlin\"],\n",
- " cluster=\"paravance\",\n",
+ " cluster=\"parasilo\",\n",
" number=5,\n",
" flavour=\"tiny\"\n",
" )\n",
@@ -623,7 +623,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.9.2"
+ "version": "3.11.2"
},
"toc-showcode": false,
"toc-showmarkdowntxt": false
diff --git a/g5k/05_using_several_networks.ipynb b/g5k/05_using_several_networks.ipynb
index 263a761..77cf52b 100644
--- a/g5k/05_using_several_networks.ipynb
+++ b/g5k/05_using_several_networks.ipynb
@@ -96,14 +96,14 @@
" .add_network_conf(private)\n",
" .add_machine(\n",
" roles=[\"server\", \"xp\"],\n",
- " cluster=\"paravance\",\n",
+ " cluster=\"parasilo\",\n",
" nodes=1,\n",
" primary_network=network,\n",
" secondary_networks=[private],\n",
" )\n",
" .add_machine(\n",
" roles=[\"client\", \"xp\"],\n",
- " cluster=\"paravance\",\n",
+ " cluster=\"parasilo\",\n",
" nodes=1,\n",
" primary_network=network,\n",
" secondary_networks=[private],\n",
@@ -577,7 +577,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.9.2"
+ "version": "3.11.2"
},
"toc-showcode": false,
"toc-showmarkdowntxt": false
diff --git a/g5k/06_working_with_virtualized_resources.ipynb b/g5k/06_working_with_virtualized_resources.ipynb
index 732e9da..7348525 100644
--- a/g5k/06_working_with_virtualized_resources.ipynb
+++ b/g5k/06_working_with_virtualized_resources.ipynb
@@ -94,7 +94,7 @@
" .from_settings(job_name=\"enoslib_providers\")\n",
" .add_machine(\n",
" roles=[\"compute\"],\n",
- " cluster=\"paravance\",\n",
+ " cluster=\"paradoxe\",\n",
" number=8,\n",
" flavour_desc={\n",
" \"core\": 2,\n",
@@ -103,7 +103,7 @@
" )\n",
" .add_machine(\n",
" roles=[\"controler\"],\n",
- " cluster=\"paravance\",\n",
+ " cluster=\"parasilo\",\n",
" number=2,\n",
" flavour=\"tiny\"\n",
" )\n",
@@ -239,7 +239,7 @@
" en.G5kConf.from_settings(job_name=\"enoslib_docker\", job_type=[])\n",
" .add_network_conf(prod_network)\n",
" .add_machine(\n",
- " roles=[\"control\"], cluster=\"paravance\", nodes=1, primary_network=prod_network\n",
+ " roles=[\"control\"], cluster=\"paradoxe\", nodes=1, primary_network=prod_network\n",
" )\n",
" .finalize()\n",
")\n",
@@ -266,7 +266,11 @@
"outputs": [],
"source": [
"# Install docker\n",
- "d = en.Docker(agent=roles[\"control\"], bind_var_docker=\"/tmp/docker\")\n",
+ "registry_opts = dict(type=\"external\", ip=\"docker-cache.grid5000.fr\", port=80)\n",
+ "d = en.Docker(\n",
+ " agent=roles[\"control\"],\n",
+ " bind_var_docker=\"/tmp/docker\",\n",
+ " registry_opts=registry_opts)\n",
"d.deploy()"
]
},
@@ -439,7 +443,7 @@
"en.init_logging()\n",
"\n",
"FORCE = False\n",
- "CLUSTER = \"paravance\"\n",
+ "CLUSTER = \"parasilo\"\n",
"\n",
"# claim the resources\n",
"conf = (\n",
@@ -540,9 +544,9 @@
],
"metadata": {
"kernelspec": {
- "display_name": "my_venv",
+ "display_name": "Python 3 (ipykernel)",
"language": "python",
- "name": "my_venv"
+ "name": "python3"
},
"language_info": {
"codemirror_mode": {
@@ -554,7 +558,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.9.2"
+ "version": "3.11.2"
},
"toc-showcode": false,
"toc-showmarkdowntxt": false
diff --git a/g5k/07_orchestrators.ipynb b/g5k/07_orchestrators.ipynb
index 0b64b8f..64f3f6a 100644
--- a/g5k/07_orchestrators.ipynb
+++ b/g5k/07_orchestrators.ipynb
@@ -75,7 +75,7 @@
" .from_settings(job_name=\"enoslib_providers\")\n",
" .add_machine(\n",
" roles=[\"swarm\"],\n",
- " cluster=\"paravance\",\n",
+ " cluster=\"paradoxe\",\n",
" number=10,\n",
" flavour=\"large\"\n",
" )\n",
@@ -106,8 +106,6 @@
"outputs": [],
"source": [
"registry_opts = dict(type=\"external\", ip=\"docker-cache.grid5000.fr\", port=80)\n",
- "\n",
- "\n",
"d = en.Docker(\n",
" agent=roles[\"swarm\"],\n",
" bind_var_docker=\"/tmp/docker\",\n",
@@ -207,7 +205,7 @@
"\n",
"[K3s](https://k3s.io/) is a lightweight K8s distribution. For instance it's supposed to run on constrained hardware.\n",
"\n",
- "For an (heavyweight) deployment of K8s, you can check [enos-kubernetes](https://gitlab.inria.fr/msimonin/enos-kubernetes/).\n",
+ "For an (heavyweight) deployment of K8s, you can check [enos-kubernetes](https://gitlab.inria.fr/discovery/enos-kubernetes).\n",
"\n",
"### Get some resources"
]
@@ -231,13 +229,13 @@
" .from_settings(job_name=\"enoslib_providers\")\n",
" .add_machine(\n",
" roles=[\"master\"],\n",
- " cluster=\"paravance\",\n",
+ " cluster=\"paradoxe\",\n",
" number=1,\n",
" flavour=\"large\"\n",
" )\n",
" .add_machine(\n",
" roles=[\"agent\"],\n",
- " cluster=\"paravance\",\n",
+ " cluster=\"paradoxe\",\n",
" number=10,\n",
" flavour=\"large\"\n",
" )\n",
@@ -360,7 +358,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.9.2"
+ "version": "3.11.2"
},
"toc-showcode": false,
"toc-showmarkdowntxt": false
diff --git a/g5k/08_planning_service.ipynb b/g5k/08_planning_service.ipynb
index d45168d..e36eb96 100644
--- a/g5k/08_planning_service.ipynb
+++ b/g5k/08_planning_service.ipynb
@@ -50,7 +50,7 @@
"\n",
"Behind the scene events are scheduled using cronjobs. Crons aren't known to be very accurate on their execution dates. However we observe that the gap between the actual event date and the wanted date don't exceed few seconds in most of the situations we tested. If a better accuracy is required by your experiment, be in touch :).\n",
"\n",
- "EnOSlib also uses cgroup (v2) to identify processes started by the events (they are given a name). Also you can define events to limit the cpu/mem/ios ... according to waht cgroup (v2) offers."
+ "EnOSlib also uses cgroup (v2) to identify processes started by the events (they are given a name). Also you can define events to limit the cpu/mem/ios ... according to what cgroup (v2) offers."
]
},
{
@@ -80,7 +80,7 @@
"\n",
"conf = (\n",
" en.G5kConf.from_settings(job_name=job_name, walltime=\"3:00:00\", job_type=\"deploy\", env_name=\"debian11-nfs\")\n",
- " .add_machine(roles=[\"groupA\", \"xp\"], cluster=\"paravance\", nodes=1)\n",
+ " .add_machine(roles=[\"groupA\", \"xp\"], cluster=\"parasilo\", nodes=1)\n",
")\n",
"\n",
"# This will validate the configuration, but not reserve resources yet\n",
@@ -256,7 +256,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.9.2"
+ "version": "3.11.2"
}
},
"nbformat": 4,
diff --git a/setup_for_use_in_labs.iot-lab.info.ipynb b/setup_for_use_in_labs.iot-lab.info.ipynb
index 52f3532..92b9ce2 100644
--- a/setup_for_use_in_labs.iot-lab.info.ipynb
+++ b/setup_for_use_in_labs.iot-lab.info.ipynb
@@ -144,7 +144,7 @@
"metadata": {},
"outputs": [],
"source": [
- "print(gk.sites[\"rennes\"].clusters[\"paravance\"].nodes.list()[0])"
+ "print(gk.sites[\"rennes\"].clusters[\"paradoxe\"].nodes.list()[0])"
]
},
{
@@ -337,7 +337,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.9.7"
+ "version": "3.11.2"
}
},
"nbformat": 4,
--
GitLab