From: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
Date: Thu, 12 Jul 2018 16:17:33 +0000 (+0000)
Subject: Merge "Improve "get_server" function in Kubernetes context"
X-Git-Tag: opnfv-7.0.0~168
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2a286049b340801cff37329921f2ecca8a33c3fa;p=yardstick.git

Merge "Improve "get_server" function in Kubernetes context"
---

2a286049b340801cff37329921f2ecca8a33c3fa
diff --cc yardstick/benchmark/contexts/kubernetes.py
index 52d17df4d,9feb00602..a6b3ebad8
--- a/yardstick/benchmark/contexts/kubernetes.py
+++ b/yardstick/benchmark/contexts/kubernetes.py
@@@ -13,9 -14,10 +13,11 @@@ import pkg_resource
  
  import paramiko
  
 +from yardstick.benchmark import contexts
  from yardstick.benchmark.contexts.base import Context
  from yardstick.orchestrator import kubernetes
+ from yardstick.common import constants
+ from yardstick.common import exceptions
  from yardstick.common import kubernetes_utils as k8s_utils
  from yardstick.common import utils
  
diff --cc yardstick/tests/unit/benchmark/contexts/test_kubernetes.py
index 941d50e82,512468fed..b070b24a9
--- a/yardstick/tests/unit/benchmark/contexts/test_kubernetes.py
+++ b/yardstick/tests/unit/benchmark/contexts/test_kubernetes.py
@@@ -10,9 -10,9 +10,10 @@@
  import mock
  import unittest
  
 +from yardstick.benchmark import contexts
  from yardstick.benchmark.contexts import base
  from yardstick.benchmark.contexts import kubernetes
+ from yardstick.common import constants
  from yardstick.orchestrator import kubernetes as orchestrator_kubernetes