REST/CLI Implementations and Fix for remote url data
Change-Id: I0daeebdd40864179c6b923bed3da0c38f259829e
diff --git a/app/src/main/java/org/opencord/sadis/impl/SadisManager.java b/app/src/main/java/org/opencord/sadis/impl/SadisManager.java
index 1297235..f8e4de8 100644
--- a/app/src/main/java/org/opencord/sadis/impl/SadisManager.java
+++ b/app/src/main/java/org/opencord/sadis/impl/SadisManager.java
@@ -31,6 +31,8 @@
import org.onosproject.net.config.NetworkConfigEvent;
import org.onosproject.net.config.NetworkConfigListener;
import org.onosproject.net.config.NetworkConfigRegistry;
+import org.onosproject.codec.CodecService;
+import org.opencord.sadis.SubscriberAndDeviceInformation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,6 +59,9 @@
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected NetworkConfigRegistry cfgService;
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ protected CodecService codecService;
+
@SuppressWarnings("rawtypes")
private final Set<ConfigFactory> factories = ImmutableSet
.of(new ConfigFactory<ApplicationId, SadisConfig>(APP_SUBJECT_FACTORY, SadisConfig.class, "sadis") {
@@ -73,6 +78,7 @@
protected void activate() {
this.appId = this.coreService.registerApplication(SADIS_APP);
+ codecService.registerCodec(SubscriberAndDeviceInformation.class, new SubscriberAndDeviceInformationCodec());
this.cfgService.addListener(this.cfgListener);
this.factories.forEach(this.cfgService::registerConfigFactory);
this.updateConfig();
diff --git a/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationAdapter.java b/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationAdapter.java
index 8842490..fbd77aa 100644
--- a/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationAdapter.java
+++ b/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationAdapter.java
@@ -26,9 +26,12 @@
import org.opencord.sadis.SubscriberAndDeviceInformationService;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.google.common.collect.Maps;
+import org.onlab.packet.VlanId;
+import org.onlab.packet.Ip4Address;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,6 +45,7 @@
private static final long DEFAULT_TTL = 0;
private String url;
+ private ObjectMapper mapper;
private Cache<String, SubscriberAndDeviceInformation> cache;
private int maxiumCacheSize = DEFAULT_MAXIMUM_CACHE_SIZE;
private long cacheEntryTtl = DEFAULT_TTL;
@@ -51,6 +55,14 @@
public SubscriberAndDeviceInformationAdapter() {
cache = CacheBuilder.newBuilder().maximumSize(maxiumCacheSize)
.expireAfterAccess(cacheEntryTtl, TimeUnit.SECONDS).build();
+ mapper = new ObjectMapper();
+ SimpleModule module = new SimpleModule();
+ SadisConfig config = new SadisConfig();
+ SadisConfig.VlanIdDeserializer vlanID = config.new VlanIdDeserializer();
+ SadisConfig.Ip4AddressDeserializer ip4Address = config.new Ip4AddressDeserializer();
+ module.addDeserializer(VlanId.class, vlanID);
+ module.addDeserializer(Ip4Address.class, ip4Address);
+ mapper.registerModule(module);
}
/**
@@ -114,6 +126,37 @@
* (non-Javadoc)
*
* @see
+ * org.opencord.sadis.SubscriberAndDeviceInformationService#invalidateId()
+ */
+ @Override
+ public void invalidateId(String id) {
+ cache.invalidate(id);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.opencord.sadis.SubscriberAndDeviceInformationService#getfromCache(java.lang.
+ * String)
+ */
+ @Override
+ public SubscriberAndDeviceInformation getfromCache(String id) {
+ Cache<String, SubscriberAndDeviceInformation> local;
+ synchronized (this) {
+ local = cache;
+ }
+ SubscriberAndDeviceInformation info = local.getIfPresent(id);
+ if (info != null) {
+ return info;
+ }
+ return null;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
* org.opencord.sadis.SubscriberAndDeviceInformationService#get(java.lang.
* String)
*/
@@ -134,7 +177,7 @@
* from there, else check for it in the locally configured data
*/
if (this.url == null) {
- info = localCfgData.get(id);
+ info = (localCfgData == null) ? null : localCfgData.get(id);
if (info != null) {
local.put(id, info);
@@ -150,13 +193,12 @@
buf.append(id);
try (InputStream io = new URL(buf.toString()).openStream()) {
- ObjectMapper mapper = new ObjectMapper();
info = mapper.readValue(io, SubscriberAndDeviceInformation.class);
local.put(id, info);
return info;
} catch (IOException e) {
// TODO Auto-generated catch block
- e.printStackTrace();
+ log.warn("Exception while reading remote data " + e.getMessage());
}
}
log.error("Data not found for id {}", id);
diff --git a/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationCodec.java b/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationCodec.java
new file mode 100644
index 0000000..18b63ac
--- /dev/null
+++ b/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationCodec.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2017-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.opencord.sadis.impl;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.opencord.sadis.SubscriberAndDeviceInformation;
+
+public class SubscriberAndDeviceInformationCodec extends JsonCodec<SubscriberAndDeviceInformation> {
+ @Override
+ public ObjectNode encode(SubscriberAndDeviceInformation entry, CodecContext context) {
+ final ObjectNode result = context.mapper().createObjectNode()
+ .put("id", entry.id())
+ .put("cTag", (entry.cTag() == null) ? "" : entry.cTag().toString())
+ .put("sTag", (entry.sTag() == null) ? "" : entry.sTag().toString())
+ .put("nasPortId", entry.nasPortId())
+ .put("port", entry.port())
+ .put("slot", entry.slot())
+ .put("hardwareIdentifier", (entry.hardwareIdentifier() == null) ? "" :
+ entry.hardwareIdentifier().toString())
+ .put("ipAddress", (entry.ipAddress() == null) ? "" : entry.ipAddress().toString())
+ .put("nasId", entry.nasId());
+ return result;
+ }
+}