diff --git a/docker-compose-novol.yml b/docker-compose-novol.yml
index 9458831e8dff4ea016cc92b193fa96d7cc231624..394a9b124436ef5e4f2700d2aef10106744e16c4 100644
--- a/docker-compose-novol.yml
+++ b/docker-compose-novol.yml
@@ -11,7 +11,7 @@ services:
ports:
- "0.0.0.0:8000:8000"
env_file:
- - ./docker-compose/.env_fod
+ - ./docker-compose/.env_fod_singlectr
#environment:
#- fod_volume_use=0
networks:
diff --git a/docker-compose-singlefodctr-novol.yml b/docker-compose-singlefodctr-novol.yml
new file mode 100644
index 0000000000000000000000000000000000000000..394a9b124436ef5e4f2700d2aef10106744e16c4
--- /dev/null
+++ b/docker-compose-singlefodctr-novol.yml
@@ -0,0 +1,114 @@
+version: "3"
+services:
+ fod:
+ build:
+ context: .
+ dockerfile: docker-compose/Dockerfile_FOD-novol
+ container_name: fodnovol
+ privileged: true
+ expose:
+ - "8000"
+ ports:
+ - "0.0.0.0:8000:8000"
+ env_file:
+ - ./docker-compose/.env_fod_singlectr
+ #environment:
+ #- fod_volume_use=0
+ networks:
+ mgmt:
+ xfod:
+ ipv4_address: 10.197.36.2
+ #volumes:
+ #- ./:/opt/FOD
+
+ freertr:
+ build:
+ context: docker-compose
+ dockerfile: Dockerfile_FREERTR
+ container_name: freertr
+ privileged: true
+ expose:
+ - "23"
+ ports:
+ - "127.0.0.1:2323:2323"
+ env_file:
+ - ./docker-compose/.env_freertr
+ networks:
+ mgmt:
+ nhost1:
+ ipv4_address: 10.1.10.3
+ nhost2:
+ ipv4_address: 10.2.10.3
+ xfod:
+ ipv4_address: 10.197.36.3
+ depends_on:
+ - fod
+ volumes:
+ - freertr:/opt
+ - ./freertr/run:/rtr/run/
+
+ host1:
+ build:
+ context: docker-compose
+ dockerfile: Dockerfile_HOST1
+ container_name: host1
+ privileged: true
+ env_file:
+ - ./docker-compose/.env_host1
+ networks:
+ mgmt:
+ nhost1:
+ ipv4_address: 10.1.10.11
+ depends_on:
+ - fod
+ #volumes:
+ # - freertr:/opt
+
+ host2:
+ build:
+ context: docker-compose
+ dockerfile: Dockerfile_HOST2
+ container_name: host2
+ privileged: true
+ env_file:
+ - ./docker-compose/.env_host2
+ networks:
+ mgmt:
+ nhost2:
+ ipv4_address: 10.2.10.12
+ depends_on:
+ - fod
+ #volumes:
+ # - freertr:/opt
+
+networks:
+ mgmt:
+ driver: bridge
+ ipam:
+ driver: default
+ config:
+ - subnet: 11.11.11.0/24
+
+ xfod:
+ driver: bridge
+ ipam:
+ driver: default
+ config:
+ - subnet: 10.197.36.0/28
+
+ nhost1:
+ driver: bridge
+ ipam:
+ driver: default
+ config:
+ - subnet: 10.1.10.0/24
+
+ nhost2:
+ driver: bridge
+ ipam:
+ driver: default
+ config:
+ - subnet: 10.2.10.0/24
+
+volumes:
+ freertr:
diff --git a/docker-compose/.env_fod_singlectr b/docker-compose/.env_fod_singlectr
new file mode 100644
index 0000000000000000000000000000000000000000..d6e2c9f2427b51c43873fc644f92661444b4ef50
--- /dev/null
+++ b/docker-compose/.env_fod_singlectr
@@ -0,0 +1,21 @@
+ADMIN_PASS=adminpwd
+ADMIN_EMAIL=admin@localhost.local
+FOD_ORG=testpeer
+FOD_ORG_NET=0.0.0.0/0
+FOD_EXABGP_LOCAL_ID=10.197.36.2
+FOD_EXABGP_LOCAL_IP=10.197.36.2
+FOD_EXABGP_LOCAL_AS=1001
+FOD_EXABGP_REMOTE_ID=10.197.36.3
+FOD_EXABGP_REMOTE_IP=10.197.36.3
+FOD_EXABGP_REMOTE_AS=2001
+FOD_TESTRULE1_NAME_PREFIX=testrtr1
+FOD_TESTRULE1_SOURCE_IP_PREFIX=10.1.10.11/32
+FOD_TESTRULE1_DESTINATION_IP_PREFIX=10.2.10.12/32
+FOD_TESTRULE1_DESTINATION_IP_PROTOCOL=1
+FOD_REDIS_HOST=localhost
+FOD_DB_ENG=mysql
+FOD_DB_NAME=fod
+FOD_DB_USER=root
+FOD_DB_PASS=
+FOD_DB_HOST=db
+FOD_DB_PORT=
diff --git a/docker-compose/demo1.sh b/docker-compose/demo1.sh
index 547f123302d2c5ef8a61602c4b0cd3cb09c22b16..cb74cf871716bdaa95b061954ea6a16969d16279 100755
--- a/docker-compose/demo1.sh
+++ b/docker-compose/demo1.sh
@@ -7,7 +7,8 @@
use_novol=1
if [ "$use_novol" = 1 ]; then
- docker_compose_spec__file="./docker-compose-novol.yml"
+ #docker_compose_spec__file="./docker-compose-novol.yml"
+ docker_compose_spec__file="./docker-compose-singlefodctr-novol.yml"
fod_container_name="fodnovol"
else
docker_compose_spec__file="./docker-compose.yml"
@@ -72,7 +73,7 @@ echo "$0: exabgp current exported rules/routes:" 1>&2
docker exec -ti "$fod_container_name" sh -c '. /opt/venv/bin/activate && exabgpcli show adj-rib out extensive'
echo "$0: freertr policy-map and block counters:" 1>&2
-docker exec -ti freertr sh -c '{ echo "show ipv4 bgp 1 flowspec database"; echo "show policy-map flowspec CORE ipv4"; echo exit; } | netcat 127.1 2323'
+docker exec -ti freertr sh -c '{ echo "show ipv4 bgp 1 flowspec summary"; echo "show ipv4 bgp 1 flowspec database"; echo "show policy-map flowspec CORE ipv4"; echo exit; } | netcat 127.1 2323'
sleep 2
@@ -81,7 +82,7 @@ docker exec -d -ti host1 ping -c 1 10.2.10.12
docker exec -ti host1 ping -c 7 10.2.10.12
echo "$0: freertr policy-map and block counters:" 1>&2
-docker exec -ti freertr sh -c '{ echo "show ipv4 bgp 1 flowspec database"; echo "show policy-map flowspec CORE ipv4"; echo exit; } | netcat 127.1 2323'
+docker exec -ti freertr sh -c '{ echo "show ipv4 bgp 1 flowspec summary"; echo "show ipv4 bgp 1 flowspec database"; echo "show policy-map flowspec CORE ipv4"; echo exit; } | netcat 127.1 2323'
###
@@ -91,7 +92,7 @@ echo "waiting $wait1 seconds" 1>&2
sleep "$wait1"
echo "$0: exabgp current exported rules/routes:" 1>&2
-docker exec -ti freertr sh -c '{ echo "show ipv4 bgp 1 flowspec database"; echo "show policy-map flowspec CORE ipv4"; echo exit; } | netcat 127.1 2323'
+docker exec -ti freertr sh -c '{ echo "show ipv4 bgp 1 flowspec summary"; echo "show ipv4 bgp 1 flowspec database"; echo "show policy-map flowspec CORE ipv4"; echo exit; } | netcat 127.1 2323'
#
@@ -113,12 +114,12 @@ echo "$0: exabgp current exported rules/routes:" 1>&2
docker exec -ti "$fod_container_name" sh -c '. /opt/venv/bin/activate && exabgpcli show adj-rib out extensive'
echo "$0: freertr block counters:" 1>&2
-docker exec -ti freertr sh -c '{ echo "show ipv4 bgp 1 flowspec database"; echo "show policy-map flowspec CORE ipv4"; echo exit; } | netcat 127.1 2323'
+docker exec -ti freertr sh -c '{ echo "show ipv4 bgp 1 flowspec summary"; echo "show ipv4 bgp 1 flowspec database"; echo "show policy-map flowspec CORE ipv4"; echo exit; } | netcat 127.1 2323'
echo "$0: ping to block:" 1>&2
docker exec -ti host1 ping -c 7 10.2.10.12 || true
echo "$0: freertr policy-map and block counters:" 1>&2
-docker exec -ti freertr sh -c '{ echo "show ipv4 bgp 1 flowspec database"; echo "show policy-map flowspec CORE ipv4"; echo exit; } | netcat 127.1 2323'
+docker exec -ti freertr sh -c '{ echo "show ipv4 bgp 1 flowspec summary"; echo "show ipv4 bgp 1 flowspec database"; echo "show policy-map flowspec CORE ipv4"; echo exit; } | netcat 127.1 2323'