specify dockerfiles and docker-compose files and integrate

rodonile · rodonile · commit 457ca87bd4a2 · 2024-11-13T16:49:11.000+01:00
diff --git a/.github/workflows/ci.backup..yaml b/.github/workflows/ci.backup..yaml
@@ -0,0 +1,81 @@
+name: Basic Checks
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '0 0 * * *'  # every day at midnight
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: "3.10"
+
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install dependencies
+        run: |
+          pip install -r requirements.txt
+      
+      - name: Set up loopback interfaces
+        run: |
+          sudo ifconfig lo:1 192.168.100.1 up
+          sudo ifconfig lo:2 192.168.100.2 up
+
+      - name: Start Listener
+        run: |
+          touch nc_output.txt
+          (nc -u -l -k 9991 | hexdump -C > nc_output.txt & echo $! > listener_pid.txt) &
+          echo "$!" > listener_pid.txt
+          sleep 5s
+          echo "Listener PID:"
+          cat listener_pid.txt
+          echo "Listener Output:"
+          cat nc_output.txt
+
+      - name: Debug IP Configuration
+        run: |
+          ip a
+          
+      - name: Run main.py
+        run: |
+          sudo env PATH="$PATH" python main.py -v -t examples/ipfix-traffic.yml
+
+      - name: Stop Listener
+        run: |
+          pid=$(cat listener_pid.txt)
+          sudo kill -SIGINT $pid
+          sleep 5s
+          echo "Listener Output:"
+          cat nc_output.txt
+
+      - name: Preprocess Hexdump Output
+        run: |
+          awk '{print substr($0, 11, 47)}' nc_output.txt | tr -d ' \n' > nc_output_cleaned.txt
+          echo "Listener Output Cleaned:"
+          cat nc_output_cleaned.txt
+
+      - name: Count Packets
+        run: |
+          packet_count=$(grep -o '000a' nc_output_cleaned.txt | wc -l)
+          echo $packet_count > packet_count.txt
+
+      - name: Check Packet Count
+        run: |
+          packet_count=$(cat packet_count.txt)
+          echo "Packet Count: $packet_count"
+          if [ "$packet_count" -eq 6 ]; then
+            echo "Success: 6 packets received."
+          else
+            echo "Error: Expected 6 packets but found $packet_count."
+            exit 1
+          fi
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -38,22 +38,37 @@ jobs:
 
 # TODO idea: send all messages from all examples and then do some basic check on collector logs / print files (no warnings, no error, line counts, etc...)
 
-  regression-tests:
+  example-tests:
     runs-on: ubuntu-latest
     needs: docker-build
     steps:
+      - name: Checkout traffic-reproducer
+        uses: actions/checkout@v4
+        with:
+          path: traffic-reproducer
+          submodules: recursive
+
       - name: Download Artifacts
         uses: actions/download-artifact@v4
         with:
           pattern: '*_docker_images'
           path: /tmp/docker
 
       - name: Import images in the local registry
+        shell: bash
         run: |
           docker load -i /tmp/docker/traffic_reproducer_docker_images/traffic_reproducer_docker_images.tar
           echo "List Images"
           docker images | grep 'traffic-reproducer'
 
       - name: Run traffic-reproducer container
+        shell: bash
         run: |
-          docker run --rm --name traffic-reproducer traffic-reproducer:latest
+          docker network create --subnet=192.168.100.0/24 --subnet=cafe::/64 --ipv6 test_network
+          cd traffic-reproducer/ci/collectors
+          docker compose up -d
+          sleep 10
+          cd ../reproducers
+          export ADDITIONAL_IPV4_LIST="192.168.100.2/24 192.168.100.3/24"
+          export ADDITIONAL_IPV6_LIST="cafe::2/64 cafe::3/64 cafe::4/64 cafe::5/64 cafe::6/64 cafe::7/64"
+          docker compose up -d
diff --git a/ci/collectors/docker-compose.yml b/ci/collectors/docker-compose.yml
@@ -0,0 +1,62 @@
+---
+version: '3'
+
+networks:
+  test_network:
+    external: true
+
+services:
+  nfacctd:
+    image: pmacct/nfacctd:v1.7.9
+    container_name: nfacctd
+    volumes:
+      - ./nfacctd.conf:/etc/pmacct/nfacctd.conf
+      - ./tmp/logs:/var/log/pmacct
+    networks:
+      test_network:
+        ipv4_address: 192.168.100.100
+        ipv6_address: cafe::100
+
+  nfacctd-bgp:
+    image: pmacct/nfacctd:v1.7.9
+    container_name: nfacctd-bgp
+    volumes:
+      - ./nfacctd-bgp.conf:/etc/pmacct/nfacctd.conf
+      - ./tmp/logs:/var/log/pmacct
+    networks:
+      test_network:
+        ipv4_address: 192.168.100.101
+        ipv6_address: cafe::101
+
+  nfacctd-bmp:
+    image: pmacct/nfacctd:v1.7.9
+    container_name: nfacctd-bmp
+    volumes:
+      - ./nfacctd-bmp.conf:/etc/pmacct/nfacctd.conf
+      - ./tmp/logs:/var/log/pmacct
+    networks:
+      test_network:
+        ipv4_address: 192.168.100.102
+        ipv6_address: cafe::102
+
+  pmtelemetryd-tcp-json:
+    image: pmacct/pmtelemetryd:v1.7.9
+    container_name: pmtelemetryd-tcp-json
+    volumes:
+      - ./pmtelemetryd-tcp-json.conf:/etc/pmacct/pmtelemetryd.conf
+      - ./tmp/logs:/var/log/pmacct
+    networks:
+      test_network:
+        ipv4_address: 192.168.100.200
+        ipv6_address: cafe::200
+
+  pmtelemetryd-udp-notif:
+    image: pmacct/pmtelemetryd:v1.7.9
+    container_name: pmtelemetryd-udp-notif
+    volumes:
+      - ./pmtelemetryd-udp-notif.conf:/etc/pmacct/pmtelemetryd.conf
+      - ./tmp/logs:/var/log/pmacct
+    networks:
+      test_network:
+        ipv4_address: 192.168.100.201
+        ipv6_address: cafe::201
diff --git a/ci/collectors/nfacctd-bgp.conf b/ci/collectors/nfacctd-bgp.conf
diff --git a/ci/collectors/nfacctd-bmp.conf b/ci/collectors/nfacctd-bmp.conf
diff --git a/ci/collectors/nfacctd.conf b/ci/collectors/nfacctd.conf
diff --git a/ci/collectors/pmtelemetryd-tcp-json.conf b/ci/collectors/pmtelemetryd-tcp-json.conf
diff --git a/ci/collectors/pmtelemetryd-udp-notif.conf b/ci/collectors/pmtelemetryd-udp-notif.conf
diff --git a/ci/reproducers/docker-compose.yml b/ci/reproducers/docker-compose.yml
@@ -0,0 +1,22 @@
+---
+version: '3'
+
+networks:
+  test_network:
+    external: true
+
+services:
+  traffic-reproducer:
+    image: traffic-reproducer:latest
+    container_name: traffic-reproducer
+    volumes:
+      - ./examples:/pcap/traffic-reproducer.conf
+    networks:
+      pmacct_test_network:
+        ipv4_address: 192.168.100.1
+        ipv6_address: cafe::1
+    environment:
+      - ADDITIONAL_IPV4_LIST=${ADDITIONAL_IPV4_LIST}
+      - ADDITIONAL_IPV6_LIST=${ADDITIONAL_IPV6_LIST}
+
+# TODO: add additional ip6 as list directly here...
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -16,3 +16,9 @@ RUN pip install -r requirements.txt
 # Set the entry point command
 # CMD ["python", "./main.py", "--cfg", "/pcap/traffic-reproducer.conf"]
 CMD ["python", "./main.py", "-h"]
