X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnetworkconfiguration%2Fneutron%2Fimplementation%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetworkconfig%2Fneutron%2Fimplementation%2FNeutronNetworkInterface.java;h=c9e15495209bb5847e8f571512f8a2a9ac78a5b4;hb=3927509ec3ecfa32a51b725d2b7155d425f5b877;hp=de9b9d1bc4fdd9d77fb29d342cf24512c4dd5b06;hpb=61b7635939c25009bbd12449d9b6aaddd100b982;p=controller.git 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 de9b9d1bc4..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,156 +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.Set; 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.IConfigurationContainerAware; import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkCRUD; import org.opendaylight.controller.networkconfig.neutron.NeutronNetwork; -import org.opendaylight.controller.sal.utils.GlobalConstants; -import org.opendaylight.controller.sal.utils.IObjectReader; -import org.opendaylight.controller.sal.utils.ObjectReader; -import org.opendaylight.controller.sal.utils.ObjectWriter; -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 String ROOT = GlobalConstants.STARTUPHOME.toString(); - private static final String FILENAME ="neutron.network"; - private static String fileName; - private String containerName = null; - - private ConcurrentMap networkDB; - private IClusterContainerServices clusterContainerService = null; - - // 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; - } - } - - @SuppressWarnings("deprecation") - 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", "deprecation" }) - 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(); - if (networkDB.isEmpty()) { - 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 = ""; - } - fileName = ROOT + FILENAME + "_" + containerName + ".conf"; - startUp(); - } - - @SuppressWarnings("deprecation") - 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"); - } + private ConcurrentMap networkDB = new ConcurrentHashMap(); - /** - * 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. @@ -195,8 +65,9 @@ public class NeutronNetworkInterface implements INeutronNetworkCRUD, IConfigurat @Override public NeutronNetwork getNetwork(String uuid) { - if (!networkExists(uuid)) + if (!networkExists(uuid)) { return null; + } return networkDB.get(uuid); } @@ -215,8 +86,9 @@ public class NeutronNetworkInterface implements INeutronNetworkCRUD, IConfigurat @Override public boolean addNetwork(NeutronNetwork input) { - if (networkExists(input.getID())) + if (networkExists(input.getID())) { return false; + } networkDB.putIfAbsent(input.getID(), input); //TODO: add code to find INeutronNetworkAware services and call newtorkCreated on them return true; @@ -224,8 +96,9 @@ public class NeutronNetworkInterface implements INeutronNetworkCRUD, IConfigurat @Override public boolean removeNetwork(String uuid) { - if (!networkExists(uuid)) + if (!networkExists(uuid)) { return false; + } networkDB.remove(uuid); //TODO: add code to find INeutronNetworkAware services and call newtorkDeleted on them return true; @@ -233,46 +106,22 @@ public class NeutronNetworkInterface implements INeutronNetworkCRUD, IConfigurat @Override public boolean updateNetwork(String uuid, NeutronNetwork delta) { - if (!networkExists(uuid)) + if (!networkExists(uuid)) { return false; + } NeutronNetwork target = networkDB.get(uuid); return overwrite(target, delta); } @Override public boolean networkInUse(String netUUID) { - if (!networkExists(netUUID)) + if (!networkExists(netUUID)) { return true; + } NeutronNetwork target = networkDB.get(netUUID); - if (target.getPortsOnNetwork().size() > 0) + if (target.getPortsOnNetwork().size() > 0) { return true; - return false; - } - - @SuppressWarnings("unchecked") - private void loadConfiguration() { - ObjectReader objReader = new ObjectReader(); - ConcurrentMap confList = (ConcurrentMap) - objReader.read(this, fileName); - - if (confList == null) { - return; - } - - for (String key : confList.keySet()) { - networkDB.put(key, confList.get(key)); } + return false; } - - @Override - public Status saveConfiguration() { - ObjectWriter objWriter = new ObjectWriter(); - return objWriter.write(new ConcurrentHashMap(networkDB), fileName); - } - - @Override - public Object readObject(ObjectInputStream ois) throws FileNotFoundException, IOException, ClassNotFoundException { - return ois.readObject(); - } - }