Fixing the ordering of flow programming operations
* When the subscriber is provisioned, it seems the related flows are being sent
in proper order. However, Voltha receives these in the wrong order. In order to
solve this problem, Charles' suggestion is implemented.
* New property named enableEapol is added, the default is true - it can be
changed to false from ONOS CLI, when it is false, OLT app does not send EAPOL
trap flows.
* Meter-mod & Flow-mod ordering issue is solved
* Multiple OLT support is added (internal maps are updated)
* New cli commands to debug bandwidthProfile and meter relations
Change-Id: Ic0a15aafa5403e00106dc660061e2a0b46ba5b01
diff --git a/app/src/main/java/org/opencord/olt/cli/ShowProgrammedMetersCommand.java b/app/src/main/java/org/opencord/olt/cli/ShowProgrammedMetersCommand.java
new file mode 100644
index 0000000..6fa8c9d
--- /dev/null
+++ b/app/src/main/java/org/opencord/olt/cli/ShowProgrammedMetersCommand.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2016-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.opencord.olt.cli;
+
+import org.apache.karaf.shell.commands.Command;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.meter.MeterKey;
+import org.opencord.olt.AccessDeviceService;
+
+import java.util.Set;
+
+/**
+ * Shows information about device-meter mappings that have been programmed in the
+ * data-plane.
+ */
+@Command(scope = "onos", name = "volt-programmed-meters",
+ description = "Shows device-meter mappings programmed in the data-plane")
+public class ShowProgrammedMetersCommand extends AbstractShellCommand {
+
+ @Override
+ protected void execute() {
+ AccessDeviceService service = AbstractShellCommand.get(AccessDeviceService.class);
+ Set<MeterKey> programmedMeters = service.getProgMeters();
+ programmedMeters.forEach(this::display);
+ }
+
+ private void display(MeterKey meterKey) {
+ print("device=%s meter=%s", meterKey.deviceId(), meterKey.meterId());
+ }
+}