Added basic pseudowire support for Trellis.
- Configurable pseudowires supporting untagged-untagged, single-single, double-double tagged traffic.
- Commands for listing, adding and removing pseudowires.
- Initial support for link failures.
- Pseudowires also configurable by network configuration.
- Tested with ofdpa_3.0.5.
Known limitations that I plan to fix soon :
- Adding pseudowires from configuration is inconvenient because we need to ammend new pws to the
existing configuration. We should create a REST API for adding/removing/listing pws and abandond the
network configuration.
- Spine fabric switches have rules matching a special mpls tag used for pw traffic for a specific leaf.
However, this rules redirect to an "indirect" group for forwarding traffic. If the resulting port there
is no mechanism as of now to handle this. We should use the MPLS ECMP Groups of ofdpa, however they are
not functional. Thus, we need to inject logic into the application to handle this case.
Change-Id: Ia85cf4514ebab627fc6ed5a19ad9f6cdc67dc24c
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PseudowireAddCommand.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PseudowireAddCommand.java
new file mode 100644
index 0000000..d612475
--- /dev/null
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PseudowireAddCommand.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2017-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.segmentrouting.cli;
+
+
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.segmentrouting.SegmentRoutingService;
+import org.onosproject.segmentrouting.pwaas.L2TunnelHandler;
+
+
+/**
+ * Command to add a pseuwodire.
+ */
+@Command(scope = "onos", name = "pseudowire-add",
+ description = "Add a pseudowire to the network configuration, if it already exists update it.")
+public class PseudowireAddCommand extends AbstractShellCommand {
+
+ @Argument(index = 0, name = "pwId",
+ description = "Pseudowire ID",
+ required = true, multiValued = false)
+ String pwId;
+
+ @Argument(index = 1, name = "pwLabel",
+ description = "Pseudowire Label",
+ required = true, multiValued = false)
+ String pwLabel;
+
+ @Argument(index = 2, name = "mode",
+ description = "Mode used for pseudowire",
+ required = true, multiValued = false)
+ String mode;
+
+ @Argument(index = 3, name = "sDTag",
+ description = "Service delimiting tag",
+ required = true, multiValued = false)
+ String sDTag;
+
+ @Argument(index = 4, name = "cP1",
+ description = "Connection Point 1",
+ required = true, multiValued = false)
+ String cP1;
+
+ @Argument(index = 5, name = "cP1InnerVlan",
+ description = "Inner Vlan of Connection Point 1",
+ required = true, multiValued = false)
+ String cP1InnerVlan;
+
+ @Argument(index = 6, name = "cP1OuterVlan",
+ description = "Outer Vlan of Connection Point 1",
+ required = true, multiValued = false)
+ String cP1OuterVlan;
+
+ @Argument(index = 7, name = "cP2",
+ description = "Connection Point 2",
+ required = true, multiValued = false)
+ String cP2;
+
+ @Argument(index = 8, name = "cP2InnerVlan",
+ description = "Inner Vlan of Connection Point 2",
+ required = true, multiValued = false)
+ String cP2InnerVlan;
+
+ @Argument(index = 9, name = "cP2OuterVlan",
+ description = "Outer Vlan of Connection Point 2",
+ required = true, multiValued = false)
+ String cP2OuterVlan;
+
+ @Override
+ protected void execute() {
+
+ SegmentRoutingService srService =
+ AbstractShellCommand.get(SegmentRoutingService.class);
+
+ L2TunnelHandler.Result res = srService.addPseudowire(pwId, pwLabel,
+ cP1, cP1InnerVlan, cP1OuterVlan,
+ cP2, cP2InnerVlan, cP2OuterVlan,
+ mode, sDTag);
+ switch (res) {
+ case ADDITION_ERROR:
+ print("Pseudowire could not be added, error in configuration, please check logs for more details!");
+ break;
+ case CONFIG_NOT_FOUND:
+ print("Configuration for pwaas was not found! Initialize the configuration first through netcfg.");
+ break;
+ default:
+ print("Pseudowire was added to the configuration succesfully, please do check logs for any errors!");
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PseudowireIdCompleter.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PseudowireIdCompleter.java
new file mode 100644
index 0000000..9022bec
--- /dev/null
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PseudowireIdCompleter.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.segmentrouting.cli;
+
+import org.apache.karaf.shell.console.Completer;
+import org.apache.karaf.shell.console.completer.StringsCompleter;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.segmentrouting.SegmentRoutingService;
+import org.onosproject.segmentrouting.pwaas.DefaultL2Tunnel;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.stream.Collectors;
+
+/**
+ * Device ID completer.
+ */
+public class PseudowireIdCompleter implements Completer {
+ @Override
+ public int complete(String buffer, int cursor, List<String> candidates) {
+ // Delegate string completer
+ StringsCompleter delegate = new StringsCompleter();
+
+ SegmentRoutingService srService =
+ AbstractShellCommand.get(SegmentRoutingService.class);
+
+
+ List<DefaultL2Tunnel> tunnels = srService.getL2Tunnels();
+
+ // combine polices and tunnels to pseudowires
+ Iterator<String> pseudowires = tunnels.stream()
+ .map(l2Tunnel -> Long.toString(l2Tunnel.tunnelId()))
+ .collect(Collectors.toList()).iterator();
+
+ SortedSet<String> strings = delegate.getStrings();
+ while (pseudowires.hasNext()) {
+ strings.add(pseudowires.next());
+ }
+
+ // Now let the completer do the work for figuring out what to offer.
+ return delegate.complete(buffer, cursor, candidates);
+ }
+
+}
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PseudowireListCommand.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PseudowireListCommand.java
new file mode 100644
index 0000000..18625db
--- /dev/null
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PseudowireListCommand.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2017-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.segmentrouting.cli;
+
+import org.apache.karaf.shell.commands.Command;
+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 java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Command to show the pseudowires.
+ */
+@Command(scope = "onos", name = "pseudowires",
+ description = "Lists all pseudowires")
+public class PseudowireListCommand extends AbstractShellCommand {
+
+ private static final String FORMAT_PSEUDOWIRE =
+ "Pseudowire id = %s \n" +
+ " mode : %s, sdTag : %s, pwLabel : %s \n" +
+ " cP1 : %s , cP1OuterTag : %s, cP1InnerTag : %s \n" +
+ " cP2 : %s , cP2OuterTag : %s, cP2InnerTag : %s \n" /* +
+ " Path used : (%s - %s) <-> (%s - %s) \n" */;
+
+ // TODO: uncomment string when path failures are fixed also for the links
+ // TODO: used in spine for pw traffic.
+ @Override
+ protected void execute() {
+
+ SegmentRoutingService srService =
+ AbstractShellCommand.get(SegmentRoutingService.class);
+
+ List<DefaultL2Tunnel> tunnels = srService.getL2Tunnels();
+ List<DefaultL2TunnelPolicy> policies = srService.getL2Policies();
+
+ // combine polices and tunnels to pseudowires
+ List<DefaultL2TunnelDescription> pseudowires = tunnels.stream()
+ .map(l2Tunnel -> {
+ DefaultL2TunnelPolicy policy = null;
+ for (DefaultL2TunnelPolicy l2Policy : policies) {
+ if (l2Policy.tunnelId() == l2Tunnel.tunnelId()) {
+ policy = l2Policy;
+ break;
+ }
+ }
+
+ return new DefaultL2TunnelDescription(l2Tunnel, policy);
+ })
+ .collect(Collectors.toList());
+
+ pseudowires.forEach(pw -> printPseudowire(pw));
+ }
+
+ private void printPseudowire(DefaultL2TunnelDescription pseudowire) {
+
+
+ print(FORMAT_PSEUDOWIRE, pseudowire.l2Tunnel().tunnelId(), pseudowire.l2Tunnel().pwMode(),
+ pseudowire.l2Tunnel().sdTag(), pseudowire.l2Tunnel().pwLabel(),
+ pseudowire.l2TunnelPolicy().cP1(), pseudowire.l2TunnelPolicy().cP1OuterTag(),
+ pseudowire.l2TunnelPolicy().cP1InnerTag(), pseudowire.l2TunnelPolicy().cP2(),
+ pseudowire.l2TunnelPolicy().cP2OuterTag(), pseudowire.l2TunnelPolicy().cP2InnerTag()/*,
+ pseudowire.l2Tunnel().pathUsed().get(0).src(), pseudowire.l2Tunnel().pathUsed().get(0).dst(),
+ pseudowire.l2Tunnel().pathUsed().get(1).src(), pseudowire.l2Tunnel().pathUsed().get(1).dst()*/);
+
+ // TODO: uncomment arguments when path issue is fixed for spine switches
+ }
+}
\ No newline at end of file
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PseudowireRemoveCommand.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PseudowireRemoveCommand.java
new file mode 100644
index 0000000..782b339
--- /dev/null
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PseudowireRemoveCommand.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2017-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.segmentrouting.cli;
+
+
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.segmentrouting.SegmentRoutingManager;
+import org.onosproject.segmentrouting.SegmentRoutingService;
+import org.onosproject.segmentrouting.pwaas.L2TunnelHandler;
+
+
+/**
+ * Command to remove a pseudowire.
+ */
+@Command(scope = "onos", name = "pseudowire-remove",
+ description = "Remove a pseudowire")
+public class PseudowireRemoveCommand extends AbstractShellCommand {
+
+ @Argument(index = 0, name = "pwId",
+ description = "pseudowire ID",
+ required = true, multiValued = false)
+ String pwId;
+
+ @Override
+ protected void execute() {
+
+ SegmentRoutingService srService =
+ AbstractShellCommand.get(SegmentRoutingService.class);
+
+ // remove the pseudowire
+ SegmentRoutingManager mngr = (SegmentRoutingManager) srService;
+ L2TunnelHandler.Result res = mngr.removePseudowire(pwId);
+
+ switch (res) {
+ case REMOVAL_ERROR:
+ error("Error in deletion, pseudowire not found!");
+ break;
+ case CONFIG_NOT_FOUND:
+ error("Could not fetch pseudowire class configuration!");
+ break;
+ default:
+ return;
+ }
+ }
+}
\ No newline at end of file