commit e33af0c830374d260c685032bc645025f6e9350b
author Georgios Katsikas <katsikas.gp@gmail.com> Thu May 02 22:06:48 2019 +0200
committer Georgios Katsikas <katsikas.gp@gmail.com> Thu May 02 22:06:48 2019 +0200
tree 84fec3824bd27e007b5d2b30482735ef92c29a98
parent dfb6090dc77caeb701073028c535d5b821ad880f

Set protocol field for server devices

The protocol field of server devices was empty
in the DeviceView UI. This commit fixes the issue
by passing the protocol as a device annotation.

Change-Id: I9dbb75f21f8f7c41362e8d3652aef4beb4cc0474
Signed-off-by: Georgios Katsikas <katsikas.gp@gmail.com>

drivers/server/src/main/java/org/onosproject/drivers/server/ServerDevicesDiscovery.java

diff --git a/drivers/server/src/main/java/org/onosproject/drivers/server/ServerDevicesDiscovery.java b/drivers/server/src/main/java/org/onosproject/drivers/server/ServerDevicesDiscovery.java
index 3ff7f05..ac6c28d 100644
--- a/drivers/server/src/main/java/org/onosproject/drivers/server/ServerDevicesDiscovery.java
+++ b/drivers/server/src/main/java/org/onosproject/drivers/server/ServerDevicesDiscovery.java
@@ -66,7 +66,6 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.ImmutableList;
 
-import javax.ws.rs.ProcessingException;
 import java.io.InputStream;
 import java.io.IOException;
 import java.net.URI;
@@ -80,6 +79,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
+import javax.ws.rs.ProcessingException;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -294,6 +294,9 @@
 
         DefaultAnnotations.Builder annotations = DefaultAnnotations.builder();
 
+        // Pass the southbound protocol as an annotation
+        annotations.set(AnnotationKeys.PROTOCOL, "REST");
+
         // Construct NIC objects
         for (JsonNode nn : nicNode) {
             ObjectNode nicObjNode = (ObjectNode) nn;
@@ -848,7 +851,7 @@
             DefaultPortStatistics.Builder nicBuilder = DefaultPortStatistics.builder();
 
             nicBuilder.setDeviceId(deviceId)
-                    .setPort((int) portNumber)
+                    .setPort(PortNumber.portNumber(portNumber))
                     .setPacketsReceived(rxCount)
                     .setPacketsSent(txCount)
                     .setBytesReceived(rxBytes)