Refactoring of IntentId based APIs
- getIntent
- getIntentState
- getInstallableIntents
Change-Id: I6d2073dfa165e0e5adcef46fe5908b563b481a43
diff --git a/apps/calendar/src/main/java/org/onosproject/calendar/BandwidthCalendarResource.java b/apps/calendar/src/main/java/org/onosproject/calendar/BandwidthCalendarResource.java
index 2e73a87..9d457b7 100644
--- a/apps/calendar/src/main/java/org/onosproject/calendar/BandwidthCalendarResource.java
+++ b/apps/calendar/src/main/java/org/onosproject/calendar/BandwidthCalendarResource.java
@@ -23,7 +23,6 @@
import org.onosproject.net.DeviceId;
import org.onosproject.net.intent.Intent;
import org.onosproject.net.intent.IntentEvent;
-import org.onosproject.net.intent.IntentId;
import org.onosproject.net.intent.IntentListener;
import org.onosproject.net.intent.IntentService;
import org.onosproject.net.intent.IntentState;
@@ -108,12 +107,15 @@
public Response withdrawIntent(@PathParam("intentId") String intentId) {
log.info("Receiving Teardown request for {}", intentId);
IntentService service = get(IntentService.class);
+ // TODO: there needs to be an app id and key here
+ /*
Intent intent = service.getIntent(IntentId.valueOf(Long.parseLong(intentId)));
if (intent != null) {
service.withdraw(intent);
String reply = "ok\n";
return Response.ok(reply).build();
}
+ */
return Response.status(Response.Status.NOT_FOUND).build();
}
@@ -163,7 +165,7 @@
@Override
public void event(IntentEvent event) {
if (event.subject().equals(intent)) {
- state = service.getIntentState(intent.id());
+ state = service.getIntentState(intent.key());
if (state == INSTALLED || state == FAILED || state == WITHDRAWN) {
latch.countDown();
}
diff --git a/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java b/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java
index 3c134fb..fc33693 100644
--- a/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java
+++ b/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java
@@ -100,7 +100,7 @@
inStatusTportMap.clear();
outStatusTportMap.clear();
for (Intent intent : intentService.getIntents()) {
- if (intentService.getIntentState(intent.id()) == INSTALLED) {
+ if (intentService.getIntentState(intent.key()) == INSTALLED) {
if (intent instanceof OpticalConnectivityIntent) {
inStatusTportMap.put(((OpticalConnectivityIntent) intent).getSrc(),
(OpticalConnectivityIntent) intent);
@@ -177,7 +177,7 @@
// TODO change the coordination approach between packet intents and optical intents
// Low speed LLDP may cause multiple calls which are not expected
- if (!IntentState.FAILED.equals(intentService.getIntentState(intent.id()))) {
+ if (!IntentState.FAILED.equals(intentService.getIntentState(intent.key()))) {
return;
}
diff --git a/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java
index c51d7d3..ff9b786 100644
--- a/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java
+++ b/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java
@@ -579,7 +579,7 @@
}
IntentState state =
- intentService.getIntentState(fetchedIntent.id());
+ intentService.getIntentState(fetchedIntent.key());
if (state == null ||
state == IntentState.WITHDRAWING ||
state == IntentState.WITHDRAWN) {
@@ -601,7 +601,7 @@
}
IntentState state =
- intentService.getIntentState(fetchedIntent.id());
+ intentService.getIntentState(fetchedIntent.key());
if (state == null ||
state == IntentState.WITHDRAWING ||
state == IntentState.WITHDRAWN) {
diff --git a/apps/sdnip/src/test/java/org/onosproject/sdnip/IntentSyncTest.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/IntentSyncTest.java
index b92b093..1af0914 100644
--- a/apps/sdnip/src/test/java/org/onosproject/sdnip/IntentSyncTest.java
+++ b/apps/sdnip/src/test/java/org/onosproject/sdnip/IntentSyncTest.java
@@ -535,19 +535,19 @@
reset(intentService);
Set<Intent> intents = new HashSet<Intent>();
intents.add(intent1);
- expect(intentService.getIntentState(intent1.id()))
+ expect(intentService.getIntentState(intent1.key()))
.andReturn(IntentState.INSTALLED).anyTimes();
intents.add(intent2);
- expect(intentService.getIntentState(intent2.id()))
+ expect(intentService.getIntentState(intent2.key()))
.andReturn(IntentState.INSTALLED).anyTimes();
intents.add(intent4);
- expect(intentService.getIntentState(intent4.id()))
+ expect(intentService.getIntentState(intent4.key()))
.andReturn(IntentState.INSTALLED).anyTimes();
intents.add(intent5);
- expect(intentService.getIntentState(intent5.id()))
+ expect(intentService.getIntentState(intent5.key()))
.andReturn(IntentState.INSTALLED).anyTimes();
intents.add(intent7);
- expect(intentService.getIntentState(intent7.id()))
+ expect(intentService.getIntentState(intent7.key()))
.andReturn(IntentState.WITHDRAWING).anyTimes();
expect(intentService.getIntents()).andReturn(intents).anyTimes();