Skip to content
Snippets Groups Projects
Commit 77b099b0 authored by Tulio Ribeiro's avatar Tulio Ribeiro
Browse files

Just to update files on github, not working properly.

parent c105dac8
No related branches found
No related tags found
No related merge requests found
......@@ -32,6 +32,7 @@ import org.sdnplatform.sync.error.UnknownStoreException;
import org.sdnplatform.sync.internal.StoreRegistry.Hint;
import org.sdnplatform.sync.internal.config.ClusterConfig;
import org.sdnplatform.sync.internal.config.DelegatingCCProvider;
import org.sdnplatform.sync.internal.config.FTCCProvider;
import org.sdnplatform.sync.internal.config.FallbackCCProvider;
import org.sdnplatform.sync.internal.config.IClusterConfigProvider;
import org.sdnplatform.sync.internal.config.Node;
......@@ -465,10 +466,16 @@ public class SyncManager extends AbstractSyncManager {
storeRegistry = new StoreRegistry(this, config.get("dbPath"));
String[] configProviders =
{PropertyCCProvider.class.getName(),
SyncStoreCCProvider.class.getName(),
StorageCCProvider.class.getName(),
{
/**
* Tulio Ribeiro
*/
FTCCProvider.class.getName(),
//PropertyCCProvider.class.getName(),
//SyncStoreCCProvider.class.getName(),
//StorageCCProvider.class.getName(),
FallbackCCProvider.class.getName()};
try {
if (config.containsKey("persistenceEnabled")) {
persistenceEnabled =
......@@ -476,12 +483,14 @@ public class SyncManager extends AbstractSyncManager {
}
if (config.containsKey("configProviders")) {
configProviders = config.get("configProviders").split(",");
logger.info("configProviders: ",configProviders);
}
DelegatingCCProvider dprovider = new DelegatingCCProvider();
for (String configProvider : configProviders) {
Class<?> cClass = Class.forName(configProvider);
IClusterConfigProvider provider =
(IClusterConfigProvider) cClass.newInstance();
logger.info("Adding provider: {}",provider);
dprovider.addProvider(provider);
}
dprovider.init(this, context);
......
......@@ -9,6 +9,8 @@ import java.util.List;
import org.sdnplatform.sync.error.SyncException;
import sun.util.logging.resources.logging;
/**
* Represent the configuration of a cluster in the sync manager
......@@ -201,6 +203,7 @@ public class ClusterConfig {
this.authScheme = AuthScheme.NO_AUTH;
this.keyStorePath = keyStorePath;
this.keyStorePassword = keyStorePassword;
}
@Override
......
......@@ -44,6 +44,9 @@ public class PropertyCCProvider implements IClusterConfigProvider {
List<Node> nodes =
mapper.readValue(config.get("nodes"),
new TypeReference<List<Node>>() { });
//nodes.add(new Node("192.168.1.131",6642,(short)1,(short)1));
//nodes.add(new Node("192.168.1.131",6643,(short)2,(short)2));
return new ClusterConfig(nodes, thisNodeId,
authScheme,
keyStorePath,
......
......@@ -31,7 +31,8 @@ public class StorageCCProvider
private IStorageSourceService storageSource;
HashMap<Short, Node> clusterNode;
private List<Node> clusterInitialNode;
String thisControllerID;
AuthScheme authScheme;
String keyStorePath;
......@@ -68,15 +69,10 @@ public class StorageCCProvider
Map<String, String> config =
context.getConfigParams(FloodlightProvider.class);
thisControllerID = config.get("controllerId");
config = context.getConfigParams(SyncManager.class);
String clusterNodes = config.get("clusterNodes");
clusterNode = jsonToNodeMap(clusterNodes, thisControllerID);
logger.info("Initial Cluster Nodes: {}",clusterNode);
logger.info("ControllerId at: {}", thisControllerID);
logger.info("ControllerId: {}", thisControllerID);
keyStorePath = config.get("keyStorePath");
keyStorePassword = config.get("keyStorePassword");
......@@ -84,6 +80,11 @@ public class StorageCCProvider
try {
authScheme = AuthScheme.valueOf(config.get("authScheme"));
} catch (Exception e) {}
String clusterNodes = config.get("clusterNodes");
clusterInitialNode = jsonToNodeMap(clusterNodes, config.get("nodeId"));
logger.info("Initial Cluster Node: {} {}",config.get("nodeId"),clusterInitialNode);
}
@Override
......@@ -149,11 +150,16 @@ public class StorageCCProvider
if (res != null) res.close();
}
nodes.add(new Node("192.168.1.131", 6642, (short)1, (short)1));
nodes.add(new Node("192.168.1.131", 6643, (short)2, (short)2));
if (nodes.size() == 0)
throw new SyncException("No valid nodes found");
if (thisNodeId < 0)
throw new SyncException("Could not find a node for the local node");
logger.info("Nodes: {}",nodes);
return new ClusterConfig(nodes, thisNodeId, authScheme,
keyStorePath, keyStorePassword);
}
......@@ -190,18 +196,19 @@ public class StorageCCProvider
}
}
/**
* Tulio Ribeiro
* @param String json
* @param String org.sdnplatform.sync.internal.SyncManager.clusterNodes foodlightdefault.properties.
* @param String controllerId
* @return Map<String, Node>
*/
private static HashMap<Short, Node> jsonToNodeMap(String json, String controllerId) {
private static List<Node> jsonToNodeMap(String json, String controllerId) {
MappingJsonFactory f = new MappingJsonFactory();
JsonParser jp;
HashMap<Short, Node> retValue = new HashMap<Short, Node>();
List<Node> nodes = new ArrayList<Node>();
if (json == null || json.isEmpty()) {
return retValue;
return nodes;
}
try {
......@@ -222,39 +229,40 @@ public class StorageCCProvider
}
String nodeId = jp.getCurrentName();
String host=null;
String domainId = controllerId;
String [] aux;
int port;
Node node=null;
jp.nextToken();
if (jp.getText().equals("")) {
continue;
}
host = jp.getValueAsString();
aux= host.split(":");
host = aux[0];
port = Integer.parseInt(aux[1]);
try {
logger.info("Initialize node: {}:{} {} {}",
logger.debug("Creating node: {}:{} {} {}",
new Object[]{host, port, nodeId, nodeId}
);
);
node = new Node(host, port, Short.parseShort(nodeId), Short.parseShort(nodeId));
retValue.put(Short.parseShort(nodeId), node);
//logger.info("Parsing JSON controllerId:{}, node:{}", controllerId, host+":"+port);
nodes.add(node);
} catch(Exception e){
e.printStackTrace();
}
}
} catch (IOException e) {
logger.error("Problem: {}", e);
}
return retValue;
return nodes;
}
}
......@@ -88,7 +88,7 @@ public class RemoteSyncManager extends AbstractSyncManager {
/**
* The hostname of the server to connect to
*/
protected String hostname = "localhost";
protected String hostname = "192.168.1.131";
/**
* Port to connect to
......
......@@ -22,6 +22,7 @@ org.sdnplatform.sync.internal.SyncManager.authScheme=CHALLENGE_RESPONSE
org.sdnplatform.sync.internal.SyncManager.keyStorePath=/etc/floodlight/mykey.jceks
org.sdnplatform.sync.internal.SyncManager.dbPath=/var/lib/floodlight/
org.sdnplatform.sync.internal.SyncManager.port=6642
org.sdnplatform.sync.internal.SyncManager.nodeId=1
org.sdnplatform.sync.internal.SyncManager.clusterNodes={"1":"192.168.1.131:6642","2":"192.168.1.131:6643"}
net.floodlightcontroller.forwarding.Forwarding.match=vlan, mac, ip, transport
net.floodlightcontroller.forwarding.Forwarding.flood-arp=NO
......
......@@ -19,13 +19,15 @@ net.floodlightcontroller.statistics.StatisticsCollector
org.sdnplatform.sync.internal.SyncManager.authScheme=CHALLENGE_RESPONSE
org.sdnplatform.sync.internal.SyncManager.keyStorePath=/etc/floodlight/auth_credentials.jceks
org.sdnplatform.sync.internal.SyncManager.dbPath=/var/lib/floodlight2/
org.sdnplatform.sync.internal.SyncManager.port=6642
org.sdnplatform.sync.internal.SyncManager.port=6643
org.sdnplatform.sync.internal.SyncManager.nodeId=2
org.sdnplatform.sync.internal.SyncManager.clusterNodes={"1":"192.168.1.131:6642","2":"192.168.1.131:6643"}
net.floodlightcontroller.forwarding.Forwarding.match=vlan, mac, ip, transport
net.floodlightcontroller.forwarding.Forwarding.flood-arp=NO
net.floodlightcontroller.core.internal.FloodlightProvider.openFlowPort=7753
net.floodlightcontroller.core.internal.FloodlightProvider.role=ACTIVE
net.floodlightcontroller.core.internal.FloodlightProvider.workerThreads=8
net.floodlightcontroller.core.internal.FloodlightProvider.controllerId=C2
net.floodlightcontroller.core.internal.FloodlightProvider.controllerId=2
net.floodlightcontroller.linkdiscovery.internal.LinkDiscoveryManager.latency-history-size=10
net.floodlightcontroller.linkdiscovery.internal.LinkDiscoveryManager.latency-update-threshold=0.5
net.floodlightcontroller.core.internal.OFSwitchManager.defaultMaxTablesToReceiveTableMissFlow=1
......
......@@ -15,12 +15,13 @@
<logger name="LogService" level="DEBUG"></logger> <!-- Restlet access logging -->
<logger name="net.floodlightcontroller" level="INFO"/>
<logger name="org.sdnplatform" level="INFO"></logger>
<logger name="org.sdnplatform.sync.internal.config.SyncStoreCCProvider" level="TRACE"></logger>
<logger name="net.floodlightcontroller.devicemanager" level="INFO"></logger>
<logger name="net.floodlightcontroller.linkdiscovery" level="INFO"></logger>
<logger name="net.floodlightcontroller.forwarding" level="INFO"></logger>
<logger name="net.floodlightcontroller.simpleft.FT" level="TRACE"></logger>
<logger name="net.floodlightcontroller.core" level="INFO"></logger>
<logger name="net.floodlightcontroller.topology" level="TRACE" ></logger>
<logger name="net.floodlightcontroller.topology" level="INFO" ></logger>
<logger name="org.projectfloodlight.openflow" level="INFO" ></logger>
<logger name="net.floodlightcontroller.core.internal.OFSwitchManager" level="INFO"></logger>
<logger name="net.floodlightcontroller.core.internal.OFSwitchHandshakeHandler" level="INFO"></logger>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment