X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fnetworkconfiguration%2Fneutron%2Fimplementation%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetworkconfig%2Fneutron%2Fimplementation%2FNeutronFirewallInterface.java;h=421f850a0eea59c3af1b3b192908692c9aca57bd;hb=3927509ec3ecfa32a51b725d2b7155d425f5b877;hp=60476a1d340f70c45f93863ee8e9241d52d13ed1;hpb=4a8d4efda0828bc0c147dee3644c51baa6ff5a15;p=controller.git diff --git a/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFirewallInterface.java b/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFirewallInterface.java index 60476a1d34..421f850a0e 100644 --- a/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFirewallInterface.java +++ b/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFirewallInterface.java @@ -8,154 +8,24 @@ package org.opendaylight.controller.networkconfig.neutron.implementation; -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.INeutronFirewallCRUD; import org.opendaylight.controller.networkconfig.neutron.NeutronFirewall; -import org.opendaylight.controller.sal.utils.IObjectReader; -import org.opendaylight.controller.sal.utils.Status; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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; -public class NeutronFirewallInterface implements INeutronFirewallCRUD, IConfigurationContainerAware, IObjectReader { +public class NeutronFirewallInterface implements INeutronFirewallCRUD { private static final Logger logger = LoggerFactory.getLogger(NeutronFirewallInterface.class); - private static final String FILE_NAME = "neutron.firewall.conf"; - private String containerName = null; - private IClusterContainerServices clusterContainerService = null; - private IConfigurationContainerService configurationService; - private ConcurrentMap firewallDB; - - // methods needed for creating caches - void setClusterContainerService(IClusterContainerServices s) { - logger.debug("Cluster Service set"); - clusterContainerService = s; - } - - void unsetClusterContainerService(IClusterContainerServices s) { - if (clusterContainerService == s) { - logger.debug("Cluster Service removed!"); - clusterContainerService = null; - } - } - - public void setConfigurationContainerService(IConfigurationContainerService service) { - logger.trace("Configuration service set: {}", service); - configurationService = service; - } - - public void unsetConfigurationContainerService(IConfigurationContainerService service) { - logger.trace("Configuration service removed: {}", service); - 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 Firewall"); - try { - // neutron caches - this.clusterContainerService.createCache("neutronFirewalls", - EnumSet.of(IClusterServices.cacheMode.NON_TRANSACTIONAL)); - } catch (CacheConfigException cce) { - logger.error("Cache couldn't be created for Neutron Firewall - check cache mode"); - } catch (CacheExistException cce) { - logger.error("Cache for Neutron Firewall already exists, destroy and recreate"); - } - logger.debug("Cache successfully created for Neutron Firewall"); - } - - @SuppressWarnings ({"unchecked"}) - private void retrieveCache() { - if (clusterContainerService == null) { - logger.error("un-initialized clusterContainerService, can't retrieve cache"); - return; - } - - logger.debug("Retrieving cache for Neutron Firewall"); - firewallDB = (ConcurrentMap) clusterContainerService - .getCache("neutronFirewalls"); - if (firewallDB == null) { - logger.error("Cache couldn't be retrieved for Neutron Firewall"); - } - logger.debug("Cache was successfully retrieved for Neutron Firewall"); - } - - private void destroyCache() { - if (clusterContainerService == null) { - logger.error("un-initialized clusterMger, can't destroy cache"); - return; - } - logger.debug("Destroying Cache for HostTracker"); - clusterContainerService.destroyCache("neutronFirewalls"); - } - - 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 firewallDB = new ConcurrentHashMap(); // this method uses reflection to update an object from it's delta. @@ -243,22 +113,5 @@ public class NeutronFirewallInterface implements INeutronFirewallCRUD, IConfigur return !neutronFirewallExists(firewallUUID); } - private void loadConfiguration() { - for (ConfigurationObject conf : configurationService.retrieveConfiguration(this, FILE_NAME)) { - NeutronFirewall nn = (NeutronFirewall) conf; - firewallDB.put(nn.getFirewallUUID(), nn); - } - } - - @Override - public Status saveConfiguration() { - return configurationService.persistConfiguration(new ArrayList(firewallDB.values()), - FILE_NAME); - } - - @Override - public Object readObject(ObjectInputStream ois) throws FileNotFoundException, IOException, ClassNotFoundException { - return ois.readObject(); - } } \ No newline at end of file