Merge "Addition of Prox NSB BNG and BNG-QoS test"

5 files changed, 41 insertions, 21 deletions

diff --git a/tests/unit/network_services/traffic_profile/test_prox_acl.py b/tests/unit/network_services/traffic_profile/test_prox_acl.py
index a0c60186c..ef5bac0d5 100644
--- a/tests/unit/network_services/traffic_profile/test_prox_acl.py
+++ b/tests/unit/network_services/traffic_profile/test_prox_acl.py
@@ -59,18 +59,9 @@ class TestProxACLProfile(unittest.TestCase):
         fail_tuple = ProxTestDataTuple(10.0, 1, 2, 3, 4, [5.6, 5.7, 5.8], 850, 1000, 123.4)
 
         traffic_gen = mock.MagicMock()
-        traffic_gen.run_test = target
-
-        traffic_gen.resource_helper.run_test.side_effect = [
-            success_tuple,
-            success_tuple,
-            success_tuple,
-            fail_tuple,
-            success_tuple,
-            fail_tuple,
-            fail_tuple,
-            fail_tuple,
-        ]
+
+        profile_helper = mock.MagicMock()
+        profile_helper.run_test = target
 
         profile = ProxACLProfile(tp_config)
         profile.init(mock.MagicMock())
@@ -82,5 +73,6 @@ class TestProxACLProfile(unittest.TestCase):
         profile.duration = 30
         profile.test_value = 100.0
         profile.tolerated_loss = 100.0
+        profile._profile_helper = profile_helper
 
         profile.run_test_with_pkt_size(traffic_gen, profile.pkt_size, profile.duration)
diff --git a/tests/unit/network_services/traffic_profile/test_prox_binsearch.py b/tests/unit/network_services/traffic_profile/test_prox_binsearch.py
index f56a7fba9..c1f1c825b 100644
--- a/tests/unit/network_services/traffic_profile/test_prox_binsearch.py
+++ b/tests/unit/network_services/traffic_profile/test_prox_binsearch.py
@@ -51,10 +51,13 @@ class TestProxBinSearchProfile(unittest.TestCase):
         fail_tuple = ProxTestDataTuple(10.0, 1, 2, 3, 4, [5.6, 5.7, 5.8], 850, 1000, 123.4)
 
         traffic_generator = mock.MagicMock()
-        traffic_generator.run_test = target
+
+        profile_helper = mock.MagicMock()
+        profile_helper.run_test = target
 
         profile = ProxBinSearchProfile(tp_config)
         profile.init(mock.MagicMock())
+        profile._profile_helper = profile_helper
 
         profile.execute_traffic(traffic_generator)
         self.assertEqual(round(profile.current_lower, 2), 74.69)
@@ -82,10 +85,13 @@ class TestProxBinSearchProfile(unittest.TestCase):
         fail_tuple = ProxTestDataTuple(10.0, 1, 2, 3, 4, [5.6, 5.7, 5.8], 850, 1000, 123.4)
 
         traffic_generator = mock.MagicMock()
-        traffic_generator.run_test = target
+
+        profile_helper = mock.MagicMock()
+        profile_helper.run_test = target
 
         profile = ProxBinSearchProfile(tp_config)
         profile.init(mock.MagicMock())
+        profile._profile_helper = profile_helper
 
         profile.execute_traffic(traffic_generator)
         self.assertEqual(round(profile.current_lower, 2), 24.06)
diff --git a/tests/unit/network_services/traffic_profile/test_prox_mpls.py b/tests/unit/network_services/traffic_profile/test_prox_mpls.py
index 642fecc35..00a690d2a 100644
--- a/tests/unit/network_services/traffic_profile/test_prox_mpls.py
+++ b/tests/unit/network_services/traffic_profile/test_prox_mpls.py
@@ -51,10 +51,11 @@ class TestProxMplsTagUntagProfile(unittest.TestCase):
         fail_tuple = ProxTestDataTuple(10.0, 1, 2, 3, 4, [5.6, 5.7, 5.8], 850, 1000, 123.4)
 
         traffic_generator = mock.MagicMock()
-        traffic_generator.run_test = target
 
         profile = ProxMplsTagUntagProfile(tp_config)
         profile.init(mock.MagicMock())
+        profile._profile_helper = profile_helper = mock.MagicMock()
+        profile_helper.run_test = target
 
         profile.execute_traffic(traffic_generator)
         self.assertEqual(round(profile.current_lower, 2), 74.69)
@@ -82,10 +83,11 @@ class TestProxMplsTagUntagProfile(unittest.TestCase):
         fail_tuple = ProxTestDataTuple(10.0, 1, 2, 3, 4, [5.6, 5.7, 5.8], 850, 1000, 123.4)
 
         traffic_generator = mock.MagicMock()
-        traffic_generator.run_test = target
 
         profile = ProxMplsTagUntagProfile(tp_config)
         profile.init(mock.MagicMock())
