summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2019-03-21 20:41:45 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-03-21 20:41:45 +0000
commit0232ee83ca4fe94f8e5fa9e51ce83c289e2ae5d8 (patch)
treeb1e6bd169a9cb31579858188a897a83dd6b18bee
parentc1543a2f005cec528d892466cb3238ed06115c09 (diff)
parent492f85284cbe3b78c66d60e187081701c8eb4869 (diff)
Merge "Set ext net and name server in Shaker templates"
-rw-r--r--functest/opnfv_tests/openstack/shaker/shaker.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/functest/opnfv_tests/openstack/shaker/shaker.py b/functest/opnfv_tests/openstack/shaker/shaker.py
index 95e10022f..995a10b18 100644
--- a/functest/opnfv_tests/openstack/shaker/shaker.py
+++ b/functest/opnfv_tests/openstack/shaker/shaker.py
@@ -22,6 +22,7 @@ import os
import scp
from functest.core import singlevm
+from functest.utils import env
class Shaker(singlevm.SingleVm2):
@@ -99,8 +100,8 @@ class Shaker(singlevm.SingleVm2):
'{}'
'env && '
'timeout {} shaker --image-name {} --flavor-name {} '
- '--server-endpoint {}:9000 --scenario '
- 'openstack/full_l2,'
+ '--server-endpoint {}:9000 --external-net {} --dns-nameservers {} '
+ '--scenario openstack/full_l2,'
'openstack/full_l3_east_west,'
'openstack/full_l3_north_south,'
'openstack/perf_l3_north_south '
@@ -110,7 +111,8 @@ class Shaker(singlevm.SingleVm2):
'export OS_CACERT=~/os_cacert && ' if os.environ.get(
'OS_CACERT') else '',
self.shaker_timeout, self.image.name, self.flavor.name,
- self.fip.floating_ip_address))
+ self.fip.floating_ip_address, self.ext_net.id,
+ env.get('NAMESERVER')))
self.__logger.info("output:\n%s", stdout.read())
self.__logger.info("error:\n%s", stderr.read())
if not os.path.exists(self.res_dir):