X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=nfvbench%2Fcfg.default.yaml;h=bc8921d109fb690a65e350495e29ce76baeec09a;hb=b481ad4a6c6b98cac760b12e4190f9540869e673;hp=fee65cb24cfa6990d5da40d5b74b029d63a62df4;hpb=ea51c75ee0a48a6ccfda70fa6792d011461c8044;p=nfvbench.git

diff --git a/nfvbench/cfg.default.yaml b/nfvbench/cfg.default.yaml
index fee65cb..bc8921d 100644
--- a/nfvbench/cfg.default.yaml
+++ b/nfvbench/cfg.default.yaml
@@ -43,7 +43,7 @@ flavor:
   # Number of vCPUs for the flavor
   vcpus: 2
   # Memory for the flavor in MB
-  ram: 8192
+  ram: 4096
   # Size of local disk in GB
   disk: 0
   # metadata are supported and can be added if needed, optional
@@ -167,6 +167,10 @@ traffic_generator:
     # `tool`: Traffic generator tool to be used (currently supported is `TRex`).
     # `ip`: IP address of the traffic generator.
     # `cores`: Specify the number of cores for TRex traffic generator. ONLY applies to trex-local.
+    # `software_mode`: Advice TRex to use software mode which provides the best compability. But
+    #                  note that TRex will not use any hardware acceleration technology under
+    #                  software mode, therefore the performance of TRex will be significantly
+    #                  lower. ONLY applies to trex-local.
     # `interfaces`: Configuration of traffic generator interfaces.
     # `interfaces.port`: The port of the traffic generator to be used (leave as 0 and 1 resp.)
     # `interfaces.switch_port`: Leave empty (reserved for advanced use cases)
@@ -178,6 +182,7 @@ traffic_generator:
           tool: TRex
           ip: 127.0.0.1
           cores: 3
+          software_mode: false
           interfaces:
             - port: 0
               switch_port:
@@ -253,6 +258,11 @@ internal_networks:
         segmentation_id:
         physical_network:
 
+# In the scenario of PVVP + SRIOV, there is choice of how the traffic will be
+# handled in the middle network. The default (false) will use vswitch, while
+# SRIOV can be used by toggling below setting.
+use_sriov_middle_net: false
+
 # EXT chain only. Names of edge networks which will be used to send traffic via traffic generator.
 external_networks:
     left: 'nfvbench-net0'
@@ -367,19 +377,32 @@ debug: false
 # Defaults to disabled
 log_file:
 
-# When enabled, all logs will be sent to a fluentd server at the requested IP and port
-# The fluentd "tag" and "label" fields for every message will be set to "nfvbench"
+# When enabled, all results and/or logs will be sent to a fluentd servers at the requested IPs and ports
+# A list of one or more fluentd servers identified by their IPs and  port numbers should be given.
+# For each recipient it is possible to enable both sending logs and performance
+# results, or enable either logs or performance results. For enabling logs or results logging_tag or
+# result_tag should be set.
+
 fluentd:
-    # by default (logging_tag is empty) nfvbench log messages are not sent to fluentd
-    # to enable logging to fluents, specify a valid fluentd tag name to be used for the
-    # log records
-    logging_tag:
+      # by default (logging_tag is empty) nfvbench log messages are not sent to fluentd
+      # to enable logging to fluents, specify a valid fluentd tag name to be used for the
+      # log records
+    - logging_tag:
+
+      # by default (result_tag is empty) nfvbench results are not sent to fluentd
+      # to enable sending nfvbench results to fluentd, specify a valid fluentd tag name
+      # to be used for the results records, which is different than logging_tag
+      result_tag:
+
+      # IP address of the server, defaults to loopback
+      ip: 127.0.0.1
 
-    # IP address of the server, defaults to loopback
-    ip: 127.0.0.1
+      # port # to use, by default, use the default fluentd forward port
+      port: 24224
 
-    # port # to use, by default, use the default fluentd forward port
-    port: 24224
+      # by default (logging_tag is empty) nfvbench log messages are not sent to fluentd
+      # to enable logging to fluents, specify a valid fluentd tag name to be used for the
+      # log records
 
 # Module and class name of factory which will be used to provide classes dynamically for other components.
 factory_module: 'nfvbench.factory'
@@ -387,4 +410,4 @@ factory_class: 'BasicFactory'
 
 # Custom label added for every perf record generated during this run.
 # Can be overriden by --user-label
-user_label:
\ No newline at end of file
+user_label: