diff --git a/src/main/java/net/floodlightcontroller/topology/TopologyInstance.java b/src/main/java/net/floodlightcontroller/topology/TopologyInstance.java index d98cbba647e57f1d72c348ce31198e83e54b7df2..dfd751424859e7cea634c3a29e9ba945a0da26fa 100644 --- a/src/main/java/net/floodlightcontroller/topology/TopologyInstance.java +++ b/src/main/java/net/floodlightcontroller/topology/TopologyInstance.java @@ -1423,7 +1423,10 @@ public class TopologyInstance { Route result = null; try { - result = pathcache.get(id); + //result = pathcache.get(id); + if (!routecache.get(id).isEmpty()) { + result = routecache.get(id).get(0); + } } catch (Exception e) { log.warn("Could not find route from {} to {}. If the path exists, wait for the topology to settle, and it will be detected", srcId, dstId); } diff --git a/src/main/resources/floodlightdefault.properties b/src/main/resources/floodlightdefault.properties index 4926ac81241e3d17351aad40cd5bf4786f0e41bf..5b63cb1d74c86632bc2f40dbb182c5cfd7db43ac 100644 --- a/src/main/resources/floodlightdefault.properties +++ b/src/main/resources/floodlightdefault.properties @@ -21,7 +21,7 @@ org.sdnplatform.sync.internal.SyncManager.authScheme=CHALLENGE_RESPONSE org.sdnplatform.sync.internal.SyncManager.keyStorePath=/etc/floodlight/key2.jceks org.sdnplatform.sync.internal.SyncManager.dbPath=/var/lib/floodlight/ org.sdnplatform.sync.internal.SyncManager.keyStorePassword=PassWord -org.sdnplatform.sync.internal.SyncManager.port=6642 +org.sdnplatform.sync.internal.SyncManager.port=6009 org.sdnplatform.sync.internal.SyncManager.thisNodeId=1 org.sdnplatform.sync.internal.SyncManager.persistenceEnabled=FALSE org.sdnplatform.sync.internal.SyncManager.nodes=[\ @@ -38,7 +38,7 @@ net.floodlightcontroller.core.internal.FloodlightProvider.controllerId=1 net.floodlightcontroller.linkdiscovery.internal.LinkDiscoveryManager.latency-history-size=10 net.floodlightcontroller.linkdiscovery.internal.LinkDiscoveryManager.latency-update-threshold=0.5 net.floodlightcontroller.core.internal.FloodlightProvider.shutdownOnTransitionToStandby=true -net.floodlightcontroller.core.internal.OFSwitchManager.openFlowPort=6653 +net.floodlightcontroller.core.internal.OFSwitchManager.openFlowPort=6010 net.floodlightcontroller.core.internal.OFSwitchManager.openFlowAddresses=0.0.0.0 net.floodlightcontroller.core.internal.OFSwitchManager.workerThreads=16 net.floodlightcontroller.core.internal.OFSwitchManager.bossThreads=1 @@ -58,8 +58,8 @@ net.floodlightcontroller.restserver.RestApiServer.keyStorePassword=Password net.floodlightcontroller.restserver.RestApiServer.httpsNeedClientAuthentication=NO net.floodlightcontroller.restserver.RestApiServer.useHttps=NO net.floodlightcontroller.restserver.RestApiServer.useHttp=YES -net.floodlightcontroller.restserver.RestApiServer.httpsPort=8081 -net.floodlightcontroller.restserver.RestApiServer.httpPort=8080 +net.floodlightcontroller.restserver.RestApiServer.httpsPort=11081 +net.floodlightcontroller.restserver.RestApiServer.httpPort=11080 net.floodlightcontroller.restserver.RestApiServer.accessControlAllowAllOrigins=TRUE net.floodlightcontroller.statistics.StatisticsCollector.enable=FALSE net.floodlightcontroller.statistics.StatisticsCollector.collectionIntervalPortStatsSeconds=10