/*
 * Copyright 2015-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.cli.net;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import org.apache.karaf.shell.commands.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.net.packet.PacketRequest;
import org.onosproject.net.packet.PacketService;

import java.util.List;

/**
 * Lists packet requests.
 */
@Command(scope = "onos", name = "packet-requests",
        description = "Lists packet requests")
public class PacketRequestsListCommand extends AbstractShellCommand {

    private static final String FMT = "nodeId=%s appId=%s, priority=%s, criteria=%s";

    @Override
    protected void execute() {
        PacketService service = get(PacketService.class);
        if (outputJson()) {
            print("%s", json(service.getRequests()));
        } else {
            service.getRequests().forEach(this::print);
        }
    }

    private JsonNode json(List<PacketRequest> requests) {
        ObjectMapper mapper = new ObjectMapper();
        ArrayNode result = mapper.createArrayNode();

        for (PacketRequest r : requests) {
            result.add(mapper.createObjectNode()
                    .put("nodeId", r.nodeId().toString())
                    .put("appId", r.appId().name())
                    .put("priority", r.priority().toString())
                    .put("criteria", r.selector().criteria().toString()));
        }

        return result;
    }

    private void print(PacketRequest request) {
        print(FMT, request.nodeId(), request.appId().name(), request.priority(), request.selector().criteria());
    }

}

@@ -1305,16 +1305,29 @@
 teria=%25s
+, deviceId=%25s
 %22;%0A%0A    
@@ -2095,16 +2095,119 @@
 tring())
+%0A                    .put(%22deviceId%22, r.deviceId().isPresent() ? r.deviceId().get().toString() : %22ALL%22)
 );%0A     
@@ -2400,16 +2400,110 @@
 iteria()
+,%0A                request.deviceId().isPresent() ? request.deviceId().get().toString() : %22ALL%22
 );%0A    %7D

Print device ID in packet-requests command