Supports dpdk config in OpenstackNode.
Change-Id: I332d7643acb56c5fa7460edb6e4c90a2d862706f
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/codec/DpdkConfigCodec.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/codec/DpdkConfigCodec.java
new file mode 100644
index 0000000..3e8156d
--- /dev/null
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/codec/DpdkConfigCodec.java
@@ -0,0 +1,95 @@
+/*
+ * 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.openstacknode.codec;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.openstacknode.api.DpdkConfig;
+import org.onosproject.openstacknode.api.DpdkInterface;
+import org.onosproject.openstacknode.impl.DefaultDpdkConfig;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.IntStream;
+
+import static org.onlab.util.Tools.nullIsIllegal;
+
+/**
+ * dpdk config codec used for serializing and de-serializing JSON string.
+ */
+public class DpdkConfigCodec extends JsonCodec<DpdkConfig> {
+ private static final String DATA_PATH_TYPE = "datapathType";
+ private static final String SOCKET_DIR = "socketDir";
+ private static final String DPDK_INTFS = "dpdkIntfs";
+
+ private static final String MISSING_MESSAGE = " is required in DpdkInterface";
+
+ @Override
+ public ObjectNode encode(DpdkConfig entity, CodecContext context) {
+ ObjectNode result = context.mapper().createObjectNode()
+ .put(DATA_PATH_TYPE, entity.datapathType().name());
+
+ if (entity.socketDir() != null) {
+ result.put(SOCKET_DIR, entity.socketDir());
+ }
+
+ ArrayNode dpdkIntfs = context.mapper().createArrayNode();
+ entity.dpdkIntfs().forEach(dpdkIntf -> {
+ ObjectNode dpdkIntfJson = context.codec(DpdkInterface.class)
+ .encode(dpdkIntf, context);
+ dpdkIntfs.add(dpdkIntfJson);
+ });
+ result.set(DPDK_INTFS, dpdkIntfs);
+
+ return result;
+ }
+
+ @Override
+ public DpdkConfig decode(ObjectNode json, CodecContext context) {
+ if (json == null || !json.isObject()) {
+ return null;
+ }
+
+ String datapathType = nullIsIllegal(json.get(DATA_PATH_TYPE).asText(),
+ DATA_PATH_TYPE + MISSING_MESSAGE);
+
+ DefaultDpdkConfig.Builder builder = DefaultDpdkConfig.builder()
+ .datapathType(DpdkConfig.DatapathType.valueOf(datapathType.toUpperCase()));
+
+ if (json.get(SOCKET_DIR) != null) {
+ builder.socketDir(json.get(SOCKET_DIR).asText());
+ }
+
+ List<DpdkInterface> dpdkInterfaces = new ArrayList<>();
+ JsonNode dpdkIntfsJson = json.get(DPDK_INTFS);
+
+ if (dpdkIntfsJson != null) {
+ final JsonCodec<DpdkInterface>
+ dpdkIntfCodec = context.codec(DpdkInterface.class);
+
+ IntStream.range(0, dpdkIntfsJson.size()).forEach(i -> {
+ ObjectNode intfJson = get(dpdkIntfsJson, i);
+ dpdkInterfaces.add(dpdkIntfCodec.decode(intfJson, context));
+ });
+ }
+ builder.dpdkIntfs(dpdkInterfaces);
+
+ return builder.build();
+ }
+}
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/codec/DpdkInterfaceCodec.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/codec/DpdkInterfaceCodec.java
new file mode 100644
index 0000000..033bfc0
--- /dev/null
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/codec/DpdkInterfaceCodec.java
@@ -0,0 +1,90 @@
+/*
+ * 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.openstacknode.codec;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.openstacknode.api.DpdkInterface;
+import org.onosproject.openstacknode.api.DpdkInterface.Type;
+import org.onosproject.openstacknode.impl.DefaultDpdkInterface;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.onlab.util.Tools.nullIsIllegal;
+
+/**
+ * DPDK interface codec used for serializing and de-serializing JSON string.
+ */
+public class DpdkInterfaceCodec extends JsonCodec<DpdkInterface> {
+ private static final String DEVICE_NAME = "deviceName";
+ private static final String INTF = "intf";
+ private static final String PCI_ADDRESS = "pciAddress";
+ private static final String TYPE = "type";
+ private static final String MTU = "mtu";
+
+ private static final String NOT_NULL_MESSAGE = "dpdk interface cannot be null";
+ private static final String MISSING_MESSAGE = " is required in DpdkInterface";
+
+ @Override
+ public ObjectNode encode(DpdkInterface entity, CodecContext context) {
+ checkNotNull(entity, NOT_NULL_MESSAGE);
+
+ return context.mapper().createObjectNode()
+ .put(DEVICE_NAME, entity.deviceName())
+ .put(INTF, entity.intf())
+ .put(PCI_ADDRESS, entity.pciAddress())
+ .put(TYPE, entity.type().name())
+ .put(MTU, entity.mtu().toString());
+ }
+
+ @Override
+ public DpdkInterface decode(ObjectNode json, CodecContext context) {
+ if (json == null || !json.isObject()) {
+ return null;
+ }
+
+ String deviceName = nullIsIllegal(json.get(DEVICE_NAME).asText(),
+ DEVICE_NAME + MISSING_MESSAGE);
+ String intf = nullIsIllegal(json.get(INTF).asText(),
+ INTF + MISSING_MESSAGE);
+ String pciAddress = nullIsIllegal(json.get(PCI_ADDRESS).asText(),
+ PCI_ADDRESS + MISSING_MESSAGE);
+ String typeString = nullIsIllegal(json.get(TYPE).asText(),
+ TYPE + MISSING_MESSAGE);
+
+ Type type;
+ try {
+ type = Type.valueOf(typeString.toUpperCase());
+ } catch (IllegalArgumentException e) {
+ throw new IllegalArgumentException(TYPE + MISSING_MESSAGE);
+ }
+
+ DpdkInterface.Builder builder = DefaultDpdkInterface.builder()
+ .deviceName(deviceName)
+ .intf(intf)
+ .pciAddress(pciAddress)
+ .type(type);
+
+ JsonNode mtuJson = json.get(MTU);
+
+ if (mtuJson != null) {
+ builder.mtu(Long.parseLong(mtuJson.asText()));
+ }
+
+ return builder.build();
+ }
+}
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/codec/OpenstackNodeCodec.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/codec/OpenstackNodeCodec.java
index 5d16199..ad2f08b 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/codec/OpenstackNodeCodec.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/codec/OpenstackNodeCodec.java
@@ -24,6 +24,7 @@
import org.onosproject.net.DeviceId;
import org.onosproject.net.behaviour.ControllerInfo;
import org.onosproject.openstacknode.api.DefaultOpenstackNode;
+import org.onosproject.openstacknode.api.DpdkConfig;
import org.onosproject.openstacknode.api.NodeState;
import org.onosproject.openstacknode.api.OpenstackAuth;
import org.onosproject.openstacknode.api.OpenstackNode;
@@ -61,11 +62,9 @@
private static final String AUTHENTICATION = "authentication";
private static final String END_POINT = "endpoint";
private static final String SSH_AUTH = "sshAuth";
- private static final String DATA_PATH_TYPE = "datapathType";
- private static final String SOCKET_DIR = "socketDir";
+ private static final String DPDK_CONFIG = "dpdkConfig";
private static final String MISSING_MESSAGE = " is required in OpenstackNode";
- private static final String UNSUPPORTED_DATAPATH_TYPE = "Unsupported datapath type";
@Override
public ObjectNode encode(OpenstackNode node, CodecContext context) {
@@ -75,8 +74,7 @@
.put(HOST_NAME, node.hostname())
.put(TYPE, node.type().name())
.put(STATE, node.state().name())
- .put(MANAGEMENT_IP, node.managementIp().toString())
- .put(DATA_PATH_TYPE, node.datapathType().name());
+ .put(MANAGEMENT_IP, node.managementIp().toString());
OpenstackNode.NodeType type = node.type();
@@ -128,8 +126,10 @@
result.set(SSH_AUTH, sshAuthJson);
}
- if (node.socketDir() != null) {
- result.put(SOCKET_DIR, node.socketDir());
+ if (node.dpdkConfig() != null) {
+ ObjectNode dpdkConfigJson = context.codec(DpdkConfig.class)
+ .encode(node.dpdkConfig(), context);
+ result.set(DPDK_CONFIG, dpdkConfigJson);
}
return result;
@@ -175,23 +175,6 @@
nodeBuilder.intgBridge(DeviceId.deviceId(intBridgeJson.asText()));
}
- JsonNode datapathTypeJson = json.get(DATA_PATH_TYPE);
-
- if (datapathTypeJson == null ||
- datapathTypeJson.asText().equals(OpenstackNode.DatapathType.NORMAL.name().toLowerCase())) {
- nodeBuilder.datapathType(OpenstackNode.DatapathType.NORMAL);
- } else if (datapathTypeJson.asText().equals(OpenstackNode.DatapathType.NETDEV.name().toLowerCase())) {
- nodeBuilder.datapathType(OpenstackNode.DatapathType.NETDEV);
- } else {
- throw new IllegalArgumentException(UNSUPPORTED_DATAPATH_TYPE + datapathTypeJson.asText());
- }
-
- JsonNode socketDir = json.get(SOCKET_DIR);
-
- if (socketDir != null) {
- nodeBuilder.socketDir(socketDir.asText());
- }
-
// parse physical interfaces
List<OpenstackPhyInterface> phyIntfs = new ArrayList<>();
JsonNode phyIntfsJson = json.get(PHYSICAL_INTERFACES);
@@ -224,7 +207,7 @@
// parse authentication
JsonNode authJson = json.get(AUTHENTICATION);
- if (json.get(AUTHENTICATION) != null) {
+ if (authJson != null) {
final JsonCodec<OpenstackAuth> authCodec = context.codec(OpenstackAuth.class);
@@ -234,13 +217,21 @@
// parse ssh authentication
JsonNode sshAuthJson = json.get(SSH_AUTH);
- if (json.get(SSH_AUTH) != null) {
+ if (sshAuthJson != null) {
final JsonCodec<OpenstackSshAuth> sshAuthJsonCodec = context.codec(OpenstackSshAuth.class);
OpenstackSshAuth sshAuth = sshAuthJsonCodec.decode((ObjectNode) sshAuthJson.deepCopy(), context);
nodeBuilder.sshAuthInfo(sshAuth);
}
+ JsonNode dpdkConfigJson = json.get(DPDK_CONFIG);
+ if (dpdkConfigJson != null) {
+ final JsonCodec<DpdkConfig> dpdkConfigJsonCodec = context.codec(DpdkConfig.class);
+
+ DpdkConfig dpdkConfig = dpdkConfigJsonCodec.decode((ObjectNode) dpdkConfigJson.deepCopy(), context);
+ nodeBuilder.dpdkConfig(dpdkConfig);
+ }
+
log.trace("node is {}", nodeBuilder.build().toString());
return nodeBuilder.build();