Merge "NSB: fix port topology"

2 files changed, 29 insertions, 9 deletions

diff --git a/tests/unit/benchmark/contexts/test_heat.py b/tests/unit/benchmark/contexts/test_heat.py
index 582d9ab99..d1b5855f9 100644
--- a/tests/unit/benchmark/contexts/test_heat.py
+++ b/tests/unit/benchmark/contexts/test_heat.py
@@ -182,11 +182,17 @@ class HeatContextTestCase(unittest.TestCase):
             u'd-mac_address': u'00:10',
             u'd-device_id': u'dev43',
             u'd-network_id': u'net987',
+            u'e': u'40.30.20.15',
+            u'e-subnet_id': 2,
+            u'e-mac_address': u'00:10',
+            u'e-device_id': u'dev43',
+            u'e-network_id': u'net987',
         }
         server = mock.MagicMock()
         server.ports = OrderedDict([
-            ('a', {'stack_name': 'b', 'port': 'port_a'}),
-            ('c', {'stack_name': 'd', 'port': 'port_c'}),
+            ('a', [{'stack_name': 'b', 'port': 'port_a'}]),
+            ('c', [{'stack_name': 'd', 'port': 'port_c'},
+                   {'stack_name': 'e', 'port': 'port_f'}]),
         ])
 
         expected = {
@@ -205,7 +211,7 @@ class HeatContextTestCase(unittest.TestCase):
         }
         self.test_context.add_server_port(server)
         self.assertEqual(server.private_ip, '10.20.30.45')
-        self.assertEqual(len(server.interfaces), 2)
+        self.assertEqual(len(server.interfaces), 3)
         self.assertDictEqual(server.interfaces['port_a'], expected)
 
     @mock.patch('yardstick.benchmark.contexts.heat.HeatTemplate')
diff --git a/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py b/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
index 58244b8f5..8aa9a8c8b 100644
--- a/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
+++ b/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
@@ -24,6 +24,8 @@ import errno
 import unittest
 import mock
 
+from copy import deepcopy
+
 from tests.unit import STL_MOCKS
 from yardstick.benchmark.scenarios.networking.vnf_generic import \
     SshManager, NetworkServiceTestCase, IncorrectConfig, \
@@ -365,6 +367,24 @@ class TestNetworkServiceTestCase(unittest.TestCase):
         result = '152.16.100.2-152.16.100.254'
         self.assertEqual(result, self.s._get_ip_flow_range({"tg__1": 'xe0'}))
 
+    @mock.patch('yardstick.benchmark.scenarios.networking.vnf_generic.ipaddress')
+    def test__get_ip_flow_range_no_node_data(self, mock_ipaddress):
+        scenario_cfg = deepcopy(self.scenario_cfg)
+        scenario_cfg["traffic_options"]["flow"] = \
+            self._get_file_abspath("ipv4_1flow_Packets_vpe.yaml")
+
+        mock_ipaddress.ip_network.return_value = ipaddr = mock.Mock()
+        ipaddr.hosts.return_value = []
+
+        expected = '0.0.0.0'
+        result = self.s._get_ip_flow_range({"tg__2": 'xe0'})
+        self.assertEqual(result, expected)
+
+    def test__get_ip_flow_range_no_nodes(self):
+        expected = '0.0.0.0'
+        result = self.s._get_ip_flow_range({})
+        self.assertEqual(result, expected)
+
     def test___get_traffic_flow(self):
         self.scenario_cfg["traffic_options"]["flow"] = \
             self._get_file_abspath("ipv4_1flow_Packets_vpe.yaml")
@@ -653,12 +673,6 @@ class TestNetworkServiceTestCase(unittest.TestCase):
         res = NetworkServiceTestCase.parse_netdev_info(output)
         assert res == self.SAMPLE_VM_NETDEVS
 
-    def test_sort_dpdk_port_num(self):
-        netdevs = self.SAMPLE_NETDEVS.copy()
-        NetworkServiceTestCase._sort_dpdk_port_num(netdevs)
-        assert netdevs['lan']['dpdk_port_num'] == 0
-        assert netdevs['enp11s0']['dpdk_port_num'] == 1
-
     def test_probe_missing_values(self):
         netdevs = self.SAMPLE_NETDEVS.copy()
         network = {'local_mac': '0a:de:ad:be:ef:f5'}