aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-07-27 00:36:52 -0700
committerRoss Brattain <ross.b.brattain@intel.com>2017-07-27 00:36:52 -0700
commit1767ce92c455008298d0ffe5b71fa3bdc1dd8d2b (patch)
tree50604a8380457688763ac11103ee0879bb074c90
parentd184d8714e543e4f2497db682154820f7eecf1de (diff)
leave port_security_enabled undefined by default
some deployments don't have port security ML2 plugin enabled, so we have to leave port security undefined by default RuntimeError: Resource CREATE failed: BadRequest: resources.yardstick-TC072-19be2f60-test: Unrecognized attribute(s) 'port_security_enabled' https://build.opnfv.org/ci/user/narindergupta/my-views/view/joid/job/yardstick-joid-baremetal-daily-master/1276/console Change-Id: I69178f869f6215f42d90ea4cfb297dad3d799f83 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
-rw-r--r--yardstick/benchmark/contexts/model.py2
-rw-r--r--yardstick/orchestrator/heat.py8
2 files changed, 6 insertions, 4 deletions
diff --git a/yardstick/benchmark/contexts/model.py b/yardstick/benchmark/contexts/model.py
index 6601ecf3b..ec474321f 100644
--- a/yardstick/benchmark/contexts/model.py
+++ b/yardstick/benchmark/contexts/model.py
@@ -110,7 +110,7 @@ class Network(Object):
self.provider = attrs.get('provider')
self.segmentation_id = attrs.get('segmentation_id')
self.network_type = attrs.get('network_type')
- self.port_security_enabled = attrs.get('port_security_enabled', True)
+ self.port_security_enabled = attrs.get('port_security_enabled')
self.allowed_address_pairs = attrs.get('allowed_address_pairs', [])
try:
# we require 'null' or '' to disable setting gateway_ip
diff --git a/yardstick/orchestrator/heat.py b/yardstick/orchestrator/heat.py
index 57b23d393..95ca0ad2e 100644
--- a/yardstick/orchestrator/heat.py
+++ b/yardstick/orchestrator/heat.py
@@ -231,7 +231,7 @@ name (i.e. %s).\
}
def add_network(self, name, physical_network='physnet1', provider=None,
- segmentation_id=None, port_security_enabled=True):
+ segmentation_id=None, port_security_enabled=None):
"""add to the template a Neutron Net"""
log.debug("adding Neutron::Net '%s'", name)
if provider is None:
@@ -239,7 +239,6 @@ name (i.e. %s).\
'type': 'OS::Neutron::Net',
'properties': {
'name': name,
- 'port_security_enabled': port_security_enabled,
}
}
else:
@@ -249,11 +248,14 @@ name (i.e. %s).\
'name': name,
'network_type': 'vlan',
'physical_network': physical_network,
- 'port_security_enabled': port_security_enabled,
},
}
if segmentation_id:
self.resources[name]['properties']['segmentation_id'] = segmentation_id
+ # if port security is not defined then don't add to template:
+ # some deployments don't have port security plugin installed
+ if port_security_enabled is not None:
+ self.resources[name]['properties']['port_security_enabled'] = port_security_enabled
def add_server_group(self, name, policies): # pragma: no cover
"""add to the template a ServerGroup"""