홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Brian O'Connor
893dcea3 1 parent e63e356c

Fixing VPLS app to use a supported Pair abstraction. 

Change-Id: I00732db82dd2780da99bf8ce05e967dde1e2a732
Inline Side-by-side
Showing 2 changed files with 6 additions and 6 deletions
......@@ -16,7 +16,7 @@
package org.onosproject.vpls;
import com.google.common.collect.SetMultimap;
import javafx.util.Pair;
import org.apache.commons.lang3.tuple.Pair;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
import org.onosproject.core.ApplicationId;
......@@ -83,7 +83,7 @@ public class IntentInstaller {
*/
protected void installIntents(SetMultimap<VlanId,
Pair<ConnectPoint,
MacAddress>> confHostPresentCPoint) {
MacAddress>> confHostPresentCPoint) {
List<Intent> intents = new ArrayList<>();
confHostPresentCPoint.asMap().keySet()
......
......@@ -17,7 +17,7 @@ package org.onosproject.vpls;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.SetMultimap;
import javafx.util.Pair;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
......@@ -179,13 +179,13 @@ public class Vpls {
if (!connectedHosts.isEmpty()) {
connectedHosts.forEach(host -> {
if (host.vlan().equals(vlanId)) {
confHostPresentCPoint.put(vlanId, new Pair<>(cp, host.mac()));
confHostPresentCPoint.put(vlanId, Pair.of(cp, host.mac()));
} else {
confHostPresentCPoint.put(vlanId, new Pair<>(cp, null));
confHostPresentCPoint.put(vlanId, Pair.of(cp, null));
}
});
} else {
confHostPresentCPoint.put(vlanId, new Pair<>(cp, null));
confHostPresentCPoint.put(vlanId, Pair.of(cp, null));
}
}
......