Revised provision_descriptions and roles

provison_descriptions/tests/spead2_test.json

@@ -5,7 +5,6 @@
         "id":"tv_injection",
         "output_data_streams":
         [
-            "spead2_stream_in":
             {
                 "format": "SIMPLE_SPEAD2:1",
                 "ip": "228.0.2.156",

provison_descriptions/tests/spead2_test.yml

 - hosts: gpuserver[2]
   roles:
-    - testvector_injector
+    - role: testvector_injector
+      container_name: testvector_injector_{{ groups['gpu_server'].index(inventory_hostname)*2}}
+      container_env: "EDD_ALLOWED_NUMA_NODES=0"
 
 - hosts: gpuserver[3]
-  roles:
-    - testvector_validator
+  - role: testvector_validator
+    container_name: testvector_validator_{{ groups['gpu_server'].index(inventory_hostname)*2}}
+    container_env: "EDD_ALLOWED_NUMA_NODES=0"

provison_descriptions/tests/spead2x2_test.json

@@ -6,7 +6,6 @@
         "ip":"pacifix2",
         "output_data_streams":
         [
-            "spead2_stream_in":
             {
                 "format": "SIMPLE_SPEAD2:1",
                 "ip": "228.0.2.156",

provison_descriptions/tests/spead2x2_test.yml

-- hosts: gpuserver[2:3]
+- hosts: gpuserver[2]
   roles:
-    - testvector_injector
-
-- hosts: gpuserver[2:3]
+    - role: testvector_injector
+      container_name: testvector_injector_{{ groups['gpu_server'].index(inventory_hostname)*2}}
+      container_env: "EDD_ALLOWED_NUMA_NODES=0"
+    - role: testvector_injector
+      container_name: testvector_injector_{{ groups['gpu_server'].index(inventory_hostname)*2+1}}
+      container_env: "EDD_ALLOWED_NUMA_NODES=1"
+- hosts: gpuserver[3]
   roles:
-    - testvector_validator
+    - role: testvector_validator
+      container_name: testvector_validator_{{ groups['gpu_server'].index(inventory_hostname)*2}}
+      container_env: "EDD_ALLOWED_NUMA_NODES=0"
+    - role: testvector_injector
+      container_name: testvector_validator_{{ groups['gpu_server'].index(inventory_hostname)*2+1}}
+      container_env: "EDD_ALLOWED_NUMA_NODES=1"

roles/testvector_injector/tasks/main.yml

@@ -5,6 +5,6 @@
   vars:
      image_name: edd_tester
      default_container_name: testvector_injection
-     container_cmd: "/usr/bin/python3 /src/bf_testframework/testframework/Injector.py --host={{ edd_subnet }} --port={{ bind_port }} --register-id={{ container_name }} --redis-ip={{ redis_storage }} --redis-port={{ redis_port }}"
+     container_cmd: "python /src/bf_testframework/testframework/core/Injector.py --host={{ edd_subnet }} --port={{ bind_port }} --register-id={{ container_name }} --redis-ip={{ redis_storage }} --redis-port={{ redis_port }}"
   tags:
     - always

roles/testvector_validator/tasks/main.yml

@@ -5,6 +5,6 @@
   vars:
      image_name: edd_tester
      default_container_name: testvector_injection
-     container_cmd: "/usr/bin/python3 /src/bf_testframework/testframework/Validator.py --host={{ edd_subnet }} --port={{ bind_port }} --register-id={{ container_name }} --redis-ip={{ redis_storage }} --redis-port={{ redis_port }}"
+     container_cmd: "python /src/bf_testframework/testframework/core/Validator.py --host={{ edd_subnet }} --port={{ bind_port }} --register-id={{ container_name }} --redis-ip={{ redis_storage }} --redis-port={{ redis_port }}"
   tags:
     - always