aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2019-06-26 12:51:17 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-06-26 12:51:17 +0000
commit1b4c9ab4adaabfa50a1c6cb2dfd940b41db752e2 (patch)
tree21d318a50cf5a991d7cf79f03352439a1c18146e
parentaf7cd29970cf56cd8e0a0fc697022933bce652e7 (diff)
parent4b641d38f3915cebf753e7fbdb1e522af0ce720e (diff)
Merge "Add warning messages in vyos_vrouter" into stable/iruya
-rw-r--r--functest/opnfv_tests/vnf/ims/cloudify_ims.py2
-rw-r--r--functest/opnfv_tests/vnf/router/cloudify_vrouter.py8
2 files changed, 9 insertions, 1 deletions
diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
index 288e0316c..0f6adf96a 100644
--- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py
+++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
@@ -105,7 +105,7 @@ class CloudifyIms(cloudify.Cloudify):
if env.get('NEW_USER_ROLE').lower() == "admin":
self.__logger.warn(
"Defining NEW_USER_ROLE=admin will easily break the testcase "
- "because Cloudify doesn't manage tenancy (e.g. subnet "
+ "because Cloudify doesn't manage tenancy (e.g. subnet "
"overlapping)")
def execute(self):
diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
index ee2921066..b449d2d81 100644
--- a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
+++ b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
@@ -21,6 +21,7 @@ from functest.core import cloudify
from functest.opnfv_tests.vnf.router import vrouter_base
from functest.opnfv_tests.vnf.router.utilvnf import Utilvnf
from functest.utils import config
+from functest.utils import env
from functest.utils import functest_utils
@@ -110,6 +111,13 @@ class CloudifyVrouter(cloudify.Cloudify):
self.image_alt = None
self.flavor_alt = None
+ def check_requirements(self):
+ if env.get('NEW_USER_ROLE').lower() == "admin":
+ self.__logger.warn(
+ "Defining NEW_USER_ROLE=admin will easily break the testcase "
+ "because Cloudify doesn't manage tenancy (e.g. subnet "
+ "overlapping)")
+
def execute(self):
# pylint: disable=too-many-locals,too-many-statements
"""