commit cbf230ca9f12938b66b83ff1c2911b8c5349d08d
author sanghoshin <sangho@onlab.us> Tue Sep 11 17:01:01 2018 +0800
committer Jian Li <pyguni@gmail.com> Tue Sep 11 09:58:14 2018 +0000
tree a8edebd35bbc62a80978358438c331afb4498680
parent e254759f5e14031755be5477d2983ccd95fdfc0c

Fix the security group bugs - degrade

Change-Id: I55484a28c4cfbd612fe649a38bbf780c57a0a5d6
(cherry picked from commit bbeb31acf9eaa5f1d722da3aaabd815c0cedd28c)

apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/DistributedOpenstackNetworkStore.java

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/DistributedOpenstackNetworkStore.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/DistributedOpenstackNetworkStore.java
index 63b4a49..b447b65 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/DistributedOpenstackNetworkStore.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/DistributedOpenstackNetworkStore.java
@@ -359,7 +359,6 @@
         public void event(MapEvent<String, Port> event) {
             switch (event.type()) {
                 case UPDATE:
-                    log.debug("OpenStack port updated");
                     eventExecutor.execute(() -> {
                         Port oldPort = event.oldValue().value();
                         Port newPort = event.newValue().value();

apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSecurityGroupHandler.java

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSecurityGroupHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSecurityGroupHandler.java
index d659c4d..d0241d6 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSecurityGroupHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSecurityGroupHandler.java
@@ -158,8 +158,8 @@
     private static final IpPrefix IP_PREFIX_ANY = Ip4Prefix.valueOf("0.0.0.0/0");
 
     // We expose pipeline structure to SONA application considering removing pipeline soon.
-    private static final int GOTO_CONNTRACK_TABLE = 2;
-    private static final int GOTO_JUMP_TABLE = 3;
+    private static final int GOTO_CONNTRACK_TABLE = CT_TABLE;
+    private static final int GOTO_JUMP_TABLE = JUMP_TABLE;
 
     private static final int CT_COMMIT = 0;
     private static final int CT_NO_COMMIT = 1;
@@ -333,7 +333,7 @@
             tb.drop();
         }
 
-        if (action != ACTION_NONE) {
+        if (action != ACTION_NONE && action != ACTION_DROP) {
             tb.transition(action);
         }
 
@@ -671,7 +671,7 @@
 
         @Override
         public boolean isRelevant(OpenstackNetworkEvent event) {
-            if (event.port() == null || !Strings.isNullOrEmpty(event.port().getId())) {
+            if (event.port() == null || Strings.isNullOrEmpty(event.port().getId())) {
                 return false;
             }
             if (event.securityGroupId() == null ||
@@ -689,6 +689,7 @@
 
         @Override
         public void event(OpenstackNetworkEvent event) {
+            log.debug("security group event received {}", event);
             Port osPort = event.port();
             InstancePort instPort = instancePortService.instancePort(osPort.getId());
             SecurityGroup osSg = securityGroupService.securityGroup(event.securityGroupId());