openstack
/
tricircle
Code Issues Proposed changes

Merge "[Urgent] Fix sec-group unit tests and smoke tests"

This commit is contained in:
Jenkins 2017-06-19 05:58:18 +00:00 committed by Gerrit Code Review
parent d5197c87e2 31c45b33dc
commit 1e6f89ff11
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tricircle/network/security_groups.py
View File

@ -42,7 +42,7 @@ class TricircleSecurityGroupMixin(securitygroups_db.SecurityGroupDbMixin):
def _compare_rule(rule1, rule2):
for key in ('direction', 'remote_ip_prefix', 'protocol', 'ethertype',
'port_range_max', 'port_range_min'):
if rule1[key] != rule2[key]:
if rule1[key] != rule2[key] and str(rule1[key]) != str(rule2[key]):
return False
return True

2
tricircle/tempestplugin/gate_hook.sh
View File

@ -30,7 +30,7 @@ function _setup_tricircle_multinode {
SUBNODE_IP=$(head -n1 /etc/nodepool/sub_nodes_private)
export OVERRIDE_ENABLED_SERVICES="c-api,c-bak,c-sch,c-vol,cinder,"
export OVERRIDE_ENABLED_SERVICES+="g-api,g-reg,horizon,key,"
export OVERRIDE_ENABLED_SERVICES+="g-api,g-reg,key,"
export OVERRIDE_ENABLED_SERVICES+="n-api,n-cauth,n-cond,n-cpu,n-crt,"
export OVERRIDE_ENABLED_SERVICES+="n-novnc,n-obj,n-sch,"
export OVERRIDE_ENABLED_SERVICES+="placement-api,placement-client,"

1
tricircle/tests/unit/network/test_security_groups.py
View File

@ -28,6 +28,7 @@ class TricircleSecurityGroupTestMixin(object):
return {'security_group_id': sg_id,
'id': _id,
'tenant_id': project_id,
'project_id': project_id,
'remote_group_id': remote_group,
'direction': 'ingress',
'remote_ip_prefix': ip_prefix,