| commit | 7a71d5da7b16ca3436b0fc8b9a4b1658e52e134b | [log] [tgz] |
|---|---|---|
| author | Brian O'Connor <bocon@onlab.us> | Tue Dec 02 00:12:27 2014 -0800 |
| committer | Brian O'Connor <bocon@onlab.us> | Tue Dec 02 00:13:46 2014 -0800 |
| tree | 6e2a242a24278fec3388854661e7515ddbb3e8f4 | |
| parent | 5b424de96fd4bf1ca03023de71d6d0b546189181 [diff] |
Added WITHDRAW_REQ Intent State for ONOS-146 Fixed flow removed from other instance Change-Id: I22c88a447e26770fea8b7e23f4a78b1389077ad1
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/FooComponent.java b/apps/foo/src/main/java/org/onlab/onos/foo/FooComponent.java index 2f5c2a6..268f6f6 100644 --- a/apps/foo/src/main/java/org/onlab/onos/foo/FooComponent.java +++ b/apps/foo/src/main/java/org/onlab/onos/foo/FooComponent.java
@@ -136,7 +136,7 @@ @Override public void event(IntentEvent event) { String message; - if (event.type() == IntentEvent.Type.SUBMITTED) { + if (event.type() == IntentEvent.Type.INSTALL_REQ) { message = "WOW! It looks like someone has some intentions: {}"; } else if (event.type() == IntentEvent.Type.INSTALLED) { message = "AWESOME! So far things are going great: {}";
diff --git a/apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/IntentMetrics.java b/apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/IntentMetrics.java index bffed2e..c65d5e1 100644 --- a/apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/IntentMetrics.java +++ b/apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/IntentMetrics.java
@@ -134,7 +134,7 @@ // an event equivalent of "Withdraw Requested" // switch (event.type()) { - case SUBMITTED: + case INSTALL_REQ: intentSubmittedEventMetric.eventReceived(); break; case INSTALLED:
diff --git a/apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/IntentMetricsService.java b/apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/IntentMetricsService.java index 97ea20f..4e47d62 100644 --- a/apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/IntentMetricsService.java +++ b/apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/IntentMetricsService.java
@@ -31,9 +31,9 @@ public List<IntentEvent> getEvents(); /** - * Gets the Event Metric for the intent SUBMITTED events. + * Gets the Event Metric for the intent INSTALL_REQ events. * - * @return the Event Metric for the intent SUBMITTED events. + * @return the Event Metric for the intent INSTALL_REQ events. */ public EventMetric intentSubmittedEventMetric();
diff --git a/apps/optical/src/main/java/org/onlab/onos/optical/OpticalPathProvisioner.java b/apps/optical/src/main/java/org/onlab/onos/optical/OpticalPathProvisioner.java index e11298b..f4ad841 100644 --- a/apps/optical/src/main/java/org/onlab/onos/optical/OpticalPathProvisioner.java +++ b/apps/optical/src/main/java/org/onlab/onos/optical/OpticalPathProvisioner.java
@@ -94,7 +94,7 @@ @Override public void event(IntentEvent event) { switch (event.type()) { - case SUBMITTED: + case INSTALL_REQ: break; case INSTALLED: break;