diff options
6 files changed, 3 insertions, 61 deletions
diff --git a/scripts/automation/trex_control_plane/client_utils/packet_builder.py b/scripts/automation/trex_control_plane/client_utils/packet_builder.py index 1c643335..c687126b 100755 --- a/scripts/automation/trex_control_plane/client_utils/packet_builder.py +++ b/scripts/automation/trex_control_plane/client_utils/packet_builder.py @@ -1055,8 +1055,8 @@ class CTRexPktBuilder(object): def __init__(self, name, layer_type, ok_type, message=''): self._default_message = "The type of packet layer {layer_name} is of type {layer_type}, " \ "and not of the expected {allowed_type}.".format(layer_name=name, - layer_type=layer_type, - allowed_type=ok_type.__name__) + layer_type=layer_type, + allowed_type=ok_type.__name__) self.message = message or self._default_message super(CTRexPktBuilder.PacketLayerTypeError, self).__init__(-13, self.message) diff --git a/scripts/automation/trex_control_plane/doc/about_trex.rst b/scripts/automation/trex_control_plane/doc/about_trex.rst deleted file mode 100755 index 669e2b28..00000000 --- a/scripts/automation/trex_control_plane/doc/about_trex.rst +++ /dev/null @@ -1,19 +0,0 @@ -================== -About TRex project -================== - -Full project's official site ----------------------------- - -To learn all about TRex project, visit TRex `official site <http://trex-tgn.cisco.com>`_ - -GitHub Repository ------------------ - -`TRex GitHub repository <https://github.com/cisco-system-traffic-generator>`_ - -TRex Google Group ------------------ - -Check out the project's `google group <https://groups.google.com/forum/#!forum/trex-tgn>`_ to contact TRex DEV team and follow other user stories. - diff --git a/scripts/automation/trex_control_plane/doc/index.rst b/scripts/automation/trex_control_plane/doc/index.rst index 10803cb0..62fd9975 100755 --- a/scripts/automation/trex_control_plane/doc/index.rst +++ b/scripts/automation/trex_control_plane/doc/index.rst @@ -18,13 +18,6 @@ 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:: @@ -46,13 +39,6 @@ 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/installation.rst b/scripts/automation/trex_control_plane/doc/installation.rst deleted file mode 100755 index f234c260..00000000 --- a/scripts/automation/trex_control_plane/doc/installation.rst +++ /dev/null @@ -1,25 +0,0 @@ -============
-Installation
-============
-
-Prerequisites
--------------
-The TRex control plane is based on client-server model that interacts using JSON-RPC.
-
-In order to use the client-side API documented a TRex server daemon must be up and listening on the same host and port that the client tries to connect with.
-
-Compatibility
--------------
-Both client and server side were developed for Linux platform.
-The client-side module is also compatible with windows python.
-
-The client side can be used with both Python 2 and Python 3 versions.
-However, the server side was designed to and best fits with Python 2.7.6 and on (all 2.x series, assuming > 2.6.9).
-
-
-Installation manual
--------------------
-
-TRex Control Plane is a cross-platform, cross-operation system API to control and run TRex.
-
-The full, most updated manual (which refers to all programming languages) can be found under the `trex-core Wiki <https://github.com/cisco-system-traffic-generator/trex-core/wiki>`_ of the TRex website.
\ 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/server/trex_server.py b/scripts/automation/trex_control_plane/server/trex_server.py index 1e5098fb..fd39b9c4 100755 --- a/scripts/automation/trex_control_plane/server/trex_server.py +++ b/scripts/automation/trex_control_plane/server/trex_server.py @@ -318,7 +318,7 @@ class CTRexServer(object): io = iom, export = export_path ) - logger.info("T-REX FULL COMMAND: {command}".format(command = cmd) ) + logger.info("TREX FULL COMMAND: {command}".format(command = cmd) ) return (cmd, export_path, long(d)) |