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

tricircle/network/security_groups.py

@@ -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
 

tricircle/tempestplugin/gate_hook.sh

@@ -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,"

tricircle/tests/unit/network/test_security_groups.py

@@ -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,