Merge "Fixes an issue in induvidual security rule update, when remote SG is selected."

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortSecurityHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortSecurityHandler.java
index 646693cd263950310ad51f608b252d49f9366816..d4cbf6a3b626ee67dd53f08dd15eab73099ef789 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortSecurityHandler.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortSecurityHandler.java
@@ -141,23 +141,23 @@ public class PortSecurityHandler extends AbstractHandler
     private void processNeutronSecurityRuleAdded(NeutronSecurityRule neutronSecurityRule) {
         List<NeutronPort> portList = getPortWithSecurityGroup(neutronSecurityRule.getSecurityRuleGroupID());
         for (NeutronPort port:portList) {
-            syncSecurityGroup(neutronSecurityRule,port,neutronSecurityRule.getSecurityRuleGroupID(),true);
+            syncSecurityGroup(neutronSecurityRule,port,true);
         }
     }
 
     private void processNeutronSecurityRuleDeleted(NeutronSecurityRule neutronSecurityRule) {
         List<NeutronPort> portList = getPortWithSecurityGroup(neutronSecurityRule.getSecurityRuleGroupID());
         for (NeutronPort port:portList) {
-            syncSecurityGroup(neutronSecurityRule,port,neutronSecurityRule.getSecurityRuleGroupID(),false);
+            syncSecurityGroup(neutronSecurityRule,port,false);
         }
     }
 
     private void syncSecurityGroup(NeutronSecurityRule  securityRule,NeutronPort port,
-                                   String neutronSecurityGroupId,boolean write) {
+                                   boolean write) {
 
         if (null != securityRule.getSecurityRemoteGroupID()) {
             List<Neutron_IPs> vmIpList  = securityServicesManager
-                    .getVmListForSecurityGroup(port.getID(), neutronSecurityGroupId);
+                    .getVmListForSecurityGroup(port.getID(), securityRule.getSecurityRemoteGroupID());
             for (Neutron_IPs vmIp :vmIpList ) {
                 securityServicesManager.syncSecurityRule(port, securityRule, vmIp, write);
             }