Fixed issue where component configuration would not propagate on node restart.
Change-Id: I431ce444025cc9a8021dd68fa23c6e8c29fa6c19
diff --git a/core/store/dist/src/main/java/org/onosproject/store/cfg/DistributedComponentConfigStore.java b/core/store/dist/src/main/java/org/onosproject/store/cfg/DistributedComponentConfigStore.java
index 5a82a8a..85e826f 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cfg/DistributedComponentConfigStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cfg/DistributedComponentConfigStore.java
@@ -15,6 +15,7 @@
*/
package org.onosproject.store.cfg;
+import com.google.common.collect.ImmutableSet;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
@@ -31,8 +32,12 @@
import org.onosproject.store.service.MapEventListener;
import org.onosproject.store.service.Serializer;
import org.onosproject.store.service.StorageService;
+import org.onosproject.store.service.Versioned;
import org.slf4j.Logger;
+import java.util.Objects;
+import java.util.Set;
+
import static org.onosproject.cfg.ComponentConfigEvent.Type.PROPERTY_SET;
import static org.onosproject.cfg.ComponentConfigEvent.Type.PROPERTY_UNSET;
import static org.onosproject.store.service.MapEvent.Type.INSERT;
@@ -59,7 +64,7 @@
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected StorageService storageService;
- InternalPropertiesListener propertiesListener = new InternalPropertiesListener();
+ private InternalPropertiesListener propertiesListener = new InternalPropertiesListener();
@Activate
public void activate() {
@@ -90,6 +95,22 @@
properties.remove(key(componentName, name));
}
+ @Override
+ public Set<String> getProperties(String componentName) {
+ ImmutableSet.Builder<String> names = ImmutableSet.builder();
+ properties.keySet().stream()
+ .filter((String k) -> Objects.equals(componentName, k.substring(0, k.indexOf(SEP))))
+ .map((String k) -> k.substring(k.indexOf(SEP) + 1))
+ .forEach(names::add);
+ return names.build();
+ }
+
+ @Override
+ public String getProperty(String componentName, String name) {
+ Versioned<String> v = properties.get(key(componentName, name));
+ return v != null ? v.value() : null;
+ }
+
/**
* Listener to component configuration properties distributed map changes.
*/