Repository: cloudstack Updated Branches: refs/heads/master 22eb5eb2d -> c56df036e
Per contrail implementation, CS ingress policy mapping: rule cidr should be mapped to src net, dst net is 'local' i.e same as 'guest network' on which rule is applied Signed-off-by: Sheng Yang <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c56df036 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c56df036 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c56df036 Branch: refs/heads/master Commit: c56df036e838811f316e658ce633bdc0ab0eb87b Parents: 22eb5eb Author: sbalineni <[email protected]> Authored: Thu Mar 6 15:49:01 2014 +0000 Committer: Sheng Yang <[email protected]> Committed: Tue Mar 18 11:04:19 2014 -0700 ---------------------------------------------------------------------- .../cloudstack/network/contrail/model/NetworkPolicyModel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c56df036/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/NetworkPolicyModel.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/NetworkPolicyModel.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/NetworkPolicyModel.java index 3092cad..fbf791a 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/NetworkPolicyModel.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/NetworkPolicyModel.java @@ -152,11 +152,11 @@ public class NetworkPolicyModel extends ModelObjectBase { for (String cidr: cidrList) { NetworkVO net = cidrToNetwork(controller, cidr); String netName = projectName + ":" + controller.getManager().getCanonicalName(net); - dstList.add(new PolicyRuleType.AddressType(null, netName, null)); + srcList.add(new PolicyRuleType.AddressType(null, netName, null)); } dstPorts.add(new PolicyRuleType.PortType(portStart, portEnd)); - srcList.add(new PolicyRuleType.AddressType(null, "any", null)); + dstList.add(new PolicyRuleType.AddressType(null, "local", null)); srcPorts.add(new PolicyRuleType.PortType(0, 65535)); }
