Added traffic update capability to Ixload TG

Allow yardstick to update IP/MAX of Net traffic

- Implemented functionality for updating traffics IP/MAC address
  in ixloadconfiguration.
- Extended http_ixload.py with functions for update IP/MAC
  address of netTraffic.
- In HTTP-vFW_IPv4_2Ports_Concurrency.rxf changed name's of
  networks from "client network" to "uplink_0 and the same for
  server

JIRA: YARDSTICK-1418

Change-Id: I28ef68b77466fff15af589954e3ef63e8099428f
Signed-off-by: Myron Sosyak <myronx.sosyak@intel.com>
Signed-off-by: Taras Chornyi <tarasx.chornyi@intel.com>

1 files changed, 32 insertions, 27 deletions

diff --git a/samples/vnf_samples/traffic_profiles/http_tests/HTTP_1b-requests_65000_concurrency.yaml b/samples/vnf_samples/traffic_profiles/http_tests/HTTP_1b-requests_65000_concurrency.yaml
index 112836ac9..dcc11d55a 100644
--- a/samples/vnf_samples/traffic_profiles/http_tests/HTTP_1b-requests_65000_concurrency.yaml
+++ b/samples/vnf_samples/traffic_profiles/http_tests/HTTP_1b-requests_65000_concurrency.yaml
@@ -5,37 +5,42 @@ description:     Traffic profile to run HTTP test
 traffic_profile:
   traffic_type: TrafficProfileGenericHTTP
 
-#http client specific values
 uplink_0:
-    http_no_requests: "1000"                # number of http iterations
-    http_concurency: "65000"                  # number of threads to be run
-    http_locator:  "/1B.bin"              # http locator to be read
-    http_peer_address: "152.40.40.20"       # address range of the servers
-    http_peer_port: "9004"                  # port range of the server
-    http_client_address: "152.16.100.20"    # address range of the servers
-    private_subnet_mask: "255.255.255.0"
-    attacker_tests: "False"                 # True : If attacker Test, False : Otherwise
+    ip:
+        address: "152.16.100.32"          # must be in same subnet with gateway
+        subnet_prefix: 24                 # subnet prefix
+        mac: "Auto"                       # port mac addr or auto to generate automatically
+        gateway: <GATEWAY_ADDR>           # will be taken from pod file
+
+    http_client:
+        http_no_requests: "1000"          # number of http iterations
+        http_concurency: "65000"          # number of threads to be run
+        http_locator:  "/1B.bin"          # http locator to be read
+        attacker_tests: "False"           # True : If attacker Test, False : Otherwise
 
-#http server side
 downlink_0:
-    http_locator_image_size: "1B"      # image size requested by http client
-    http_bind_address: "152.40.40.20"   # where address is bound
-    http_bind_port: "9004"              # when port is bound
-    public_subnet_mask: "255.255.255.0"
+    ip:
+        address: "152.40.40.32"           # must be in same subnet with gateway
+        subnet_prefix: 24                 # subnet prefix
+        mac: "Auto"                       # port mac addr or auto to generate automatically
+        gateway: <GATEWAY_ADDR>           # will be taken from pod file
 
 uplink_1:
-    http_no_requests: "1000"                # number of http iterations
-    http_concurency: "65000"                  # number of threads to be run
-    http_locator:  "/1B.bin"              # http locator to be read
-    http_peer_address: "192.40.40.20"       # address range of the servers
-    http_peer_port: "9004"                  # port range of the server
-    http_client_address: "152.16.100.20"    # address range of the servers
-    private_subnet_mask: "255.255.255.0"
-    attacker_tests: "False"                 # True : If attacker Test, False : Otherwise
+    ip:
+        address: "12.12.12.32"
+        subnet_prefix: 24
+        mac: "00:00:00:00:00:01"
+        gateway: <GATEWAY_ADDR>
+
+    http_client:
+        http_no_requests: "1000"
+        http_concurency: "65000"
+        http_locator:  "/1B.bin"
+        attacker_tests: "False"
 
-#http server side
 downlink_1:
-    http_locator_image_size: "1B"      # image size requested by http client
-    http_bind_address: "192.40.40.20"   # where address is bound
-    http_bind_port: "9004"              # when port is bound
-    public_subnet_mask: "255.255.255.0"
+    ip:
+        address: "13.13.13.32"
+        subnet_prefix: 24
+        mac: "00:00:00:00:00:02"
+        gateway: <GATEWAY_ADDR>
\ No newline at end of file