Refactored pseudowire code.
This refactoring is needed in order to be able to further
refactor the sr application in api / app / web, where api contains
the interfaces, used by other modules, app contains the implementations
and web contains rest related code.
Change-Id: I147442e5d1248941a6c3c4df2715b01e72c40b3f
diff --git a/src/main/java/org/onosproject/segmentrouting/cli/PseudowireListCommand.java b/src/main/java/org/onosproject/segmentrouting/cli/PseudowireListCommand.java
index 70ae32f..c48f633 100644
--- a/src/main/java/org/onosproject/segmentrouting/cli/PseudowireListCommand.java
+++ b/src/main/java/org/onosproject/segmentrouting/cli/PseudowireListCommand.java
@@ -19,9 +19,10 @@
import org.onlab.packet.VlanId;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.segmentrouting.SegmentRoutingService;
-import org.onosproject.segmentrouting.pwaas.DefaultL2Tunnel;
import org.onosproject.segmentrouting.pwaas.DefaultL2TunnelDescription;
-import org.onosproject.segmentrouting.pwaas.DefaultL2TunnelPolicy;
+import org.onosproject.segmentrouting.pwaas.L2Tunnel;
+import org.onosproject.segmentrouting.pwaas.L2TunnelDescription;
+import org.onosproject.segmentrouting.pwaas.L2TunnelPolicy;
import java.util.List;
import java.util.stream.Collectors;
@@ -46,14 +47,14 @@
SegmentRoutingService srService =
AbstractShellCommand.get(SegmentRoutingService.class);
- List<DefaultL2Tunnel> tunnels = srService.getL2Tunnels();
- List<DefaultL2TunnelPolicy> policies = srService.getL2Policies();
+ List<L2Tunnel> tunnels = srService.getL2Tunnels();
+ List<L2TunnelPolicy> policies = srService.getL2Policies();
// combine polices and tunnels to pseudowires
- List<DefaultL2TunnelDescription> pseudowires = tunnels.stream()
+ List<L2TunnelDescription> pseudowires = tunnels.stream()
.map(l2Tunnel -> {
- DefaultL2TunnelPolicy policy = null;
- for (DefaultL2TunnelPolicy l2Policy : policies) {
+ L2TunnelPolicy policy = null;
+ for (L2TunnelPolicy l2Policy : policies) {
if (l2Policy.tunnelId() == l2Tunnel.tunnelId()) {
policy = l2Policy;
break;
@@ -67,7 +68,7 @@
pseudowires.forEach(pw -> printPseudowire(pw));
}
- private void printPseudowire(DefaultL2TunnelDescription pseudowire) {
+ private void printPseudowire(L2TunnelDescription pseudowire) {
VlanId vlan = pseudowire.l2Tunnel().transportVlan().equals(VlanId.vlanId((short) 4094)) ?