REST API's for tenants, virtual networks, virtual devices ad virtual ports.
Change-Id: I80abe14a083fce3dc6246118af8874028109388f
REST API's for tenants, virtual networks, virtual devices ad virtual ports.
Change-Id: Ib6c3d69d396e57822bae23f5bf3101c8b9c0b95c
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/CodecManager.java b/core/common/src/main/java/org/onosproject/codec/impl/CodecManager.java
index 2223970..71eef0f 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/CodecManager.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/CodecManager.java
@@ -26,6 +26,10 @@
import org.onosproject.codec.CodecService;
import org.onosproject.codec.JsonCodec;
import org.onosproject.core.Application;
+import org.onosproject.incubator.net.virtual.TenantId;
+import org.onosproject.incubator.net.virtual.VirtualDevice;
+import org.onosproject.incubator.net.virtual.VirtualNetwork;
+import org.onosproject.incubator.net.virtual.VirtualPort;
import org.onosproject.net.Annotations;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.Device;
@@ -126,6 +130,10 @@
registerCodec(McastRoute.class, new McastRouteCodec());
registerCodec(DeviceKey.class, new DeviceKeyCodec());
registerCodec(Region.class, new RegionCodec());
+ registerCodec(TenantId.class, new TenantIdCodec());
+ registerCodec(VirtualNetwork.class, new VirtualNetworkCodec());
+ registerCodec(VirtualDevice.class, new VirtualDeviceCodec());
+ registerCodec(VirtualPort.class, new VirtualPortCodec());
log.info("Started");
}
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/TenantIdCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/TenantIdCodec.java
new file mode 100644
index 0000000..6d43eb2
--- /dev/null
+++ b/core/common/src/main/java/org/onosproject/codec/impl/TenantIdCodec.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2016 Open Networking Laboratory
+ *
+ * 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.codec.impl;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.incubator.net.virtual.TenantId;
+
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.onlab.util.Tools.nullIsIllegal;
+
+/**
+ * Codec for the TenantId class.
+ */
+public class TenantIdCodec extends JsonCodec<TenantId> {
+
+ // JSON field names
+ private static final String TENANT_ID = "id";
+
+ private static final String NULL_TENANT_MSG = "TenantId cannot be null";
+ private static final String MISSING_MEMBER_MSG = " member is required in TenantId";
+
+ @Override
+ public ObjectNode encode(TenantId tenantId, CodecContext context) {
+ checkNotNull(tenantId, NULL_TENANT_MSG);
+
+ ObjectNode result = context.mapper().createObjectNode()
+ .put(TENANT_ID, tenantId.id().toString());
+
+ return result;
+ }
+
+ @Override
+ public TenantId decode(ObjectNode json, CodecContext context) {
+ if (json == null || !json.isObject()) {
+ return null;
+ }
+
+ TenantId tenantId = TenantId.tenantId(extractMember(TENANT_ID, json));
+
+ return tenantId;
+ }
+
+ private String extractMember(String key, ObjectNode json) {
+ return nullIsIllegal(json.get(key), key + MISSING_MEMBER_MSG).asText();
+ }
+}
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/VirtualDeviceCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/VirtualDeviceCodec.java
new file mode 100644
index 0000000..fb1dac6
--- /dev/null
+++ b/core/common/src/main/java/org/onosproject/codec/impl/VirtualDeviceCodec.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2016 Open Networking Laboratory
+ *
+ * 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.codec.impl;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.incubator.net.virtual.DefaultVirtualDevice;
+import org.onosproject.incubator.net.virtual.NetworkId;
+import org.onosproject.incubator.net.virtual.VirtualDevice;
+import org.onosproject.net.DeviceId;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.onlab.util.Tools.nullIsIllegal;
+
+/**
+ * Codec for the VirtualDevice class.
+ */
+public class VirtualDeviceCodec extends JsonCodec<VirtualDevice> {
+
+ // JSON field names
+ private static final String ID = "deviceId";
+ private static final String NETWORK_ID = "networkId";
+
+ private static final String NULL_OBJECT_MSG = "VirtualDevice cannot be null";
+ private static final String MISSING_MEMBER_MSG = " member is required in VirtualDevice";
+
+ @Override
+ public ObjectNode encode(VirtualDevice vDev, CodecContext context) {
+ checkNotNull(vDev, NULL_OBJECT_MSG);
+
+ ObjectNode result = context.mapper().createObjectNode()
+ .put(ID, vDev.id().toString())
+ .put(NETWORK_ID, vDev.networkId().toString());
+
+ return result;
+ }
+
+ @Override
+ public VirtualDevice decode(ObjectNode json, CodecContext context) {
+ if (json == null || !json.isObject()) {
+ return null;
+ }
+
+ DeviceId dId = DeviceId.deviceId(extractMember(ID, json));
+ NetworkId nId = NetworkId.networkId(Long.parseLong(extractMember(NETWORK_ID, json)));
+ return new DefaultVirtualDevice(nId, dId);
+ }
+
+ private String extractMember(String key, ObjectNode json) {
+ return nullIsIllegal(json.get(key), key + MISSING_MEMBER_MSG).asText();
+ }
+}
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/VirtualNetworkCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/VirtualNetworkCodec.java
new file mode 100644
index 0000000..6e5285e
--- /dev/null
+++ b/core/common/src/main/java/org/onosproject/codec/impl/VirtualNetworkCodec.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2016 Open Networking Laboratory
+ *
+ * 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.codec.impl;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.incubator.net.virtual.DefaultVirtualNetwork;
+import org.onosproject.incubator.net.virtual.NetworkId;
+import org.onosproject.incubator.net.virtual.TenantId;
+import org.onosproject.incubator.net.virtual.VirtualNetwork;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.onlab.util.Tools.nullIsIllegal;
+
+/**
+ * Codec for the VirtualNetwork class.
+ */
+public class VirtualNetworkCodec extends JsonCodec<VirtualNetwork> {
+
+ // JSON field names
+ private static final String NETWORK_ID = "networkId";
+ private static final String TENANT_ID = "tenantId";
+
+ private static final String NULL_OBJECT_MSG = "VirtualNetwork cannot be null";
+ private static final String MISSING_MEMBER_MSG = " member is required in VirtualNetwork";
+
+ @Override
+ public ObjectNode encode(VirtualNetwork vnet, CodecContext context) {
+ checkNotNull(vnet, NULL_OBJECT_MSG);
+
+ ObjectNode result = context.mapper().createObjectNode()
+ .put(NETWORK_ID, vnet.id().toString())
+ .put(TENANT_ID, vnet.tenantId().toString());
+
+ return result;
+ }
+
+ @Override
+ public VirtualNetwork decode(ObjectNode json, CodecContext context) {
+ if (json == null || !json.isObject()) {
+ return null;
+ }
+
+ NetworkId nId = NetworkId.networkId(Long.parseLong(extractMember(NETWORK_ID, json)));
+ TenantId tId = TenantId.tenantId(extractMember(TENANT_ID, json));
+ return new DefaultVirtualNetwork(nId, tId);
+ }
+
+ private String extractMember(String key, ObjectNode json) {
+ return nullIsIllegal(json.get(key), key + MISSING_MEMBER_MSG).asText();
+ }
+}
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/VirtualPortCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/VirtualPortCodec.java
new file mode 100644
index 0000000..df20366
--- /dev/null
+++ b/core/common/src/main/java/org/onosproject/codec/impl/VirtualPortCodec.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2016 Open Networking Laboratory
+ *
+ * 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.codec.impl;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.incubator.net.virtual.DefaultVirtualPort;
+import org.onosproject.incubator.net.virtual.NetworkId;
+import org.onosproject.incubator.net.virtual.VirtualDevice;
+import org.onosproject.incubator.net.virtual.VirtualNetworkService;
+import org.onosproject.incubator.net.virtual.VirtualPort;
+import org.onosproject.net.DefaultAnnotations;
+import org.onosproject.net.DefaultDevice;
+import org.onosproject.net.DefaultPort;
+import org.onosproject.net.Device;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Port;
+import org.onosproject.net.PortNumber;
+
+import java.util.Set;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.onlab.util.Tools.nullIsIllegal;
+
+/**
+ * Codec for the VirtualPort class.
+ */
+public class VirtualPortCodec extends JsonCodec<VirtualPort> {
+
+ // JSON field names
+ private static final String NETWORK_ID = "networkId";
+ private static final String DEVICE_ID = "deviceId";
+ private static final String PORT_NUM = "portNum";
+ private static final String PHYS_DEVICE_ID = "physDeviceId";
+ private static final String PHYS_PORT_NUM = "physPortNum";
+
+ private static final String NULL_OBJECT_MSG = "VirtualPort cannot be null";
+ private static final String MISSING_MEMBER_MSG = " member is required in VirtualPort";
+ private static final String INVALID_VIRTUAL_DEVICE = " is not a valid VirtualDevice";
+
+ @Override
+ public ObjectNode encode(VirtualPort vPort, CodecContext context) {
+ checkNotNull(vPort, NULL_OBJECT_MSG);
+
+ ObjectNode result = context.mapper().createObjectNode()
+ .put(NETWORK_ID, vPort.networkId().toString())
+ .put(DEVICE_ID, vPort.element().id().toString())
+ .put(PORT_NUM, vPort.number().toString())
+ .put(PHYS_DEVICE_ID, vPort.realizedBy().element().id().toString())
+ .put(PHYS_PORT_NUM, vPort.realizedBy().number().toString());
+
+ return result;
+ }
+
+ @Override
+ public VirtualPort decode(ObjectNode json, CodecContext context) {
+ if (json == null || !json.isObject()) {
+ return null;
+ }
+
+ NetworkId nId = NetworkId.networkId(Long.parseLong(extractMember(NETWORK_ID, json)));
+ DeviceId dId = DeviceId.deviceId(extractMember(DEVICE_ID, json));
+
+ VirtualNetworkService vnetService = context.getService(VirtualNetworkService.class);
+ Set<VirtualDevice> vDevs = vnetService.getVirtualDevices(nId);
+ VirtualDevice vDev = vDevs.stream()
+ .filter(virtualDevice -> virtualDevice.id().equals(dId))
+ .findFirst().orElse(null);
+ nullIsIllegal(vDev, dId.toString() + INVALID_VIRTUAL_DEVICE);
+
+ PortNumber portNum = PortNumber.portNumber(extractMember(PORT_NUM, json));
+ DeviceId physDId = DeviceId.deviceId(extractMember(PHYS_DEVICE_ID, json));
+ PortNumber physPortNum = PortNumber.portNumber(extractMember(PHYS_PORT_NUM, json));
+
+ DefaultAnnotations annotations = DefaultAnnotations.builder().build();
+ Device physDevice = new DefaultDevice(null, physDId,
+ null, null, null, null, null, null, annotations);
+ Port realizedBy = new DefaultPort(physDevice, physPortNum, true);
+ return new DefaultVirtualPort(nId, vDev, portNum, realizedBy);
+ }
+
+ private String extractMember(String key, ObjectNode json) {
+ return nullIsIllegal(json.get(key), key + MISSING_MEMBER_MSG).asText();
+ }
+}