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%2FNeutronPortInterface.java;h=5c8780028dd0a5ce9cfa16aa5148ee952137aae2;hp=a49888f6c3e97201059c1c4f2f28e3a8038c3d51;hb=b1ad203b32b73fc06a856cdfae243986c8037617;hpb=d3230a844c5c0c6ca6ae774672fcb97a0c5a3951 diff --git a/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronPortInterface.java b/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronPortInterface.java index a49888f6c3..5c8780028d 100644 --- a/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronPortInterface.java +++ b/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronPortInterface.java @@ -8,13 +8,8 @@ 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.Iterator; import java.util.List; @@ -23,12 +18,6 @@ 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.INeutronPortCRUD; import org.opendaylight.controller.networkconfig.neutron.INeutronSubnetCRUD; @@ -37,137 +26,14 @@ import org.opendaylight.controller.networkconfig.neutron.NeutronNetwork; import org.opendaylight.controller.networkconfig.neutron.NeutronPort; import org.opendaylight.controller.networkconfig.neutron.NeutronSubnet; import org.opendaylight.controller.networkconfig.neutron.Neutron_IPs; -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 NeutronPortInterface implements INeutronPortCRUD, IConfigurationContainerAware, - IObjectReader { +public class NeutronPortInterface implements INeutronPortCRUD { private static final Logger logger = LoggerFactory.getLogger(NeutronPortInterface.class); - private static String ROOT = GlobalConstants.STARTUPHOME.toString(); - private static final String FILENAME ="neutron.port"; - private static String fileName; - private String containerName = null; + private ConcurrentMap portDB = new ConcurrentHashMap(); - private IClusterContainerServices clusterContainerService = null; - private ConcurrentMap portDB; - // 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; - } - } - - @SuppressWarnings("deprecation") - private void allocateCache() { - if (clusterContainerService == null) { - logger.error("un-initialized clusterContainerService, can't create cache"); - return; - } - logger.debug("Creating Cache for OpenDOVE"); - try { - // neutron caches - clusterContainerService.createCache("neutronPorts", - EnumSet.of(IClusterServices.cacheMode.NON_TRANSACTIONAL)); - } catch (CacheConfigException cce) { - logger.error("Cache couldn't be created for OpenDOVE - check cache mode"); - } catch (CacheExistException cce) { - logger.error("Cache for OpenDOVE already exists, destroy and recreate"); - } - logger.debug("Cache successfully created for OpenDOVE"); - } - - @SuppressWarnings({ "unchecked", "deprecation" }) - private void retrieveCache() { - if (clusterContainerService == null) { - logger.error("un-initialized clusterContainerService, can't retrieve cache"); - return; - } - - logger.debug("Retrieving cache for Neutron Ports"); - portDB = (ConcurrentMap) clusterContainerService - .getCache("neutronPorts"); - if (portDB == null) { - logger.error("Cache couldn't be retrieved for Neutron Ports"); - } - logger.debug("Cache was successfully retrieved for Neutron Ports"); - } - - @SuppressWarnings("deprecation") - private void destroyCache() { - if (clusterContainerService == null) { - logger.error("un-initialized clusterMger, can't destroy cache"); - return; - } - logger.debug("Destroying Cache for HostTracker"); - clusterContainerService.destroyCache("neutronPorts"); - } - - private void startUp() { - allocateCache(); - retrieveCache(); - if ((clusterContainerService != null) && (clusterContainerService.amICoordinator())) { - 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) { - containerName = (String) props.get("containerName"); - logger.debug("Running containerName: {}", containerName); - } else { - // In the Global instance case the containerName is empty - containerName = ""; - } - fileName = ROOT + FILENAME + "_" + containerName + ".conf"; - 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() { - } // this method uses reflection to update an object from it's delta. @@ -232,6 +98,9 @@ public class NeutronPortInterface implements INeutronPortCRUD, IConfigurationCon portDB.putIfAbsent(input.getID(), input); // if there are no fixed IPs, allocate one for each subnet in the network INeutronSubnetCRUD systemCRUD = NeutronCRUDInterfaces.getINeutronSubnetCRUD(this); + if (input.getFixedIPs() == null){ + input.setFixedIPs(new ArrayList()); + } if (input.getFixedIPs().size() == 0) { List list = input.getFixedIPs(); Iterator subnetIterator = systemCRUD.getAllSubnets().iterator(); @@ -347,31 +216,4 @@ public class NeutronPortInterface implements INeutronPortCRUD, IConfigurationCon } return null; } - - @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()) { - portDB.put(key, confList.get(key)); - } - } - - @Override - public Status saveConfiguration() { - ObjectWriter objWriter = new ObjectWriter(); - return objWriter.write(new ConcurrentHashMap(portDB), fileName); - } - - @Override - public Object readObject(ObjectInputStream ois) throws FileNotFoundException, IOException, ClassNotFoundException { - return ois.readObject(); - } - }