.getLogger(ClusterManager.class);
private DefaultCacheManager cm;
GossipRouter gossiper;
- private HashSet roleChangeListeners;
+ private HashSet<IListenRoleChange> roleChangeListeners;
private ViewChangedListener cacheManagerListener;
private static String loopbackAddress = "127.0.0.1";
if (supernodes.hasMoreTokens()) {
// Populate the list of my addresses
try {
- Enumeration e = NetworkInterface.getNetworkInterfaces();
+ Enumeration<NetworkInterface> e = NetworkInterface.getNetworkInterfaces();
while (e.hasMoreElements()) {
NetworkInterface n = (NetworkInterface) e.nextElement();
- Enumeration ee = n.getInetAddresses();
+ Enumeration<InetAddress> ee = n.getInetAddresses();
while (ee.hasMoreElements()) {
InetAddress i = (InetAddress) ee.nextElement();
myAddresses.add(i);
String cacheName, Set<cacheMode> cMode) throws CacheExistException,
CacheConfigException {
EmbeddedCacheManager manager = this.cm;
- Cache c;
+ Cache<Object,Object> c;
String realCacheName = "{" + containerName + "}_{" + cacheName + "}";
if (manager == null) {
return null;
@Override
public ConcurrentMap<?, ?> getCache(String containerName, String cacheName) {
EmbeddedCacheManager manager = this.cm;
- Cache c;
+ Cache<Object,Object> c;
String realCacheName = "{" + containerName + "}_{" + cacheName + "}";
if (manager == null) {
return null;
@Override
public Set<String> getCacheList(String containerName) {
- Set<String> perContainerCaches = new HashSet();
+ Set<String> perContainerCaches = new HashSet<String>();
EmbeddedCacheManager manager = this.cm;
if (manager == null) {
return null;
public void addListener(String containerName, String cacheName,
IGetUpdates<?, ?> u) throws CacheListenerAddException {
EmbeddedCacheManager manager = this.cm;
- Cache c;
+ Cache<Object,Object> c;
String realCacheName = "{" + containerName + "}_{" + cacheName + "}";
if (manager == null) {
return;
public Set<IGetUpdates<?, ?>> getListeners(String containerName,
String cacheName) {
EmbeddedCacheManager manager = this.cm;
- Cache c;
+ Cache<Object,Object> c;
String realCacheName = "{" + containerName + "}_{" + cacheName + "}";
if (manager == null) {
return null;
}
c = manager.getCache(realCacheName);
- Set<IGetUpdates<?, ?>> res = new HashSet();
+ Set<IGetUpdates<?, ?>> res = new HashSet<IGetUpdates<?, ?>>();
Set<Object> listeners = c.getListeners();
for (Object listener : listeners) {
if (listener instanceof CacheListenerContainer) {
public void removeListener(String containerName, String cacheName,
IGetUpdates<?, ?> u) {
EmbeddedCacheManager manager = this.cm;
- Cache c;
+ Cache<Object,Object> c;
String realCacheName = "{" + containerName + "}_{" + cacheName + "}";
if (manager == null) {
return;
EmbeddedCacheManager manager = this.cm;
if (manager == null) {
// In case we cannot fetch the information, lets assume we
- // are standby, so to have less responsability.
+ // are standby, so to have less responsibility.
return true;
}
return (!manager.isCoordinator());
EmbeddedCacheManager manager = this.cm;
if ((manager == null) || (a == null)) {
// In case we cannot fetch the information, lets assume we
- // are standby, so to have less responsability.
+ // are standby, so to have less responsibility.
return null;
}
Transport t = manager.getTransport();
EmbeddedCacheManager manager = this.cm;
if (manager == null) {
// In case we cannot fetch the information, lets assume we
- // are standby, so to have less responsability.
+ // are standby, so to have less responsibility.
return null;
}
EmbeddedCacheManager manager = this.cm;
if (manager == null) {
// In case we cannot fetch the information, lets assume we
- // are standby, so to have less responsability.
+ // are standby, so to have less responsibility.
throw new ListenRoleChangeAddException();
}
if (this.roleChangeListeners == null) {
- this.roleChangeListeners = new HashSet();
+ this.roleChangeListeners = new HashSet<IListenRoleChange>();
this.cacheManagerListener = new ViewChangedListener(
this.roleChangeListeners);
manager.addListener(this.cacheManagerListener);
EmbeddedCacheManager manager = this.cm;
if (manager == null) {
// In case we cannot fetch the information, lets assume we
- // are standby, so to have less responsability.
+ // are standby, so to have less responsibility.
return;
}
xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd">
<services>
- <rest defaultRestSubcontext="/one/nb/v2/flow"/>
+ <rest defaultRestSubcontext="/controller/nb/v2/flow"/>
</services>
<modules>
</Import-Package>
<Export-Package>
</Export-Package>
- <Web-ContextPath>/one/nb/v2/flow</Web-ContextPath>
+ <Web-ContextPath>/controller/nb/v2/flow</Web-ContextPath>
</instructions>
</configuration>
</plugin>
xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd">
<services>
- <rest defaultRestSubcontext="/one/nb/v2/host"/>
+ <rest defaultRestSubcontext="/controller/nb/v2/host"/>
</services>
<modules>
org.slf4j,
!org.codehaus.enunciate.jaxrs
</Import-Package>
- <Web-ContextPath>/one/nb/v2/host</Web-ContextPath>
+ <Web-ContextPath>/controller/nb/v2/host</Web-ContextPath>
</instructions>
</configuration>
</plugin>
xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd">
<services>
- <rest defaultRestSubcontext="/one/nb/v2/staticroute"/>
+ <rest defaultRestSubcontext="/controller/nb/v2/staticroute"/>
</services>
<modules>
</Import-Package>
<Export-Package>
</Export-Package>
- <Web-ContextPath>/one/nb/v2/staticroute</Web-ContextPath>
+ <Web-ContextPath>/controller/nb/v2/staticroute</Web-ContextPath>
</instructions>
</configuration>
</plugin>
xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd">
<services>
- <rest defaultRestSubcontext="/one/nb/v2/statistics"/>
+ <rest defaultRestSubcontext="/controller/nb/v2/statistics"/>
</services>
<modules>
</Import-Package>
<Export-Package>
</Export-Package>
- <Web-ContextPath>/one/nb/v2/statistics</Web-ContextPath>
+ <Web-ContextPath>/controller/nb/v2/statistics</Web-ContextPath>
</instructions>
</configuration>
</plugin>
xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd">
<services>
- <rest defaultRestSubcontext="/one/nb/v2/subnet"/>
+ <rest defaultRestSubcontext="/controller/nb/v2/subnet"/>
</services>
<modules>
</Import-Package>
<Export-Package>
</Export-Package>
- <Web-ContextPath>/one/nb/v2/subnet</Web-ContextPath>
+ <Web-ContextPath>/controller/nb/v2/subnet</Web-ContextPath>
</instructions>
</configuration>
</plugin>
xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd">
<services>
- <rest defaultRestSubcontext="/one/nb/v2/switch"/>
+ <rest defaultRestSubcontext="/controller/nb/v2/switch"/>
</services>
<modules>
org.slf4j,
!org.codehaus.enunciate.jaxrs
</Import-Package>
- <Web-ContextPath>/one/nb/v2/switch</Web-ContextPath>
+ <Web-ContextPath>/controller/nb/v2/switch</Web-ContextPath>
</instructions>
</configuration>
</plugin>
xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd">
<services>
- <rest defaultRestSubcontext="/one/nb/v2/topology"/>
+ <rest defaultRestSubcontext="/controller/nb/v2/topology"/>
</services>
<modules>
org.springframework.security.web.authentication.www,
!org.codehaus.enunciate.jaxrs
</Import-Package>
- <Web-ContextPath>/one/nb/v2/topology</Web-ContextPath>
+ <Web-ContextPath>/controller/nb/v2/topology</Web-ContextPath>
</instructions>
</configuration>
</plugin>
// replication is done in the SAL implementation toward
// the different APPS
this.pluginOutDataPacketServices.put(containerName, s);
- logger.debug("New outService for container:" + containerName);
+ logger.debug("New outService for container: {}", containerName);
}
}
}
if (this.pluginOutDataPacketServices != null) {
this.pluginOutDataPacketServices.remove(containerName);
- logger.debug("Removed outService for container:" + containerName);
+ logger.debug("Removed outService for container: {}", containerName);
}
}
if (sw == null || msg == null
|| this.pluginOutDataPacketServices == null) {
// Something fishy, we cannot do anything
+ logger.debug("sw: {} and/or msg: {} and/or pluginOutDataPacketServices: {} is null!",
+ new Object[]{sw, msg, this.pluginOutDataPacketServices});
return;
}
if (msg instanceof OFPacketIn) {
.get(GlobalConstants.DEFAULT.toString());
if (defaultOutService != null) {
defaultOutService.receiveDataPacket(dataPacket);
- logger.trace("Dispatched to apps a frame of size: "
- + ofPacket.getPacketData().length
- + " on container: "
- + GlobalConstants.DEFAULT.toString());
+ logger.trace("Dispatched to apps a frame of size: {} on container: {}",
+ ofPacket.getPacketData().length, GlobalConstants.DEFAULT.toString());
}
// Now check the mapping between nodeConnector and
// Container and later on optinally filter based on
if (s != null) {
// TODO add filtering on a per-flowSpec base
s.receiveDataPacket(dataPacket);
- logger.trace("Dispatched to apps a frame of size: "
- + ofPacket.getPacketData().length
- + " on container: " + container);
+ logger.trace("Dispatched to apps a frame of size: {} on container: {}",
+ ofPacket.getPacketData().length, GlobalConstants.DEFAULT.toString());
}
}
public void transmitDataPacket(RawPacket outPkt) {
// Sanity check area
if (outPkt == null) {
+ logger.debug("outPkt is null!");
return;
}
NodeConnector outPort = outPkt.getOutgoingNodeConnector();
if (outPort == null) {
+ logger.debug("outPort is null! outPkt: {}", outPkt);
return;
}
if (!outPort.getType().equals(
NodeConnector.NodeConnectorIDType.OPENFLOW)) {
// The output Port is not of type OpenFlow
+ logger.debug("outPort is not OF Type! outPort: {}", outPort);
return;
}
if (sw == null) {
// If we cannot get the controller descriptor we cannot even
// send out the frame
+ logger.debug("swID: {} - sw is null!", swID);
return;
}
po.setPacketData(data);
sw.asyncSend(po);
- logger.trace("Transmitted a frame of size:" + data.length);
+ logger.trace("Transmitted a frame of size: {}", data.length);
}
public void addNode(Node node, Set<Property> props) {
- if (node == null)
+ if (node == null) {
+ logger.debug("node is null!");
return;
+ }
long sid = (Long) node.getID();
ISwitch sw = controller.getSwitches().get(sid);
- if (sw != null) {
- this.swID2ISwitch.put(sw.getId(), sw);
+ if (sw == null) {
+ logger.debug("sid: {} - sw is null!", sid);
+ return;
}
+ this.swID2ISwitch.put(sw.getId(), sw);
}
public void removeNode(Node node) {
- if (node == null)
+ if (node == null) {
+ logger.debug("node is null!");
return;
+ }
long sid = (Long) node.getID();
ISwitch sw = controller.getSwitches().get(sid);
- if (sw != null) {
- this.swID2ISwitch.remove(sw.getId());
+ if (sw == null) {
+ logger.debug("sid: {} - sw is null!", sid);
+ return;
}
+ this.swID2ISwitch.remove(sw.getId());
}
@Override
if (fSpecs == null) {
fSpecs = new CopyOnWriteArrayList<ContainerFlow>();
}
- boolean updateMap = false;
switch (t) {
case ADDED:
if (!fSpecs.contains(previousFlow)) {
case CHANGED:
break;
}
- if (updateMap) {
- if (fSpecs.isEmpty()) {
- this.container2FlowSpecs.remove(containerName);
- } else {
- this.container2FlowSpecs.put(containerName, fSpecs);
- }
- }
}
@Override
this.routingAware = new HashSet<IListenRoutingUpdates>();
}
if (this.routingAware != null) {
- log.debug("Adding routingAware listener: " + i);
+ log.debug("Adding routingAware listener: {}", i);
this.routingAware.add(i);
}
}
: avlDstThruPut;
if (avlThruPut <= 0) {
- log
- .trace(
- "Edge {}: Available Throughput {} is Zero/Negative",
- e, avlThruPut);
+ log.debug("Edge {}: Available Throughput {} <= 0!",
+ e, avlThruPut);
return (double) -1;
}
return (double) (Bandwidth.BW1Pbps / avlThruPut);
@Override
public synchronized Path getMaxThroughputRoute(Node src, Node dst) {
if (mtp == null) {
- log
- .error("Max Throughput Path Calculation has not been Initialized!");
+ log.error("Max Throughput Path Calculation Uninitialized!");
return null;
}
try {
path = mtp.getMaxThroughputPath(src, dst);
} catch (IllegalArgumentException ie) {
- log.debug("A vertex is yet not known between " + src.toString()
- + " " + dst.toString());
+ log.debug("A vertex is yet not known between {} {}", src.toString(),
+ dst.toString());
return null;
}
Path res;
try {
res = new Path(path);
} catch (ConstructionException e) {
- log.debug("A vertex is yet not known between " + src.toString()
- + " " + dst.toString());
+ log.debug("A vertex is yet not known between {} {}", src.toString(),
+ dst.toString());
return null;
}
return res;
try {
path = spt.getPath(src, dst);
} catch (IllegalArgumentException ie) {
- log.debug("A vertex is yet not known between " + src.toString()
- + " " + dst.toString());
+ log.debug("A vertex is yet not known between {} {}", src.toString(),
+ dst.toString());
return null;
}
Path res;
try {
res = new Path(path);
} catch (ConstructionException e) {
- log.debug("A vertex is yet not known between " + src.toString()
- + " " + dst.toString());
+ log.debug("A vertex is yet not known between {} {}", src.toString(),
+ dst.toString());
return null;
}
return res;
if (topo.containsVertex(src.getNode())
&& topo.inDegree(src.getNode()) == 0
&& topo.outDegree(src.getNode()) == 0) {
- log.debug("Removing vertex " + src);
+ log.debug("Removing vertex {}", src);
topo.removeVertex(src.getNode());
}
if (topo.containsVertex(dst.getNode())
&& topo.inDegree(dst.getNode()) == 0
&& topo.outDegree(dst.getNode()) == 0) {
- log.debug("Removing vertex " + dst);
+ log.debug("Removing vertex {}", dst);
topo.removeVertex(dst.getNode());
}
}
clearMaxThroughput();
}
} else {
- log.error("Cannot find topology for BW " + bw
- + " this is unexpected!");
+ log.error("Cannot find topology for BW {} this is unexpected!", bw);
}
return edgePresentInGraph;
}
if (props != null)
props.remove(bw);
- log.debug("edgeUpdate: " + e.toString() + " bw: " + bw.getValue());
+ log.debug("edgeUpdate: {} bw: {}", e.toString(), bw.getValue());
Short baseBW = Short.valueOf((short) 0);
boolean add = (type == UpdateType.ADDED) ? true : false;
public void containerCreate(String containerName) {
try {
Object[] imps = getImplementations();
- logger.trace("Creating instance " + containerName);
+ logger.trace("Creating instance {}", containerName);
if (imps != null) {
for (int i = 0; i < imps.length; i++) {
ImmutablePair<String, Object> key = new ImmutablePair<String, Object>(
// Set the implementation so the component can manage
// its lifecycle
if (c.getService() == null) {
- logger
- .trace("Setting implementation to:"
- + imps[i]);
+ logger.trace("Setting implementation to: {}",
+ imps[i]);
c.setImplementation(imps[i]);
}
public void containerDestroy(String containerName) {
try {
Object[] imps = getImplementations();
- logger.trace("Destroying instance " + containerName);
+ logger.trace("Destroying instance {}", containerName);
if (imps != null) {
for (int i = 0; i < imps.length; i++) {
ImmutablePair<String, Object> key = new ImmutablePair<String, Object>(
// Set the implementation so the component
// can manage its lifesycle
if (c.getService() == null) {
- logger.trace("Setting implementation to:"
- + imps[i]);
+ logger.trace("Setting implementation to: {}",
+ imps[i]);
c.setImplementation(imps[i]);
}
try {
Component c = this.dbInstances.get(key);
if (c != null) {
- logger.trace("Remove component on container:"
- + key.getLeft() + " Object:" + key.getRight());
+ logger.trace("Remove component on container: {} Object: {}",
+ key.getLeft(), key.getRight());
this.dm.remove(c);
}
} catch (Exception nex) {
try {
Component c = this.dbGlobalInstances.get(key);
if (c != null) {
- logger.trace("Remove component for Object:" + key);
+ logger.trace("Remove component for Object: {}" , key);
this.dm.remove(c);
}
} catch (Exception nex) {
*
*/
public enum GlobalConstants {
- DEFAULT("default"), CONTAINERMANAGER("containermanager"), CONTAINERNAME(
- "name"), STATICVLAN("staticvlan"), CLUSTERINGSERVICES("clusteringservices"), ONECONTROLLER(
- "onecontroller"), STARTUPHOME("configuration/startup/");
+ DEFAULT("default"),
+ CONTAINERMANAGER("containermanager"),
+ CONTAINERNAME("name"),
+ STATICVLAN("staticvlan"),
+ CLUSTERINGSERVICES("clusteringservices"),
+ STARTUPHOME("configuration/startup/");
private GlobalConstants(String name) {
this.name = name;
logger.trace("Received setPluginInDataService request");
for (Object e : props.entrySet()) {
Map.Entry entry = (Map.Entry) e;
- logger.trace("Prop key:(" + entry.getKey() + ") value:("
- + entry.getValue() + ")");
+ logger.trace("Prop key:({}) value:({})",entry.getKey(), entry.getValue());
}
Object value = props.get("protocolPluginType");
+ "protocolPluginType provided");
} else {
this.pluginInDataService.put(type, s);
- logger.debug("Stored the PluginInDataService for type:" + type);
+ logger.debug("Stored the PluginInDataService for type: {}", type);
}
}
logger.trace("Received unsetPluginInDataService request");
for (Object e : props.entrySet()) {
Map.Entry entry = (Map.Entry) e;
- logger.trace("Prop key:(" + entry.getKey() + ") value:("
- + entry.getValue() + ")");
+ logger.trace("Prop key:({}) value:({})",entry.getKey(), entry.getValue());
}
Object value = props.get("protocoloPluginType");
+ "protocolPluginType provided");
} else if (this.pluginInDataService.get(type).equals(s)) {
this.pluginInDataService.remove(type);
- logger.debug("Removed the PluginInDataService for type:" + type);
+ logger.debug("Removed the PluginInDataService for type: {}", type);
}
}
logger.trace("Received setListenDataPacket request");
for (Object e : props.entrySet()) {
Map.Entry entry = (Map.Entry) e;
- logger.trace("Prop key:(" + entry.getKey() + ") value:("
- + entry.getValue() + ")");
+ logger.trace("Prop key:({}) value:({})",entry.getKey(), entry.getValue());
}
String listenerName = null;
if (this.indexDataPacket.contains(l)) {
logger.error("trying to add an existing element");
} else {
- logger.debug("adding listener: " + listenerName);
+ logger.debug("adding listener: {}", listenerName);
CopyOnWriteArrayList<DataPacketListener> serialListeners = new CopyOnWriteArrayList<DataPacketListener>();
serialListeners.add(l);
this.listenDataPacket.add(serialListeners);
if (this.indexDataPacket.contains(l)) {
logger.error("trying to add an existing element");
} else {
- logger.debug("adding listener: " + listenerName);
+ logger.debug("adding listener: {}", listenerName);
// Lets find the set with the dependency in it, if we
// find it lets just add our dependency at the end of
// the list.
logger.trace("Received UNsetListenDataPacket request");
for (Object e : props.entrySet()) {
Map.Entry entry = (Map.Entry) e;
- logger.trace("Prop key:(" + entry.getKey() + ") value:("
- + entry.getValue() + ")");
+ logger.trace("Prop key:({}) value:({})",entry.getKey(), entry.getValue());
}
String listenerName = null;
if (!this.indexDataPacket.contains(l)) {
logger.error("trying to remove a non-existing element");
} else {
- logger.debug("removing listener: " + listenerName);
+ logger.debug("removing listener: {}", listenerName);
for (List<DataPacketListener> serialListeners : this.listenDataPacket) {
int i = 0;
boolean done = false;
String type = null;
for (Object e : props.entrySet()) {
Map.Entry entry = (Map.Entry) e;
- logger.trace("Prop key:(" + entry.getKey() + ") value:("
- + entry.getValue() + ")");
+ logger.trace("Prop key:({}) value:({})",entry.getKey(),
+ entry.getValue());
}
Object value = props.get("protocolPluginType");
+ "protocolPluginType provided");
} else {
this.pluginFlowProgrammer.put(type, s);
- logger.debug("Stored the pluginFlowProgrammer for type:" + type);
+ logger.debug("Stored the pluginFlowProgrammer for type: {}",type);
}
}
logger.debug("Received unsetpluginFlowProgrammer request");
for (Object e : props.entrySet()) {
Map.Entry entry = (Map.Entry) e;
- logger.trace("Prop key:(" + entry.getKey() + ") value:("
- + entry.getValue() + ")");
+ logger.trace("Prop key:({}) value:({})",entry.getKey(),
+ entry.getValue());
}
Object value = props.get("protocoloPluginType");
+ "protocolPluginType provided");
} else if (this.pluginFlowProgrammer.get(type).equals(s)) {
this.pluginFlowProgrammer.remove(type);
- logger.debug("Removed the pluginFlowProgrammer for type:" + type);
+ logger.debug("Removed the pluginFlowProgrammer for type: {}", type);
}
}
String type = null;
for (Object e : props.entrySet()) {
Map.Entry entry = (Map.Entry) e;
- logger.trace("Prop key:(" + entry.getKey() + ") value:("
- + entry.getValue() + ")");
+ logger.trace("Prop key:({}) value:({})", entry.getKey(),
+ entry.getValue());
}
Object value = props.get("protocolPluginType");
+ "protocolPluginType provided");
} else {
this.pluginReader.put(type, s);
- logger.debug("Stored the pluginReader for type:" + type);
+ logger.debug("Stored the pluginReader for type: {}", type);
}
}
logger.debug("Received unsetpluginReader request");
for (Object e : props.entrySet()) {
Map.Entry entry = (Map.Entry) e;
- logger.trace("Prop key:(" + entry.getKey() + ") value:("
- + entry.getValue() + ")");
+ logger.trace("Prop key:({}) value:({})", entry.getKey(),
+ entry.getValue());
}
Object value = props.get("protocoloPluginType");
+ "protocolPluginType provided");
} else if (this.pluginReader.get(type).equals(s)) {
this.pluginReader.remove(type);
- logger.debug("Removed the pluginReader for type:" + type);
+ logger.debug("Removed the pluginReader for type: {}", type);
}
}
.readFlow(node, flow, true);
}
}
- logger.warn("Plugin unuvailable");
+ logger.warn("Plugin unavailable");
return null;
}
.readFlow(node, flow, false);
}
}
- logger.warn("Plugin unuvailable");
+ logger.warn("Plugin unavailable");
return null;
}
.readAllFlow(node, true);
}
}
- logger.warn("Plugin unuvailable");
+ logger.warn("Plugin unavailable");
return null;
}
.readAllFlow(node, false);
}
}
- logger.warn("Plugin unuvailable");
+ logger.warn("Plugin unavailable");
return null;
}
.readDescription(node, true);
}
}
- logger.warn("Plugin unuvailable");
+ logger.warn("Plugin unavailable");
return null;
}
.readDescription(node, false);
}
}
- logger.warn("Plugin unuvailable");
+ logger.warn("Plugin unavailable");
return null;
}
.readNodeConnector(connector, true);
}
}
- logger.warn("Plugin unuvailable");
+ logger.warn("Plugin unavailable");
return null;
}
.readNodeConnector(connector, false);
}
}
- logger.warn("Plugin unuvailable");
+ logger.warn("Plugin unavailable");
return null;
}
.readAllNodeConnector(node, true);
}
}
- logger.warn("Plugin unuvailable");
+ logger.warn("Plugin unavailable");
return null;
}
.readAllNodeConnector(node, false);
}
}
- logger.warn("Plugin unuvailable");
+ logger.warn("Plugin unavailable");
return null;
}
.getTransmitRate(connector);
}
}
- logger.warn("Plugin unuvailable");
+ logger.warn("Plugin unavailable");
return 0;
}
org.springframework.security.web.authentication.logout,
org.springframework.dao
</Import-Package>
- <Web-ContextPath>/one/devices</Web-ContextPath>
+ <Web-ContextPath>/controller/web/devices</Web-ContextPath>
</instructions>
</configuration>
</plugin>
<http pattern="/js/**" security="none" />
<http pattern="/images/**" security="none" />
<http pattern="/favicon.ico" security="none" />
- <http pattern="/one/css/**" security="none" />
- <http pattern="/one/js/**" security="none" />
- <http pattern="/one/images/**" security="none" />
+ <http pattern="/controller/web/css/**" security="none" />
+ <http pattern="/controller/web/js/**" security="none" />
+ <http pattern="/controller/web/images/**" security="none" />
<http auto-config="false" authentication-manager-ref="authenticationManager"
/**Devices Modules */
one.f.switchmanager = {
- rootUrl: "one/devices",
+ rootUrl: "controller/web/devices",
createTable: function(columnNames, body) {
var tableAttributes = ["table-striped", "table-bordered", "table-condensed"];
var $table = one.lib.dashlet.table.table(tableAttributes);
org.springframework.security.web.authentication.logout,
org.springframework.dao\r
</Import-Package>
- <Web-ContextPath>/one/flows</Web-ContextPath>
+ <Web-ContextPath>/controller/web/flows</Web-ContextPath>
</instructions>
</configuration>
</plugin>
<http pattern="/js/**" security="none" />
<http pattern="/images/**" security="none" />
<http pattern="/favicon.ico" security="none" />
- <http pattern="/one/css/**" security="none" />
- <http pattern="/one/js/**" security="none" />
- <http pattern="/one/images/**" security="none" />
+ <http pattern="/controller/web/css/**" security="none" />
+ <http pattern="/controller/web/js/**" security="none" />
+ <http pattern="/controller/web/images/**" security="none" />
<http auto-config="false" authentication-manager-ref="authenticationManager"
};
one.f.address = {
- root : "/one/flows",
+ root : "/controller/web/flows",
flows : {
main : "/main",
flows : "/node-flows",
<http pattern="/js/**" security="none" />
<http pattern="/images/**" security="none" />
<http pattern="/favicon.ico" security="none" />
- <http pattern="/one/css/**" security="none" />
- <http pattern="/one/js/**" security="none" />
- <http pattern="/one/images/**" security="none" />
+ <http pattern="/controller/web/css/**" security="none" />
+ <http pattern="/controller/web/js/**" security="none" />
+ <http pattern="/controller/web/images/**" security="none" />
<http auto-config="false" authentication-manager-ref="authenticationManager"
var data = {};
data['x'] = ps.x;
data['y'] = ps.y;
- $.post('/one/topology/node/' + did, data);
+ $.post('/controller/web/topology/node/' + did, data);
},
onClick: function(node, eventInfo, e) {
return false;
one.topology.update = function() {
$('#topology').empty();
- $.getJSON(one.global.remoteAddress+"one/topology/visual.json", function(data) {
+ $.getJSON(one.global.remoteAddress+"controller/web/topology/visual.json", function(data) {
one.topology.init(data);
});
}
/** INIT */
-$.getJSON(one.global.remoteAddress+"one/topology/visual.json", function(data) {
+$.getJSON(one.global.remoteAddress+"controller/web/topology/visual.json", function(data) {
one.topology.init(data);
});
\ No newline at end of file
one.main.constants = {
address : {
menu : "/web.json",
- prefix : "/one",
+ prefix : "/controller/web",
save : "/save"
}
}
org.springframework.security.web.authentication.logout,
org.springframework.dao
</Import-Package>
- <Web-ContextPath>/one/topology</Web-ContextPath>
+ <Web-ContextPath>/controller/web/topology</Web-ContextPath>
</instructions>
</configuration>
</plugin>
<http pattern="/js/**" security="none" />
<http pattern="/images/**" security="none" />
<http pattern="/favicon.ico" security="none" />
- <http pattern="/one/css/**" security="none" />
- <http pattern="/one/js/**" security="none" />
- <http pattern="/one/images/**" security="none" />
+ <http pattern="/controller/web/css/**" security="none" />
+ <http pattern="/controller/web/js/**" security="none" />
+ <http pattern="/controller/web/images/**" security="none" />
<http auto-config="false" authentication-manager-ref="authenticationManager"
org.springframework.security.web.authentication.logout,
org.springframework.dao
</Import-Package>
- <Web-ContextPath>/one/troubleshoot</Web-ContextPath>
+ <Web-ContextPath>/controller/web/troubleshoot</Web-ContextPath>
</instructions>
</configuration>
</plugin>
<http pattern="/js/**" security="none" />
<http pattern="/images/**" security="none" />
<http pattern="/favicon.ico" security="none" />
- <http pattern="/one/css/**" security="none" />
- <http pattern="/one/js/**" security="none" />
- <http pattern="/one/images/**" security="none" />
+ <http pattern="/controller/web/css/**" security="none" />
+ <http pattern="/controller/web/js/**" security="none" />
+ <http pattern="/controller/web/images/**" security="none" />
<http auto-config="false" authentication-manager-ref="authenticationManager"
/**Troubleshoot modules*/
one.f.troubleshooting = {
- rootUrl: "/one/troubleshoot",
+ rootUrl: "/controller/web/troubleshoot",
rightBottomDashlet: {
get: function() {
var $rightBottomDashlet = $("#right-bottom").find(".dashlet");
Code Review / controller.git / commitdiff