diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/BDINetRApp.java b/network-resilience/src/br/ufrgs/inf/bdinetr/BDINetRApp.java
index 76a7cb0..7bffaeb 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/BDINetRApp.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/BDINetRApp.java
@@ -70,17 +70,26 @@ public class BDINetRApp {
OMNeT, SIMPLE_NETWORK, COMPLEX_NETWORK, ESCAPE
};
- private static final Set<Link> AFFECTED_LINKS;
- private static final Network NETWORK;
+ private static final Set<Link> AFFECTED_LINKS = new HashSet<>();
+ private static final Network NETWORK = new Network();
private static final SimulationType SIMULATION_TYPE = SimulationType.ESCAPE;
+ private String[] args = null;
- static {
+ public static void main(String[] args) {
+ new BDINetRApp(args).createAndShowGUI();
+ }
+
+ private ProfileImpl bootProfile;
+ private final Log log;
+ private jade.core.Runtime runtime;
+
+ public BDINetRApp(String[] args) {
+ this.log = LogFactory.getLog(this.getClass());
+
PropertyConfigurator.configure(BDINetRApp.class.getResource("log4j.properties"));
- NETWORK = new Network();
- AFFECTED_LINKS = new HashSet<>();
AbstractRouterComponentFactory factory;
-
+
switch (SIMULATION_TYPE) {
case OMNeT:
factory = new OMNeTRouterComponentFactory();
@@ -128,61 +137,13 @@ public class BDINetRApp {
NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5552, "CLASSIFIER", Role.CLASSIFIER.getId(), factory));
NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5553, "FLOW_EXPORTER", Role.FLOW_EXPORTER.getId(), factory));
- //NETWORK.addRouter(new Router(new Ip("10.0.0.17"), -1, "LINK_MONITOR 2", Role.LINK_MONITOR.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5550, "RATE_LIMITER 2", Role.RATE_LIMITER.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5551, "ANOMALY_DETECTION 2", Role.ANOMALY_DETECTION.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5552, "CLASSIFIER 2", Role.CLASSIFIER.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5553, "FLOW_EXPORTER 2", Role.FLOW_EXPORTER.getId(), factory));
-
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5550, "RATE_LIMITER 3", Role.RATE_LIMITER.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5551, "ANOMALY_DETECTION 3", Role.ANOMALY_DETECTION.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5552, "CLASSIFIER 3", Role.CLASSIFIER.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5553, "FLOW_EXPORTER 3", Role.FLOW_EXPORTER.getId(), factory));
-
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5550, "RATE_LIMITER 4", Role.RATE_LIMITER.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5551, "ANOMALY_DETECTION 4", Role.ANOMALY_DETECTION.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5552, "CLASSIFIER 4", Role.CLASSIFIER.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5553, "FLOW_EXPORTER 4", Role.FLOW_EXPORTER.getId(), factory));
-
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5550, "RATE_LIMITER 5", Role.RATE_LIMITER.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5551, "ANOMALY_DETECTION 5", Role.ANOMALY_DETECTION.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5552, "CLASSIFIER 5", Role.CLASSIFIER.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5553, "FLOW_EXPORTER 5", Role.FLOW_EXPORTER.getId(), factory));
-
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5550, "RATE_LIMITER 6", Role.RATE_LIMITER.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5551, "ANOMALY_DETECTION 6", Role.ANOMALY_DETECTION.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5552, "CLASSIFIER 6", Role.CLASSIFIER.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5553, "FLOW_EXPORTER 6", Role.FLOW_EXPORTER.getId(), factory));
-
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5550, "RATE_LIMITER 7", Role.RATE_LIMITER.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5551, "ANOMALY_DETECTION 7", Role.ANOMALY_DETECTION.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5552, "CLASSIFIER 7", Role.CLASSIFIER.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5553, "FLOW_EXPORTER 7", Role.FLOW_EXPORTER.getId(), factory));
-
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5550, "RATE_LIMITER 8", Role.RATE_LIMITER.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5551, "ANOMALY_DETECTION 8", Role.ANOMALY_DETECTION.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5552, "CLASSIFIER 8", Role.CLASSIFIER.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5553, "FLOW_EXPORTER 8", Role.FLOW_EXPORTER.getId(), factory));
-
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5550, "RATE_LIMITER 9", Role.RATE_LIMITER.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5551, "ANOMALY_DETECTION 9", Role.ANOMALY_DETECTION.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5552, "CLASSIFIER 9", Role.CLASSIFIER.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5553, "FLOW_EXPORTER 9", Role.FLOW_EXPORTER.getId(), factory));
-
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5550, "RATE_LIMITER 19", Role.RATE_LIMITER.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5551, "ANOMALY_DETECTION 19", Role.ANOMALY_DETECTION.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5552, "CLASSIFIER 19", Role.CLASSIFIER.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5553, "FLOW_EXPORTER 19", Role.FLOW_EXPORTER.getId(), factory));
-
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5550, "RATE_LIMITER 29", Role.RATE_LIMITER.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5551, "ANOMALY_DETECTION 29", Role.ANOMALY_DETECTION.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5552, "CLASSIFIER 29", Role.CLASSIFIER.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5553, "FLOW_EXPORTER 29", Role.FLOW_EXPORTER.getId(), factory));
-
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5550, "RATE_LIMITER 39", Role.RATE_LIMITER.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5551, "ANOMALY_DETECTION 39", Role.ANOMALY_DETECTION.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5552, "CLASSIFIER 39", Role.CLASSIFIER.getId(), factory));
- NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5553, "FLOW_EXPORTER 39", Role.FLOW_EXPORTER.getId(), factory));
+ log.info("Total : " + args[0]);
+
+ for(int i = 0; i < Integer.parseInt(args[0]); i++){
+ NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5550, "RATE_LIMITER " + i, Role.RATE_LIMITER.getId(), factory));
+ NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5551, "ANOMALY_DETECTION " + i, Role.ANOMALY_DETECTION.getId(), factory));
+ NETWORK.addRouter(new Router(new Ip("10.0.0.17"), 5552, "CLASSIFIER " + i, Role.CLASSIFIER.getId(), factory));
+ }
break;
@@ -199,18 +160,7 @@ public class BDINetRApp {
}
}
}
- }
-
- public static void main(String[] args) {
- new BDINetRApp().createAndShowGUI();
- }
-
- private ProfileImpl bootProfile;
- private final Log log;
- private jade.core.Runtime runtime;
-
- public BDINetRApp() {
- this.log = LogFactory.getLog(this.getClass());
+
List<String> params = new ArrayList<String>();
params.add("-gui");
