From: Jo¶rgen Karlsson Date: Tue, 26 Jan 2016 12:18:32 +0000 (+0100) Subject: Test: Workaround for ODL scenarios X-Git-Tag: brahmaputra.1.0~40 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e1d2d085b04dd3e6bbed0aede1cc5487b2916193;p=yardstick.git Test: Workaround for ODL scenarios Temporarily removing security group from generated heat template. This patch is pushed through for testing purposes and should be reverted when a proper solution is found. Change-Id: I64c86f41664499d46d8317bb1ebbe304083554ab Signed-off-by: Jo¶rgen Karlsson (cherry picked from commit 8236c94ecef8aa25af073c50f7a0eaafae9b4bc6) --- diff --git a/yardstick/benchmark/contexts/heat.py b/yardstick/benchmark/contexts/heat.py index 8c514d250..e58482286 100644 --- a/yardstick/benchmark/contexts/heat.py +++ b/yardstick/benchmark/contexts/heat.py @@ -7,6 +7,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +import os import sys import pkg_resources @@ -54,6 +55,13 @@ class HeatContext(Context): self.keypair_name = self.name + "-key" self.secgroup_name = self.name + "-secgroup" + # Temporarily removing security group due to + # ssh problems with ODL scenarios. + scenario = os.environ.get('DEPLOY_SCENARIO', None) + if scenario and scenario.startswith('os-odl'): + print "INFO: ODL scenario - removing security group." + self.secgroup_name = None + if "image" in attrs: self._image = attrs["image"] @@ -92,7 +100,8 @@ class HeatContext(Context): def _add_resources_to_template(self, template): '''add to the template the resources represented by this context''' template.add_keypair(self.keypair_name) - template.add_security_group(self.secgroup_name) + if self.secgroup_name: + template.add_security_group(self.secgroup_name) for network in self.networks: template.add_network(network.stack_name)