+        profile._profile_helper = profile_helper = mock.MagicMock()
+        profile_helper.run_test = target
 
         profile.execute_traffic(traffic_generator)
         self.assertEqual(round(profile.current_lower, 2), 24.06)
diff --git a/tests/unit/network_services/traffic_profile/test_prox_profile.py b/tests/unit/network_services/traffic_profile/test_prox_profile.py
index 9899d9909..c32cc2878 100644
--- a/tests/unit/network_services/traffic_profile/test_prox_profile.py
+++ b/tests/unit/network_services/traffic_profile/test_prox_profile.py
@@ -26,6 +26,7 @@ stl_patch.start()
 
 if stl_patch:
     from yardstick.network_services.traffic_profile.prox_profile import ProxProfile
+    from yardstick.network_services.vnf_generic.vnf.prox_helpers import ProxResourceHelper
 
 
 class TestProxProfile(unittest.TestCase):
@@ -78,6 +79,13 @@ class TestProxProfile(unittest.TestCase):
         }
 
         traffic_generator = mock.MagicMock()
+
+        setup_helper = traffic_generator.setup_helper
+        setup_helper.find_in_section.return_value = None
+
+        prox_resource_helper = ProxResourceHelper(setup_helper)
+        traffic_generator.resource_helper = prox_resource_helper
+
         profile = ProxProfile(tp_config)
 
         self.assertFalse(profile.done)
@@ -86,6 +94,7 @@ class TestProxProfile(unittest.TestCase):
                 profile.execute_traffic(traffic_generator)
 
         self.assertIsNone(profile.execute_traffic(traffic_generator))
+        self.assertTrue(profile.done)
 
     def test_bounds_iterator(self):
         tp_config = {
diff --git a/tests/unit/network_services/traffic_profile/test_prox_ramp.py b/tests/unit/network_services/traffic_profile/test_prox_ramp.py
index 357298759..1acec2f68 100644
--- a/tests/unit/network_services/traffic_profile/test_prox_ramp.py
+++ b/tests/unit/network_services/traffic_profile/test_prox_ramp.py
@@ -26,6 +26,7 @@ stl_patch.start()
 
 if stl_patch:
     from yardstick.network_services.traffic_profile.prox_ramp import ProxRampProfile
+    from yardstick.network_services.vnf_generic.vnf.prox_helpers import ProxProfileHelper
     from yardstick.network_services.vnf_generic.vnf.prox_helpers import ProxTestDataTuple
 
 
@@ -43,14 +44,18 @@ class TestProxRampProfile(unittest.TestCase):
         success_tuple = ProxTestDataTuple(10.0, 1, 2, 3, 4, [5.1, 5.2, 5.3], 995, 1000, 123.4)
 
         traffic_gen = mock.MagicMock()
-        traffic_gen.resource_helper.run_test.return_value = success_tuple
+        traffic_gen._test_type = 'Generic'
+
+        profile_helper = ProxProfileHelper(traffic_gen.resource_helper)
+        profile_helper.run_test = run_test = mock.MagicMock(return_value=success_tuple)
 
         profile = ProxRampProfile(tp_config)
         profile.fill_samples = fill_samples = mock.MagicMock()
         profile.queue = mock.MagicMock()
+        profile._profile_helper = profile_helper
 
         profile.run_test_with_pkt_size(traffic_gen, 128, 30)
-        self.assertEqual(traffic_gen.resource_helper.run_test.call_count, 10)
+        self.assertEqual(run_test.call_count, 10)
         self.assertEqual(fill_samples.call_count, 10)
 
     def test_run_test_with_pkt_size_with_fail(self):
@@ -65,8 +70,7 @@ class TestProxRampProfile(unittest.TestCase):
         success_tuple = ProxTestDataTuple(10.0, 1, 2, 3, 4, [5.1, 5.2, 5.3], 995, 1000, 123.4)
         fail_tuple = ProxTestDataTuple(10.0, 1, 2, 3, 4, [5.6, 5.7, 5.8], 850, 1000, 123.4)
 
-        traffic_gen = mock.MagicMock()
-        traffic_gen.resource_helper.run_test.side_effect = [
+        result_list = [
             success_tuple,
             success_tuple,
             success_tuple,
@@ -77,10 +81,17 @@ class TestProxRampProfile(unittest.TestCase):
             fail_tuple,
         ]
 
+        traffic_gen = mock.MagicMock()
+        traffic_gen._test_type = 'Generic'
+
+        profile_helper = ProxProfileHelper(traffic_gen.resource_helper)
+        profile_helper.run_test = run_test = mock.MagicMock(side_effect=result_list)
+
         profile = ProxRampProfile(tp_config)
         profile.fill_samples = fill_samples = mock.MagicMock()
         profile.queue = mock.MagicMock()
+        profile._profile_helper = profile_helper
 
         profile.run_test_with_pkt_size(traffic_gen, 128, 30)
-        self.assertEqual(traffic_gen.resource_helper.run_test.call_count, 4)
+        self.assertEqual(run_test.call_count, 4)
         self.assertEqual(fill_samples.call_count, 3)