From: Martin Klozik <martin.klozik@tieto.com>
Date: Mon, 18 Jun 2018 18:40:11 +0000 (+0000)
Subject: Merge "connections: Introduction of generic API"
X-Git-Tag: opnfv-7.0.0~12
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7e3db8dbc23d91484cc608bd8cb1d42ea7729396;p=vswitchperf.git

Merge "connections: Introduction of generic API"
---

7e3db8dbc23d91484cc608bd8cb1d42ea7729396
diff --cc conf/integration/01_testcases.conf
index 945b36f7,4e3c192e..7daff217
--- a/conf/integration/01_testcases.conf
+++ b/conf/integration/01_testcases.conf
@@@ -466,17 -747,43 +561,17 @@@ INTEGRATION_TESTS = 
                          ['vnf1', 'stop'],
                          ['vnf2', 'stop'],
                       ] +
-                      STEP_VSWITCH_PVVP_FLOWS_FINIT
+                      STEP_VSWITCH_PVVP_CONNECTIONS_FINIT
      },
 -    {
 -        "Name": "vswitch_p4vp",
 -        "Description": "Just configure 4 chained vnfs",
 -        "Deployment": "clean",
 -        "TestSteps": STEP_VSWITCH_P4VP_FLOWS_INIT +
 -        [
 -            ['vnf1', 'start'],
 -            ['vnf2', 'start'],
 -            ['vnf3', 'start'],
 -            ['vnf4', 'start'],
 -            ['vnf1', 'stop'],
 -            ['vnf2', 'stop'],
 -            ['vnf3', 'stop'],
 -            ['vnf4', 'stop'],
 -        ] +
 -        STEP_VSWITCH_P4VP_FLOWS_FINIT
 -    },
      {
          "Name": "vswitch_p4vp_tput",
 -        "Description": "4 chained vnfs, execute RFC2544 throughput test",
 -        "Deployment": "clean",
 -        "TestSteps": STEP_VSWITCH_P4VP_FLOWS_INIT +
 -        [
 -            ['vnf1', 'start'],
 -            ['vnf2', 'start'],
 -            ['vnf3', 'start'],
 -            ['vnf4', 'start'],
 -            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_throughput', \
 -                'bidir' : 'True'}],
 -            ['vnf1', 'stop'],
 -            ['vnf2', 'stop'],
 -            ['vnf3', 'stop'],
 -            ['vnf4', 'stop'],
 -        ] +
 -        STEP_VSWITCH_P4VP_FLOWS_FINIT
 +        "Description": "4 chained vnfs, execute RFC2544 throughput test, deployment pvvp4",
 +        "Deployment": "pvvp4",
 +        "Parameters" : {
 +            "TRAFFIC" : {
 +                "traffic_type" : "rfc2544_throughput",
 +            },
 +        },
      },
      {
          "Name": "vswitch_p4vp_back2back",