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%2FNeutronFloatingIPInterface.java;fp=opendaylight%2Fnetworkconfiguration%2Fneutron%2Fimplementation%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetworkconfig%2Fneutron%2Fimplementation%2FNeutronFloatingIPInterface.java;h=51824d6ce1a93e42f372e6863e0f91ee2f696bb2;hp=5cbe5cde9851eabfc7927d5fc3b949e2b26cb4e4;hb=b1ad203b32b73fc06a856cdfae243986c8037617;hpb=13bc7fa54d688d59131c462c731fe6d0f59d83ec diff --git a/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFloatingIPInterface.java b/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFloatingIPInterface.java index 5cbe5cde98..51824d6ce1 100644 --- a/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFloatingIPInterface.java +++ b/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFloatingIPInterface.java @@ -8,27 +8,15 @@ 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.INeutronFloatingIPCRUD; import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkCRUD; import org.opendaylight.controller.networkconfig.neutron.INeutronPortCRUD; @@ -37,137 +25,13 @@ import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces; import org.opendaylight.controller.networkconfig.neutron.NeutronFloatingIP; import org.opendaylight.controller.networkconfig.neutron.NeutronPort; import org.opendaylight.controller.networkconfig.neutron.NeutronSubnet; -import org.opendaylight.controller.sal.utils.IObjectReader; -import org.opendaylight.controller.sal.utils.Status; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class NeutronFloatingIPInterface implements INeutronFloatingIPCRUD, IConfigurationContainerAware, - IObjectReader { +public class NeutronFloatingIPInterface implements INeutronFloatingIPCRUD { private static final Logger logger = LoggerFactory.getLogger(NeutronFloatingIPInterface.class); - private static final String FILE_NAME = "neutron.floatingip.conf"; - private String containerName = null; - private IClusterContainerServices clusterContainerService = null; - private IConfigurationContainerService configurationService; - private ConcurrentMap floatingIPDB; - - // 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 FloatingIPs"); - try { - // neutron caches - this.clusterContainerService.createCache("neutronFloatingIPs", - EnumSet.of(IClusterServices.cacheMode.NON_TRANSACTIONAL)); - } catch (CacheConfigException cce) { - logger.error("Cache couldn't be created for Neutron - check cache mode"); - } catch (CacheExistException cce) { - logger.error("Cache for Neutron already exists, destroy and recreate"); - } - logger.debug("Cache successfully created for NeutronFloatingIps"); - } - - @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 FloatingIPs"); - floatingIPDB = (ConcurrentMap) this.clusterContainerService - .getCache("neutronFloatingIPs"); - if (floatingIPDB == null) { - logger.error("Cache couldn't be retrieved for Neutron FloatingIPs"); - } - logger.debug("Cache was successfully retrieved for Neutron FloatingIPs"); - } - - private void destroyCache() { - if (this.clusterContainerService == null) { - logger.error("un-initialized clusterMger, can't destroy cache"); - return; - } - logger.debug("Destroying Cache for HostTracker"); - this.clusterContainerService.destroyCache("neutronFloatingIPs"); - } - - 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(); - } - - /** - * 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() { - } + private ConcurrentMap floatingIPDB = new ConcurrentHashMap(); // this method uses reflection to update an object from it's delta. @@ -295,22 +159,4 @@ public class NeutronFloatingIPInterface implements INeutronFloatingIPCRUD, IConf target.setFixedIPAddress(delta.getFixedIPAddress()); return true; } - - private void loadConfiguration() { - for (ConfigurationObject conf : configurationService.retrieveConfiguration(this, FILE_NAME)) { - NeutronFloatingIP nfIP = (NeutronFloatingIP) conf; - floatingIPDB.put(nfIP.getID(), nfIP); - } - } - - @Override - public Status saveConfiguration() { - return configurationService.persistConfiguration(new ArrayList(floatingIPDB.values()), - FILE_NAME); - } - - @Override - public Object readObject(ObjectInputStream ois) throws FileNotFoundException, IOException, ClassNotFoundException { - return ois.readObject(); - } }