diff options
| author |   Dan Klein <danklei@cisco.com> | 2015-10-12 09:11:44 +0300 |
|---|---|---|
| committer | Dan Klein <danklei@cisco.com> | 2015-10-12 09:11:44 +0300 |
| commit | bd640666c052a1c770c9c1758c809f68d99af010 (patch) | |
| tree | 7943dc2bfb2eaf20240189a61e23f326e1d5e8ac | |
| parent | 47111637f4989f82fb8ed2dab6240efb5b12713f (diff) | |
solving conflicts
11 files changed, 310 insertions, 249 deletions
diff --git a/scripts/automation/trex_control_plane/client/trex_adv_client.py b/scripts/automation/trex_control_plane/client/trex_adv_client.py index b135da59..b3fe3dad 100755 --- a/scripts/automation/trex_control_plane/client/trex_adv_client.py +++ b/scripts/automation/trex_control_plane/client/trex_adv_client.py @@ -8,7 +8,7 @@ class CTRexAdvClient(trex_client.CTRexClient): super(CTRexAdvClient, self).__init__(trex_host, max_history_size, trex_daemon_port, trex_zmq_port, verbose) pass - # TREX KIWI advanced methods + # T-REX KIWI advanced methods def start_quick_trex(self, pcap_file, d, delay, dual, ipv6, times, interfaces): try: return self.server.start_quick_trex(pcap_file = pcap_file, duration = d, dual = dual, delay = delay, ipv6 = ipv6, times = times, interfaces = interfaces) diff --git a/scripts/automation/trex_control_plane/client/trex_client.py b/scripts/automation/trex_control_plane/client/trex_client.py index 607251fe..c3677132 100755 --- a/scripts/automation/trex_control_plane/client/trex_client.py +++ b/scripts/automation/trex_control_plane/client/trex_client.py @@ -805,7 +805,7 @@ class CTRexResult(object): def is_valid_hist (self): """ - Checks if result object contains valid data. + Checks if result obejct contains valid data. :parameters: None @@ -819,7 +819,7 @@ class CTRexResult(object): def set_valid_hist (self, valid_stat = True): """ - Sets result object validity status. + Sets result obejct validity status. :parameters: valid_stat : bool diff --git a/scripts/automation/trex_control_plane/doc/api/index.rst b/scripts/automation/trex_control_plane/doc/api/index.rst index 6db45160..cfdc6917 100755 --- a/scripts/automation/trex_control_plane/doc/api/index.rst +++ b/scripts/automation/trex_control_plane/doc/api/index.rst @@ -1,9 +1,8 @@ API Reference ============= -The T-Rex API reference section is currently a work in progress. -**T-Rex Modules** +**TRex Modules** .. toctree:: :maxdepth: 4 @@ -11,9 +10,9 @@ The T-Rex API reference section is currently a work in progress. client_code exceptions -**T-Rex JSON Template** +**TRex JSON Template** .. toctree:: :maxdepth: 4 - json_fields
\ No newline at end of file + json_fields diff --git a/scripts/automation/trex_control_plane/doc/api/json_fields.rst b/scripts/automation/trex_control_plane/doc/api/json_fields.rst index c921fec4..9e32d23e 100755 --- a/scripts/automation/trex_control_plane/doc/api/json_fields.rst +++ b/scripts/automation/trex_control_plane/doc/api/json_fields.rst @@ -1,233 +1,233 @@ - -TRex JSON Template -================== - -Whenever TRex is publishing live data, it uses JSON notation to describe the data-object. - -Each client may parse it differently, however this page will describe the values meaning when published by TRex server. - - -Main Fields ------------ - -Each TRex server-published JSON object contains data divided to main fields under which the actual data lays. - -These main fields are: - -+-----------------------------+----------------------------------------------------+---------------------------+ -| Main field | Contains | Comments | -+=============================+====================================================+===========================+ -| :ref:`trex-global-field` | Must-have data on TRex run, | | -| | mainly regarding Tx/Rx and packet drops | | -+-----------------------------+----------------------------------------------------+---------------------------+ -| :ref:`tx-gen-field` | Data indicate the quality of the transmit process. | | -| | In case histogram is zero it means that all packets| | -| | were injected in the right time. | | -+-----------------------------+----------------------------------------------------+---------------------------+ -| :ref:`trex-latecny-field` | Latency reports, containing latency data on | - Generated when latency | -| | generated data and on response traffic | test is enabled (``l`` | -| | | param) | -| | | - *typo* on field key: | -+-----------------------------+----------------------------------------------------+ will be fixed on next | -| :ref:`trex-latecny-v2-field`| Extended latency information | release | -+-----------------------------+----------------------------------------------------+---------------------------+ - - -Each of these fields contains keys for field general data (such as its name) and its actual data, which is always stored under the **"data"** key. - -For example, in order to access some trex-global data, the access path would look like:: - - AllData -> trex-global -> data -> desired_info - - - - -Detailed explanation --------------------- - -.. _trex-global-field: - -trex-global field -~~~~~~~~~~~~~~~~~ - - -+--------------------------------+-------+-----------------------------------------------------------+ -| Sub-key | Type | Meaning | -+================================+=======+===========================================================+ -| m_cpu_util | float | CPU utilization (0-100) | -+--------------------------------+-------+-----------------------------------------------------------+ -| m_platform_factor | float | multiplier factor | -+--------------------------------+-------+-----------------------------------------------------------+ -| m_tx_bps | float | total tx bit per second | -+--------------------------------+-------+-----------------------------------------------------------+ -| m_rx_bps | float | total rx bit per second | -+--------------------------------+-------+-----------------------------------------------------------+ -| m_tx_pps | float | total tx packet per second | -+--------------------------------+-------+-----------------------------------------------------------+ -| m_tx_cps | float | total tx connection per second | -+--------------------------------+-------+-----------------------------------------------------------+ -| m_tx_expected_cps | float | expected tx connection per second | -+--------------------------------+-------+-----------------------------------------------------------+ -| m_tx_expected_pps | float | expected tx packet per second | -+--------------------------------+-------+-----------------------------------------------------------+ -| m_tx_expected_bps | float | expected tx bit per second | -+--------------------------------+-------+-----------------------------------------------------------+ -| m_rx_drop_bps | float | drop rate in bit per second | -+--------------------------------+-------+-----------------------------------------------------------+ -| m_active_flows | float | active trex flows | -+--------------------------------+-------+-----------------------------------------------------------+ -| m_open_flows | float | open trex flows from startup (monotonically incrementing) | -+--------------------------------+-------+-----------------------------------------------------------+ -| m_total_tx_pkts | int | total tx in packets | -+--------------------------------+-------+-----------------------------------------------------------+ -| m_total_rx_pkts | int | total rx in packets | -+--------------------------------+-------+-----------------------------------------------------------+ -| m_total_tx_bytes | int | total tx in bytes | -+--------------------------------+-------+-----------------------------------------------------------+ -| m_total_rx_bytes | int | total rx in bytes | -+--------------------------------+-------+-----------------------------------------------------------+ -| opackets-# | int | output packets (per interface) | -+--------------------------------+-------+-----------------------------------------------------------+ -| obytes-# | int | output bytes (per interface) | -+--------------------------------+-------+-----------------------------------------------------------+ -| ipackets-# | int | input packet (per interface) | -+--------------------------------+-------+-----------------------------------------------------------+ -| ibytes-# | int | input bytes (per interface) | -+--------------------------------+-------+-----------------------------------------------------------+ -| ierrors-# | int | input errors (per interface) | -+--------------------------------+-------+-----------------------------------------------------------+ -| oerrors-# | int | input errors (per interface) | -+--------------------------------+-------+-----------------------------------------------------------+ -| m_total_tx_bps-# | float | total transmitted data in bit per second | -+--------------------------------+-------+-----------------------------------------------------------+ -| unknown | int | | -+--------------------------------+-------+-----------------------------------------------------------+ -| m_total_nat_learn_error [#f1]_ | int | | -+--------------------------------+-------+-----------------------------------------------------------+ -| m_total_nat_active [#f2]_ | int | | -+--------------------------------+-------+-----------------------------------------------------------+ -| m_total_nat_no_fid [#f2]_ | int | | -+--------------------------------+-------+-----------------------------------------------------------+ -| m_total_nat_time_out [#f2]_ | int | | -+--------------------------------+-------+-----------------------------------------------------------+ -| m_total_nat_open [#f2]_ | int | | -+--------------------------------+-------+-----------------------------------------------------------+ - - -.. _tx-gen-field: - -tx-gen field -~~~~~~~~~~~~ - -+-------------------+-------+-----------------------------------------------------------+ -| Sub-key | Type | Meaning | -+===================+=======+===========================================================+ -| realtime-hist | dict | histogram of transmission. See extended information about | -| | | histogram object under :ref:`histogram-object-fields`. | -| | | The attribute analyzed is time packet has been sent | -| | | before/after it was intended to be | -+-------------------+-------+-----------------------------------------------------------+ -| unknown | int | | -+-------------------+-------+-----------------------------------------------------------+ - -.. _trex-latecny-field: - -trex-latecny field -~~~~~~~~~~~~~~~~~~ - -+---------+-------+---------------------------------------------------------+ -| Sub-key | Type | Meaning | -+=========+=======+=========================================================+ -| avg-# | float | average latency in usec (per interface) | -+---------+-------+---------------------------------------------------------+ -| max-# | float | max latency in usec from the test start (per interface) | -+---------+-------+---------------------------------------------------------+ -| c-max-# | float | max in the last 1 sec window (per interface) | -+---------+-------+---------------------------------------------------------+ -| error-# | float | errors in latency packets (per interface) | -+---------+-------+---------------------------------------------------------+ -| unknown | int | | -+---------+-------+---------------------------------------------------------+ - -.. _trex-latecny-v2-field: - -trex-latecny-v2 field -~~~~~~~~~~~~~~~~~~~~~ - -+--------------------------------------+-------+--------------------------------------+ -| Sub-key | Type | Meaning | -+======================================+=======+======================================+ -| cpu_util | float | rx thread cpu % (this is not trex DP | -| | | threads cpu%%) | -+--------------------------------------+-------+--------------------------------------+ -| port-# | | Containing per interface | -| | dict | information. See extended | -| | | information under ``port-# -> | -| | | key_name -> sub_key`` | -+--------------------------------------+-------+--------------------------------------+ -| port-#->hist | dict | histogram of latency. See extended | -| | | information about histogram object | -| | | under :ref:`histogram-object-fields`.| -+--------------------------------------+-------+--------------------------------------+ -| port-#->stats | | Containing per interface | -| | dict | information. See extended | -| | | information under ``port-# -> | -| | | key_name -> sub_key`` | -+--------------------------------------+-------+--------------------------------------+ -| port-#->stats->m_tx_pkt_ok | int | total of try sent packets | -+--------------------------------------+-------+--------------------------------------+ -| port-#->stats->m_pkt_ok | int | total of packets sent from hardware | -+--------------------------------------+-------+--------------------------------------+ -| port-#->stats->m_no_magic | int | rx error with no magic | -+--------------------------------------+-------+--------------------------------------+ -| port-#->stats->m_no_id | int | rx errors with no id | -+--------------------------------------+-------+--------------------------------------+ -| port-#->stats->m_seq_error | int | error in seq number | -+--------------------------------------+-------+--------------------------------------+ -| port-#->stats->m_length_error | int | | -+--------------------------------------+-------+--------------------------------------+ -| port-#->stats->m_rx_check | int | packets tested in rx | -+--------------------------------------+-------+--------------------------------------+ -| unknown | int | | -+--------------------------------------+-------+--------------------------------------+ - - - -.. _histogram-object-fields: - -Histogram object fields -~~~~~~~~~~~~~~~~~~~~~~~ - -The histogram object is being used in number of place throughout the JSON object. -The following section describes its fields in detail. - - -+-----------+-------+-----------------------------------------------------------------------------------+ -| Sub-key | Type | Meaning | -+===========+=======+===================================================================================+ -| min_usec | int | min attribute value in usec. pkt with latency less than this value is not counted | -+-----------+-------+-----------------------------------------------------------------------------------+ -| max_usec | int | max attribute value in usec | -+-----------+-------+-----------------------------------------------------------------------------------+ -| high_cnt | int | how many packets on which its attribute > min_usec | -+-----------+-------+-----------------------------------------------------------------------------------+ -| cnt | int | total packets from test startup | -+-----------+-------+-----------------------------------------------------------------------------------+ -| s_avg | float | average value from test startup | -+-----------+-------+-----------------------------------------------------------------------------------+ -| histogram | | histogram of relevant object by the following keys: | -| | array | - key: value in usec | -| | | - val: number of packets | -+-----------+-------+-----------------------------------------------------------------------------------+ - - -Access Examples ---------------- - - - -.. rubric:: Footnotes - -.. [#f1] Available only in NAT and NAT learning operation (``learn`` and ``learn-verify`` flags) - +
+TRex JSON Template
+==================
+
+Whenever TRex is publishing live data, it uses JSON notation to describe the data-object.
+
+Each client may parse it differently, however this page will describe the values meaning when published by TRex server.
+
+
+Main Fields
+-----------
+
+Each TRex server-published JSON object contains data divided to main fields under which the actual data lays.
+
+These main fields are:
+
++-----------------------------+----------------------------------------------------+---------------------------+
+| Main field | Contains | Comments |
++=============================+====================================================+===========================+
+| :ref:`trex-global-field` | Must-have data on TRex run, | |
+| | mainly regarding Tx/Rx and packet drops | |
++-----------------------------+----------------------------------------------------+---------------------------+
+| :ref:`tx-gen-field` | Data indicate the quality of the transmit process. | |
+| | In case histogram is zero it means that all packets| |
+| | were injected in the right time. | |
++-----------------------------+----------------------------------------------------+---------------------------+
+| :ref:`trex-latecny-field` | Latency reports, containing latency data on | - Generated when latency |
+| | generated data and on response traffic | test is enabled (``l`` |
+| | | param) |
+| | | - *typo* on field key: |
++-----------------------------+----------------------------------------------------+ will be fixed on next |
+| :ref:`trex-latecny-v2-field`| Extended latency information | release |
++-----------------------------+----------------------------------------------------+---------------------------+
+
+
+Each of these fields contains keys for field general data (such as its name) and its actual data, which is always stored under the **"data"** key.
+
+For example, in order to access some trex-global data, the access path would look like::
+
+ AllData -> trex-global -> data -> desired_info
+
+
+
+
+Detailed explanation
+--------------------
+
+.. _trex-global-field:
+
+trex-global field
+~~~~~~~~~~~~~~~~~
+
+
++--------------------------------+-------+-----------------------------------------------------------+
+| Sub-key | Type | Meaning |
++================================+=======+===========================================================+
+| m_cpu_util | float | CPU utilization (0-100) |
++--------------------------------+-------+-----------------------------------------------------------+
+| m_platform_factor | float | multiplier factor |
++--------------------------------+-------+-----------------------------------------------------------+
+| m_tx_bps | float | total tx bit per second |
++--------------------------------+-------+-----------------------------------------------------------+
+| m_rx_bps | float | total rx bit per second |
++--------------------------------+-------+-----------------------------------------------------------+
+| m_tx_pps | float | total tx packet per second |
++--------------------------------+-------+-----------------------------------------------------------+
+| m_tx_cps | float | total tx connection per second |
++--------------------------------+-------+-----------------------------------------------------------+
+| m_tx_expected_cps | float | expected tx connection per second |
++--------------------------------+-------+-----------------------------------------------------------+
+| m_tx_expected_pps | float | expected tx packet per second |
++--------------------------------+-------+-----------------------------------------------------------+
+| m_tx_expected_bps | float | expected tx bit per second |
++--------------------------------+-------+-----------------------------------------------------------+
+| m_rx_drop_bps | float | drop rate in bit per second |
++--------------------------------+-------+-----------------------------------------------------------+
+| m_active_flows | float | active trex flows |
++--------------------------------+-------+-----------------------------------------------------------+
+| m_open_flows | float | open trex flows from startup (monotonically incrementing) |
++--------------------------------+-------+-----------------------------------------------------------+
+| m_total_tx_pkts | int | total tx in packets |
++--------------------------------+-------+-----------------------------------------------------------+
+| m_total_rx_pkts | int | total rx in packets |
++--------------------------------+-------+-----------------------------------------------------------+
+| m_total_tx_bytes | int | total tx in bytes |
++--------------------------------+-------+-----------------------------------------------------------+
+| m_total_rx_bytes | int | total rx in bytes |
++--------------------------------+-------+-----------------------------------------------------------+
+| opackets-# | int | output packets (per interface) |
++--------------------------------+-------+-----------------------------------------------------------+
+| obytes-# | int | output bytes (per interface) |
++--------------------------------+-------+-----------------------------------------------------------+
+| ipackets-# | int | input packet (per interface) |
++--------------------------------+-------+-----------------------------------------------------------+
+| ibytes-# | int | input bytes (per interface) |
++--------------------------------+-------+-----------------------------------------------------------+
+| ierrors-# | int | input errors (per interface) |
++--------------------------------+-------+-----------------------------------------------------------+
+| oerrors-# | int | input errors (per interface) |
++--------------------------------+-------+-----------------------------------------------------------+
+| m_total_tx_bps-# | float | total transmitted data in bit per second |
++--------------------------------+-------+-----------------------------------------------------------+
+| unknown | int | |
++--------------------------------+-------+-----------------------------------------------------------+
+| m_total_nat_learn_error [#f1]_ | int | |
++--------------------------------+-------+-----------------------------------------------------------+
+| m_total_nat_active [#f2]_ | int | |
++--------------------------------+-------+-----------------------------------------------------------+
+| m_total_nat_no_fid [#f2]_ | int | |
++--------------------------------+-------+-----------------------------------------------------------+
+| m_total_nat_time_out [#f2]_ | int | |
++--------------------------------+-------+-----------------------------------------------------------+
+| m_total_nat_open [#f2]_ | int | |
++--------------------------------+-------+-----------------------------------------------------------+
+
+
+.. _tx-gen-field:
+
+tx-gen field
+~~~~~~~~~~~~
+
++-------------------+-------+-----------------------------------------------------------+
+| Sub-key | Type | Meaning |
++===================+=======+===========================================================+
+| realtime-hist | dict | histogram of transmission. See extended information about |
+| | | histogram object under :ref:`histogram-object-fields`. |
+| | | The attribute analyzed is time packet has been sent |
+| | | before/after it was intended to be |
++-------------------+-------+-----------------------------------------------------------+
+| unknown | int | |
++-------------------+-------+-----------------------------------------------------------+
+
+.. _trex-latecny-field:
+
+trex-latecny field
+~~~~~~~~~~~~~~~~~~
+
++---------+-------+---------------------------------------------------------+
+| Sub-key | Type | Meaning |
++=========+=======+=========================================================+
+| avg-# | float | average latency in usec (per interface) |
++---------+-------+---------------------------------------------------------+
+| max-# | float | max latency in usec from the test start (per interface) |
++---------+-------+---------------------------------------------------------+
+| c-max-# | float | max in the last 1 sec window (per interface) |
++---------+-------+---------------------------------------------------------+
+| error-# | float | errors in latency packets (per interface) |
++---------+-------+---------------------------------------------------------+
+| unknown | int | |
++---------+-------+---------------------------------------------------------+
+
+.. _trex-latecny-v2-field:
+
+trex-latecny-v2 field
+~~~~~~~~~~~~~~~~~~~~~
+
++--------------------------------------+-------+--------------------------------------+
+| Sub-key | Type | Meaning |
++======================================+=======+======================================+
+| cpu_util | float | rx thread cpu % (this is not trex DP |
+| | | threads cpu%%) |
++--------------------------------------+-------+--------------------------------------+
+| port-# | | Containing per interface |
+| | dict | information. See extended |
+| | | information under ``port-# -> |
+| | | key_name -> sub_key`` |
++--------------------------------------+-------+--------------------------------------+
+| port-#->hist | dict | histogram of latency. See extended |
+| | | information about histogram object |
+| | | under :ref:`histogram-object-fields`.|
++--------------------------------------+-------+--------------------------------------+
+| port-#->stats | | Containing per interface |
+| | dict | information. See extended |
+| | | information under ``port-# -> |
+| | | key_name -> sub_key`` |
++--------------------------------------+-------+--------------------------------------+
+| port-#->stats->m_tx_pkt_ok | int | total of try sent packets |
++--------------------------------------+-------+--------------------------------------+
+| port-#->stats->m_pkt_ok | int | total of packets sent from hardware |
++--------------------------------------+-------+--------------------------------------+
+| port-#->stats->m_no_magic | int | rx error with no magic |
++--------------------------------------+-------+--------------------------------------+
+| port-#->stats->m_no_id | int | rx errors with no id |
++--------------------------------------+-------+--------------------------------------+
+| port-#->stats->m_seq_error | int | error in seq number |
++--------------------------------------+-------+--------------------------------------+
+| port-#->stats->m_length_error | int | |
++--------------------------------------+-------+--------------------------------------+
+| port-#->stats->m_rx_check | int | packets tested in rx |
++--------------------------------------+-------+--------------------------------------+
+| unknown | int | |
++--------------------------------------+-------+--------------------------------------+
+
+
+
+.. _histogram-object-fields:
+
+Histogram object fields
+~~~~~~~~~~~~~~~~~~~~~~~
+
+The histogram object is being used in number of place throughout the JSON object.
+The following section describes its fields in detail.
+
+
++-----------+-------+-----------------------------------------------------------------------------------+
+| Sub-key | Type | Meaning |
++===========+=======+===================================================================================+
+| min_usec | int | min attribute value in usec. pkt with latency less than this value is not counted |
++-----------+-------+-----------------------------------------------------------------------------------+
+| max_usec | int | max attribute value in usec |
++-----------+-------+-----------------------------------------------------------------------------------+
+| high_cnt | int | how many packets on which its attribute > min_usec |
++-----------+-------+-----------------------------------------------------------------------------------+
+| cnt | int | total packets from test startup |
++-----------+-------+-----------------------------------------------------------------------------------+
+| s_avg | float | average value from test startup |
++-----------+-------+-----------------------------------------------------------------------------------+
+| histogram | | histogram of relevant object by the following keys: |
+| | array | - key: value in usec |
+| | | - val: number of packets |
++-----------+-------+-----------------------------------------------------------------------------------+
+
+
+Access Examples
+---------------
+
+
+
+.. rubric:: Footnotes
+
+.. [#f1] Available only in NAT and NAT learning operation (``learn`` and ``learn-verify`` flags)
+
.. [#f2] Available only in NAT operation (``learn`` flag)
\ No newline at end of file diff --git a/scripts/automation/trex_control_plane/doc/client_utils.rst b/scripts/automation/trex_control_plane/doc/client_utils.rst index 122ae310..32728a57 100755 --- a/scripts/automation/trex_control_plane/doc/client_utils.rst +++ b/scripts/automation/trex_control_plane/doc/client_utils.rst @@ -2,6 +2,11 @@ Client Utilities ================ +.. toctree:: + :maxdepth: 2 + + packet_generator/index + TRex YAML generator ------------------- diff --git a/scripts/automation/trex_control_plane/doc/index.rst b/scripts/automation/trex_control_plane/doc/index.rst index 62fd9975..10803cb0 100755 --- a/scripts/automation/trex_control_plane/doc/index.rst +++ b/scripts/automation/trex_control_plane/doc/index.rst @@ -18,6 +18,13 @@ To understand the entirely how the API works and how to set up the server side, **Use the table of contents below or the menu to your left to navigate through the site** +Getting Started +=============== +.. toctree:: + :maxdepth: 2 + + installation + API Reference ============= .. toctree:: @@ -39,6 +46,13 @@ Usage Examples usage_examples +About TRex +========== +.. toctree:: + :maxdepth: 2 + + All about TRex <about_trex> + Indices and tables ================== diff --git a/scripts/automation/trex_control_plane/doc/packet_generator/examples.rst b/scripts/automation/trex_control_plane/doc/packet_generator/examples.rst new file mode 100755 index 00000000..bff1ef7f --- /dev/null +++ b/scripts/automation/trex_control_plane/doc/packet_generator/examples.rst @@ -0,0 +1,5 @@ +
+Packet Builder Usage Examples
+=============================
+
+Here I'll add usage examples, very similar to those I added to RPC document
\ No newline at end of file diff --git a/scripts/automation/trex_control_plane/doc/packet_generator/export_format.yaml b/scripts/automation/trex_control_plane/doc/packet_generator/export_format.yaml new file mode 100755 index 00000000..9f8c8f7b --- /dev/null +++ b/scripts/automation/trex_control_plane/doc/packet_generator/export_format.yaml @@ -0,0 +1,47 @@ +#################################################### +#### TRex packet export format #### +#################################################### + +# PACKET REP - OPTION #1 +packet: + is_pcap : YES/NO # <1> + binary : [] # <2> + pcap : path/to/pcap/file.pcap # <3> + meta : any metadata wished to # <4> + +# PACKET REP - OPTION #2 +packet: + data : [] / path/to/pcap/file.pcap # <5> + meta : any metadata wished to # <4> + +vm: # <6> + - vm instruction #1 + - vm instruction #2 + ... + - vm instruction #N + + +################################### +#### Comments #### +################################### +# +# <1>: is_pcap is a boolean field that indicates if packet is transferred by pcap referencs +# ('YES') or binary representation ('NO'). +# +# <2>: binary field encodes the packet in binary representation. in a sequence (array) data. +# Each array item is an integer ranging 0-255. +# **LEAVE BLANK IF USING PCAP REFERENCE** +# +# <3>: path to the linked pcap file. Make sure to provide path with reading credentials. +# **LEAVE BLANK IF USING BINARY REP FOR THE PACKET** +# +# <4>: meta data is any JSON formatted data ment to be passed on. +# +# <5>: data field can be both binary representation or pcap file refernce, +# without the need for user's explicit typing. +# The application logic differs between the cases by the object type +# (array/string ending in '.pcap') +# Less configuration, little more confusing, LESS similar to RPC spec +# +# <6>: vm instructions passed in array representation (sequence). +# Each instruction is deifned according to the structures of the supported VM instructions.
\ No newline at end of file diff --git a/scripts/automation/trex_control_plane/doc/requirements.rst b/scripts/automation/trex_control_plane/doc/requirements.rst deleted file mode 100755 index e69de29b..00000000 --- a/scripts/automation/trex_control_plane/doc/requirements.rst +++ /dev/null diff --git a/scripts/automation/trex_control_plane/examples/client_interactive_example.py b/scripts/automation/trex_control_plane/examples/client_interactive_example.py index 5a3ebf8a..9ee28898 100755 --- a/scripts/automation/trex_control_plane/examples/client_interactive_example.py +++ b/scripts/automation/trex_control_plane/examples/client_interactive_example.py @@ -74,7 +74,7 @@ class InteractiveTRexClient(cmd.Cmd): print termstyle.green("*** End of TRex status prompt ***") def do_show_trex_files_path (self, line): - """Prompts the local path in which files are stored when pushed to TRex server from client""" + """Prompts the local path in which files are stored when pushed to t-rex server from client""" print self.trex.get_trex_files_path() print termstyle.green("*** End of trex_files_path prompt ***") diff --git a/scripts/trex-cfg b/scripts/trex-cfg index ca442d15..2aebf026 100755 --- a/scripts/trex-cfg +++ b/scripts/trex-cfg @@ -30,15 +30,6 @@ for file in /sys/devices/system/node/node0/hugepages/hugepages-2048kB/nr_hugepag fi done -MACHINE_TYPE=`uname -m` - -if [ ${MACHINE_TYPE} != 'x86_64' ]; then - echo "ERROR You have a 32bit Kernel try to install 64bit Kernel" - exit 1 -fi - - - if ! lsmod | grep -q igb_uio ; then echo "Load the drivers for the first time " modprobe uio |