Refactoring of IntentId based APIs
- getIntent
- getIntentState
- getInstallableIntents
Change-Id: I6d2073dfa165e0e5adcef46fe5908b563b481a43
diff --git a/cli/src/main/java/org/onosproject/cli/net/IntentIdCompleter.java b/cli/src/main/java/org/onosproject/cli/net/IntentIdCompleter.java
index 7c5a480..4e418b7 100644
--- a/cli/src/main/java/org/onosproject/cli/net/IntentIdCompleter.java
+++ b/cli/src/main/java/org/onosproject/cli/net/IntentIdCompleter.java
@@ -39,7 +39,7 @@
Iterator<Intent> it = service.getIntents().iterator();
SortedSet<String> strings = delegate.getStrings();
while (it.hasNext()) {
- strings.add(it.next().id().toString());
+ strings.add(it.next().key().toString());
}
// Now let the completer do the work for figuring out what to offer.
diff --git a/cli/src/main/java/org/onosproject/cli/net/IntentRemoveCommand.java b/cli/src/main/java/org/onosproject/cli/net/IntentRemoveCommand.java
index 2350f05..3b05b7e 100644
--- a/cli/src/main/java/org/onosproject/cli/net/IntentRemoveCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/IntentRemoveCommand.java
@@ -19,8 +19,8 @@
import org.apache.karaf.shell.commands.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.net.intent.Intent;
-import org.onosproject.net.intent.IntentId;
import org.onosproject.net.intent.IntentService;
+import org.onosproject.net.intent.Key;
import java.math.BigInteger;
@@ -43,8 +43,8 @@
id = id.replaceFirst("0x", "");
}
- IntentId intentId = IntentId.valueOf(new BigInteger(id, 16).longValue());
- Intent intent = service.getIntent(intentId);
+ Key key = Key.of(new BigInteger(id, 16).longValue(), appId());
+ Intent intent = service.getIntent(key);
if (intent != null) {
service.withdraw(intent);
}
diff --git a/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java
index 992c528..cdae9b5 100644
--- a/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java
@@ -76,7 +76,7 @@
print("%s", json(service, service.getIntents()));
} else {
for (Intent intent : service.getIntents()) {
- IntentState state = service.getIntentState(intent.id());
+ IntentState state = service.getIntentState(intent.key());
if (state != null) {
print("id=%s, state=%s, type=%s, appId=%s",
intent.id(), state, intent.getClass().getSimpleName(),
@@ -130,7 +130,7 @@
// Collect the summary for each intent type intents
for (Intent intent : intents) {
- IntentState intentState = service.getIntentState(intent.id());
+ IntentState intentState = service.getIntentState(intent.key());
if (intentState == null) {
continue;
}
@@ -365,7 +365,7 @@
print(" egress=%s", li.egressPoints());
}
- List<Intent> installable = service.getInstallableIntents(intent.id());
+ List<Intent> installable = service.getInstallableIntents(intent.key());
if (showInstallable && installable != null && !installable.isEmpty()) {
print(" installable=%s", installable);
}
@@ -387,7 +387,7 @@
.put("type", intent.getClass().getSimpleName())
.put("appId", intent.appId().name());
- IntentState state = service.getIntentState(intent.id());
+ IntentState state = service.getIntentState(intent.key());
if (state != null) {
result.put("state", state.toString());
}
@@ -438,7 +438,7 @@
result.set("links", LinksListCommand.json(li.links()));
}
- List<Intent> installable = service.getInstallableIntents(intent.id());
+ List<Intent> installable = service.getInstallableIntents(intent.key());
if (installable != null && !installable.isEmpty()) {
result.set("installable", json(service, installable));
}
diff --git a/cli/src/main/java/org/onosproject/cli/net/WipeOutCommand.java b/cli/src/main/java/org/onosproject/cli/net/WipeOutCommand.java
index 3262fb9..b2bba9a 100644
--- a/cli/src/main/java/org/onosproject/cli/net/WipeOutCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/WipeOutCommand.java
@@ -64,7 +64,7 @@
print("Wiping intents");
IntentService intentService = get(IntentService.class);
for (Intent intent : intentService.getIntents()) {
- if (intentService.getIntentState(intent.id()) == IntentState.INSTALLED) {
+ if (intentService.getIntentState(intent.key()) == IntentState.INSTALLED) {
intentService.withdraw(intent);
}
}