add enable_docker script to work for rocky9 and update iperf notebook…

…s to user rocky9

artifacts.json

@@ -260,7 +260,7 @@
  "title": "Wide Area Link (Layer 2) - auto, manual, ERO or user defined",
  "description_short": "Create a private WAN Ethernet link between FABRIC sites",
  "description_long": "Create a private WAN Ethernet link between FABRIC sites with three configuration options - auto, manual, explicit route options(ERO) or user defined",
- "location": "fabric_examples/fablib_api/create_l2network_basic",
+ "location": "fabric_examples/fablib_api/create_l2network_wide_area",
  "tags": ["fabric", "example"],
  "visibility": "public",
  "authors":[

fabric_examples/complex_recipes/iPerf3/iperf3.ipynb

@@ -69,7 +69,7 @@
  "slice = fablib.new_slice(name=slice_name)\n",
  "\n",
  "# Node1\n",
- "node1 = slice.add_node(name=node1_name, cores=4, ram=16, site=site1, image='docker_rocky_8')\n",
+ "node1 = slice.add_node(name=node1_name, cores=4, ram=16, site=site1, image='default_rocky_9')\n",
  "node1.add_fabnet()\n",
  "node1.add_post_boot_upload_directory('node_tools','.')\n",
  "node1.add_post_boot_execute('sudo node_tools/host_tune.sh')\n",
@@ -78,7 +78,7 @@
  "\n",
  "\n",
  "# Node2\n",
- "node2 = slice.add_node(name=node2_name, cores=4, ram=16, site=site2, image='docker_rocky_8')\n",
+ "node2 = slice.add_node(name=node2_name, cores=4, ram=16, site=site2, image='default_rocky_9')\n",
  "node2.add_fabnet()\n",
  "node2.add_post_boot_upload_directory('node_tools','.')\n",
  "node2.add_post_boot_execute('sudo node_tools/host_tune.sh')\n",
@@ -143,8 +143,8 @@
  },
  "outputs": [],
  "source": [
- "#slice = fablib.get_slice(slice_name)\n",
- "#slice.delete()"
+ "slice = fablib.get_slice(slice_name)\n",
+ "slice.delete()"
  ]
  },
  {
@@ -171,7 +171,7 @@
  "name": "python",
  "nbconvert_exporter": "python",
  "pygments_lexer": "ipython3",
- "version": "3.9.13"
+ "version": "3.11.8"
  }
  },
  "nbformat": 4,

fabric_examples/complex_recipes/iPerf3/iperf3_optimized.ipynb

@@ -114,7 +114,7 @@
  "for h in hosts:\n",
  "\n",
  " # Node1\n",
- " node1 = slice.add_node(name=f\"{h}-a\", cores=16, ram=32, site=site1, image='docker_rocky_8', host=f\"{h}.fabric-testbed.net\")\n",
+ " node1 = slice.add_node(name=f\"{h}-a\", cores=16, ram=32, site=site1, image='default_rocky_9', host=f\"{h}.fabric-testbed.net\")\n",
  "\n",
  " iface1 = node1.add_component(model=model_name, name=nic_name).get_interfaces()[0]\n",
  " iface1.set_mode('auto')\n",
@@ -350,7 +350,7 @@
  "name": "python",
  "nbconvert_exporter": "python",
  "pygments_lexer": "ipython3",
- "version": "3.11.2"
+ "version": "3.11.8"
  }
  },
  "nbformat": 4,

fabric_examples/complex_recipes/iPerf3/iperf3_optimized_smart_nic.ipynb

@@ -110,7 +110,7 @@
  "\n",
  "for s in sites:\n",
  " # Node1\n",
- " node1 = slice.add_node(name=f\"Node-{s}\", cores=16, ram=32, site=s, image='docker_rocky_8')\n",
+ " node1 = slice.add_node(name=f\"Node-{s}\", cores=16, ram=32, site=s, image='default_rocky_9')\n",
  "\n",
  " iface1 = node1.add_component(model=model_name, name=nic_name).get_interfaces()[0]\n",
  " iface1.set_mode('auto')\n",
@@ -327,7 +327,7 @@
  "name": "python",
  "nbconvert_exporter": "python",
  "pygments_lexer": "ipython3",
- "version": "3.9.7"
+ "version": "3.11.8"
  }
  },
  "nbformat": 4,

fabric_examples/complex_recipes/iPerf3/node_tools/enable_docker.sh

@@ -40,7 +40,7 @@ elif [[ $image == "default_ubuntu_22" ]]; then
  sudo systemctl start openvswitch-switch 
  sudo systemctl status openvswitch-switch 
  sudo systemctl enable --now openvswitch-switch 
- sudo apt-get install -y build-essential checkinstall libreadline-gplv2-dev libncursesw5-dev libssl-dev libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev wget tcpdump iftop python3-pip 
+ sudo apt-get install -y build-essential checkinstall libncursesw5-dev libssl-dev libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev wget tcpdump iftop python3-pip 
  python3 -m pip install docker rpyc --user 
 elif [[ $image == "default_rocky_8" ]]; then
  sudo dnf install -y epel-release 
@@ -55,13 +55,41 @@ elif [[ $image == "default_rocky_8" ]]; then
  pip3.9 install docker rpyc --user 
  sudo systemctl enable --now openvswitch 
  sudo sysctl --system 
+ sudo firewall-cmd --zone=public --add-port=5201/tcp --permanent
+ sudo firewall-cmd --zone=public --add-port=5201/udp --permanent
+ sudo firewall-cmd --reload
+elif [[ $image == "default_rocky_9" ]]; then
+ sudo dnf install -y epel-release 
+ sudo dnf config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo 
+ sudo dnf install -y docker-ce docker-ce-cli containerd.io 
+ sudo mkdir -p /etc/docker 
+ sudo cp ${script_dir}/docker/daemon.json /etc/docker/daemon.json 
+ sudo systemctl start docker 
+ sudo usermod -aG docker rocky
+ sudo dnf install -y centos-release-nfv-openvswitch 
+ sudo dnf install -y openvswitch3.3 libibverbs tcpdump net-tools python vim iftop
+ pip3.9 install docker rpyc --user 
+ sudo systemctl enable --now openvswitch 
+ sudo sysctl --system 
+ sudo firewall-cmd --zone=public --add-port=5201/tcp --permanent
+ sudo firewall-cmd --zone=public --add-port=5201/udp --permanent
+ sudo firewall-cmd --reload
 elif [[ $image == "docker_ubuntu_20" ]]; then
  sudo usermod -aG docker ubuntu
 elif [[ $image == "docker_ubuntu_22" ]]; then
  sudo usermod -aG docker ubuntu
 elif [[ $image == "docker_rocky_8" ]]; then
  sudo systemctl start docker 
  sudo usermod -aG docker rocky
+ sudo firewall-cmd --zone=public --add-port=5201/tcp --permanent
+ sudo firewall-cmd --zone=public --add-port=5201/udp --permanent
+ sudo firewall-cmd --reload
+elif [[ $image == "docker_rocky_9" ]]; then
+ sudo systemctl start docker 
+ sudo usermod -aG docker rocky
+ sudo firewall-cmd --zone=public --add-port=5201/tcp --permanent
+ sudo firewall-cmd --zone=public --add-port=5201/udp --permanent
+ sudo firewall-cmd --reload
 else
  echo invalid image type $image 
 fi