vFW scale-up template.

Added topology and traffic profile templates
Added support for using JinJa2 templates in topology definition
Added support for static pipeline configs for SampleVNFs

JIRA: YARDSTICK-1043

Change-Id: Iab99fd5b5ad69ca32ee70b9fe47779387ad27e7f
Signed-off-by: Chornyi, TarasX <tarasx.chornyi@intel.com>
Signed-off-by: Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com>

4 files changed, 142 insertions, 16 deletions

diff --git a/yardstick/benchmark/scenarios/networking/vnf_generic.py b/yardstick/benchmark/scenarios/networking/vnf_generic.py
index c43dabfd4..45c151b59 100644
--- a/yardstick/benchmark/scenarios/networking/vnf_generic.py
+++ b/yardstick/benchmark/scenarios/networking/vnf_generic.py
@@ -28,7 +28,6 @@ from yardstick.benchmark.scenarios import base as scenario_base
 from yardstick.common.constants import LOG_DIR
 from yardstick.common.process import terminate_children
 from yardstick.common import utils
-from yardstick.common.yaml_loader import yaml_load
 from yardstick.network_services.collector.subscriber import Collector
 from yardstick.network_services.vnf_generic import vnfdgen
 from yardstick.network_services.vnf_generic.vnf.base import GenericVNF
@@ -100,12 +99,7 @@ class NetworkServiceTestCase(scenario_base.Scenario):
         self.scenario_cfg = scenario_cfg
         self.context_cfg = context_cfg
 
-        # fixme: create schema to validate all fields have been provided
-        with utils.open_relative_file(scenario_cfg["topology"],
-                                      scenario_cfg['task_path']) as stream:
-            topology_yaml = yaml_load(stream)
-
-        self.topology = topology_yaml["nsd:nsd-catalog"]["nsd"][0]
+        self._render_topology()
         self.vnfs = []
         self.collector = None
         self.traffic_profile = None
@@ -184,6 +178,12 @@ class NetworkServiceTestCase(scenario_base.Scenario):
         with utils.open_relative_file(profile, path) as infile:
             return infile.read()
 
+    def _get_topology(self):
+        topology = self.scenario_cfg["topology"]
+        path = self.scenario_cfg["task_path"]
+        with utils.open_relative_file(topology, path) as infile:
+            return infile.read()
+
     def _fill_traffic_profile(self):
         tprofile = self._get_traffic_profile()
         extra_args = self.scenario_cfg.get('extra_args', {})
@@ -198,6 +198,15 @@ class NetworkServiceTestCase(scenario_base.Scenario):
         traffic_vnfd = vnfdgen.generate_vnfd(tprofile, tprofile_data)
         self.traffic_profile = tprofile_base.TrafficProfile.get(traffic_vnfd)
 
