commit d177f8f57e3bb09535e2ff4f68822294f90c65a0
author sangho <sangho@onlab.us> Wed Jun 29 21:52:23 2016 +0900
committer Gerrit Code Review <gerrit@onlab.us> Fri Jul 01 18:13:44 2016 +0000
tree a7679dbeda222784ba43abbc9a0ec55fe1c9346d
parent 744527286a0b93f1afdda344fcbdefb3b006ba87

[ONOS-4703,4704] SONA : Floating IP handling in SONA initialization

Generates flow rules for existing Floating IPs when SONA is initialized.

Change-Id: I0cb86345600c3cf3ee72fca176ae6d82e7a8cc36

apps/openstacknetworking/openstackswitching/src/main/java/org/onosproject/openstacknetworking/switching/OpenstackSecurityGroupRulePopulator.java

diff --git a/apps/openstacknetworking/openstackswitching/src/main/java/org/onosproject/openstacknetworking/switching/OpenstackSecurityGroupRulePopulator.java b/apps/openstacknetworking/openstackswitching/src/main/java/org/onosproject/openstacknetworking/switching/OpenstackSecurityGroupRulePopulator.java
index 5b132e8..dcc1c52 100644
--- a/apps/openstacknetworking/openstackswitching/src/main/java/org/onosproject/openstacknetworking/switching/OpenstackSecurityGroupRulePopulator.java
+++ b/apps/openstacknetworking/openstackswitching/src/main/java/org/onosproject/openstacknetworking/switching/OpenstackSecurityGroupRulePopulator.java
@@ -89,7 +89,7 @@
      */
     public void populateSecurityGroupRules(DeviceId id, String sgId, Ip4Address vmIp,
                                            Map<String, OpenstackPortInfo> portInfoMap) {
-        OpenstackSecurityGroup securityGroup = openstackService.getSecurityGroup(sgId);
+        OpenstackSecurityGroup securityGroup = openstackService.securityGroup(sgId);
         if (securityGroup != null) {
             securityGroup.rules().stream().forEach(sgRule -> {
                 if (sgRule.remoteGroupId() != null && !sgRule.remoteGroupId().equals("null")) {
@@ -105,7 +105,7 @@
 
             openstackService.ports().stream().forEach(osPort ->
                 osPort.securityGroups().stream().forEach(remoteVmSgId -> {
-                    OpenstackSecurityGroup remoteVmSg = openstackService.getSecurityGroup(remoteVmSgId);
+                    OpenstackSecurityGroup remoteVmSg = openstackService.securityGroup(remoteVmSgId);
                     remoteVmSg.rules().stream()
                         .filter(remoteVmSgRule -> remoteVmSgRule.remoteGroupId().equals(sgId))
                         .forEach(remoteVmSgRule -> {