aboutsummaryrefslogtreecommitdiffstats
path: root/yardstick/common/constants.py
diff options
context:
space:
mode:
authorJohn O Loughlin <john.oloughlin@intel.com>2018-07-11 11:22:39 +0100
committerRodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>2018-07-12 16:57:13 +0100
commit8da1feb7267f4b04e543b2e2e6590e2de8c31237 (patch)
tree8cd06439567fd6e6450184005bfc04c23cdb7bd5 /yardstick/common/constants.py
parent438f7b5100e05ed668a0ea90674008a391eb5784 (diff)
Improve "get_server" function in Kubernetes context
When a kubernetes context is returning the node info it is assumed that the first port defined is the ssh port which may not be the case. This patch will address this issue by looking for a defined port 22. JIRA: YARDSTICK-1301 Change-Id: I65dee1bcf62f21ebcaefeaa2666bb0ad53f3876c Signed-off-by: John O Loughlin <john.oloughlin@intel.com>
Diffstat (limited to 'yardstick/common/constants.py')
-rw-r--r--yardstick/common/constants.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/yardstick/common/constants.py b/yardstick/common/constants.py
index 2f14d4bc4..4ed40f8af 100644
--- a/yardstick/common/constants.py
+++ b/yardstick/common/constants.py
@@ -6,7 +6,6 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-from __future__ import absolute_import
import errno
import os
@@ -14,11 +13,9 @@ from functools import reduce
import pkg_resources
-# this module must only import other modules that do
-# not require loggers to be created, so this cannot
-# include yardstick.common.utils
from yardstick.common.yaml_loader import yaml_load
+
dirname = os.path.dirname
abspath = os.path.abspath
join = os.path.join
@@ -175,3 +172,6 @@ OS_CLOUD_DEFAULT_CONFIG = {'verify': False}
# Kubernetes
SCOPE_NAMESPACED = 'Namespaced'
SCOPE_CLUSTER = 'Cluster'
+
+# VNF definition
+SSH_PORT = 22