Use rest-traffic image (#64)

Dockerfile.rest-traffic

@@ -1,3 +0,0 @@
-FROM python:3.9.18-alpine3.18
-
-RUN pip install requests argparse

docker-compose.yml

@@ -95,16 +95,11 @@ services:
       - simulation
       
   rest-traffic:
-    build:
-      context: .
-      dockerfile: Dockerfile.rest-traffic
-    command: >
-      python /opt/traffic.py
+    image: alrevuelta/rest-traffic:d936446
+    command:
       --multiple-nodes=http://waku-simulator_nwaku_[1..${NUM_NWAKU_NODES:-5}]:8645
       --msg-size-kbytes=${MSG_SIZE_KBYTES:-10}
       --delay-seconds=${TRAFFIC_DELAY_SECONDS:-15}
-    volumes:
-      - ./traffic.py:/opt/traffic.py:Z
     networks:
       - simulation
     depends_on:

run_wakupublisher.sh

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-IP=$(ip a | grep "inet " | grep -Fv 127.0.0.1 | sed 's/.*inet \([^/]*\).*/\1/')
-
-echo "I am a traffic generator"
-
-RETRIES=${RETRIES:=10}
-
-while [ -z "${BOOTSTRAP_ENR}" ] && [ ${RETRIES} -ge 0 ]; do
-  BOOTSTRAP_ENR=$(wget -qO- http://bootstrap:8645/debug/v1/info --header='Content-Type:application/json' 2> /dev/null | sed 's/.*"enrUri":"\([^"]*\)".*/\1/');
-  echo "Bootstrap node not ready, retrying (retries left: ${RETRIES})"
-  sleep 1
-  RETRIES=$(( $RETRIES - 1 ))
-done
-
-if [ -z "${BOOTSTRAP_ENR}" ]; then
-   echo "Could not get BOOTSTRAP_ENR and none provided. Failing"
-   exit 1
-fi
-
-echo "Using bootstrap node: ${BOOTSTRAP_ENR}"
-exec /main\
-    --pubsub-topic="/waku/2/default-waku/proto"\
-    --content-topic="my-ctopic"\
-    --msg-per-second=${MSG_PER_SECOND}\
-    --msg-size-kb=${MSG_SIZE_KBYTES}\
-    --bootstrap-node=${BOOTSTRAP_ENR}\
-    --max-peers=50

traffic.py

@@ -1,91 +0,0 @@
-import requests
-import time
-import json
-import os
-import base64
-import sys
-import urllib.parse
-import requests
-import argparse
-
-def send_waku_msg(node_address, kbytes, pubsub_topic, content_topic):
-    # TODO dirty trick .replace("=", "")
-    base64_payload = (base64.b64encode(os.urandom(kbytes*1000)).decode('ascii')).replace("=", "")
-    print("size message kBytes", len(base64_payload) *(3/4)/1000, "KBytes")
-    body = {
-        "payload": base64_payload,
-        "contentTopic": content_topic,
-        "version": 1,  # You can adjust the version as needed
-        #"timestamp": int(time.time())
-    }
-
-    encoded_pubsub_topic = urllib.parse.quote(pubsub_topic, safe='')
-
-    url = f"{node_address}/relay/v1/messages/{encoded_pubsub_topic}"
-    headers = {'content-type': 'application/json'}
-
-    print('Waku REST API: %s PubSubTopic: %s, ContentTopic: %s' % (url, pubsub_topic, content_topic))
-    s_time = time.time()
-    
-    response = None
-
-    try:
-      print("Sending request")
-      response = requests.post(url, json=body, headers=headers)
-    except Exception as e:
-      print(f"Error sending request: {e}")
-
-    if(response != None):
-      elapsed_ms = (time.time() - s_time) * 1000
-      print('Response from %s: status:%s content:%s [%.4f ms.]' % (node_address, \
-        response.status_code, response.text, elapsed_ms))
-
-parser = argparse.ArgumentParser(description='')
-
-# these flags are mutually exclusive, one or the other, never at once
-group = parser.add_mutually_exclusive_group(required=True)
-group.add_argument('-sn', '--single-node', type=str, help='example: http://waku-simulator_nwaku_1:8645')
-group.add_argument('-mn', '--multiple-nodes', type=str, help='example: http://waku-simulator_nwaku_[1..10]:8645')
-
-# rest of araguments
-parser.add_argument('-c', '--content-topic', type=str, help='content topic', default="my-ctopic")
-parser.add_argument('-p', '--pubsub-topic', type=str, help='pubsub topic', default="/waku/2/rs/66/0")
-parser.add_argument('-s', '--msg-size-kbytes', type=int, help='message size in kBytes', default=10)
-parser.add_argument('-d', '--delay-seconds', type=int, help='delay in second between messages', required=15)
-args = parser.parse_args()
-
-print(args)
-
-if args.single_node != None:
-  print("Injecting traffic to single node REST API:", args.single_node)
-
-# this simply converts from http://url_[1..5]:port to
-# [http://url_1:port
-nodes = []
-if args.multiple_nodes:
-  range_nodes = args.multiple_nodes.split(":")[1].split("_")[2]
-  node_placeholder = args.multiple_nodes.replace(range_nodes, "{placeholder}")
-  clean_range = range_nodes.replace("[", "").replace("]", "")
-  start = int(clean_range.split("..")[0])
-  end = int(clean_range.split("..")[1])
-
-  print("Injecting traffic to multiple nodes REST APIs") 
-  for i in range(start, end+1):
-    nodes.append(node_placeholder.replace("{placeholder}", str(i)))
-
-for node in nodes:
-  print(node)
-
-while True:
-    # calls are blocking
-    # limited by the time it takes the REST API to reply
-
-    if args.single_node != None:
-      send_waku_msg(args.single_node, args.msg_size_kbytes, args.pubsub_topic, args.content_topic)
-
-    if args.multiple_nodes != None:
-      for node in nodes:
-        send_waku_msg(node, args.msg_size_kbytes, args.pubsub_topic, args.content_topic)
-
-    print("sleeping: ", args.delay_seconds, " seconds")
-    time.sleep(args.delay_seconds)