X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetworkconfiguration%2Fneutron%2Fimplementation%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetworkconfig%2Fneutron%2Fimplementation%2FNeutronNetworkInterface.java;h=c9e15495209bb5847e8f571512f8a2a9ac78a5b4;hp=c6e161b91f66462941e322914f80ea14a1b28db8;hb=b1ad203b32b73fc06a856cdfae243986c8037617;hpb=13bc7fa54d688d59131c462c731fe6d0f59d83ec diff --git a/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronNetworkInterface.java b/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronNetworkInterface.java index c6e161b91f..c9e1549520 100644 --- a/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronNetworkInterface.java +++ b/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronNetworkInterface.java @@ -8,158 +8,26 @@ package org.opendaylight.controller.networkconfig.neutron.implementation; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.ObjectInputStream; import java.lang.reflect.Method; import java.util.ArrayList; -import java.util.Dictionary; -import java.util.EnumSet; import java.util.HashSet; import java.util.List; import java.util.Map.Entry; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.felix.dm.Component; -import org.opendaylight.controller.clustering.services.CacheConfigException; -import org.opendaylight.controller.clustering.services.CacheExistException; -import org.opendaylight.controller.clustering.services.IClusterContainerServices; -import org.opendaylight.controller.clustering.services.IClusterServices; -import org.opendaylight.controller.configuration.ConfigurationObject; -import org.opendaylight.controller.configuration.IConfigurationContainerAware; -import org.opendaylight.controller.configuration.IConfigurationContainerService; import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkCRUD; import org.opendaylight.controller.networkconfig.neutron.NeutronNetwork; -import org.opendaylight.controller.sal.utils.IObjectReader; -import org.opendaylight.controller.sal.utils.Status; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class NeutronNetworkInterface implements INeutronNetworkCRUD, IConfigurationContainerAware, - IObjectReader { +public class NeutronNetworkInterface implements INeutronNetworkCRUD { private static final Logger logger = LoggerFactory.getLogger(NeutronNetworkInterface.class); - private static final String FILE_NAME ="neutron.network.conf"; - private String containerName = null; + private ConcurrentMap networkDB = new ConcurrentHashMap(); - private ConcurrentMap networkDB; - private IClusterContainerServices clusterContainerService = null; - private IConfigurationContainerService configurationService; - // methods needed for creating caches - void setClusterContainerService(IClusterContainerServices s) { - logger.debug("Cluster Service set"); - this.clusterContainerService = s; - } - - void unsetClusterContainerService(IClusterContainerServices s) { - if (this.clusterContainerService == s) { - logger.debug("Cluster Service removed!"); - this.clusterContainerService = null; - } - } - - public void setConfigurationContainerService(IConfigurationContainerService service) { - logger.trace("Configuration service set: {}", service); - this.configurationService = service; - } - - public void unsetConfigurationContainerService(IConfigurationContainerService service) { - logger.trace("Configuration service removed: {}", service); - this.configurationService = null; - } - - private void allocateCache() { - if (this.clusterContainerService == null) { - logger.error("un-initialized clusterContainerService, can't create cache"); - return; - } - logger.debug("Creating Cache for Neutron Networks"); - try { - // neutron caches - this.clusterContainerService.createCache("neutronNetworks", - EnumSet.of(IClusterServices.cacheMode.NON_TRANSACTIONAL)); - } catch (CacheConfigException cce) { - logger.error("Cache couldn't be created for Neutron Networks - check cache mode"); - } catch (CacheExistException cce) { - logger.error("Cache for Neutron Networks already exists, destroy and recreate"); - } - logger.debug("Cache successfully created for Neutron Networks"); - } - - @SuppressWarnings({ "unchecked" }) - private void retrieveCache() { - if (this.clusterContainerService == null) { - logger.error("un-initialized clusterContainerService, can't retrieve cache"); - return; - } - logger.debug("Retrieving cache for Neutron Networks"); - networkDB = (ConcurrentMap) this.clusterContainerService.getCache("neutronNetworks"); - if (networkDB == null) { - logger.error("Cache couldn't be retrieved for Neutron Networks"); - } - logger.debug("Cache was successfully retrieved for Neutron Networks"); - } - - private void startUp() { - allocateCache(); - retrieveCache(); - loadConfiguration(); - } - - /** - * Function called by the dependency manager when all the required - * dependencies are satisfied - * - */ - void init(Component c) { - Dictionary props = c.getServiceProperties(); - if (props != null) { - this.containerName = (String) props.get("containerName"); - logger.debug("Running containerName: {}", this.containerName); - } else { - // In the Global instance case the containerName is empty - this.containerName = ""; - } - startUp(); - } - - private void destroyCache() { - if (this.clusterContainerService == null) { - logger.error("un-initialized clusterMger, can't destroy cache"); - return; - } - logger.debug("Destroying Cache for Neutron Networks"); - this.clusterContainerService.destroyCache("Neutron Networks"); - } - - /** - * Function called by the dependency manager when at least one dependency - * become unsatisfied or when the component is shutting down because for - * example bundle is being stopped. - * - */ - void destroy() { - destroyCache(); - } - - /** - * Function called by dependency manager after "init ()" is called and after - * the services provided by the class are registered in the service registry - * - */ - void start() { - } - - /** - * Function called by the dependency manager before the services exported by - * the component are unregistered, this will be followed by a "destroy ()" - * calls - * - */ - void stop() { - } // this method uses reflection to update an object from it's delta. @@ -256,23 +124,4 @@ public class NeutronNetworkInterface implements INeutronNetworkCRUD, IConfigurat } return false; } - - private void loadConfiguration() { - for (ConfigurationObject conf : configurationService.retrieveConfiguration(this, FILE_NAME)) { - NeutronNetwork nn = (NeutronNetwork) conf; - networkDB.put(nn.getID(), nn); - } - } - - @Override - public Status saveConfiguration() { - return configurationService.persistConfiguration(new ArrayList(networkDB.values()), - FILE_NAME); - } - - @Override - public Object readObject(ObjectInputStream ois) throws FileNotFoundException, IOException, ClassNotFoundException { - return ois.readObject(); - } - }