commit 8c83f1d8fe212604fdbd245036d4b428d0adf98e
author Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> Fri May 22 13:47:31 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri May 22 21:50:04 2015 +0000
tree 207b2547dd0dcbf1a4897d5718500de03b7dbba6
parent d93e84f63316da94e8e656c6c7ecf3e4ec94c78b

ONOS-1951: Segment Routing multi-instance instability: Plugging Objective context to monitor any errors

Change-Id: Ic710a756b7fec411a52a356409639c3f96c3129d

src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java

diff --git a/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java b/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
index 8c84e39..59fc4ca 100644
--- a/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
+++ b/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
@@ -35,7 +35,10 @@
 import org.onosproject.net.flowobjective.DefaultForwardingObjective;
 import org.onosproject.net.flowobjective.FilteringObjective;
 import org.onosproject.net.flowobjective.ForwardingObjective;
+import org.onosproject.net.flowobjective.Objective;
+import org.onosproject.net.flowobjective.ObjectiveError;
 import org.onosproject.net.flowobjective.ForwardingObjective.Builder;
+import org.onosproject.net.flowobjective.ObjectiveContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -113,7 +116,11 @@
 
         log.debug("Installing IPv4 forwarding objective "
                 + "for host {} in switch {}", hostIp, deviceId);
-        srManager.flowObjectiveService.forward(deviceId, fwdBuilder.add());
+        srManager.flowObjectiveService.
+            forward(deviceId,
+                    fwdBuilder.
+                    add(new SRObjectiveContext(deviceId,
+                                           SRObjectiveContext.ObjectiveType.FORWARDING)));
         rulePopulationCounter.incrementAndGet();
     }
 
@@ -192,7 +199,11 @@
                         + "for router IP/subnet {} in switch {}",
                 ipPrefix,
                 deviceId);
-        srManager.flowObjectiveService.forward(deviceId, fwdBuilder.add());
+        srManager.flowObjectiveService.
+            forward(deviceId,
+                    fwdBuilder.
+                    add(new SRObjectiveContext(deviceId,
+                                               SRObjectiveContext.ObjectiveType.FORWARDING)));
         rulePopulationCounter.incrementAndGet();
 
         return true;
@@ -275,8 +286,11 @@
                     .makePermanent()).withSelector(selector)
                     .withPriority(100))
                     .withFlag(ForwardingObjective.Flag.SPECIFIC);
-            srManager.flowObjectiveService.forward(deviceId,
-                                                   fwdObjBuilder.add());
+            srManager.flowObjectiveService.
+                forward(deviceId,
+                        fwdObjBuilder.
+                        add(new SRObjectiveContext(deviceId,
+                                                   SRObjectiveContext.ObjectiveType.FORWARDING)));
             rulePopulationCounter.incrementAndGet();
         }
 
@@ -346,7 +360,10 @@
                 .addCondition(Criteria.matchVlanId(VlanId.NONE));
         fob.permit().fromApp(srManager.appId);
         log.debug("populateTableVlan: Installing filtering objective for untagged packets");
-        srManager.flowObjectiveService.filter(deviceId, fob.add());
+        srManager.flowObjectiveService.
+            filter(deviceId,
+                   fob.add(new SRObjectiveContext(deviceId,
+                                                  SRObjectiveContext.ObjectiveType.FILTER)));
     }
 
     /**
@@ -363,7 +380,10 @@
                                       .getDeviceMac(deviceId)));
         fob.permit().fromApp(srManager.appId);
         log.debug("populateTableVlan: Installing filtering objective for router mac");
-        srManager.flowObjectiveService.filter(deviceId, fob.add());
+        srManager.flowObjectiveService.
+            filter(deviceId,
+                   fob.add(new SRObjectiveContext(deviceId,
+                                                  SRObjectiveContext.ObjectiveType.FILTER)));
     }
 
     private PortNumber selectOnePort(DeviceId srcId, Set<DeviceId> destIds) {
@@ -382,4 +402,29 @@
         return null;
     }
 
+    private static class SRObjectiveContext implements ObjectiveContext {
+        enum ObjectiveType {
+            FILTER,
+            FORWARDING
+        }
+        final DeviceId deviceId;
+        final ObjectiveType type;
+
+        SRObjectiveContext(DeviceId deviceId, ObjectiveType type) {
+            this.deviceId = deviceId;
+            this.type = type;
+        }
+        @Override
+        public void onSuccess(Objective objective) {
+            log.debug("{} objective operation successful in device {}",
+                      type.name(), deviceId);
+        }
+
+        @Override
+        public void onError(Objective objective, ObjectiveError error) {
+            log.warn("{} objective {} operation failed with error: {} in device {}",
+                     type.name(), objective, error, deviceId);
+        }
+    }
+
 }