aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-06-24 17:24:54 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2019-06-25 18:06:01 +0200
commit4b641d38f3915cebf753e7fbdb1e522af0ce720e (patch)
tree89d9948c3daf81c0df838c14e9224f3f5bd21e4b
parent8b604e60a3bb1c2943ff716ce57ab6c891b069c4 (diff)
Add warning messages in vyos_vrouter
Both Cloudify based testcases print the same warning messages if NEW_USER_ROLE is admin. An additional whitespace is removed too. Change-Id: Idf2a2ea4373efdc579f0ac3e0a69ec08a7fbf105 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit b95cdce13a8c51f285e285a3c4332cf1732abadb)
-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
"""