+
+# Make script to add multiple IP addresses executable
+RUN chmod +x ./docker/add_interfaces.sh
+
+# Set the entry point command
+ENTRYPOINT ["./docker/add_interfaces.sh", "python", "./main.py", "-h"]
diff --git a/docker/add_interfaces.sh b/docker/add_interfaces.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Add more IPv4 addresses
+for ip in ${ADDITIONAL_IPV4_LIST}; do
+  ip addr add $ip dev eth0
+done
+
+# Add more IPv6 addresses
+for ip in ${ADDITIONAL_IPV6_LIST}; do
+  ip -6 addr add $ip dev eth0
+done
+
+ip a
+
+# Execute the original entrypoint
+exec "$@"
diff --git a/examples/bgp-traffic.yml b/examples/bgp-traffic.yml
@@ -24,5 +24,5 @@ bgp:
       dport:
       - 179
   collector:                              # collector that will receive the reproduced messages
-    ip: localhost
+    ip: 191.168.100.101
     port: 179
diff --git a/examples/bmp-repeat.yml b/examples/bmp-repeat.yml
@@ -36,5 +36,5 @@ bmp:
       dport:
       - 1790
   collector:                              # collector that will receive the reproduced messages
-    ip: localhost
+    ip: cafe::102
     port: 1791
diff --git a/examples/bmp-traffic.yml b/examples/bmp-traffic.yml
@@ -24,5 +24,5 @@ bmp:
       dport:
       - 1790
   collector:                              # collector that will receive the reproduced messages
-    ip: localhost
-    port: 1790
+    ip: 192.168.100.102
+    port: 1791
diff --git a/examples/collector_examples/docker-compose.yml b/examples/collector_examples/docker-compose.yml
diff --git a/examples/ipfix-bmp-scenario-segmented.yml b/examples/ipfix-bmp-scenario-segmented.yml
@@ -33,7 +33,7 @@ bmp:
       dport:
       - 1790
   collector:                              # collector that will receive the reproduced messages
-    ip: localhost
+    ip: cafe::102
     port: 1791
 
 ipfix:
@@ -42,5 +42,5 @@ ipfix:
       dport:
       - 9991
   collector:
-    ip: localhost
+    ip: cafe::102
     port: 9992
diff --git a/examples/ipfix-traffic.yml b/examples/ipfix-traffic.yml
@@ -27,5 +27,5 @@ ipfix:
       dport:
       - 9991
   collector:                            # define the collector that will receive the reproduced messages
-    ip: localhost
-    port: 9991
+    ip: 192.168.100.100
+    port: 9992
diff --git a/examples/nfv9-traffic.yml b/examples/nfv9-traffic.yml
@@ -24,5 +24,5 @@ ipfix:
       dport:
       - 9991
   collector:                            # define the collector that will receive the reproduced messages
-    ip: localhost
-    port: 9991
+    ip: 192.168.100.100
+    port: 9992
diff --git a/examples/tcp-json.yml b/examples/tcp-json.yml
@@ -29,5 +29,5 @@ tcp_generic:
       dport:
       - 10005
   collector:
-    ip: cafe::100
+    ip: cafe::200
     port: 10005
diff --git a/examples/udp-notif.yml b/examples/udp-notif.yml
@@ -29,5 +29,5 @@ udp_generic:
       dport:
       - 10003
   collector:
-    ip: 192.168.100.100
+    ip: 192.168.100.201
     port: 10003
