diff options
| author |   Manuel Buil <manuel.buil@ericsson.com> | 2016-05-24 16:11:53 +0200 |
|---|---|---|
| committer | Manuel Buil <manuel.buil@ericsson.com> | 2016-07-05 09:38:58 +0200 |
| commit | 9a4ed05300b2aed28e8d2ec213049d5475655577 (patch) | |
| tree | d1d63f88c6a9146e9a2b99ae54682b13cce68d28 /tests | |
| parent | 14c7413448e4690fefd0ecad908ec86d6f774d6f (diff) | |
SFC Yardstick test
Modifications of the SFC Yardstick test
The test creates two chains. One chain blocks HTTP the other one blocks SSH.
We doublecheck that HTTP works in one but not in the other and the same for
SSH.
There are some things that must be modified manually as ODL is not yet ready
for ovs 2.5.90. Here are the instructions:
https://wiki.opnfv.org/display/sfc/Yardstick
Change-Id: Ide6588a682f3491ab58c47ee7335205868c109fc
Signed-off-by: Manuel Buil <manuel.buil@ericsson.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/sfc/sfc_TC02.yaml | 36 | ||||
| -rw-r--r-- | tests/unit/benchmark/scenarios/networking/test_sfc.py | 18 |
2 files changed, 12 insertions, 42 deletions
diff --git a/tests/sfc/sfc_TC02.yaml b/tests/sfc/sfc_TC02.yaml deleted file mode 100644 index 85e6eeb52..000000000 --- a/tests/sfc/sfc_TC02.yaml +++ /dev/null @@ -1,36 +0,0 @@ -#SFC test case using Tacker as Orchestrator and Netvirt as classifier - -schema: "yardstick:task:0.1" - -scenarios: -- - type: sfc - - host: http_client.sfc - target: http_server.sfc - - runner: - type: Iteration - iterations: 1 - interval: 1 - -contexts: -- - name: sfc - placement_groups: - pgrp1: - policy: "availability" - servers: - http_client: - flavor: m1.tiny - image: cirros-0.3.3 - floating_ip: true - placement: "pgrp1" - http_server: - flavor: sfc_custom - image: sfc - floating_ip: true - placement: "pgrp1" - networks: - net_mgmt: - cidr: '11.0.0.0/24' diff --git a/tests/unit/benchmark/scenarios/networking/test_sfc.py b/tests/unit/benchmark/scenarios/networking/test_sfc.py index adce0824a..2d7990e59 100644 --- a/tests/unit/benchmark/scenarios/networking/test_sfc.py +++ b/tests/unit/benchmark/scenarios/networking/test_sfc.py @@ -26,26 +26,32 @@ class SfcTestCase(unittest.TestCase): # Used in Sfc.setup() context_cfg['target'] = dict() context_cfg['target']['user'] = 'root' - context_cfg['target']['password'] = 'octopus' - context_cfg['target']['ip'] = None + context_cfg['target']['password'] = 'opnfv' + context_cfg['target']['ip'] = '127.0.0.1' # Used in Sfc.run() context_cfg['host'] = dict() - context_cfg['host']['user'] = 'cirros' - context_cfg['host']['password'] = 'cubslose:)' + context_cfg['host']['user'] = 'root' + context_cfg['host']['password'] = 'opnfv' context_cfg['host']['ip'] = None context_cfg['target'] = dict() - context_cfg['target']['ip'] = None + context_cfg['target']['ip'] = '127.0.0.1' self.sfc = sfc.Sfc(scenario_cfg=scenario_cfg, context_cfg=context_cfg) @mock.patch('yardstick.benchmark.scenarios.networking.sfc.ssh') - def test_run_for_success(self, mock_ssh): + @mock.patch('yardstick.benchmark.scenarios.networking.sfc.sfc_openstack') + @mock.patch('yardstick.benchmark.scenarios.networking.sfc.subprocess') + def test_run_for_success(self, mock_subprocess, mock_openstack, mock_ssh): # Mock a successfull SSH in Sfc.setup() and Sfc.run() mock_ssh.SSH().execute.return_value = (0, '100', '') + mock_openstack.return_value = "127.0.0.1" + mock_subprocess.return_value = 'mocked!' result = {} + self.sfc.setup() self.sfc.run(result) + self.sfc.teardown() def main(): |