+    def _render_topology(self):
+        topology = self._get_topology()
+        topology_args = self.scenario_cfg.get('extra_args', {})
+        topolgy_data = {
+            'extra_args': topology_args
+        }
+        topology_yaml = vnfdgen.generate_vnfd(topology, topolgy_data)
+        self.topology = topology_yaml["nsd:nsd-catalog"]["nsd"][0]
+
     def _find_vnf_name_from_id(self, vnf_id):
         return next((vnfd["vnfd-id-ref"]
                      for vnfd in self.topology["constituent-vnfd"]
diff --git a/yardstick/network_services/vnf_generic/vnf/sample_vnf.py b/yardstick/network_services/vnf_generic/vnf/sample_vnf.py
index a6b1d0792..d6249a874 100644
--- a/yardstick/network_services/vnf_generic/vnf/sample_vnf.py
+++ b/yardstick/network_services/vnf_generic/vnf/sample_vnf.py
@@ -174,6 +174,7 @@ class DpdkVnfSetupEnvHelper(SetupEnvHelper):
         vnf_cfg = self.scenario_helper.vnf_cfg
         task_path = self.scenario_helper.task_path
 
+        config_file = vnf_cfg.get('file')
         lb_count = vnf_cfg.get('lb_count', 3)
         lb_config = vnf_cfg.get('lb_config', 'SW')
         worker_config = vnf_cfg.get('worker_config', '1C/1T')
@@ -202,12 +203,20 @@ class DpdkVnfSetupEnvHelper(SetupEnvHelper):
                                     self.socket)
 
         multiport.generate_config()
-        with open(self.CFG_CONFIG) as handle:
-            new_config = handle.read()
-
-        new_config = self._update_traffic_type(new_config, traffic_options)
-        new_config = self._update_packet_type(new_config, traffic_options)
-
+        if config_file:
+            with utils.open_relative_file(config_file, task_path) as infile:
+                new_config = ['[EAL]']
+                vpci = []
+                for port in self.vnfd_helper.port_pairs.all_ports:
+                    interface = self.vnfd_helper.find_interface(name=port)
+                    vpci.append(interface['virtual-interface']["vpci"])
+                new_config.extend('w = {0}'.format(item) for item in vpci)
+                new_config = '\n'.join(new_config) + '\n' + infile.read()
+        else:
+            with open(self.CFG_CONFIG) as handle:
+                new_config = handle.read()
+            new_config = self._update_traffic_type(new_config, traffic_options)
+            new_config = self._update_packet_type(new_config, traffic_options)
         self.ssh_helper.upload_config_file(config_basename, new_config)
         self.ssh_helper.upload_config_file(script_basename,
                                            multiport.generate_script(self.vnfd_helper))
diff --git a/yardstick/tests/functional/benchmark/scenarios/networking/test_vnf_generic.py b/yardstick/tests/functional/benchmark/scenarios/networking/test_vnf_generic.py
index da75e3a7e..38f1a978d 100644
--- a/yardstick/tests/functional/benchmark/scenarios/networking/test_vnf_generic.py
+++ b/yardstick/tests/functional/benchmark/scenarios/networking/test_vnf_generic.py
@@ -17,7 +17,6 @@ import sys
 
 import mock
 import unittest
-import yaml
 
 from yardstick import tests as y_tests
 from yardstick.common import utils
@@ -53,6 +52,24 @@ uplink_{{vport}}:
 {% endfor %}
 """
 
+TOPOLOGY_PROFILE = """
+{% set vports = get(extra_args, 'vports', 2) %}
+nsd:nsd-catalog:
+    nsd:
+    -   id: 3tg-topology
+        vld:
+{% for vport in range(0,vports,2|int) %}
+        -   id: uplink_{{loop.index0}}
+            name: tg__0 to vnf__0 link {{vport + 1}}
+            vnfd-connection-point-ref:
+            -   vnfd-connection-point-ref: xe{{vport}}
+        -   id: downlink_{{loop.index0}}
+            name: vnf__0 to tg__0 link {{vport + 2}}
+            vnfd-connection-point-ref:
+            -   vnfd-connection-point-ref: xe{{vport+1}}
+{% endfor %}
+"""
+
 class VnfGenericTestCase(unittest.TestCase):
 
     def setUp(self):
@@ -61,11 +78,13 @@ class VnfGenericTestCase(unittest.TestCase):
                         'traffic_profile': 'fake_fprofile_path'}
         context_cfg = {}
         topology_yaml = {'nsd:nsd-catalog': {'nsd': [mock.Mock()]}}
-        with mock.patch.object(yaml, 'load', return_value=topology_yaml), \
-                mock.patch.object(utils, 'open_relative_file'):
+
+        with mock.patch.object(utils, 'open_relative_file') as mock_open_path:
+            mock_open_path.side_effect = mock.mock_open(read_data=str(topology_yaml))
             self.ns_testcase = vnf_generic.NetworkServiceTestCase(scenario_cfg,
                                                                   context_cfg)
         self.ns_testcase._get_traffic_profile = mock.Mock()
+        self.ns_testcase._get_topology = mock.Mock()
 
     def test__fill_traffic_profile_no_args(self):
         traffic_profile = copy.deepcopy(TRAFFIC_PROFILE_1)
@@ -108,3 +127,69 @@ class VnfGenericTestCase(unittest.TestCase):
         config = self.ns_testcase.traffic_profile.params
         self.assertEqual({'ipv4': '192.168.0.0'}, config['uplink_0'])
         self.assertNotIn('uplink_1', config)
+
+    def test__render_topology_with_args(self):
+        topology_profile = copy.deepcopy(TOPOLOGY_PROFILE)
+        self.ns_testcase._get_topology.return_value = topology_profile
+        self.ns_testcase.scenario_cfg['extra_args'] = {'vports': 6}
+
+        self.ns_testcase._render_topology()
+        topology = self.ns_testcase.topology
+        self.assertEqual("3tg-topology", topology['id'])
+        vld = self.ns_testcase.topology['vld']
+        self.assertEqual(len(vld), 6)
+        for index, vport in enumerate(range(0, 6, 2)):
+            self.assertEqual('uplink_{}'.format(index), vld[vport]['id'])
+            self.assertEqual('tg__0 to vnf__0 link {}'.format(vport + 1), vld[vport]['name'])
+            self.assertEqual('xe{}'.format(vport),
+                             vld[vport]['vnfd-connection-point-ref'][0]
+                             ['vnfd-connection-point-ref'])
+
+            self.assertEqual('downlink_{}'.format(index), vld[vport + 1]['id'])
+            self.assertEqual('vnf__0 to tg__0 link {}'.format(vport + 2), vld[vport + 1]['name'])
+            self.assertEqual('xe{}'.format(vport + 1),
+                             vld[vport + 1]['vnfd-connection-point-ref'][0]
+                             ['vnfd-connection-point-ref'])
+
+    def test__render_topology_incorrect_args(self):
+        topology_profile = copy.deepcopy(TOPOLOGY_PROFILE)
+        self.ns_testcase._get_topology.return_value = topology_profile
+        self.ns_testcase.scenario_cfg['extra_args'] = {'fake_vports': 5}
+
+        self.ns_testcase._render_topology()
+
+        topology = self.ns_testcase.topology
+        self.assertEqual("3tg-topology", topology['id'])
+        vld = self.ns_testcase.topology['vld']
+        self.assertEqual(len(vld), 2)
+
+        self.assertEqual('uplink_0', vld[0]['id'])
+        self.assertEqual('tg__0 to vnf__0 link 1', vld[0]['name'])
+        self.assertEqual('xe0',
+                         vld[0]['vnfd-connection-point-ref'][0]['vnfd-connection-point-ref'])
+
+        self.assertEqual('downlink_0', vld[1]['id'])
+        self.assertEqual('vnf__0 to tg__0 link 2', vld[1]['name'])
+        self.assertEqual('xe1',
+                         vld[1]['vnfd-connection-point-ref'][0]['vnfd-connection-point-ref'])
+
+    def test__render_topology_no_args(self):
+        topology_profile = copy.deepcopy(TOPOLOGY_PROFILE)
+        self.ns_testcase._get_topology.return_value = topology_profile
+
+        self.ns_testcase._render_topology()
+
+        topology = self.ns_testcase.topology
+        self.assertEqual("3tg-topology", topology['id'])
+        vld = self.ns_testcase.topology['vld']
+        self.assertEqual(len(vld), 2)
+
+        self.assertEqual('uplink_0', vld[0]['id'])
+        self.assertEqual('tg__0 to vnf__0 link 1', vld[0]['name'])
+        self.assertEqual('xe0',
+                         vld[0]['vnfd-connection-point-ref'][0]['vnfd-connection-point-ref'])
+
+        self.assertEqual('downlink_0', vld[1]['id'])
+        self.assertEqual('vnf__0 to tg__0 link 2', vld[1]['name'])
+        self.assertEqual('xe1',
+                         vld[1]['vnfd-connection-point-ref'][0]['vnfd-connection-point-ref'])
diff --git a/yardstick/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py b/yardstick/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
index 022e66ff1..83db6ae01 100644
--- a/yardstick/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
+++ b/yardstick/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
@@ -645,6 +645,29 @@ class TestNetworkServiceTestCase(unittest.TestCase):
             )
             mock_tprofile_get.assert_called_once_with(fake_vnfd)
 
+    @mock.patch.object(utils, 'open_relative_file')
+    def test__get_topology(self, mock_open_path):
+        self.s.scenario_cfg['topology'] = 'fake_topology'
+        self.s.scenario_cfg['task_path'] = 'fake_path'
+        mock_open_path.side_effect = mock.mock_open(read_data='fake_data')
+        self.assertEqual('fake_data', self.s._get_topology())
+        mock_open_path.assert_called_once_with('fake_topology', 'fake_path')
+
+    @mock.patch.object(vnfdgen, 'generate_vnfd')
+    def test__render_topology(self, mock_generate):
+        fake_topology = 'fake_topology'
+        mock_generate.return_value = {'nsd:nsd-catalog': {'nsd': ['fake_nsd']}}
+        with mock.patch.object(self.s, '_get_topology',
+                               return_value=fake_topology) as mock_get_topology:
+            self.s._render_topology()
+            mock_get_topology.assert_called_once()
+
+        mock_generate.assert_called_once_with(
+            fake_topology,
+            {'extra_args': {'arg1': 'value1', 'arg2': 'value2'}}
+        )
+        self.assertEqual(self.s.topology, 'fake_nsd')
+
     def test_teardown(self):
         vnf = mock.Mock(autospec=GenericVNF)
         vnf.terminate = mock.Mock(return_value=True)