Merge "Raise BadRequest when remote_ip_prefix and remote_group_id are…

… set"
Juniper · Aug 17, 2015 · 32364bf · 32364bf
2 parents 3c92f97 + b365bbe
commit 32364bf
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/neutron_plugin_contrail/plugins/opencontrail/vnc_client/sgrule_res_handler.py b/neutron_plugin_contrail/plugins/opencontrail/vnc_client/sgrule_res_handler.py
@@ -296,6 +296,11 @@ def _security_group_rule_neutron_to_vnc(self, sgr_q):
         if sgr_q['port_range_max'] is not None:
             port_max = sgr_q['port_range_max']
 
+        if sgr_q['remote_ip_prefix'] and sgr_q['remote_group_id']:
+            self._raise_contrail_exception("BadRequest",
+                                           msg="Can't set remote_ip_prefix with remote_group_id",
+                                           resource="security_group_rule")
+
         endpt = [vnc_api.AddressType(security_group='any')]
         if sgr_q['remote_ip_prefix']:
             cidr = sgr_q['remote_ip_prefix'].split('/')