MINOR: bind: Add e2e test cases for thread

Author: Pratik Mohanty

e2e/libs/haproxy_config_setup.bash

@@ -29,8 +29,22 @@ setup() {
       skip
   fi
 
+  local haproxy_cfg_file="${BATS_TEST_DIRNAME}/data/haproxy_*.cfg"
+  local haproxy_file_version=""
+
+  if ls $haproxy_cfg_file 1> /dev/null 2>&1; then
+      haproxy_file_version=$(echo $haproxy_cfg_file | sed 's/.*_\([0-9]\+\.[0-9]\+\)\.cfg/\1/')
+  fi
+
+  major_file_version=$(echo $haproxy_file_version | cut -d '.' -f 1)
+  minor_file_version=$(echo $haproxy_file_version | cut -d '.' -f 2)
+  major_cfg_version=$(echo $HAPROXY_VERSION | cut -d '.' -f 1)
+  minor_cfg_version=$(echo $HAPROXY_VERSION | cut -d '.' -f 2)
+
   # replace the default haproxy config file
-  if [ -f "${BATS_TEST_DIRNAME}/data/haproxy.cfg" ]; then
+  if [[ $major_cfg_version -ge $major_file_version && $minor_cfg_version -ge $minor_file_version ]] && [ -f "${BATS_TEST_DIRNAME}/data/haproxy_${haproxy_file_version}.cfg" ]; then
+      run docker cp "${BATS_TEST_DIRNAME}/data/haproxy_${haproxy_file_version}.cfg" "${DOCKER_CONTAINER_NAME}:/etc/haproxy/haproxy.cfg"
+  elif [ -f "${BATS_TEST_DIRNAME}/data/haproxy.cfg" ]; then
       run docker cp "${BATS_TEST_DIRNAME}/data/haproxy.cfg" "${DOCKER_CONTAINER_NAME}:/etc/haproxy/haproxy.cfg"
   else
       run docker cp "${E2E_DIR}/fixtures/haproxy.cfg" "${DOCKER_CONTAINER_NAME}:/etc/haproxy/haproxy.cfg"

e2e/tests/binds/add.bats

@@ -16,14 +16,27 @@
 #
 
 load '../../libs/dataplaneapi'
-load '../../libs/get_json_path'
-load '../../libs/haproxy_config_setup'
+load "../../libs/get_json_path"
 load '../../libs/resource_client'
 load '../../libs/version'
+load '../../libs/haproxy_config_setup'
+load '../../libs/haproxy_version'
 
 load 'utils/_helpers'
 
 @test "binds: Add a new bind" {
-  resource_post "$_BIND_BASE_PATH" "data/post.json" "frontend=test_frontend&force_reload=true"
-	assert_equal "$SC" 201
+  if haproxy_version_ge "2.5"
+  then
+    resource_post "$_BIND_BASE_PATH" "data/post_2.5.json" "frontend=test_frontend&force_reload=true"
+  else
+    resource_post "$_BIND_BASE_PATH" "data/post.json" "frontend=test_frontend&force_reload=true"
+  fi
+  assert_equal "$SC" 201
+  if haproxy_version_ge "2.5"
+  then
+    resource_get "$_BIND_BASE_PATH/test_bind" "frontend=test_frontend&force_reload=true"
+    assert_equal "$SC" 200
+    assert_equal "$(get_json_path "$BODY" '.data.name')" "test_bind"
+    assert_equal "1/all" "$(get_json_path "$BODY" ".data.thread")"
+  fi
 }

e2e/tests/binds/data/haproxy_2.5.cfg

@@ -0,0 +1,35 @@
+global
+  chroot /var/lib/haproxy
+  user haproxy
+  group haproxy
+  maxconn 4000
+  pidfile /var/run/haproxy.pid
+  stats socket /var/lib/haproxy/stats level admin
+  log 127.0.0.1 local2
+
+defaults
+  mode http
+  maxconn 3000
+  log global
+  option httplog
+  option redispatch
+  option dontlognull
+  option http-server-close
+  option forwardfor except 127.0.0.0/8
+  timeout http-request 10s
+  timeout check 10s
+  timeout connect 10s
+  timeout client 1m
+  timeout queue 1m
+  timeout server 1m
+  timeout http-keep-alive 10s
+  retries 3
+
+frontend test_frontend
+  mode tcp
+  maxconn 1000
+  bind localhost:9000 name fixture thread all
+  bind localhost:9090 name loopback thread 1/1
+  bind localhost:9091 name loopback1 thread 1/1-1
+  option httpclose
+

e2e/tests/binds/data/post_2.5.json

@@ -0,0 +1,8 @@
+{
+  "address": "127.0.0.2",
+  "name": "test_bind",
+  "port": 10000,
+  "defer_accept": true,
+  "allow_0rtt": true,
+  "thread": "1/all"
+}

e2e/tests/binds/delete.bats

@@ -16,17 +16,18 @@
 #
 
 load '../../libs/dataplaneapi'
-load '../../libs/get_json_path'
-load '../../libs/haproxy_config_setup'
+load "../../libs/get_json_path"
 load '../../libs/resource_client'
 load '../../libs/version'
+load '../../libs/haproxy_config_setup'
+load '../../libs/haproxy_version'
 
 load 'utils/_helpers'
 
 @test "binds: Delete a bind" {
   resource_delete "$_BIND_BASE_PATH/fixture" "frontend=test_frontend&force_reload=true"
-	assert_equal "$SC" 204
+  assert_equal "$SC" 204
 
-	resource_delete "$_BIND_BASE_PATH/loopback" "frontend=test_frontend&force_reload=true"
-	assert_equal "$SC" 204
+  resource_delete "$_BIND_BASE_PATH/loopback" "frontend=test_frontend&force_reload=true"
+  assert_equal "$SC" 204
 }

e2e/tests/binds/get.bats

@@ -16,15 +16,20 @@
 #
 
 load '../../libs/dataplaneapi'
-load '../../libs/get_json_path'
-load '../../libs/haproxy_config_setup'
+load "../../libs/get_json_path"
 load '../../libs/resource_client'
 load '../../libs/version'
+load '../../libs/haproxy_config_setup'
+load '../../libs/haproxy_version'
 
 load 'utils/_helpers'
 
 @test "binds: Return one bind" {
-	resource_get "$_BIND_BASE_PATH/fixture" "frontend=test_frontend&force_reload=true"
-	assert_equal "$SC" 200
+  resource_get "$_BIND_BASE_PATH/fixture" "frontend=test_frontend&force_reload=true"
+  assert_equal "$SC" 200
   assert_equal "$(get_json_path "$BODY" '.data.name')" "fixture"
+  if haproxy_version_ge "2.5"
+  then
+    assert_equal "all" "$(get_json_path "$BODY" ".data.thread")"
+  fi
 }

e2e/tests/binds/list.bats

@@ -16,18 +16,31 @@
 #
 
 load '../../libs/dataplaneapi'
-load '../../libs/get_json_path'
-load '../../libs/haproxy_config_setup'
+load "../../libs/get_json_path"
 load '../../libs/resource_client'
 load '../../libs/version'
+load '../../libs/haproxy_config_setup'
+load '../../libs/haproxy_version'
 
 load 'utils/_helpers'
 
 @test "binds: Return an array of binds" {
   resource_get "$_BIND_BASE_PATH" "frontend=test_frontend"
-	assert_equal "$SC" 200
+  assert_equal "$SC" 200
 
-  assert_equal 2 "$(get_json_path "$BODY" ".data | length")"
+  if haproxy_version_ge "2.5"
+  then
+    assert_equal 3 "$(get_json_path "$BODY" ".data | length")"
+  else
+    assert_equal 2 "$(get_json_path "$BODY" ".data | length")"
+  fi
   assert_equal "fixture" "$(get_json_path "$BODY" ".data[0].name")"
   assert_equal "loopback" "$(get_json_path "$BODY" ".data[1].name")"
+  if haproxy_version_ge "2.5"
+  then
+    assert_equal "all" "$(get_json_path "$BODY" ".data[0].thread")"
+    assert_equal "1/1" "$(get_json_path "$BODY" ".data[1].thread")"
+    assert_equal "loopback1" "$(get_json_path "$BODY" ".data[2].name")"
+    assert_equal "1/1-1" "$(get_json_path "$BODY" ".data[2].thread")"
+  fi
 }