Merge "Added NSB descriptors for vCMTS testcase"

[yardstick.git] / yardstick / network_services / vnf_generic / vnf / tg_landslide.py

diff --git a/yardstick/network_services/vnf_generic/vnf/tg_landslide.py b/yardstick/network_services/vnf_generic/vnf/tg_landslide.py
index 68021c9..285374a 100644 (file)
--- a/yardstick/network_services/vnf_generic/vnf/tg_landslide.py
+++ b/yardstick/network_services/vnf_generic/vnf/tg_landslide.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Intel Corporation
+# Copyright (c) 2018-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -35,11 +35,11 @@ LOG = logging.getLogger(__name__)
 class LandslideTrafficGen(sample_vnf.SampleVNFTrafficGen):
     APP_NAME = 'LandslideTG'
 
-    def __init__(self, name, vnfd, task_id, setup_env_helper_type=None,
+    def __init__(self, name, vnfd, setup_env_helper_type=None,
                  resource_helper_type=None):
         if resource_helper_type is None:
             resource_helper_type = LandslideResourceHelper
-        super(LandslideTrafficGen, self).__init__(name, vnfd, task_id,
+        super(LandslideTrafficGen, self).__init__(name, vnfd,
                                                   setup_env_helper_type,
                                                   resource_helper_type)
 
@@ -616,6 +616,13 @@ class LandslideResourceHelper(sample_vnf.ClientResourceHelper):
     def create_test_session(self, test_session):
         # Use tcl client to create session
         test_session['library'] = self._user_id
+
+        # If no traffic duration set in test case, use predefined default value
+        # in session profile
+        test_session['duration'] = self.scenario_helper.all_options.get(
+            'traffic_duration',
+            test_session['duration'])
+
         LOG.debug("Creating session='%s'", test_session['name'])
         self._tcl.create_test_session(test_session)