Fixed a few intent synchronization issues.
Also added a CLI command to test SDN-IP primary switchover.
Change-Id: Id31f79262a2b607f987adad2fdb3eb54eb939fea
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/Router.java b/apps/sdnip/src/main/java/org/onlab/onos/sdnip/Router.java
index 1dcd9d3..79491c5 100644
--- a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/Router.java
+++ b/apps/sdnip/src/main/java/org/onlab/onos/sdnip/Router.java
@@ -46,6 +46,7 @@
import org.onlab.onos.net.host.HostService;
import org.onlab.onos.net.intent.Intent;
import org.onlab.onos.net.intent.IntentService;
+import org.onlab.onos.net.intent.IntentState;
import org.onlab.onos.net.intent.MultiPointToSinglePointIntent;
import org.onlab.onos.sdnip.config.BgpPeer;
import org.onlab.onos.sdnip.config.Interface;
@@ -145,11 +146,6 @@
* Starts the Router.
*/
public void start() {
-
- // TODO hack to enable SDN-IP now for testing
- isElectedLeader = true;
- isActivatedLeader = true;
-
bgpUpdatesExecutor.execute(new Runnable() {
@Override
public void run() {
@@ -277,30 +273,21 @@
// based on the matching prefix.
//
for (Intent intent : intentService.getIntents()) {
- //
- // TODO: Ignore all intents that are not installed by
- // the SDN-IP application.
- //
- if (!(intent instanceof MultiPointToSinglePointIntent)) {
+
+ if (!(intent instanceof MultiPointToSinglePointIntent)
+ || !intent.appId().equals(appId)) {
continue;
}
MultiPointToSinglePointIntent mp2pIntent =
(MultiPointToSinglePointIntent) intent;
- /*Match match = mp2pIntent.getMatch();
- if (!(match instanceof PacketMatch)) {
- continue;
- }
- PacketMatch packetMatch = (PacketMatch) match;
- Ip4Prefix prefix = packetMatch.getDstIpAddress();
- if (prefix == null) {
- continue;
- }
- fetchedIntents.put(prefix, mp2pIntent);*/
- for (Criterion criterion : mp2pIntent.selector().criteria()) {
- if (criterion.type() == Type.IPV4_DST) {
- IPCriterion ipCriterion = (IPCriterion) criterion;
- fetchedIntents.put(ipCriterion.ip(), mp2pIntent);
- }
+
+ Criterion c = mp2pIntent.selector().getCriterion(Type.IPV4_DST);
+ if (c != null && c instanceof IPCriterion) {
+ IPCriterion ipCriterion = (IPCriterion) c;
+ fetchedIntents.put(ipCriterion.ip(), mp2pIntent);
+ } else {
+ log.warn("No IPV4_DST criterion found for intent {}",
+ mp2pIntent.id());
}
}
@@ -344,6 +331,14 @@
continue;
}
+ IntentState state = intentService.getIntentState(fetchedIntent.id());
+ if (state == IntentState.WITHDRAWING ||
+ state == IntentState.WITHDRAWN) {
+ // The intent has been withdrawn but according to our route
+ // table it should be installed. We'll reinstall it.
+ addIntents.add(Pair.of(prefix, inMemoryIntent));
+ }
+
//
// If IN-MEMORY Intent is same as the FETCHED Intent,
// store the FETCHED Intent in the local memory.
@@ -434,19 +429,7 @@
private boolean compareMultiPointToSinglePointIntents(
MultiPointToSinglePointIntent intent1,
MultiPointToSinglePointIntent intent2) {
- /*Match match1 = intent1.getMatch();
- Match match2 = intent2.getMatch();
- Action action1 = intent1.getAction();
- Action action2 = intent2.getAction();
- Set<SwitchPort> ingressPorts1 = intent1.getIngressPorts();
- Set<SwitchPort> ingressPorts2 = intent2.getIngressPorts();
- SwitchPort egressPort1 = intent1.getEgressPort();
- SwitchPort egressPort2 = intent2.getEgressPort();
- return Objects.equal(match1, match2) &&
- Objects.equal(action1, action2) &&
- Objects.equal(egressPort1, egressPort2) &&
- Objects.equal(ingressPorts1, ingressPorts2);*/
return Objects.equal(intent1.appId(), intent2.appId()) &&
Objects.equal(intent1.selector(), intent2.selector()) &&
Objects.equal(intent1.treatment(), intent2.treatment()) &&