Autogen: Create NICs for TCP suites.

+ Put Regenerator internal functions ourside class.
+ Duplicate into _default_ and _tcp_ functions.
+ Rework Testcase to be a single class with two factories.
+ Improve suite and testcase naming.

Change-Id: I1f835b576c476c1a40c8c52469b1876695f9ae73
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

1 files changed, 11 insertions, 12 deletions

diff --git a/resources/libraries/python/tcp.py b/resources/libraries/python/tcp.py
index 1b08912b7e..f3a24cbd06 100644
--- a/resources/libraries/python/tcp.py
+++ b/resources/libraries/python/tcp.py
@@ -73,17 +73,16 @@ class TCPUtils(object):
         :type fifo_size: str
         :type private_segment_size: str
         """
-        if http_static_plugin == True:
-            cmd='http static server www-root {www_root} '\
-                'prealloc-fifos {prealloc_fifos} fifo-size {fifo_size}'\
-                ' private-segment-size {pvt_seg_size}'\
-                .format(www_root=cls.www_root_dir,
-                        prealloc_fifos=prealloc_fifos, fifo_size=fifo_size,
-                        pvt_seg_size=private_segment_size)
+        if http_static_plugin:
+            cmd = 'http static server www-root {www_root} '\
+                  'prealloc-fifos {prealloc_fifos} fifo-size {fifo_size}'\
+                  ' private-segment-size {pvt_seg_size}'\
+                  .format(www_root=cls.www_root_dir,
+                          prealloc_fifos=prealloc_fifos, fifo_size=fifo_size,
+                          pvt_seg_size=private_segment_size)
         else:
-            cmd='test http server static prealloc-fifos {prealloc_fifos} '\
-                'fifo-size {fifo_size} private-segment-size {pvt_seg_size}'\
-                .format(prealloc_fifos=prealloc_fifos, fifo_size=fifo_size,
-                        pvt_seg_size=private_segment_size)
+            cmd = 'test http server static prealloc-fifos {prealloc_fifos} '\
+                  'fifo-size {fifo_size} private-segment-size {pvt_seg_size}'\
+                  .format(prealloc_fifos=prealloc_fifos, fifo_size=fifo_size,
+                          pvt_seg_size=private_segment_size)
         PapiSocketExecutor.run_cli_cmd(node, cmd)
-