Modify a annotation and refactor Web UI.
Change-Id: I985733e8f4e7d0cda292ed4a240d1250db8e2316
diff --git a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/codec/FlowInfoJsonCodec.java b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/codec/FlowInfoJsonCodec.java
index 4244c7f..be51b15 100644
--- a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/codec/FlowInfoJsonCodec.java
+++ b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/codec/FlowInfoJsonCodec.java
@@ -21,24 +21,22 @@
import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
import org.onlab.packet.TpPort;
+import org.onlab.packet.VlanId;
import org.onosproject.codec.CodecContext;
import org.onosproject.codec.JsonCodec;
import org.onosproject.net.DeviceId;
import org.onosproject.openstacktelemetry.api.FlowInfo;
import org.onosproject.openstacktelemetry.api.StatsInfo;
import org.onosproject.openstacktelemetry.impl.DefaultFlowInfo;
-import org.slf4j.Logger;
import static com.google.common.base.Preconditions.checkNotNull;
-import static org.slf4j.LoggerFactory.getLogger;
+import static org.onlab.packet.VlanId.NO_VID;
/**
* Openstack telemetry codec used for serializing and de-serializing JSON string.
*/
public final class FlowInfoJsonCodec extends JsonCodec<FlowInfo> {
- private final Logger log = getLogger(getClass());
-
private static final String FLOW_TYPE = "flowType";
private static final String DEVICE_ID = "deviceId";
private static final String INPUT_INTERFACE_ID = "inputInterfaceId";
@@ -76,7 +74,6 @@
.put(SRC_MAC, info.srcMac().toString())
.put(DST_MAC, info.dstMac().toString());
-
if (info.vlanId() != null) {
result.put(VLAN_ID, info.vlanId().toString());
} else {
@@ -111,6 +108,21 @@
String srcMac = json.get(SRC_MAC).asText();
String dstMac = json.get(DST_MAC).asText();
+ VlanId vlanId;
+ short vxlanId = 0;
+ try {
+ if (json.get(VLAN_ID).isNull()) {
+ vlanId = VlanId.vlanId(NO_VID);
+ if (!(json.get(VXLAN_ID).isNull())) {
+ vxlanId = (short) json.get(VXLAN_ID).asInt();
+ }
+ } else {
+ vlanId = VlanId.vlanId((short) json.get(VLAN_ID).asInt());
+ }
+ } catch (NullPointerException ex) {
+ vlanId = VlanId.vlanId();
+ }
+
JsonNode statsInfoJson = json.get(STATS_INFO);
JsonCodec<StatsInfo> statsInfoCodec = context.codec(StatsInfo.class);
@@ -128,6 +140,8 @@
.withProtocol(Byte.valueOf(protocol))
.withSrcMac(MacAddress.valueOf(srcMac))
.withDstMac(MacAddress.valueOf(dstMac))
+ .withVlanId(vlanId)
+ .withVxlanId(vxlanId)
.withStatsInfo(statsInfo)
.build();
}
diff --git a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/codec/StatsFlowRuleJsonCodec.java b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/codec/StatsFlowRuleJsonCodec.java
index 8fc8143..2e84b79 100644
--- a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/codec/StatsFlowRuleJsonCodec.java
+++ b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/codec/StatsFlowRuleJsonCodec.java
@@ -17,7 +17,6 @@
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.onlab.packet.IPv4;
import org.onlab.packet.TpPort;
import org.onosproject.codec.CodecContext;
import org.onosproject.codec.JsonCodec;
@@ -28,6 +27,7 @@
import org.onlab.packet.IpPrefix;
import static com.google.common.base.Preconditions.checkNotNull;
+import static org.onosproject.openstacktelemetry.util.OpenstackTelemetryUtil.getProtocolTypeFromString;
import static org.slf4j.LoggerFactory.getLogger;
public class StatsFlowRuleJsonCodec extends JsonCodec<StatsFlowRule> {
@@ -59,41 +59,26 @@
try {
String srcIpPrefix = json.get(SRC_IP_PREFIX).asText();
String dstIpPrefix = json.get(DST_IP_PREFIX).asText();
- String tmpIpProtocol = new String("");
- int srcTpPort = 0;
- int dstTpPort = 0;
DefaultStatsFlowRule.Builder flowRuleBuilder;
- byte ipProtocol = 0;
if (json.get(IP_PROTOCOL) == null) {
log.info("ipProtocol: null");
flowRuleBuilder = DefaultStatsFlowRule.builder()
.srcIpPrefix(IpPrefix.valueOf(srcIpPrefix))
.dstIpPrefix(IpPrefix.valueOf(dstIpPrefix));
} else {
- tmpIpProtocol = json.get(IP_PROTOCOL).asText().toUpperCase();
- srcTpPort = json.get(SRC_TP_PORT).asInt();
- dstTpPort = json.get(DST_TP_PORT).asInt();
- if (tmpIpProtocol.equals("TCP")) {
- ipProtocol = IPv4.PROTOCOL_TCP;
- } else if (tmpIpProtocol.equals("UDP")) {
- ipProtocol = IPv4.PROTOCOL_UDP;
- } else {
- ipProtocol = 0;
- }
+ byte ipProtocol = getProtocolTypeFromString(json.get(IP_PROTOCOL).asText());
+ int srcTpPort = json.get(SRC_TP_PORT).asInt();
+ int dstTpPort = json.get(DST_TP_PORT).asInt();
flowRuleBuilder = DefaultStatsFlowRule.builder()
- .srcIpPrefix(IpPrefix.valueOf(srcIpPrefix))
- .dstIpPrefix(IpPrefix.valueOf(dstIpPrefix))
- .ipProtocol(ipProtocol)
- .srcTpPort(TpPort.tpPort(srcTpPort))
- .dstTpPort(TpPort.tpPort(dstTpPort));
+ .srcIpPrefix(IpPrefix.valueOf(srcIpPrefix))
+ .dstIpPrefix(IpPrefix.valueOf(dstIpPrefix))
+ .ipProtocol(ipProtocol)
+ .srcTpPort(TpPort.tpPort(srcTpPort))
+ .dstTpPort(TpPort.tpPort(dstTpPort));
}
-
- log.debug("StatsFlowRule after building from JSON:\n{}",
- flowRuleBuilder.build().toString());
-
return flowRuleBuilder.build();
} catch (Exception ex) {
log.error("Exception Stack:\n{}", ExceptionUtils.getStackTrace(ex));
diff --git a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/codec/StatsInfoJsonCodec.java b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/codec/StatsInfoJsonCodec.java
index 53cf924..905b2ff 100644
--- a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/codec/StatsInfoJsonCodec.java
+++ b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/codec/StatsInfoJsonCodec.java
@@ -20,18 +20,14 @@
import org.onosproject.codec.JsonCodec;
import org.onosproject.openstacktelemetry.api.StatsInfo;
import org.onosproject.openstacktelemetry.impl.DefaultStatsInfo;
-import org.slf4j.Logger;
import static com.google.common.base.Preconditions.checkNotNull;
-import static org.slf4j.LoggerFactory.getLogger;
/**
* Openstack telemetry codec used for serializing and de-serializing JSON string.
*/
public final class StatsInfoJsonCodec extends JsonCodec<StatsInfo> {
- private final Logger log = getLogger(getClass());
-
private static final String STARTUP_TIME = "startupTime";
private static final String FST_PKT_ARR_TIME = "fstPktArrTime";
private static final String LST_PKT_OFFSET = "lstPktOffset";
diff --git a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/codec/TinaFlowInfoByteBufferCodec.java b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/codec/TinaFlowInfoByteBufferCodec.java
index 73258ac..2ee625f 100644
--- a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/codec/TinaFlowInfoByteBufferCodec.java
+++ b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/codec/TinaFlowInfoByteBufferCodec.java
@@ -34,6 +34,7 @@
*/
public class TinaFlowInfoByteBufferCodec extends ByteBufferCodec<FlowInfo> {
+ private static final int NUM_RADIX = 16;
private static final int MESSAGE_SIZE = 88;
private static final String OF_PREFIX = "of:";
@@ -46,7 +47,7 @@
String deviceId = flowInfo.deviceId().toString();
short switchId = (short) Integer.parseInt(deviceId.substring(3,
- deviceId.length()), 16);
+ deviceId.length()), NUM_RADIX);
if (flowInfo.srcPort() != null) {
srcPort = flowInfo.srcPort().toInt();
diff --git a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/gui/OpenstackTelemetryUiTopovOverlay.java b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/gui/OpenstackTelemetryUiTopovOverlay.java
new file mode 100644
index 0000000..f1575bc
--- /dev/null
+++ b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/gui/OpenstackTelemetryUiTopovOverlay.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2018-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.openstacktelemetry.gui;
+
+import org.onosproject.ui.UiTopoOverlay;
+
+public class OpenstackTelemetryUiTopovOverlay extends UiTopoOverlay {
+ private static final String OVERLAY_ID = "ostelemetry-overlay";
+
+ public OpenstackTelemetryUiTopovOverlay() {
+ super(OVERLAY_ID);
+ }
+
+ @Override
+ public void activate() {
+ super.activate();
+ log.info("OpenstackTelemetry Overlay View Activated");
+ }
+
+ @Override
+ public void deactivate() {
+ super.deactivate();
+ log.info("OpenstackTelemetry Overlay View Deactivated");
+ }
+}
diff --git a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/gui/OpensteckTelemetryUI.java b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/gui/OpensteckTelemetryUI.java
index 3f09f6a..da987c9 100644
--- a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/gui/OpensteckTelemetryUI.java
+++ b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/gui/OpensteckTelemetryUI.java
@@ -19,6 +19,7 @@
import org.onosproject.ui.UiExtension;
import org.onosproject.ui.UiExtensionService;
import org.onosproject.ui.UiMessageHandlerFactory;
+import org.onosproject.ui.UiTopoOverlayFactory;
import org.onosproject.ui.UiView;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -56,11 +57,18 @@
new UiView(NETWORK, OPENSTACKTELEMETRY_ID, OPENSTACKTELEMETRY_TEXT)
);
+ // Factory for UI topology overlays
+ private final UiTopoOverlayFactory topoOverlayFactory =
+ () -> ImmutableList.of(
+ new OpenstackTelemetryUiTopovOverlay()
+ );
+
// Application UI extension
private final UiExtension uiExtension =
new UiExtension.Builder(CL, views)
.messageHandlerFactory(messageHandlerFactory)
.resourcePath(RESOURCE_PATH)
+ .topoOverlayFactory(topoOverlayFactory)
.build();
@Activate
diff --git a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/gui/OpensteckTelemetryViewMessageHandler.java b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/gui/OpensteckTelemetryViewMessageHandler.java
index 8d1df10..dcb7082 100644
--- a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/gui/OpensteckTelemetryViewMessageHandler.java
+++ b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/gui/OpensteckTelemetryViewMessageHandler.java
@@ -21,9 +21,18 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
+import org.onlab.osgi.ServiceDirectory;
+import org.onlab.packet.IpAddress;
+import org.onlab.packet.IpPrefix;
+import org.onlab.packet.TpPort;
+import org.onosproject.net.Host;
+import org.onosproject.net.host.HostService;
import org.onosproject.openstacktelemetry.api.FlowInfo;
+import org.onosproject.openstacktelemetry.api.StatsFlowRule;
import org.onosproject.openstacktelemetry.api.StatsFlowRuleAdminService;
+import org.onosproject.openstacktelemetry.impl.DefaultStatsFlowRule;
import org.onosproject.ui.RequestHandler;
+import org.onosproject.ui.UiConnection;
import org.onosproject.ui.UiMessageHandler;
import org.onosproject.ui.chart.ChartModel;
import org.onosproject.ui.chart.ChartRequestHandler;
@@ -33,8 +42,13 @@
import java.text.SimpleDateFormat;
import java.util.Collection;
import java.util.Date;
+import java.util.Iterator;
import java.util.Map;
import java.util.Queue;
+import java.util.Set;
+
+import static org.onosproject.net.HostId.hostId;
+import static org.onosproject.openstacktelemetry.util.OpenstackTelemetryUtil.getProtocolTypeFromString;
/**
* Message handler for Openstack Telemetry view related messages.
@@ -42,12 +56,40 @@
public class OpensteckTelemetryViewMessageHandler extends UiMessageHandler {
private final Logger log = LoggerFactory.getLogger(getClass());
+ // Chart View
private static final String OST_DATA_REQ = "openstacktelemetryDataRequest";
private static final String OST_DATA_RESP = "openstacktelemetryDataResponse";
+
+ // Network Topology
+ private static final String OST_IS_ACTIVATED_REQ = "openstackFlowStatsIsActivatedRequest";
+ private static final String OST_IS_ACTIVATED_RESP = "openstackFlowStatsIsActivatedResponse";
+ private static final String OST_FLOW_STATS_CREATE_REQ = "openstackFlowStatsCreateRequest";
+ private static final String OST_FLOW_STATS_CREATE_RESP = "openstackFlowStatsCreateResponse";
+
private static final String OSTS = "openstacktelemetrys";
private static final String ANNOT_FLOW_IDS = "flowIds";
private static final String ANNOT_PERIOD_OPTIONS = "periodOptions";
+ private static final String SOURCE = "src";
+ private static final String DESTINATION = "dst";
+ private static final String SOURCE_IP = "srcIp";
+ private static final String DESTINATION_IP = "dstIp";
+ private static final String SOURCE_TRANSPORT_PORT = "srcPort";
+ private static final String DESTINATION_TRANSPORT_PORT = "dstPort";
+ private static final String SOURCE_HOST_NAME = "srcName";
+ private static final String DESTINATION_HOST_NAME = "dstName";
+ private static final String IP_PROTOCOL = "ipProto";
+ private static final String IP_PROTOCOL_LIST = "ipProtoList";
+
+ private static final String RESULT = "result";
+ private static final String RESULT_OK = "OK";
+ private static final String VALUE = "value";
+ private static final String SUCCESS = "Success";
+ private static final String FAILED = "Failed";
+ private static final String FAILED_TO_CREATE_FLOW_STATS = "Failed to create a flow rule for statistics";
+
+ private static final String[] IP_PROTOCOL_ARRAY = {"TCP", "UDP", "ANY"};
+
private static final String STAT_CURR_ACC_PACKET = "curr_acc_packet";
private static final String STAT_PREV_ACC_PACKET = "prev_acc_packet";
private static final String STAT_CURR_ACC_BYTE = "curr_acc_byte";
@@ -76,20 +118,33 @@
.put("24 HOUR", 17280)
.build();
+ private HostService hostService;
+ private StatsFlowRuleAdminService statsFlowRuleService;
+
+ @Override
+ public void init(UiConnection connection, ServiceDirectory directory) {
+ super.init(connection, directory);
+
+ hostService = directory.get(HostService.class);
+ statsFlowRuleService = directory.get(StatsFlowRuleAdminService.class);
+ }
+
@Override
protected Collection<RequestHandler> createRequestHandlers() {
return ImmutableSet.of(
- new ControlMessageRequest()
+ new ChartControlMessageRequest(),
+ new FlowStatsIsActivatedRequestHandler(),
+ new FlowStatsCreateRequestHandler()
);
}
- private final class ControlMessageRequest extends ChartRequestHandler {
- private StatsFlowRuleAdminService statsFlowRuleService = null;
+ /* Handler for Line-Chart View */
+ private final class ChartControlMessageRequest extends ChartRequestHandler {
private Map<String, Queue<FlowInfo>> flowInfoMap = null;
private String currentFlowKey = null;
private String currentPeriod = DEFAULT_PERIOD_OPTION_1MIN;
- private ControlMessageRequest() {
+ private ChartControlMessageRequest() {
super(OST_DATA_REQ, OST_DATA_RESP, OSTS);
}
@@ -204,4 +259,92 @@
return flowInfos[flowInfos.length - 1];
}
}
+
+ /* Handler for Network Topology View */
+ private final class FlowStatsIsActivatedRequestHandler extends RequestHandler {
+
+ private FlowStatsIsActivatedRequestHandler() {
+ super(OST_IS_ACTIVATED_REQ);
+ }
+
+ @Override
+ public void process(ObjectNode payload) {
+ String srcId = string(payload, SOURCE, null);
+ String dstId = string(payload, DESTINATION, null);
+
+ log.debug("Input from GUI: {}", payload.toString());
+ if (srcId != null && dstId != null) {
+ Host srcHost = hostService.getHost(hostId(srcId));
+ Host dstHost = hostService.getHost(hostId(dstId));
+
+ if (srcHost != null && dstHost != null) {
+ ArrayNode ipProtos = arrayNode();
+ String srcHostName = ipForHost(srcHost);
+ String dstHostName = ipForHost(dstHost);
+
+ for (String proto : IP_PROTOCOL_ARRAY) {
+ ipProtos.add(proto);
+ }
+
+ payload.put(SOURCE_HOST_NAME, srcHostName);
+ payload.put(DESTINATION_HOST_NAME, dstHostName);
+ payload.put(IP_PROTOCOL_LIST, ipProtos);
+
+ log.debug("Output to GUI: {}", payload.toString());
+
+ sendMessage(OST_IS_ACTIVATED_RESP, payload);
+ }
+ }
+ }
+
+ // Returns the first of the given host's set of IP addresses as a string.
+ private String ipForHost(Host host) {
+ Set<IpAddress> ipAddresses = host.ipAddresses();
+ Iterator<IpAddress> it = ipAddresses.iterator();
+ return it.hasNext() ? it.next().toString() + "/32" : "unknown";
+ }
+ }
+
+ private final class FlowStatsCreateRequestHandler extends RequestHandler {
+ private String srcIp;
+ private String dstIp;
+ private String ipProto;
+ private String srcTpPort;
+ private String dstTpPort;
+ private ObjectNode result = objectNode();
+
+ private FlowStatsCreateRequestHandler() {
+ super(OST_FLOW_STATS_CREATE_REQ);
+ }
+
+ @Override
+ public void process(ObjectNode payload) {
+ srcIp = string(payload, SOURCE_IP, null);
+ dstIp = string(payload, DESTINATION_IP, null);
+ ipProto = string(payload, IP_PROTOCOL, null);
+ srcTpPort = string(payload, SOURCE_TRANSPORT_PORT, null);
+ dstTpPort = string(payload, DESTINATION_TRANSPORT_PORT, null);
+
+ log.debug("[GUI input] srcIp:{} dstIp:{} ipPro:{} srcTpPort:{} dstTpPort:{}",
+ srcIp, dstIp, ipProto, srcTpPort, dstTpPort);
+
+ try {
+ StatsFlowRule statsFlowRule = DefaultStatsFlowRule.builder()
+ .srcIpPrefix(IpPrefix.valueOf(srcIp))
+ .dstIpPrefix(IpPrefix.valueOf(dstIp))
+ .srcTpPort(TpPort.tpPort(Integer.valueOf(srcTpPort)))
+ .dstTpPort(TpPort.tpPort(Integer.valueOf(dstTpPort)))
+ .ipProtocol(getProtocolTypeFromString(ipProto))
+ .build();
+ statsFlowRuleService.createStatFlowRule(statsFlowRule);
+ result.put(RESULT, SUCCESS);
+ result.put(VALUE, RESULT_OK);
+ } catch (Exception ex) {
+ log.warn(FAILED_TO_CREATE_FLOW_STATS + " : " + ex.toString());
+ result.put(RESULT, FAILED);
+ result.put(VALUE, FAILED_TO_CREATE_FLOW_STATS);
+ }
+ sendMessage(OST_FLOW_STATS_CREATE_RESP, result);
+ }
+ }
}
diff --git a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/DefaultFlowInfo.java b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/DefaultFlowInfo.java
index 8560170..b0d3aad 100644
--- a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/DefaultFlowInfo.java
+++ b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/DefaultFlowInfo.java
@@ -27,6 +27,7 @@
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
+import static org.onosproject.openstacktelemetry.util.OpenstackTelemetryUtil.getProtocolNameFromType;
/**
* Implementation class of FlowInfo.
@@ -200,7 +201,8 @@
((srcPort == null) ? "any" : srcPort.toString()) +
" -> " +
dstIp.toString() + ":" +
- ((dstPort == null) ? "any" : dstPort.toString());
+ ((dstPort == null) ? "any" : dstPort.toString()) +
+ " (" + getProtocolNameFromType(protocol) + ")";
}
@Override
diff --git a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/OsgiPropertyConstants.java b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/OsgiPropertyConstants.java
index 7be6973..325bce2 100644
--- a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/OsgiPropertyConstants.java
+++ b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/OsgiPropertyConstants.java
@@ -141,11 +141,11 @@
// Prometheus Telemetry config manager
static final String PROP_PROMETHEUS_ENABLE_SERVICE = "enableService";
- static final boolean PROMETHEUS_ENABLE_SERVICE_DEFAULT = false;
+ static final boolean PROP_PROMETHEUS_ENABLE_SERVICE_DEFAULT = true;
static final String PROP_PROMETHEUS_EXPORTER_ADDRESS = "address";
- public static final String PROMETHEUS_EXPORTER_ADDRESS_DEFAULT = "localhost";
+ public static final String PROP_PROMETHEUS_EXPORTER_ADDRESS_DEFAULT = "localhost";
static final String PROP_PROMETHEUS_EXPORTER_PORT = "port";
- public static final int PROMETHEUS_EXPORTER_PORT_DEFAULT = 50051;
+ public static final int PROP_PROMETHEUS_EXPORTER_PORT_DEFAULT = 9555;
}
diff --git a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/PrometheusTelemetryConfigManager.java b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/PrometheusTelemetryConfigManager.java
index 4405b97..dcc7023 100644
--- a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/PrometheusTelemetryConfigManager.java
+++ b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/PrometheusTelemetryConfigManager.java
@@ -33,9 +33,9 @@
import java.util.Dictionary;
-import static org.onosproject.openstacktelemetry.impl.OsgiPropertyConstants.PROMETHEUS_ENABLE_SERVICE_DEFAULT;
-import static org.onosproject.openstacktelemetry.impl.OsgiPropertyConstants.PROMETHEUS_EXPORTER_ADDRESS_DEFAULT;
-import static org.onosproject.openstacktelemetry.impl.OsgiPropertyConstants.PROMETHEUS_EXPORTER_PORT_DEFAULT;
+import static org.onosproject.openstacktelemetry.impl.OsgiPropertyConstants.PROP_PROMETHEUS_ENABLE_SERVICE_DEFAULT;
+import static org.onosproject.openstacktelemetry.impl.OsgiPropertyConstants.PROP_PROMETHEUS_EXPORTER_ADDRESS_DEFAULT;
+import static org.onosproject.openstacktelemetry.impl.OsgiPropertyConstants.PROP_PROMETHEUS_EXPORTER_PORT_DEFAULT;
import static org.onosproject.openstacktelemetry.impl.OsgiPropertyConstants.PROP_PROMETHEUS_ENABLE_SERVICE;
import static org.onosproject.openstacktelemetry.impl.OsgiPropertyConstants.PROP_PROMETHEUS_EXPORTER_ADDRESS;
import static org.onosproject.openstacktelemetry.impl.OsgiPropertyConstants.PROP_PROMETHEUS_EXPORTER_PORT;
@@ -49,9 +49,9 @@
immediate = true,
service = PrometheusTelemetryConfigService.class,
property = {
- PROP_PROMETHEUS_ENABLE_SERVICE + ":Boolean=" + PROMETHEUS_ENABLE_SERVICE_DEFAULT,
- PROP_PROMETHEUS_EXPORTER_ADDRESS + "=" + PROMETHEUS_EXPORTER_ADDRESS_DEFAULT,
- PROP_PROMETHEUS_EXPORTER_PORT + ":Integer=" + PROMETHEUS_EXPORTER_PORT_DEFAULT
+ PROP_PROMETHEUS_ENABLE_SERVICE + ":Boolean=" + PROP_PROMETHEUS_ENABLE_SERVICE_DEFAULT,
+ PROP_PROMETHEUS_EXPORTER_ADDRESS + "=" + PROP_PROMETHEUS_EXPORTER_ADDRESS_DEFAULT,
+ PROP_PROMETHEUS_EXPORTER_PORT + ":Integer=" + PROP_PROMETHEUS_EXPORTER_PORT_DEFAULT
}
)
public class PrometheusTelemetryConfigManager implements PrometheusTelemetryConfigService {
@@ -65,13 +65,13 @@
protected PrometheusTelemetryAdminService prometheusTelemetryAdminService;
/** Default IP address of prometheus exporter. */
- protected String address = PROMETHEUS_EXPORTER_ADDRESS_DEFAULT;
+ protected String address = PROP_PROMETHEUS_EXPORTER_ADDRESS_DEFAULT;
/** Default port number of prometheus exporter. */
- protected Integer port = PROMETHEUS_EXPORTER_PORT_DEFAULT;
+ protected Integer port = PROP_PROMETHEUS_EXPORTER_PORT_DEFAULT;
/** Specify the default behavior of telemetry service. */
- protected Boolean enableService = PROMETHEUS_ENABLE_SERVICE_DEFAULT;
+ protected Boolean enableService = PROP_PROMETHEUS_ENABLE_SERVICE_DEFAULT;
@Activate
protected void activate(ComponentContext context) {
@@ -115,12 +115,12 @@
Dictionary<?, ?> properties = context.getProperties();
String addressStr = Tools.get(properties, PROP_PROMETHEUS_EXPORTER_ADDRESS);
- address = addressStr != null ? addressStr : PROMETHEUS_EXPORTER_ADDRESS_DEFAULT;
+ address = addressStr != null ? addressStr : PROP_PROMETHEUS_EXPORTER_ADDRESS_DEFAULT;
log.info("Configured. Prometheus exporter address is {}", address);
Integer portConfigured = Tools.getIntegerProperty(properties, PROP_PROMETHEUS_EXPORTER_PORT);
if (portConfigured == null) {
- port = PROMETHEUS_EXPORTER_PORT_DEFAULT;
+ port = PROP_PROMETHEUS_EXPORTER_PORT_DEFAULT;
log.info("Prometheus exporter port is NOT configured, default value is {}", port);
} else {
port = portConfigured;
@@ -129,7 +129,7 @@
Boolean enableServiceConfigured = getBooleanProperty(properties, PROP_PROMETHEUS_ENABLE_SERVICE);
if (enableServiceConfigured == null) {
- enableService = PROMETHEUS_ENABLE_SERVICE_DEFAULT;
+ enableService = PROP_PROMETHEUS_ENABLE_SERVICE_DEFAULT;
log.info("Prometheus service enable flag is NOT " +
"configured, default value is {}", enableService);
} else {
diff --git a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/PrometheusTelemetryManager.java b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/PrometheusTelemetryManager.java
index f029fa4..69423ca 100644
--- a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/PrometheusTelemetryManager.java
+++ b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/PrometheusTelemetryManager.java
@@ -15,10 +15,11 @@
*/
package org.onosproject.openstacktelemetry.impl;
+import io.prometheus.client.Gauge;
+import org.onlab.packet.TpPort;
import org.onosproject.openstacktelemetry.api.FlowInfo;
import org.onosproject.openstacktelemetry.api.OpenstackTelemetryService;
import org.onosproject.openstacktelemetry.api.PrometheusTelemetryAdminService;
-import org.onosproject.openstacktelemetry.api.PrometheusTelemetryService;
import org.onosproject.openstacktelemetry.api.config.PrometheusTelemetryConfig;
import org.onosproject.openstacktelemetry.api.config.TelemetryConfig;
import org.osgi.service.component.annotations.Activate;
@@ -34,76 +35,101 @@
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
+
+import java.util.Arrays;
import java.util.Set;
/**
* Prometheus telemetry manager.
*/
-@Component(immediate = true, service = PrometheusTelemetryService.class)
+@Component(immediate = true, service = PrometheusTelemetryAdminService.class)
public class PrometheusTelemetryManager implements PrometheusTelemetryAdminService {
private final Logger log = LoggerFactory.getLogger(getClass());
private Server prometheusExporter;
- private static final String BYTE_VM2VM = "byte_vm2vm";
- private static final String BYTE_DEVICE = "byte_device";
- private static final String BYTE_SRC_IP = "byte_src_ip";
- private static final String BYTE_DST_IP = "byte_dst_ip";
+ private static final String FLOW_TYPE = "flowType";
+ private static final String DEVICE_ID = "deviceId";
+ private static final String INPUT_INTERFACE_ID = "inputInterfaceId";
+ private static final String OUTPUT_INTERFACE_ID = "outputInterfaceId";
+ private static final String VLAN_ID = "vlanId";
+ private static final String VXLAN_ID = "vxlanId";
+ private static final String SRC_IP = "srcIp";
+ private static final String DST_IP = "dstIp";
+ private static final String SRC_PORT = "srcPort";
+ private static final String DST_PORT = "dstPort";
+ private static final String PROTOCOL = "protocol";
- private static final String PKT_VM2VM = "pkt_vm2vm";
- private static final String PKT_DEVICE = "pkt_device";
- private static final String PKT_SRC_IP = "pkt_src_ip";
- private static final String PKT_DST_IP = "pkt_dst_ip";
+ private static final String[] LABEL_TAGS = {
+ FLOW_TYPE, DEVICE_ID, INPUT_INTERFACE_ID, OUTPUT_INTERFACE_ID,
+ VLAN_ID, VXLAN_ID, SRC_IP, DST_IP, SRC_PORT, DST_PORT, PROTOCOL
+ };
- private static final String PKT_ERROR = "pkt_error";
- private static final String PKT_DROP = "pkt_drop";
+ private static final String STAT_NAME_VM2VM_BYTE = "vm2vm_byte";
+ private static final String STAT_NAME_VM2VM_BYTE_PREV = "vm2vm_byte_prev";
+ private static final String STAT_NAME_VM2VM_BYTE_CURR = "vm2vm_byte_curr";
+ private static final String STAT_NAME_VM2VM_PKT = "vm2vm_pkt";
+ private static final String STAT_NAME_VM2VM_PKT_PREV = "vm2vm_pkt_prev";
+ private static final String STAT_NAME_VM2VM_PKT_CURR = "vm2vm_pkt_curr";
+ private static final String STAT_NAME_ERROR_PKT = "error_pkt";
+ private static final String STAT_NAME_DROP_PKT = "drop_pkt";
- private static final String LABEL_IP_5_TUPLE = "IP_5_TUPLE";
- private static final String LABEL_DEV_ID = "DEVICE_ID";
- private static final String LABEL_SRC_IP = "SOURCE_IP";
- private static final String LABEL_DST_IP = "DESTINATION_IP";
+ private static final String HELP_MSG_VM2VM_BYTE =
+ "SONA flow bytes statistics for VM to VM";
+ private static final String HELP_MSG_VM2VM_BYTE_PREV =
+ HELP_MSG_VM2VM_BYTE + " [Accumulated previous byte]";
+ private static final String HELP_MSG_VM2VM_BYTE_CURR =
+ HELP_MSG_VM2VM_BYTE + " [Accumulated current byte]";
+ private static final String HELP_MSG_VM2VM_PKT =
+ "SONA flow packets statistics for VM to VM";
+ private static final String HELP_MSG_VM2VM_PKT_PREV =
+ HELP_MSG_VM2VM_PKT + " [Accumulated previous pkt]";
+ private static final String HELP_MSG_VM2VM_PKT_CURR =
+ HELP_MSG_VM2VM_PKT + " [Accumulated current pkt]";
+ private static final String HELP_MSG_ERROR = "SONA error statistics";
+ private static final String HELP_MSG_DROP = "SONA drop statistics";
- private static final String HELP_MSG = "SONA Flow statistics";
-
- private static Counter byteVM2VM = Counter.build().name(BYTE_VM2VM)
- .help(HELP_MSG)
- .labelNames(LABEL_IP_5_TUPLE).register();
-
- private static Counter byteDevice = Counter.build().name(BYTE_DEVICE)
- .help(HELP_MSG)
- .labelNames(LABEL_DEV_ID).register();
-
- private static Counter byteSrcIp = Counter.build().name(BYTE_SRC_IP)
- .help(HELP_MSG)
- .labelNames(LABEL_SRC_IP).register();
-
- private static Counter byteDstIp = Counter.build().name(BYTE_DST_IP)
- .help(HELP_MSG)
- .labelNames(LABEL_DST_IP).register();
-
- private static Counter pktVM2VM = Counter.build().name(PKT_VM2VM)
- .help(HELP_MSG)
- .labelNames(LABEL_IP_5_TUPLE).register();
-
- private static Counter pktDevice = Counter.build().name(PKT_DEVICE)
- .help(HELP_MSG)
- .labelNames(LABEL_DEV_ID).register();
-
- private static Counter pktSrcIp = Counter.build().name(PKT_SRC_IP)
- .help(HELP_MSG)
- .labelNames(LABEL_SRC_IP).register();
-
- private static Counter pktDstIp = Counter.build().name(PKT_DST_IP)
- .help(HELP_MSG)
- .labelNames(LABEL_DST_IP).register();
-
- private static Counter pktError = Counter.build().name(PKT_ERROR)
- .help(HELP_MSG)
- .register();
- private static Counter pktDrop = Counter.build().name(PKT_DROP)
- .help(HELP_MSG)
- .register();
+ private static Gauge byteVM2VM = Gauge.build()
+ .name(STAT_NAME_VM2VM_BYTE)
+ .help(HELP_MSG_VM2VM_BYTE)
+ .labelNames(LABEL_TAGS)
+ .register();
+ private static Gauge byteVM2VMPrev = Gauge.build()
+ .name(STAT_NAME_VM2VM_BYTE_PREV)
+ .help(HELP_MSG_VM2VM_BYTE_PREV)
+ .labelNames(LABEL_TAGS)
+ .register();
+ private static Gauge byteVM2VMCurr = Gauge.build()
+ .name(STAT_NAME_VM2VM_BYTE_CURR)
+ .help(HELP_MSG_VM2VM_BYTE_CURR)
+ .labelNames(LABEL_TAGS)
+ .register();
+ private static Gauge pktVM2VM = Gauge.build()
+ .name(STAT_NAME_VM2VM_PKT)
+ .help(HELP_MSG_VM2VM_PKT)
+ .labelNames(LABEL_TAGS)
+ .register();
+ private static Gauge pktVM2VMPrev = Gauge.build()
+ .name(STAT_NAME_VM2VM_PKT_PREV)
+ .help(HELP_MSG_VM2VM_PKT_PREV)
+ .labelNames(LABEL_TAGS)
+ .register();
+ private static Gauge pktVM2VMCurr = Gauge.build()
+ .name(STAT_NAME_VM2VM_PKT_CURR)
+ .help(HELP_MSG_VM2VM_PKT_CURR)
+ .labelNames(LABEL_TAGS)
+ .register();
+ private static Counter pktError = Counter.build()
+ .name(STAT_NAME_ERROR_PKT)
+ .help(HELP_MSG_ERROR)
+ .labelNames(LABEL_TAGS)
+ .register();
+ private static Counter pktDrop = Counter.build()
+ .name(STAT_NAME_DROP_PKT)
+ .help(HELP_MSG_DROP)
+ .labelNames(LABEL_TAGS)
+ .register();
@Reference(cardinality = ReferenceCardinality.MANDATORY)
protected OpenstackTelemetryService openstackTelemetryService;
@@ -128,15 +154,12 @@
PrometheusTelemetryConfig prometheusConfig = (PrometheusTelemetryConfig) config;
try {
- // TODO Offer a 'Authentication'
prometheusExporter = new Server(prometheusConfig.port());
ServletContextHandler context = new ServletContextHandler();
context.setContextPath("/");
prometheusExporter.setHandler(context);
context.addServlet(new ServletHolder(new MetricsServlet()), "/metrics");
-
- log.info("Prometeus server start");
-
+ log.info("Prometeus server start (Server port:{})", prometheusConfig.port());
prometheusExporter.start();
} catch (Exception ex) {
log.warn("Exception: {}", ex.toString());
@@ -161,35 +184,69 @@
@Override
public void publish(Set<FlowInfo> flowInfos) {
- if (flowInfos.size() == 0) {
- log.debug("No record to publish");
+ if (flowInfos.isEmpty()) {
+ log.debug("No FlowInfo record to publish");
return;
}
long flowByte;
int flowPkt;
+ String[] labelValues;
+
for (FlowInfo flowInfo: flowInfos) {
flowByte = flowInfo.statsInfo().currAccBytes() - flowInfo.statsInfo().prevAccBytes();
flowPkt = flowInfo.statsInfo().currAccPkts() - flowInfo.statsInfo().prevAccPkts();
-
- byteVM2VM.labels(flowInfo.uniqueFlowInfoKey()).inc(flowByte);
- byteDevice.labels(flowInfo.deviceId().toString()).inc(flowByte);
- byteSrcIp.labels(flowInfo.srcIp().toString()).inc(flowByte);
- byteDstIp.labels(flowInfo.dstIp().toString()).inc(flowByte);
-
- pktVM2VM.labels(flowInfo.uniqueFlowInfoKey()).inc(flowPkt);
- pktDevice.labels(flowInfo.deviceId().toString()).inc(flowPkt);
- pktSrcIp.labels(flowInfo.srcIp().toString()).inc(flowPkt);
- pktDstIp.labels(flowInfo.dstIp().toString()).inc(flowPkt);
-
- pktError.inc(flowInfo.statsInfo().errorPkts());
- pktDrop.inc(flowInfo.statsInfo().dropPkts());
+ labelValues = getLabelValues(flowInfo);
+ byteVM2VM.labels(labelValues).set(flowByte);
+ byteVM2VMPrev.labels(labelValues).set(flowInfo.statsInfo().prevAccBytes());
+ byteVM2VMCurr.labels(labelValues).set(flowInfo.statsInfo().currAccBytes());
+ pktVM2VM.labels(labelValues).set(flowPkt);
+ pktVM2VMPrev.labels(labelValues).set(flowInfo.statsInfo().prevAccPkts());
+ pktVM2VMCurr.labels(labelValues).set(flowInfo.statsInfo().currAccPkts());
+ pktError.labels(labelValues).inc(flowInfo.statsInfo().errorPkts());
+ pktDrop.labels(labelValues).inc(flowInfo.statsInfo().dropPkts());
}
}
+ private String[] getLabelValues(FlowInfo flowInfo) {
+ String[] labelValues = new String[LABEL_TAGS.length];
+
+ labelValues[Arrays.asList(LABEL_TAGS).indexOf(FLOW_TYPE)]
+ = String.valueOf(flowInfo.flowType());
+ labelValues[Arrays.asList(LABEL_TAGS).indexOf(DEVICE_ID)]
+ = flowInfo.deviceId().toString();
+ labelValues[Arrays.asList(LABEL_TAGS).indexOf(INPUT_INTERFACE_ID)]
+ = String.valueOf(flowInfo.inputInterfaceId());
+ labelValues[Arrays.asList(LABEL_TAGS).indexOf(OUTPUT_INTERFACE_ID)]
+ = String.valueOf(flowInfo.outputInterfaceId());
+ labelValues[Arrays.asList(LABEL_TAGS).indexOf(VXLAN_ID)]
+ = String.valueOf(flowInfo.vxlanId());
+ labelValues[Arrays.asList(LABEL_TAGS).indexOf(SRC_IP)]
+ = flowInfo.srcIp().toString();
+ labelValues[Arrays.asList(LABEL_TAGS).indexOf(DST_IP)]
+ = flowInfo.dstIp().toString();
+ labelValues[Arrays.asList(LABEL_TAGS).indexOf(SRC_PORT)]
+ = getTpPort(flowInfo.srcPort());
+ labelValues[Arrays.asList(LABEL_TAGS).indexOf(DST_PORT)]
+ = getTpPort(flowInfo.dstPort());
+ labelValues[Arrays.asList(LABEL_TAGS).indexOf(PROTOCOL)]
+ = String.valueOf(flowInfo.protocol());
+ if (flowInfo.vlanId() != null) {
+ labelValues[Arrays.asList(LABEL_TAGS).indexOf(VLAN_ID)]
+ = flowInfo.vlanId().toString();
+ }
+ return labelValues;
+ }
+
+ private String getTpPort(TpPort tpPort) {
+ if (tpPort == null) {
+ return "";
+ }
+ return tpPort.toString();
+ }
+
@Override
public boolean isRunning() {
- log.info("Prometheus Exporter State: {}", prometheusExporter.isRunning());
return prometheusExporter.isRunning();
}
}
diff --git a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/StatsFlowRuleManager.java b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/StatsFlowRuleManager.java
index 4ddaf40..3d9f577 100644
--- a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/StatsFlowRuleManager.java
+++ b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/StatsFlowRuleManager.java
@@ -138,7 +138,7 @@
private final Logger log = LoggerFactory.getLogger(getClass());
- private static final byte FLOW_TYPE_SONA = 1; // VLAN
+ private static final byte FLOW_TYPE_SONA = 1;
private static final long MILLISECONDS = 1000L;
private static final long INITIAL_DELAY = 5L;
@@ -148,7 +148,6 @@
private static final String OVS_DRIVER_NAME = "ovs";
private static final String ARBITRARY_IP = "0.0.0.0/32";
- private static final int ARBITRARY_PROTOCOL = 0x0;
private static final int ARBITRARY_LENGTH = 32;
private static final String ARBITRARY_MAC = "00:00:00:00:00:00";
private static final IpAddress NO_HOST_IP = IpAddress.valueOf("255.255.255.255");
@@ -263,16 +262,6 @@
}
@Override
- public void setStatFlowL2Rule(String srcIp, String dstIp, Boolean install) {
- StatsFlowRule statsFlowRule = DefaultStatsFlowRule.builder()
- .srcIpPrefix(IpPrefix.valueOf(IpAddress.valueOf(srcIp), ARBITRARY_LENGTH))
- .dstIpPrefix(IpPrefix.valueOf(IpAddress.valueOf(dstIp), ARBITRARY_LENGTH))
- .ipProtocol((byte) ARBITRARY_PROTOCOL)
- .build();
- setStatFlowRule(statsFlowRule, install);
- }
-
- @Override
public void createStatFlowRule(StatsFlowRule statsFlowRule) {
setStatFlowRule(statsFlowRule, true);
}
@@ -438,8 +427,10 @@
stats.forEach(s -> {
InstancePort instPort = getInstancePort(d, s.portNumber());
- flowInfos.add(buildTxFlowInfoFromInstancePort(instPort, s));
- flowInfos.add(buildRxFlowInfoFromInstancePort(instPort, s));
+ if (instPort != null) {
+ flowInfos.add(buildTxFlowInfoFromInstancePort(instPort, s));
+ flowInfos.add(buildRxFlowInfoFromInstancePort(instPort, s));
+ }
});
});
diff --git a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/util/OpenstackTelemetryUtil.java b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/util/OpenstackTelemetryUtil.java
index a957369..860da11 100644
--- a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/util/OpenstackTelemetryUtil.java
+++ b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/util/OpenstackTelemetryUtil.java
@@ -16,6 +16,7 @@
package org.onosproject.openstacktelemetry.util;
import com.google.common.base.Strings;
+import org.onlab.packet.IPv4;
import org.onosproject.cfg.ConfigProperty;
import org.onosproject.openstacktelemetry.api.TelemetryAdminService;
import org.onosproject.openstacktelemetry.api.config.TelemetryConfig;
@@ -31,6 +32,11 @@
*/
public final class OpenstackTelemetryUtil {
+ private static final String PROTOCOL_NAME_TCP = "tcp";
+ private static final String PROTOCOL_NAME_UDP = "udp";
+ private static final String PROTOCOL_NAME_ANY = "any";
+ private static final int ARBITRARY_PROTOCOL = 0x0;
+
/**
* Prevents object instantiation from external.
*/
@@ -72,6 +78,42 @@
}
/**
+ * Obtains transport protocol type from the given string.
+ *
+ * @param str transport protocol name
+ * @return transport protocol type
+ */
+ public static byte getProtocolTypeFromString(String str) {
+ switch (str.toLowerCase()) {
+ case PROTOCOL_NAME_TCP:
+ return IPv4.PROTOCOL_TCP;
+ case PROTOCOL_NAME_UDP:
+ return IPv4.PROTOCOL_UDP;
+ default:
+ return ARBITRARY_PROTOCOL;
+ }
+ }
+
+ /**
+ * Obtains protocol name from the protocol type.
+ *
+ * @param type transport protocol type
+ * @return transport protocol name
+ */
+ public static String getProtocolNameFromType(byte type) {
+ switch (type) {
+ case IPv4.PROTOCOL_TCP:
+ return PROTOCOL_NAME_TCP;
+ case IPv4.PROTOCOL_UDP:
+ return PROTOCOL_NAME_UDP;
+ case ARBITRARY_PROTOCOL:
+ return PROTOCOL_NAME_ANY;
+ default:
+ return PROTOCOL_NAME_ANY;
+ }
+ }
+
+ /**
* Initializes the telemetry service due tue configuration changes.
*
*